Merge pull request #230 from SgLy/fix-adapter-extra-this-type-misplaced

fix(miniprogram-adapter): extraThisType generic for BehaviorBuilder#behavior misplaced

Author: LastLeaf

glass-easel-miniprogram-adapter/src/behavior.ts

@@ -17,7 +17,6 @@ export type GeneralBehavior = Behavior<
   Record<string, any>,
   Record<string, any>,
   Record<string, any>,
-  any,
   any
 >
 

glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts

@@ -424,7 +424,7 @@ export class BaseBehaviorBuilder<
       export: exports,
     } = def
     behaviors?.forEach((beh) => {
-      this._$parents.push(beh as GeneralBehavior)
+      this._$parents.push(beh)
       inner.behavior(beh._$)
     })
     if (rawData !== undefined) {

glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts

@@ -85,9 +85,17 @@ export class BehaviorBuilder<
     UProperty extends PropertyList,
     UMethod extends MethodList,
     UChainingFilter extends ChainingFilterType,
+    UComponentExport,
     UExtraThisFields extends DataList,
   >(
-    behavior: Behavior<UData, UProperty, UMethod, UChainingFilter, UExtraThisFields>,
+    behavior: Behavior<
+      UData,
+      UProperty,
+      UMethod,
+      UChainingFilter,
+      UComponentExport,
+      UExtraThisFields
+    >,
   ): ResolveBehaviorBuilder<
     BehaviorBuilder<
       TPrevData,

glass-easel-miniprogram-adapter/src/types.ts

@@ -1,5 +1,5 @@
 import { type DeepCopyKind, type typeUtils as utils } from 'glass-easel'
-import type { Behavior, DefinitionFilter, GeneralBehavior } from './behavior'
+import type { DefinitionFilter, GeneralBehavior } from './behavior'
 import { type GeneralComponent } from './component'
 
 export { typeUtils as utils } from 'glass-easel'
@@ -44,7 +44,7 @@ export type BehaviorDefinition<
   TMethod extends utils.MethodList,
   TComponentExport,
 > = {
-  behaviors?: Behavior<any, any, any, any, any>[]
+  behaviors?: GeneralBehavior[]
   properties?: TProperty
   data?: TData | (() => TData)
   observers?:

glass-easel-miniprogram-adapter/tests/space.test.ts

@@ -1119,27 +1119,36 @@ describe('define', () => {
       .behavior()
       .extraThisFieldsType<{ behDelayedData: string }>()
       .lifetime('created', function () {
-        this.behDelayedData = ' World!'
+        this.behDelayedData = 'Say hello'
+      })
+      .register()
+
+    const beh2 = codeSpace
+      .behavior()
+      .behavior(beh)
+      .extraThisFieldsType<{ beh2DelayedData: string }>()
+      .lifetime('created', function () {
+        this.beh2DelayedData = `${this.behDelayedData} to`
       })
       .register()
 
     codeSpace
       .component('path/to/comp')
-      .behavior(beh)
+      .behavior(beh2)
       .extraThisFieldsType<{ delayedData: string }>()
       .data(() => ({
         hello: '',
       }))
       .lifetime('created', function () {
-        this.delayedData = 'Hello'
+        this.delayedData = `${this.beh2DelayedData} glass-easel!`
         this.setData({
-          hello: this.delayedData + this.behDelayedData,
+          hello: this.delayedData,
         })
       })
       .register()
 
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
-    expect(domHtml(root.getComponent())).toBe('<div>Hello World!</div>')
+    expect(domHtml(root.getComponent())).toBe('<div>Say hello to glass-easel!</div>')
   })
 })