From 7e90365657bd65eb91129e48ae8b5f8d5e109105 Mon Sep 17 00:00:00 2001 From: lionel-rowe Date: Wed, 15 May 2024 11:22:04 +0800 Subject: [PATCH] Fix type checking issues --- .../text-to-unicode/text-to-unicode.service.test.ts | 12 ++++++------ src/tools/text-to-unicode/text-to-unicode.service.ts | 4 ++-- src/tools/text-to-unicode/text-to-unicode.vue | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tools/text-to-unicode/text-to-unicode.service.test.ts b/src/tools/text-to-unicode/text-to-unicode.service.test.ts index 7b4e7f74..3c79622a 100644 --- a/src/tools/text-to-unicode/text-to-unicode.service.test.ts +++ b/src/tools/text-to-unicode/text-to-unicode.service.test.ts @@ -43,7 +43,7 @@ describe('text-to-unicode', () => { interface TestConfig { text: string results: Record - skipPrintableAscii?: boolean + skipAscii?: boolean }; const tests: TestConfig[] = [ { @@ -57,7 +57,7 @@ describe('text-to-unicode', () => { }, { text: 'ABC', - skipPrintableAscii: true, + skipAscii: true, results: { fullUnicode: 'ABC', utf16: 'ABC', @@ -67,7 +67,7 @@ describe('text-to-unicode', () => { }, { text: ALL_PRINTABLE_ASCII, - skipPrintableAscii: true, + skipAscii: true, results: { // eslint-disable-next-line unicorn/escape-case fullUnicode: String.raw` !\u0022#$%&\u0027()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\u005c]^_${'`'}abcdefghijklmnopqrstuvwxyz{|}~`, @@ -90,7 +90,7 @@ describe('text-to-unicode', () => { }, { text: 'a 💩 b', - skipPrintableAscii: true, + skipAscii: true, results: { // eslint-disable-next-line unicorn/escape-case fullUnicode: String.raw`a \u{1f4a9} b`, @@ -102,13 +102,13 @@ describe('text-to-unicode', () => { }, ]; - for (const { text, skipPrintableAscii: skipAscii, results } of tests) { + for (const { text, skipAscii, results } of tests) { describe(`${text} (skipAscii=${skipAscii})`, () => { for (const [key, result] of Object.entries(results)) { describe(key, () => { const converter = converters[key as ConverterId]; it('Escaping', () => { - expect(converter.escape(text, skipAscii)).toBe(result); + expect(converter.escape(text, skipAscii ?? false)).toBe(result); }); it('Unescaping', () => { expect(converter.unescape(result)).toBe(text); diff --git a/src/tools/text-to-unicode/text-to-unicode.service.ts b/src/tools/text-to-unicode/text-to-unicode.service.ts index ac07fd31..407bb6f9 100644 --- a/src/tools/text-to-unicode/text-to-unicode.service.ts +++ b/src/tools/text-to-unicode/text-to-unicode.service.ts @@ -4,11 +4,11 @@ export const SKIP_ASCII_JS = /([ -!#-&(-\[\]-~]+)/g; export const SKIP_ASCII_HTML = /([ -!#-%(-;=?-~]+)/g; function codeUnits(text: string): number[] { - return text.split('').map(char => char.codePointAt(0)); + return text.split('').map(char => char.codePointAt(0)!); } function codePoints(text: string): number[] { - return [...text].map(char => char.codePointAt(0)); + return [...text].map(char => char.codePointAt(0)!); } interface ConverterConfig { diff --git a/src/tools/text-to-unicode/text-to-unicode.vue b/src/tools/text-to-unicode/text-to-unicode.vue index ed185975..8dea882e 100644 --- a/src/tools/text-to-unicode/text-to-unicode.vue +++ b/src/tools/text-to-unicode/text-to-unicode.vue @@ -27,7 +27,7 @@ const { copy: copyText } = useCopy({ source: textFromUnicode }); v-model:value="converterId" searchable label="Conversion type:" - :options="Object.entries(converters).map(([key, val]) => ({ label: val.name, value: key }))" + :options="Object.entries(converters).map(([key, val]) => ({ label: val.config.name, value: key }))" />