glyphix 1.0.30 → 1.0.31

package/package.json

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

package/types/index.d.ts

@@ -21,39 +21,31 @@ declare global {
   function $t(key: string): string;
 }
 
-// 基础 Data 类型定义
-type Data<T extends Record<string, any> = Record<string, any>> = T;
-
-// 其他类型定义保持不变
-type ComputedResults<C, D extends Data> = {
+type ComputedResults<C, D> = {
   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 Computed<C, D extends Data> = {
+type Data = Record<string, any>;
+type Computed<C, D> = {
   [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
-    : any;
+    : never;
 };
-
-type Methods<M, D extends Data> = {
+type Methods<M, D> = {
   [K in keyof M]: K extends keyof D ? never : M[K];
 };
-
 type LifeCycleHooks = {
   onInit?: () => void;
   onReady?: () => void;
@@ -61,7 +53,6 @@ type LifeCycleHooks = {
   onHide?: () => void;
   onDestroy?: () => void;
 };
-
 type OmitedProps =
   | "data"
   | "computed"
@@ -70,7 +61,6 @@ type OmitedProps =
   | "onShow"
   | "onHide"
   | "onDestroy";
-
 type ComponentInternals = {
   $element(id: string): Record<string, any> | undefined;
   $valid: boolean;
@@ -79,31 +69,26 @@ type ComponentInternals = {
   $component(name: string, url: string): void;
   $emit(name: string, ...args: Array<any>);
 };
-
-type ComponentProps<D extends Data, C, M> = Omit<
+type ComponentProps<D, C, M> = Omit<
   D & ComputedResults<C, D> & M & ComponentInternals,
   OmitedProps
 >;
-
-// 修正 ComponentOptions 类型
 type ComponentOptions<
-  T extends Record<string, any>,
-  C = any,
-  W = any,
-  M = any
+  D extends Data,
+  C, // 先不深究 C 的 this 约束
+  W,
+  M
 > = {
-  data: T;
-  computed?: Computed<C, T>;
-  watch?: Watches<W, T>;
+  data: D;
+  computed?: Computed<C, D>;
+  watch?: Watches<W, D>;
 } & LifeCycleHooks &
-  Methods<M, T> &
-  ThisType<ComponentProps<T, Computed<C, T & Methods<M, T>>, M>>;
-
+  Methods<M, D> &
+  ThisType<ComponentProps<D, Computed<C, D & Methods<M, D>>, M>>;
 export declare function defineComponent<
-  T extends Record<string, any>,
-  C = any,
-  W = any,
-  M = any
->(options: ComponentOptions<T, C, W, M>): ComponentOptions<T, C, W, M>;
-
+  D extends Data,
+  C, // 计算属性可能依赖于 data 和 methods
+  W,
+  M
+>(options: ComponentOptions<D, C, W, M>): ComponentOptions<D, C, W, M>;
 export {};