Merge pull request #17 from 8128-33550336/develop

8128-33550336 · Jul 3, 2023 · 8bb734c · 8bb734c
2 parents 89a20a0 + f6752f6
commit 8bb734c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@8128-33550336/key-capture",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "keyboard capture",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/key.ts b/src/key.ts
@@ -35,11 +35,11 @@ type shiftFunctionKeyTypes = { [P in
 
 type pageKey = { [P in 'Home' | 'End' | 'PageUp' | 'PageDown' | 'Insert' | 'DeleteKey' | 'Find' | 'Select']: [name: P, codePoint: number[]] };
 
-type ascii0x40ControlTypes = { [P in typeof ascii0x40 extends readonly (infer T extends string)[] ? `Control.${T}` : never]: [name: P, codePoint: number] };
+type ascii0x40ControlTypes = { [P in `Control.${typeof ascii0x40[number]}`]: [name: P, codePoint: number] };
 
-type ascii0x50ControlTypes = { [P in typeof ascii0x50 extends readonly (infer T extends string)[] ? `Control.${T}` : never]: [name: P, codePoint: number] };
-type noShiftFirstHalfCaseTypes = { [P in typeof noShiftFirstHalf extends readonly (infer T extends string)[] ? Lowercase<T> : never]: [name: P, codePoint: number] };
-type noShiftSecondHalfCaseTypes = { [P in typeof noShiftSecondHalf extends readonly (infer T extends string)[] ? Lowercase<T> : never]: [name: P, codePoint: number] };
+type ascii0x50ControlTypes = { [P in `Control.${typeof ascii0x50[number]}`]: [name: P, codePoint: number] };
+type noShiftFirstHalfCaseTypes = { [P in Lowercase<typeof noShiftFirstHalf[number]>]: [name: P, codePoint: number] };
+type noShiftSecondHalfCaseTypes = { [P in Lowercase<typeof noShiftSecondHalf[number]>]: [name: P, codePoint: number] };
 
 type arrowTypes = { [P in 'ArrowUp' | 'ArrowDown' | 'ArrowLeft' | 'ArrowRight']: [name: P, codePoint: number[]] };
 type sequenceType = { [P in 'CSI' | 'SS3']: [name: P, codePoint: number[]] };