glyphix 1.0.25 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "glyphix",
-	"version": "1.0.25",
+	"version": "1.0.27",
 	"main": "lib/index.js",
 	"types": "types/index.d.ts",
 	"files": [

package/types/audiokit.d.ts

@@ -39,7 +39,7 @@ declare module "@system.audiokit" {
     }
 
     interface AudioKitFactory {
-        getPlayers(): AudioPlayer
+        getPlayers(): Array<AudioPlayer>
         getActivePlayer(): AudioPlayer
         subscribe(callback: (event:{
             notify: string,

package/types/index.d.ts

@@ -17,37 +17,43 @@
 /// <reference path="./exchange.d.ts" />
 /// <reference path="./audiokit.d.ts" />
 
-
 declare global {
   function $t(key: string): string;
 }
 
+// 基础 Data 类型定义
+type Data<T extends Record<string, any> = Record<string, any>> = T;
 
-type ComputedResults<C, D> = {
+// 其他类型定义保持不变
+type ComputedResults<C, D extends Data> = {
   readonly [K in keyof C as C[K] extends (this: D) => any
     ? K
     : never]: C[K] extends () => infer R ? R : never;
 } & {
   [K in keyof C]: C[K] extends ComputedField<infer R> ? R : never;
 };
+
 type ComputedField<T> =
   | {
       get(): T;
       set(x: T): void;
     }
   | (() => T);
-type Data = Record<string, any>;
-type Computed<C, D> = {
+
+type Computed<C, D extends Data> = {
   [K in keyof C]: K extends keyof D ? never : ComputedField<C[K]>;
 } & ThisType<D>;
+
 type Watches<W, D extends Data> = {
   [K in keyof W]: K extends keyof D
     ? ((newValue: D[K], oldValue: D[K]) => void) | undefined
     : never;
 };
-type Methods<M, D> = {
+
+type Methods<M, D extends Data> = {
   [K in keyof M]: K extends keyof D ? never : M[K];
 };
+
 type LifeCycleHooks = {
   onInit?: () => void;
   onReady?: () => void;
@@ -55,6 +61,7 @@ type LifeCycleHooks = {
   onHide?: () => void;
   onDestroy?: () => void;
 };
+
 type OmitedProps =
   | "data"
   | "computed"
@@ -63,6 +70,7 @@ type OmitedProps =
   | "onShow"
   | "onHide"
   | "onDestroy";
+
 type ComponentInternals = {
   $element(id: string): Record<string, any> | undefined;
   $valid: boolean;
@@ -71,26 +79,31 @@ type ComponentInternals = {
   $component(name: string, url: string): void;
   $emit(name: string, ...args: Array<any>);
 };
-type ComponentProps<D, C, M> = Omit<
+
+type ComponentProps<D extends Data, C, M> = Omit<
   D & ComputedResults<C, D> & M & ComponentInternals,
   OmitedProps
 >;
+
+// 修正 ComponentOptions 类型
 type ComponentOptions<
-  D extends Data,
-  C, // 先不深究 C 的 this 约束
-  W,
-  M
+  T extends Record<string, any>,
+  C = any,
+  W = any,
+  M = any
 > = {
-  data: D;
-  computed?: Computed<C, D>;
-  watch?: Watches<W, D>;
+  data: T;
+  computed?: Computed<C, T>;
+  watch?: Watches<W, T>;
 } & LifeCycleHooks &
-  Methods<M, D> &
-  ThisType<ComponentProps<D, Computed<C, D & Methods<M, D>>, M>>;
+  Methods<M, T> &
+  ThisType<ComponentProps<T, Computed<C, T & Methods<M, T>>, M>>;
+
 export declare function defineComponent<
-  D extends Data,
-  C, // 计算属性可能依赖于 data 和 methods
-  W,
-  M
->(options: ComponentOptions<D, C, W, M>): ComponentOptions<D, C, W, M>;
+  T extends Record<string, any>,
+  C = any,
+  W = any,
+  M = any
+>(options: ComponentOptions<T, C, W, M>): ComponentOptions<T, C, W, M>;
+
 export {};