feat(adapter): support export properly

wechat-miniprogram · Nov 16, 2023 · 8995008 · 8995008
1 parent 7742f82
commit 8995008
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 47 deletions.
diff --git a/glass-easel-miniprogram-adapter/src/behavior.ts b/glass-easel-miniprogram-adapter/src/behavior.ts
@@ -1,5 +1,6 @@
 import * as glassEasel from 'glass-easel'
 import { GeneralComponentDefinition, utils as typeUtils } from './types'
+import { GeneralComponent } from './component'
 
 type DataList = typeUtils.DataList
 type PropertyList = typeUtils.PropertyList
@@ -23,19 +24,24 @@ export class Behavior<
   TProperty extends PropertyList,
   TMethod extends MethodList,
   TChainingFilter extends ChainingFilterType,
+  TComponentExport = never,
 > {
   /** @internal */
   _$: glassEasel.GeneralBehavior
   /** @internal */
   _$bindedDefinitionFilter?: (target: GeneralComponentDefinition) => void
+  /** @internal */
+  _$export?: (source: GeneralComponent | null) => TComponentExport
 
   /** @internal */
   constructor(
     inner: glassEasel.Behavior<TData, TProperty, TMethod, TChainingFilter>,
     parents: GeneralBehavior[],
     definitionFilter: DefinitionFilter | undefined,
+    componentExport: ((source: GeneralComponent | null) => TComponentExport) | undefined,
   ) {
     this._$ = inner as glassEasel.GeneralBehavior
+    this._$export = componentExport
 
     // processing definition filter
     if (definitionFilter !== undefined) {

diff --git a/glass-easel-miniprogram-adapter/src/component.ts b/glass-easel-miniprogram-adapter/src/component.ts
@@ -18,7 +18,7 @@ type ExportType<
   UProperty extends PropertyList,
   UMethod extends MethodList,
   UComponentExport,
-> = UComponentExport extends undefined
+> = [UComponentExport] extends [never]
   ? Component<UData, UProperty, UMethod, UComponentExport>
   : UComponentExport
 
@@ -52,7 +52,7 @@ const filterComponentExport = (
   source: ComponentCaller<any, any, any, any>,
   elem: glassEasel.Element,
 ): any => {
-  if (elem instanceof glassEasel.Component) {
+  if (glassEasel.Component.isComponent(elem)) {
     const selectedSpace = elem.getRootBehavior().ownerSpace
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const uncheckedCaller = elem.getMethodCaller()
@@ -477,7 +477,10 @@ export class ComponentProto<
 > {
   private proto: Component<TData, TProperty, TMethod, TComponentExport>
 
-  constructor(methods: TMethod, componentExport?: () => TComponentExport) {
+  constructor(
+    methods: TMethod,
+    componentExport?: (source: GeneralComponent | null) => TComponentExport,
+  ) {
     this.proto = Object.create(ComponentCaller.prototype) as Component<
       TData,
       TProperty,

diff --git a/glass-easel-miniprogram-adapter/src/space.ts b/glass-easel-miniprogram-adapter/src/space.ts
@@ -50,10 +50,9 @@ export interface BehaviorConstructor {
     TData extends DataList,
     TProperty extends PropertyList,
     TMethod extends MethodList,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     TComponentExport,
   >(
-    definition: BehaviorDefinition<TData, TProperty, TMethod>,
+    definition: BehaviorDefinition<TData, TProperty, TMethod, TComponentExport>,
   ): Behavior<TData, TProperty, TMethod, never>
   trait<TIn extends { [key: string]: any }>(): TraitBehavior<TIn, TIn>
   trait<TIn extends { [key: string]: any }, TOut extends { [key: string]: any }>(
@@ -441,18 +440,16 @@ export class CodeSpace {
       TData extends DataList,
       TProperty extends PropertyList,
       TMethod extends MethodList,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       TComponentExport,
     >(
-      definition: BehaviorDefinition<TData, TProperty, TMethod>,
+      definition: BehaviorDefinition<TData, TProperty, TMethod, TComponentExport>,
     ): Behavior<TData, TProperty, TMethod, never>
     function behaviorConstructor<
       TData extends DataList,
       TProperty extends PropertyList,
       TMethod extends MethodList,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       TComponentExport,
-    >(definition?: BehaviorDefinition<TData, TProperty, TMethod>) {
+    >(definition?: BehaviorDefinition<TData, TProperty, TMethod, TComponentExport>) {
       if (definition !== undefined) {
         return self.behavior().definition(definition).register()
       }
@@ -521,7 +518,7 @@ export class BaseBehaviorBuilder<
   TMethod extends MethodList = Empty,
   TChainingFilter extends ChainingFilterType = never,
   TPendingChainingFilter extends ChainingFilterType = never,
-  TComponentExport = undefined,
+  TComponentExport = never,
 > {
   protected _$codeSpace!: CodeSpace
   protected _$!: glassEasel.BehaviorBuilder<
@@ -533,6 +530,7 @@ export class BaseBehaviorBuilder<
     TPendingChainingFilter
   >
   protected _$parents: GeneralBehavior[] = []
+  protected _$export?: (source: GeneralComponent | null) => TComponentExport
 
   /** Implement a trait behavior */
   implement<TIn extends { [key: string]: any }>(
@@ -549,6 +547,26 @@ export class BaseBehaviorBuilder<
     return this
   }
 
+  /** Set the export value when the component is being selected */
+  export<TNewComponentExport>(
+    f: (this: GeneralComponent, source: GeneralComponent | null) => TNewComponentExport,
+  ): ResolveBehaviorBuilder<
+    BaseBehaviorBuilder<
+      TPrevData,
+      TData,
+      TProperty,
+      TMethod,
+      TChainingFilter,
+      TPendingChainingFilter,
+      TNewComponentExport
+    >,
+    TChainingFilter
+  > {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    this._$export = f as any
+    return this as any
+  }
+
   data<T extends DataList>(
     gen: () => typeUtils.NewFieldList<AllData<TData, TProperty>, T>,
   ): ResolveBehaviorBuilder<
@@ -791,14 +809,15 @@ export class BaseBehaviorBuilder<
     TNewData extends DataList = Empty,
     TNewProperty extends PropertyList = Empty,
     TNewMethod extends MethodList = Empty,
+    TNewComponentExport = never,
   >(
-    def: BehaviorDefinition<TNewData, TNewProperty, TNewMethod> &
+    def: BehaviorDefinition<TNewData, TNewProperty, TNewMethod, TNewComponentExport> &
       ThisType<
         Component<
           TData & TNewData,
           TProperty & TNewProperty,
           TMethod & TNewMethod,
-          TComponentExport
+          TNewComponentExport
         >
       >,
   ): ResolveBehaviorBuilder<
@@ -809,7 +828,7 @@ export class BaseBehaviorBuilder<
       TMethod & TNewMethod,
       TChainingFilter,
       TPendingChainingFilter,
-      TComponentExport
+      TNewComponentExport
     >,
     TChainingFilter
   > {
@@ -830,6 +849,7 @@ export class BaseBehaviorBuilder<
       pageLifetimes: rawPageLifetimes,
       relations: rawRelations,
       externalClasses,
+      export: exports,
     } = def
     behaviors?.forEach((beh) => {
       this._$parents.push(beh as GeneralBehavior)
@@ -896,6 +916,8 @@ export class BaseBehaviorBuilder<
       }
     }
     if (externalClasses) inner.externalClasses(externalClasses)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    if (exports) this._$export = exports as any
     return this as any
   }
 }
@@ -907,7 +929,7 @@ export class BehaviorBuilder<
   TMethod extends MethodList = Empty,
   TChainingFilter extends ChainingFilterType = never,
   TPendingChainingFilter extends ChainingFilterType = never,
-  TComponentExport = undefined,
+  TComponentExport = never,
 > extends BaseBehaviorBuilder<
   TPrevData,
   TData,
@@ -978,6 +1000,24 @@ export class BehaviorBuilder<
     return this as any
   }
 
+  /** Set the export value when the component is being selected */
+  override export<TNewComponentExport>(
+    f: (this: GeneralComponent, source: GeneralComponent | null) => TNewComponentExport,
+  ): ResolveBehaviorBuilder<
+    BehaviorBuilder<
+      TPrevData,
+      TData,
+      TProperty,
+      TMethod,
+      TChainingFilter,
+      TPendingChainingFilter,
+      TNewComponentExport
+    >,
+    TChainingFilter
+  > {
+    return super.export(f) as any
+  }
+
   /**
    * Add some template data fields
    *
@@ -1083,14 +1123,15 @@ export class BehaviorBuilder<
     TNewData extends DataList = Empty,
     TNewProperty extends PropertyList = Empty,
     TNewMethod extends MethodList = Empty,
+    TNewComponentExport = never
   >(
-    def: BehaviorDefinition<TNewData, TNewProperty, TNewMethod> &
+    def: BehaviorDefinition<TNewData, TNewProperty, TNewMethod, TNewComponentExport> &
       ThisType<
         Component<
           TData & TNewData,
           TProperty & TNewProperty,
           TMethod & TNewMethod,
-          TComponentExport
+          TNewComponentExport
         >
       >,
   ): ResolveBehaviorBuilder<
@@ -1101,7 +1142,7 @@ export class BehaviorBuilder<
       TMethod & TNewMethod,
       TChainingFilter,
       TPendingChainingFilter,
-      TComponentExport
+      TNewComponentExport
     >,
     TChainingFilter
   > {
@@ -1113,8 +1154,13 @@ export class BehaviorBuilder<
   /**
    * Finish the behavior definition process
    */
-  register(): Behavior<TData, TProperty, TMethod, TPendingChainingFilter> {
-    return new Behavior(this._$.registerBehavior(), this._$parents, this._$definitionFilter)
+  register(): Behavior<TData, TProperty, TMethod, TPendingChainingFilter, TComponentExport> {
+    return new Behavior(
+      this._$.registerBehavior(),
+      this._$parents,
+      this._$definitionFilter,
+      this._$export,
+    )
   }
 }
 
@@ -1128,7 +1174,7 @@ export class ComponentBuilder<
   TMethod extends MethodList = Empty,
   TChainingFilter extends ChainingFilterType = never,
   TPendingChainingFilter extends ChainingFilterType = never,
-  TComponentExport = undefined,
+  TComponentExport = never,
 > extends BaseBehaviorBuilder<
   TPrevData,
   TData,
@@ -1141,7 +1187,6 @@ export class ComponentBuilder<
   private _$is!: string
   private _$alias?: string[]
   private _$options?: ComponentDefinitionOptions
-  private _$export?: (source: GeneralComponent | null) => TComponentExport
   private _$proto?: ComponentProto<TData, TProperty, TMethod, TComponentExport>
 
   /** @internal */
@@ -1158,12 +1203,11 @@ export class ComponentBuilder<
       if (proto === undefined) {
         const methods = originalCaller.getComponentDefinition().behavior.getMethods()
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        proto = ret._$proto = new ComponentProto(methods) as any
+        proto = ret._$proto = new ComponentProto(methods, ret._$export) as any
       }
       const caller = proto!.derive()
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       caller._$ = originalCaller as any
-      caller._$export = ret._$export
       return caller
     })
     if (overallBehavior) ret._$.behavior(overallBehavior)
@@ -1186,8 +1230,9 @@ export class ComponentBuilder<
     UProperty extends PropertyList,
     UMethod extends MethodList,
     UChainingFilter extends ChainingFilterType,
+    UComponentExport,
   >(
-    behavior: Behavior<UData, UProperty, UMethod, UChainingFilter>,
+    behavior: Behavior<UData, UProperty, UMethod, UChainingFilter, UComponentExport>,
   ): ResolveBehaviorBuilder<
     ComponentBuilder<
       TPrevData,
@@ -1196,22 +1241,23 @@ export class ComponentBuilder<
       TMethod & UMethod,
       UChainingFilter,
       TPendingChainingFilter,
-      TComponentExport
+      UComponentExport
     >,
     UChainingFilter
   > {
     this._$parents.push(behavior as GeneralBehavior)
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     this._$ = this._$.behavior(behavior._$)
+    if (behavior._$export) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      this._$export = behavior._$export as any
+    }
     return this as any
   }
 
   /** Set the export value when the component is being selected */
-  export<TNewComponentExport>(
-    f: (
-      this: Component<TData, TProperty, TMethod, TComponentExport>,
-      source: GeneralComponent | null,
-    ) => TNewComponentExport,
+  override export<TNewComponentExport>(
+    f: (this: GeneralComponent, source: GeneralComponent | null) => TNewComponentExport,
   ): ResolveBehaviorBuilder<
     ComponentBuilder<
       TPrevData,
@@ -1334,7 +1380,7 @@ export class ComponentBuilder<
     TNewData extends DataList = Empty,
     TNewProperty extends PropertyList = Empty,
     TNewMethod extends MethodList = Empty,
-    TNewComponentExport = undefined,
+    TNewComponentExport = never,
   >(
     def: ComponentDefinition<TNewData, TNewProperty, TNewMethod, TNewComponentExport> &
       ThisType<

diff --git a/glass-easel-miniprogram-adapter/src/types.ts b/glass-easel-miniprogram-adapter/src/types.ts
@@ -1,5 +1,6 @@
 import { DeepCopyKind, typeUtils as utils } from 'glass-easel'
 import type { DefinitionFilter, GeneralBehavior, Behavior } from './behavior'
+import { GeneralComponent } from './component'
 
 export { typeUtils as utils } from 'glass-easel'
 
@@ -40,8 +41,9 @@ export type BehaviorDefinition<
   TData extends utils.DataList,
   TProperty extends utils.PropertyList,
   TMethod extends utils.MethodList,
+  TComponentExport,
 > = {
-  behaviors?: Behavior<any, any, any, any>[]
+  behaviors?: Behavior<any, any, any, any, any>[]
   properties?: TProperty
   data?: TData | (() => TData)
   observers?:
@@ -61,6 +63,7 @@ export type BehaviorDefinition<
   relations?: utils.RelationParamsWithKey
   externalClasses?: string[]
   definitionFilter?: DefinitionFilter
+  export?: (source: GeneralComponent | null) => TComponentExport
 }
 
 export type ComponentDefinition<
@@ -70,8 +73,7 @@ export type ComponentDefinition<
   TComponentExport,
 > = {
   options?: ComponentDefinitionOptions
-  export?: () => TComponentExport
-} & BehaviorDefinition<TData, TProperty, TMethod>
+} & BehaviorDefinition<TData, TProperty, TMethod, TComponentExport>
 
 export type GeneralComponentDefinition = ComponentDefinition<any, any, any, any>