fix: type errors

hoshimei · May 14, 2023 · d740b05 · d740b05
1 parent 8180494
commit d740b05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hoshimei/adv",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Aipura adv reader.",
   "scripts": {
     "bundle": "bash scripts/build.sh",

diff --git a/src/parts/choiceGroup.ts b/src/parts/choiceGroup.ts
@@ -8,7 +8,7 @@ export default function read(t: RawCommand): ChoiceGroup {
   return {
     _t: 'ChoiceGroup',
     choices: pickMany(t, 'choices', 'object').map((x) =>
-      pickFirst(x, 'text', 'string')
+      pickFirst(x as RawCommand, 'text', 'string')
     ),
     startTime: pickObject(clip, '_startTime', 'number'),
     duration: pickObject(clip, '_duration', 'number'),

diff --git a/src/utils/pick.ts b/src/utils/pick.ts
@@ -1,4 +1,4 @@
-import type { ArgValueType, ArgValueTypeMap, RawCommand } from '../types'
+import type { Arg, ArgValueType, ArgValueTypeMap, RawCommand } from '../types'
 
 function checkType(
   value: ArgValueType,
@@ -28,7 +28,11 @@ export function tryPickFirst<T extends keyof ArgValueTypeMap>(
 }
 
 export function pickFirst<T extends keyof ArgValueTypeMap>(
-  c: RawCommand | Record<string, any>,
+  c:
+    | RawCommand
+    | {
+        args: Arg[]
+      },
   key: string,
   assertType: T
 ): ArgValueTypeMap[T] {
@@ -43,7 +47,11 @@ export function pickFirst<T extends keyof ArgValueTypeMap>(
 }
 
 export function pickMany<T extends keyof ArgValueTypeMap>(
-  c: RawCommand | Record<string, any>,
+  c:
+    | RawCommand
+    | {
+        args: Arg[]
+      },
   key: string,
   assertType: T
 ): ArgValueTypeMap[T][] {