Merge pull request #177 from wechat-miniprogram/feat-adapter-write-in…

…it-method Adapter: write init method to method caller
wechat-miniprogram · Jul 10, 2024 · 0f9698f · 0f9698f
2 parents 398a0b1 + f9d916c
commit 0f9698f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 12 deletions.
diff --git a/glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts
@@ -23,6 +23,7 @@ type MethodList = typeUtils.MethodList
 type ChainingFilterType = typeUtils.ChainingFilterType
 type ComponentMethod = typeUtils.ComponentMethod
 type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
+type UnTaggedMethod<M extends TaggedMethod<any>> = typeUtils.UnTaggedMethod<M>
 
 export class BaseBehaviorBuilder<
   TPrevData extends DataList = Empty,
@@ -260,7 +261,12 @@ export class BaseBehaviorBuilder<
       TPrevData,
       TData,
       TProperty,
-      TMethod,
+      TMethod &
+        (TExport extends void
+          ? Empty
+          : {
+              [K in keyof TExport]: UnTaggedMethod<TExport[K]>
+            }),
       TChainingFilter,
       TPendingChainingFilter,
       TComponentExport,
@@ -316,7 +322,7 @@ export class BaseBehaviorBuilder<
         TExtraThisFields
       >
 
-      return func.call(methodCaller, {
+      const exported = func.call(methodCaller, {
         self: methodCaller,
         data,
         setData: (newData, callback) => {
@@ -335,6 +341,18 @@ export class BaseBehaviorBuilder<
         method,
         listener,
       })
+
+      if (exported) {
+        const exportedKeys = Object.keys(exported)
+        for (let j = 0; j < exportedKeys.length; j += 1) {
+          const exportedKey = exportedKeys[j]!
+          const exportItem: unknown = exported[exportedKey]
+          if (glassEasel.Component.isTaggedMethod(exportItem)) {
+            ;(methodCaller as { [key: string]: unknown })[exportedKey] = exportItem
+          }
+        }
+      }
+      return exported
     })
     return this as any
   }

diff --git a/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts
@@ -17,6 +17,7 @@ type MethodList = typeUtils.MethodList
 type ChainingFilterType = typeUtils.ChainingFilterType
 type ComponentMethod = typeUtils.ComponentMethod
 type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
+type UnTaggedMethod<M extends TaggedMethod<any>> = typeUtils.UnTaggedMethod<M>
 type ChainingFilterFunc<
   TAddedFields extends { [key: string]: any },
   TRemovedFields extends string = never,
@@ -217,7 +218,12 @@ export class BehaviorBuilder<
       TPrevData,
       TData,
       TProperty,
-      TMethod,
+      TMethod &
+        (TExport extends void
+          ? Empty
+          : {
+              [K in keyof TExport]: UnTaggedMethod<TExport[K]>
+            }),
       TChainingFilter,
       TPendingChainingFilter,
       TComponentExport,

diff --git a/glass-easel-miniprogram-adapter/src/builder/component_builder.ts b/glass-easel-miniprogram-adapter/src/builder/component_builder.ts
@@ -24,6 +24,7 @@ type MethodList = typeUtils.MethodList
 type ChainingFilterType = typeUtils.ChainingFilterType
 type ComponentMethod = typeUtils.ComponentMethod
 type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
+type UnTaggedMethod<M extends TaggedMethod<any>> = typeUtils.UnTaggedMethod<M>
 
 /**
  * A direct way to create a component
@@ -241,7 +242,12 @@ export class ComponentBuilder<
       TPrevData,
       TData,
       TProperty,
-      TMethod,
+      TMethod &
+        (TExport extends void
+          ? Empty
+          : {
+              [K in keyof TExport]: UnTaggedMethod<TExport[K]>
+            }),
       TChainingFilter,
       TPendingChainingFilter,
       TComponentExport,

diff --git a/glass-easel-miniprogram-adapter/tests/space.test.ts b/glass-easel-miniprogram-adapter/tests/space.test.ts
@@ -855,15 +855,14 @@ describe('define', () => {
     // eslint-disable-next-line arrow-body-style
     const parentType = codeSpace.componentEnv('path/to/comp', ({ Component }) => {
       return Component()
-        .methods({
-          parentFn() {
-            return 456
-          },
-        })
         .lifetime('attached', function () {
           expect(this.selectComponent('#c', childType)!.childFn()).toBe(123)
           callOrder.push(2)
         })
+        .init(({ method }) => {
+          const parentFn = method(() => 456)
+          return { parentFn }
+        })
         .register()
     })
 

diff --git a/glass-easel/src/component.ts b/glass-easel/src/component.ts
@@ -502,8 +502,7 @@ export class Component<
     return taggedMethod
   }
 
-  /** @internal */
-  static _$isTaggedMethod(func: unknown): func is TaggedMethod<ComponentMethod> {
+  static isTaggedMethod(func: unknown): func is TaggedMethod<ComponentMethod> {
     return typeof func === 'function' && !!(func as unknown as { [tag: symbol]: true })[METHOD_TAG]
   }
 
@@ -815,7 +814,7 @@ export class Component<
           for (let j = 0; j < exportedKeys.length; j += 1) {
             const exportedKey = exportedKeys[j]!
             const exportItem: unknown = exported[exportedKey]
-            if (Component._$isTaggedMethod(exportItem)) {
+            if (Component.isTaggedMethod(exportItem)) {
               if (cowMethodMap) {
                 cowMethodMap = false
                 comp._$methodMap = Object.create(comp._$methodMap) as MethodList