glass-easel-miniprogram-adapter 0.7.0 → 0.8.0

package/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
   }

package/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,

package/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,

package/tests/env.test.ts

@@ -135,7 +135,7 @@ describe('env', () => {
     const ab = env.associateBackend(backend)
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     expect(domHtml(root.getComponent())).toBe(
-      '<c-a>A</c-a><c-aa>A</c-aa><i-a></i-a><i-b></i-b><c-b>B</c-b>',
+      '<c-a is="inner-comp-1">A</c-a><c-aa is="inner-comp-1">A</c-aa><i-a></i-a><i-b></i-b><c-b is="inner-comp-2">B</c-b>',
     )
   })
 })

package/tests/selector.test.ts

@@ -72,7 +72,9 @@ describe('selector query', () => {
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     glassEasel.Element.pretendAttached(root.getComponent())
-    expect(domHtml(root.getComponent())).toBe('<div><child>456</child><child>789</child></div>')
+    expect(domHtml(root.getComponent())).toBe(
+      '<div><child is="child/comp">456</child><child is="child/comp">789</child></div>',
+    )
   })
 
   test('select single component (with custom export)', () => {
@@ -159,7 +161,9 @@ describe('selector query', () => {
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     glassEasel.Element.pretendAttached(root.getComponent())
-    expect(domHtml(root.getComponent())).toBe('<div><child1>456</child1><child2>789</child2></div>')
+    expect(domHtml(root.getComponent())).toBe(
+      '<div><child1 is="child1/comp">456</child1><child2 is="child2/comp">789</child2></div>',
+    )
   })
 
   test('select single component (with custom export on behavior)', () => {
@@ -251,7 +255,9 @@ describe('selector query', () => {
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     glassEasel.Element.pretendAttached(root.getComponent())
-    expect(domHtml(root.getComponent())).toBe('<div><child1>456</child1><child2>789</child2></div>')
+    expect(domHtml(root.getComponent())).toBe(
+      '<div><child1 is="child1/comp">456</child1><child2 is="child2/comp">789</child2></div>',
+    )
   })
 
   test('select all components', () => {
@@ -316,7 +322,7 @@ describe('selector query', () => {
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     glassEasel.Element.pretendAttached(root.getComponent())
     expect(domHtml(root.getComponent())).toBe(
-      '<div><child class="c">0</child><child class="c">1</child><child-b class="c">2</child-b></div>',
+      '<div><child is="child/comp" class="c">0</child><child is="child/comp" class="c">1</child><child-b is="child/comp2" class="c">2</child-b></div>',
     )
   })
 

package/tests/space.test.ts

@@ -249,7 +249,9 @@ describe('define', () => {
 
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
-    expect(domHtml(root.getComponent())).toBe('<a><c><span>B</span></c></a>')
+    expect(domHtml(root.getComponent())).toBe(
+      '<a is="comp/a"><c is="comp/b"><span>B</span></c></a>',
+    )
   })
 
   test('options placeholder', () => {
@@ -290,7 +292,7 @@ describe('define', () => {
 
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
-    expect(domHtml(root.getComponent())).toBe('<a><div>A</div></a>')
+    expect(domHtml(root.getComponent())).toBe('<a is="comp/a"><div>A</div></a>')
 
     codeSpace.addComponentStaticConfig('comp/b', {
       component: true,
@@ -305,7 +307,7 @@ describe('define', () => {
       Component().register()
     })
 
-    expect(domHtml(root.getComponent())).toBe('<a><span>B</span></a>')
+    expect(domHtml(root.getComponent())).toBe('<a is="comp/b"><span>B</span></a>')
   })
 
   test('options pureDataPattern (js)', () => {
@@ -853,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()
     })
 
@@ -1067,7 +1068,9 @@ describe('define', () => {
     const ab = env.associateBackend()
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     glassEasel.Element.pretendAttached(root.getComponent())
-    expect(domHtml(root.getComponent())).toBe('<list><div>2</div><item></item><item></item></list>')
+    expect(domHtml(root.getComponent())).toBe(
+      '<list is="child/list"><div>2</div><item is="child/item"></item><item is="child/item"></item></list>',
+    )
   })
 
   test('chaining extraThisFieldsType', () => {

package/tests/trait_behavior.test.ts

@@ -138,7 +138,7 @@ describe('trait behavior', () => {
     const root = ab.createRoot('body', codeSpace, 'path/to/comp')
     glassEasel.Element.pretendAttached(root.getComponent())
     expect(domHtml(root.getComponent())).toBe(
-      '<list><div>2</div><item>2</item><item>3</item></list>',
+      '<list is="child/list"><div>2</div><item is="child/item">2</item><item is="child/item">3</item></list>',
     )
   })
 })