feat: support extraThisFieldsType(#70)

wechat-miniprogram · May 21, 2024 · 896386d · 896386d
1 parent f6ff0bc
commit 896386d
Show file tree

Hide file tree

Showing 12 changed files with 283 additions and 52 deletions.
diff --git a/glass-easel-miniprogram-adapter/src/behavior.ts b/glass-easel-miniprogram-adapter/src/behavior.ts
@@ -2,6 +2,7 @@ import type * as glassEasel from 'glass-easel'
 import { type GeneralComponentDefinition, type utils as typeUtils } from './types'
 import { type GeneralComponent } from './component'
 
+type Empty = typeUtils.Empty
 type DataList = typeUtils.DataList
 type PropertyList = typeUtils.PropertyList
 type MethodList = typeUtils.MethodList
@@ -16,6 +17,7 @@ export type GeneralBehavior = Behavior<
   Record<string, any>,
   Record<string, any>,
   Record<string, any>,
+  any,
   any
 >
 
@@ -25,6 +27,7 @@ export class Behavior<
   TMethod extends MethodList,
   TChainingFilter extends ChainingFilterType,
   TComponentExport = never,
+  TDelayedData extends DataList = Empty,
 > {
   /** @internal */
   _$: glassEasel.GeneralBehavior
@@ -35,7 +38,7 @@ export class Behavior<
 
   /** @internal */
   constructor(
-    inner: glassEasel.Behavior<TData, TProperty, TMethod, TChainingFilter>,
+    inner: glassEasel.Behavior<TData, TProperty, TMethod, TChainingFilter, TDelayedData>,
     parents: GeneralBehavior[],
     definitionFilter: DefinitionFilter | undefined,
     componentExport: ((source: GeneralComponent | null) => TComponentExport) | undefined,

diff --git a/glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts
@@ -27,6 +27,7 @@ type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
 export class BaseBehaviorBuilder<
   TPrevData extends DataList = Empty,
   TData extends DataList = Empty,
+  TDelayedData extends DataList = Empty,
   TProperty extends PropertyList = Empty,
   TMethod extends MethodList = Empty,
   TChainingFilter extends ChainingFilterType = never,
@@ -37,6 +38,7 @@ export class BaseBehaviorBuilder<
   protected _$!: glassEasel.BehaviorBuilder<
     TPrevData,
     TData,
+    TDelayedData,
     TProperty,
     TMethod,
     TChainingFilter,
@@ -67,6 +69,7 @@ export class BaseBehaviorBuilder<
     BaseBehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -86,6 +89,7 @@ export class BaseBehaviorBuilder<
     BaseBehaviorBuilder<
       T,
       TData & T,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -105,6 +109,7 @@ export class BaseBehaviorBuilder<
     BaseBehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty & Record<N, unknown extends V ? T : typeUtils.PropertyOption<T, V>>,
       TMethod,
       TChainingFilter,
@@ -123,11 +128,12 @@ export class BaseBehaviorBuilder<
    * The public method can be used as an event handler, and can be visited in component instance.
    */
   methods<T extends MethodList>(
-    funcs: T & ThisType<Component<TData, TProperty, TMethod & T, any>>,
+    funcs: T & ThisType<Component<TData, TProperty, TMethod & T, any, TDelayedData>>,
   ): ResolveBehaviorBuilder<
     BaseBehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod & T,
       TChainingFilter,
@@ -153,7 +159,7 @@ export class BaseBehaviorBuilder<
     >,
   >(
     paths: P,
-    func: (this: Component<TData, TProperty, TMethod, any>, newValue: V) => void,
+    func: (this: Component<TData, TProperty, TMethod, any, TDelayedData>, newValue: V) => void,
     once?: boolean,
   ): ResolveBehaviorBuilder<this, TChainingFilter>
   observer<
@@ -169,14 +175,14 @@ export class BaseBehaviorBuilder<
   >(
     paths: readonly [...P],
     func: (
-      this: Component<TData, TProperty, TMethod, any>,
+      this: Component<TData, TProperty, TMethod, any, TDelayedData>,
       ...newValues: V extends any[] ? V : never
     ) => void,
     once?: boolean,
   ): ResolveBehaviorBuilder<this, TChainingFilter>
   observer(
     paths: string | readonly string[],
-    func: (this: Component<TData, TProperty, TMethod, any>, ...args: any[]) => any,
+    func: (this: Component<TData, TProperty, TMethod, any, TDelayedData>, ...args: any[]) => any,
     once = false,
   ): ResolveBehaviorBuilder<this, TChainingFilter> {
     this._$.observer(paths as any, func as any, once)
@@ -189,7 +195,7 @@ export class BaseBehaviorBuilder<
   lifetime<L extends keyof Lifetimes>(
     name: L,
     func: (
-      this: Component<TData, TProperty, TMethod, any>,
+      this: Component<TData, TProperty, TMethod, any, TDelayedData>,
       ...args: Parameters<Lifetimes[L]>
     ) => ReturnType<Lifetimes[L]>,
     once = false,
@@ -203,7 +209,7 @@ export class BaseBehaviorBuilder<
    */
   pageLifetime(
     name: string,
-    func: (this: Component<TData, TProperty, TMethod, any>, ...args: any[]) => any,
+    func: (this: Component<TData, TProperty, TMethod, any, TDelayedData>, ...args: any[]) => any,
     once = false,
   ): ResolveBehaviorBuilder<this, TChainingFilter> {
     this._$.pageLifetime(name, func as any, once)
@@ -215,7 +221,8 @@ export class BaseBehaviorBuilder<
    */
   relation(
     name: string,
-    rel: RelationParams & ThisType<Component<TData, TProperty, TMethod, TComponentExport>>,
+    rel: RelationParams &
+      ThisType<Component<TData, TProperty, TMethod, TComponentExport, TDelayedData>>,
   ): ResolveBehaviorBuilder<this, TChainingFilter> {
     const target =
       rel.target instanceof Behavior || rel.target instanceof ComponentType
@@ -234,18 +241,19 @@ export class BaseBehaviorBuilder<
 
   init<TExport extends Record<string, TaggedMethod<(...args: any[]) => any>> | void>(
     func: (
-      this: Component<TData, TProperty, TMethod, TComponentExport>,
+      this: Component<TData, TProperty, TMethod, TComponentExport, TDelayedData>,
       builderContext: BuilderContext<
         TPrevData,
         TProperty,
-        Component<TData, TProperty, TMethod, TComponentExport>
+        Component<TData, TProperty, TMethod, TComponentExport, TDelayedData>
       >,
     ) => TExport,
     // eslint-disable-next-line function-paren-newline
   ): ResolveBehaviorBuilder<
     BaseBehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -294,7 +302,13 @@ export class BaseBehaviorBuilder<
         implement(traitBehavior._$, impl)
       }) as BuilderContext<TPrevData, TProperty, TMethod>['implement']
 
-      const methodCaller = this as unknown as Component<TData, TProperty, TMethod, TComponentExport>
+      const methodCaller = this as unknown as Component<
+        TData,
+        TProperty,
+        TMethod,
+        TComponentExport,
+        TDelayedData
+      >
 
       return func.call(methodCaller, {
         self: methodCaller,
@@ -331,13 +345,15 @@ export class BaseBehaviorBuilder<
           TData & TNewData,
           TProperty & TNewProperty,
           TMethod & TNewMethod,
-          TNewComponentExport
+          TNewComponentExport,
+          TDelayedData
         >
       >,
   ): ResolveBehaviorBuilder<
     BaseBehaviorBuilder<
       TPrevData,
       TData & TNewData,
+      TDelayedData,
       TProperty & TNewProperty,
       TMethod & TNewMethod,
       TChainingFilter,

diff --git a/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts
@@ -25,6 +25,7 @@ type ChainingFilterFunc<
 export class BehaviorBuilder<
   TPrevData extends DataList = Empty,
   TData extends DataList = Empty,
+  TDelayedData extends DataList = Empty,
   TProperty extends PropertyList = Empty,
   TMethod extends MethodList = Empty,
   TChainingFilter extends ChainingFilterType = never,
@@ -33,6 +34,7 @@ export class BehaviorBuilder<
 > extends BaseBehaviorBuilder<
   TPrevData,
   TData,
+  TDelayedData,
   TProperty,
   TMethod,
   TChainingFilter,
@@ -59,6 +61,7 @@ export class BehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -80,12 +83,14 @@ export class BehaviorBuilder<
     UProperty extends PropertyList,
     UMethod extends MethodList,
     UChainingFilter extends ChainingFilterType,
+    UDelayedData extends DataList,
   >(
-    behavior: Behavior<UData, UProperty, UMethod, UChainingFilter>,
+    behavior: Behavior<UData, UProperty, UMethod, UChainingFilter, UDelayedData>,
   ): ResolveBehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData & UData,
+      TDelayedData & UDelayedData,
       TProperty & UProperty,
       TMethod & UMethod,
       UChainingFilter,
@@ -107,6 +112,7 @@ export class BehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -130,6 +136,7 @@ export class BehaviorBuilder<
     BehaviorBuilder<
       T,
       TData & T,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -153,6 +160,7 @@ export class BehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty & Record<N, unknown extends V ? T : typeUtils.PropertyOption<T, V>>,
       TMethod,
       TChainingFilter,
@@ -170,11 +178,12 @@ export class BehaviorBuilder<
    * The public method can be used as an event handler, and can be visited in component instance.
    */
   override methods<T extends MethodList>(
-    funcs: T & ThisType<Component<TData, TProperty, TMethod & T, any>>,
+    funcs: T & ThisType<Component<TData, TProperty, TMethod & T, any, TDelayedData>>,
   ): ResolveBehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod & T,
       TChainingFilter,
@@ -195,18 +204,19 @@ export class BehaviorBuilder<
    */
   override init<TExport extends Record<string, TaggedMethod<(...args: any[]) => any>> | void>(
     func: (
-      this: Component<TData, TProperty, TMethod, TComponentExport>,
+      this: Component<TData, TProperty, TMethod, TComponentExport, TDelayedData>,
       builderContext: BuilderContext<
         TPrevData,
         TProperty,
-        Component<TData, TProperty, TMethod, TComponentExport>
+        Component<TData, TProperty, TMethod, TComponentExport, TDelayedData>
       >,
     ) => TExport,
     // eslint-disable-next-line function-paren-newline
   ): ResolveBehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData,
+      TDelayedData,
       TProperty,
       TMethod,
       TChainingFilter,
@@ -231,13 +241,15 @@ export class BehaviorBuilder<
           TData & TNewData,
           TProperty & TNewProperty,
           TMethod & TNewMethod,
-          TNewComponentExport
+          TNewComponentExport,
+          TDelayedData
         >
       >,
   ): ResolveBehaviorBuilder<
     BehaviorBuilder<
       TPrevData,
       TData & TNewData,
+      TDelayedData,
       TProperty & TNewProperty,
       TMethod & TNewMethod,
       TChainingFilter,
@@ -254,12 +266,38 @@ export class BehaviorBuilder<
   /**
    * Finish the behavior definition process
    */
-  register(): Behavior<TData, TProperty, TMethod, TPendingChainingFilter, TComponentExport> {
+  register(): Behavior<
+    TData,
+    TProperty,
+    TMethod,
+    TPendingChainingFilter,
+    TComponentExport,
+    TDelayedData
+  > {
     return new Behavior(
       this._$.registerBehavior(),
       this._$parents,
       this._$definitionFilter,
       this._$export,
     )
   }
+
+  /**
+   * Add extra this fields type
+   */
+  extraThisFieldsType<T extends DataList>(): ResolveBehaviorBuilder<
+    BehaviorBuilder<
+      TPrevData,
+      TData,
+      TDelayedData & T,
+      TProperty,
+      TMethod,
+      TChainingFilter,
+      TPendingChainingFilter,
+      TComponentExport
+    >,
+    TChainingFilter
+  > {
+    return this as any
+  }
 }