fix: refactor with unit test + better handle korean

This commit is contained in:
ShareVB 2024-05-15 22:08:06 +02:00
parent c434a5f3f0
commit 7a4310ad90
8 changed files with 1857 additions and 1589 deletions

1
components.d.ts vendored
View file

@ -159,6 +159,7 @@ declare module '@vue/runtime-core' {
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
RsaKeyPairGenerator: typeof import('./src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue')['default']
SafelinkDecoder: typeof import('./src/tools/safelink-decoder/safelink-decoder.vue')['default']
SlugifyString: typeof import('./src/tools/slugify-string/slugify-string.vue')['default']
SpanCopyable: typeof import('./src/components/SpanCopyable.vue')['default']
SqlPrettify: typeof import('./src/tools/sql-prettify/sql-prettify.vue')['default']

View file

@ -66,6 +66,7 @@
"ibantools": "^4.3.3",
"json5": "^2.2.3",
"jwt-decode": "^3.1.2",
"korean-unpacker": "^1.0.3",
"libphonenumber-js": "^1.10.28",
"lodash": "^4.17.21",
"marked": "^10.0.0",

20
pnpm-lock.yaml generated
View file

@ -98,6 +98,9 @@ dependencies:
jwt-decode:
specifier: ^3.1.2
version: 3.1.2
korean-unpacker:
specifier: ^1.0.3
version: 1.0.3
libphonenumber-js:
specifier: ^1.10.28
version: 1.10.28
@ -3351,7 +3354,7 @@ packages:
dependencies:
'@unhead/dom': 0.5.1
'@unhead/schema': 0.5.1
'@vueuse/shared': 10.7.2(vue@3.3.4)
'@vueuse/shared': 10.9.0(vue@3.3.4)
unhead: 0.5.1
vue: 3.3.4
transitivePeerDependencies:
@ -3993,10 +3996,10 @@ packages:
- vue
dev: false
/@vueuse/shared@10.7.2(vue@3.3.4):
resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==}
/@vueuse/shared@10.9.0(vue@3.3.4):
resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==}
dependencies:
vue-demi: 0.14.6(vue@3.3.4)
vue-demi: 0.14.7(vue@3.3.4)
transitivePeerDependencies:
- '@vue/composition-api'
- vue
@ -6624,6 +6627,10 @@ packages:
resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
dev: true
/korean-unpacker@1.0.3:
resolution: {integrity: sha512-s0VIyZOFOtalBSp51NECPvM1g9Af8M0Oxe1ZdMMGL7nvG/ecVNYkCAzPU+f52f0R83ytVCOd3fd14TTOFx2GXQ==}
dev: false
/less@4.1.3:
resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==}
engines: {node: '>=6'}
@ -9151,8 +9158,8 @@ packages:
vue: 3.3.4
dev: false
/vue-demi@0.14.6(vue@3.3.4):
resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
/vue-demi@0.14.7(vue@3.3.4):
resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
@ -9442,6 +9449,7 @@ packages:
/workbox-google-analytics@7.0.0:
resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
dependencies:
workbox-background-sync: 7.0.0
workbox-core: 7.0.0

View file

@ -0,0 +1,3 @@
declare module 'korean-unpacker' {
function unpack(text: string): string;
}

View file

@ -1576,5 +1576,109 @@
"(France)": "Neuf",
"Korean": "아홉",
"Japanese": "数字のきゅう"
},
{
"Letter": "ㄱ",
"Korean": "기러기"
},
{
"Letter": "ㄴ",
"Korean": "나폴리"
},
{
"Letter": "ㄷ",
"Korean": "도라지"
},
{
"Letter": "ㄹ",
"Korean": "로마"
},
{
"Letter": "ㅁ",
"Korean": "미나리"
},
{
"Letter": "ㅂ",
"Korean": "바가지"
},
{
"Letter": "ㅅ",
"Korean": "서울"
},
{
"Letter": "ㅇ",
"Korean": "잉어"
},
{
"Letter": "ㅈ",
"Korean": "지게"
},
{
"Letter": "ㅊ",
"Korean": "치마"
},
{
"Letter": "ㅋ",
"Korean": "키다리"
},
{
"Letter": "ㅌ",
"Korean": "통신"
},
{
"Letter": "ㅍ",
"Korean": "파고다"
},
{
"Letter": "ㅎ",
"Korean": "한강"
},
{
"Letter": "ㅏ",
"Korean": "아버지"
},
{
"Letter": "ㅑ",
"Korean": "야자수"
},
{
"Letter": "ㅓ",
"Korean": "어머니"
},
{
"Letter": "ㅕ",
"Korean": "연못"
},
{
"Letter": "ㅗ",
"Korean": "오징어"
},
{
"Letter": "ㅛ",
"Korean": "요지경"
},
{
"Letter": "ㅜ",
"Korean": "우편"
},
{
"Letter": "ㅠ",
"Korean": "유달산"
},
{
"Letter": "ㅡ",
"Korean": "은방울"
},
{
"Letter": "ㅣ",
"Korean": "이순신"
},
{
"Letter": "ㅐ",
"Korean": "앵무새"
},
{
"Letter": "ㅔ",
"Korean": "엑스레이"
}
]

View file

@ -0,0 +1,137 @@
[
{
"lang": "(International)",
"input": "TesYW 123 ? = !@",
"output": "TANGO echo sierra YANKEE WHISKEY (SPACE) ONE TWO THREE (SPACE) (?) (SPACE) (=) (SPACE) (!) (@)"
},
{
"lang": "(France)",
"input": "TesYW 123 ? = !@",
"output": "THÉRÈSE eugène suzanne YVONNE WILLIAM (ESPACE) UN DEUX TROIS (ESPACE) (?) (ESPACE) (=) (ESPACE) (!) (@)"
},
{
"lang": "(Belgium)",
"input": "TesYW 123 ? = !@",
"output": "TELEFOON emiel sofie YVONNE WATERLOO (ESPACE) (1) (2) (3) (ESPACE) (?) (ESPACE) (=) (ESPACE) (!) (@)"
},
{
"lang": "(Switzerland)",
"input": "TesYW 123 ? = !@",
"output": "THÉRÈSE émile suzanne (Y) WILLIAM (ESPACE) (1) (2) (3) (ESPACE) (?) (ESPACE) (=) (ESPACE) (!) (@)"
},
{
"lang": "(Québec)",
"input": "TesYW 123 ? = !@",
"output": "THOMAS édouard samuel (Y) WILLIAM (ESPACE) (1) (2) (3) (ESPACE) (?) (ESPACE) (=) (ESPACE) (!) (@)"
},
{
"lang": "(Germany, 2022)",
"input": "TesYü 123 ? = !@",
"output": "TÜBINGEN essen salzwedel YPSILON umlaut-unna (LEERZEICHEN) (1) (2) (3) (LEERZEICHEN) (?) (LEERZEICHEN) (=) (LEERZEICHEN) (!) (@)"
},
{
"lang": "(Austria)",
"input": "TesYW 123 ? = !@",
"output": "THEODOR emil samuel/siegfried YPSILON WILHELM (LEERZEICHEN) (1) (2) (3) (LEERZEICHEN) (?) (LEERZEICHEN) (=) (LEERZEICHEN) (!) (@)"
},
{
"lang": "(Germany, informal, 2022)",
"input": "TesYü 123 ? = !@",
"output": "THEODOR emil samuel YPSILON überfluss (LEERZEICHEN) (1) (2) (3) (LEERZEICHEN) (?) (LEERZEICHEN) (=) (LEERZEICHEN) (!) (@)"
},
{
"lang": "(Netherlands)",
"input": "TesY huis rij 123 ? = !@",
"output": "THEODOR eduard simon YPSILON (SPATIE) hendrik utrecht izaak simon (SPATIE) richard/rudolf ijmuiden/ijsbrand (SPATIE) (1) (2) (3) (SPATIE) (?) (SPATIE) (=) (SPATIE) (!) (@)"
},
{
"lang": "Italian",
"input": "TesYj 123 ? = !@",
"output": "TORINO empoli savona YORK, YOGURT jolly/juventus (SPAZIO) (1) (2) (3) (SPAZIO) (?) (SPAZIO) (=) (SPAZIO) (!) (@)"
},
{
"lang": "Spanish",
"input": "TesYñj 123 ? = !@",
"output": "TOLEDO españa sábado YOLANDA ñoño josé (ESPACIO) (1) (2) (3) (ESPACIO) (?) (ESPACIO) (=) (ESPACIO) (!) (@)"
},
{
"lang": "(Brazil)",
"input": "TesYÇj 123 ? = !@",
"output": "TATU estrela saci YOLANDA (Ç) josé (ESPAÇO) (1) (2) (3) (ESPAÇO) (?) (ESPAÇO) (=) (ESPAÇO) (!) (@)"
},
{
"lang": "(Portugal)",
"input": "TesYúj 123 ? = !@",
"output": "TAVIRA évora setúbal YORK (ú) josé (ESPAÇO) (1) (2) (3) (ESPAÇO) (?) (ESPAÇO) (=) (ESPAÇO) (!) (@)"
},
{
"lang": "Swedish",
"input": "TesYj 123 ? = !@",
"output": "TORE erik sigurd YNGVE johan (UTRYMME) (1) (2) (3) (UTRYMME) (?) (UTRYMME) (=) (UTRYMME) (!) (@)"
},
{
"lang": "Danish",
"input": "TesÆYj 123 ? = !@",
"output": "THEODOR erik søren ÆGIR YRSA johan (MELLEMRUMSTEGN) (1) (2) (3) (MELLEMRUMSTEGN) (?) (MELLEMRUMSTEGN) (=) (MELLEMRUMSTEGN) (!) (@)"
},
{
"lang": "Norwegian",
"input": "TesYÅj 123 ? = !@",
"output": "TEODOR edith sigrid YNGLING ÅSE johan (MELLOMROMSTEGN) (1) (2) (3) (MELLOMROMSTEGN) (?) (MELLOMROMSTEGN) (=) (MELLOMROMSTEGN) (!) (@)"
},
{
"lang": "Finnish",
"input": "TesYj 123 ? = !@",
"output": "TYYNE eemeli sakari YRJÖ jussi (VÄLILYÖNTI) (1) (2) (3) (VÄLILYÖNTI) (?) (VÄLILYÖNTI) (=) (VÄLILYÖNTI) (!) (@)"
},
{
"lang": "Turkish",
"input": "TesYj 123 ? = !@",
"output": "TOKAT edirne sinop YOZGAT jandarma (BOŞLUK) (1) (2) (3) (BOŞLUK) (?) (BOŞLUK) (=) (BOŞLUK) (!) (@)"
},
{
"lang": "Romanian",
"input": "TesYj 123 ? = !@",
"output": "TUDOR elena sandu I-GREC jean (SPAȚIU) (1) (2) (3) (SPAȚIU) (?) (SPAȚIU) (=) (SPAȚIU) (!) (@)"
},
{
"lang": "Czech",
"input": "TesYj 123 ? = !@",
"output": "TOMÁŠ emil svatopluk YPSILON josef (PROSTOROVÝ) (1) (2) (3) (PROSTOROVÝ) (?) (PROSTOROVÝ) (=) (PROSTOROVÝ) (!) (@)"
},
{
"lang": "Yugoslav",
"input": "TesYČj 123 ? = !@",
"output": "TUZLA evropa skopje IPSILON ČAČAK jadran (PRIESTOROVÝ) (1) (2) (3) (PRIESTOROVÝ) (?) (PRIESTOROVÝ) (=) (PRIESTOROVÝ) (!) (@)"
},
{
"lang": "Serbian",
"input": "TesYČj 123 ? = !@",
"output": "TIMOK evropa sava IPSILON ČAČAK jadran (PROSTORNI) (1) (2) (3) (PROSTORNI) (?) (PROSTORNI) (=) (PROSTORNI) (!) (@)"
},
{
"lang": "Slovene",
"input": "TesYČj 123 ? = !@",
"output": "TRIGLAV evropa soča IPSILON ČATEŽ jadran (PRESLEDKA) (1) (2) (3) (PRESLEDKA) (?) (PRESLEDKA) (=) (PRESLEDKA) (!) (@)"
},
{
"lang": "Russian",
"input": "Зинаида !.?",
"output": "ЗИНАИДА иван николай анна иван дмитрий анна ( ) (!) (.) (?)"
},
{
"lang": "Korean",
"input": "안녕하세요 여러분",
"output": "잉어 아버지 나폴리 나폴리 연못 잉어 한강 아버지 서울 엑스레이 잉어 요지경 ( ) 잉어 연못 로마 어머니 바가지 우편 나폴리"
},
{
"lang": "Greek",
"input": "τίγρης !?",
"output": "τίγρης (ί) γαλή ρήγας ηρώ σοφός ( ) (!) (?)"
},
{
"lang": "Japanese",
"input": "数字のひと おしまいのン ?:",
"output": "(数) (字) 野原のノ 飛行機のヒ 東京のト ( ) 大阪のオ 新聞のシ マッチのマ いろはのイ 野原のノ おしまいのン ( ) (?) (:)"
}
]

View file

@ -0,0 +1,12 @@
import { describe, expect, it } from 'vitest';
import { textToNatoAlphabet } from './text-to-nato-alphabet.service';
import natoTests from './nato.test.data.json';
describe('text-to-nato', () => {
it('Convert text to NATO', async () => {
for (const nato of natoTests) {
const { lang, input, output } = nato;
expect(textToNatoAlphabet({ text: input, langOrCountry: lang })).to.equal(output);
}
});
});

View file

@ -1,3 +1,4 @@
import hangul from 'korean-unpacker';
import allAlphabets from './nato.alphabets.json';
type AllALphabetsKeys = keyof typeof allAlphabets[0];
@ -14,8 +15,8 @@ function textToNatoAlphabet({ text, langOrCountry = '(International)' }: { text:
.join('|')
}|.)`,
'gi');
return text
.replace(/\s/g, ' ')
return hangul.unpack(text)
.replace(/\s+/g, ' ')
.replace(
charRegex,
(character) => {
@ -28,5 +29,6 @@ function textToNatoAlphabet({ text, langOrCountry = '(International)' }: { text:
}
return ` (${character})`;
});
})
.trim();
}