glass-easel 0.2.0 → 0.3.0

package/src/tmpl/index.ts

@@ -1,23 +1,20 @@
 /* eslint-disable class-methods-use-this */
 
-import {
-  ShadowRoot,
-  ExternalShadowRoot,
-  DataValue,
-  templateEngine,
-  GeneralBehavior,
-  NormalizedComponentOptions,
-  ShadowedEvent,
-  GeneralComponent,
-} from '..'
-import { DataChange } from '../data_proxy'
+import { type GeneralBehavior } from '../behavior'
+import { type GeneralComponent } from '../component'
+import { type DataChange, type DataValue } from '../data_proxy'
+import { type ShadowedEvent } from '../event'
+import { type ExternalShadowRoot } from '../external_shadow_tree'
+import { type NormalizedComponentOptions } from '../global_options'
+import { type ShadowRoot } from '../shadow_root'
+import { type Template, type TemplateEngine, type TemplateInstance } from '../template_engine'
 import { GlassEaselTemplateDOM } from './native_rendering'
 import {
   ProcGenWrapper,
-  ProcGenEnv,
-  ProcGen,
-  BindingMapGen,
-  UpdatePathTreeNode,
+  type BindingMapGen,
+  type ProcGen,
+  type ProcGenEnv,
+  type UpdatePathTreeNode,
 } from './proc_gen_wrapper'
 
 const DEFAULT_PROC_GEN: ProcGen = () => ({
@@ -36,7 +33,7 @@ export type ComponentTemplate = {
   groupList?: ProcGenGroupList
   content: (name: string) => ProcGen
   updateMode?: string
-  disallowNativeNode?: boolean
+  fallbackListenerOnNativeNode?: boolean
   eventObjectFilter?: (x: ShadowedEvent<unknown>) => ShadowedEvent<unknown>
   procGenWrapperType?: typeof ProcGenWrapper
 }
@@ -47,11 +44,8 @@ const enum BindingMapUpdateEnabled {
   Forced,
 }
 
-export class GlassEaselTemplateEngine implements templateEngine.TemplateEngine {
-  create(
-    behavior: GeneralBehavior,
-    componentOptions: NormalizedComponentOptions,
-  ): templateEngine.Template {
+export class GlassEaselTemplateEngine implements TemplateEngine {
+  create(behavior: GeneralBehavior, componentOptions: NormalizedComponentOptions): Template {
     if (componentOptions.externalComponent) {
       return new GlassEaselTemplateDOM(behavior)
     }
@@ -59,10 +53,10 @@ export class GlassEaselTemplateEngine implements templateEngine.TemplateEngine {
   }
 }
 
-class GlassEaselTemplate implements templateEngine.Template {
+class GlassEaselTemplate implements Template {
   genObjectGroupEnv!: ProcGenEnv
   updateMode!: string
-  disallowNativeNode!: boolean
+  fallbackListenerOnNativeNode!: boolean
   eventObjectFilter?: (x: ShadowedEvent<unknown>) => ShadowedEvent<unknown>
 
   constructor(behavior: GeneralBehavior) {
@@ -89,25 +83,28 @@ class GlassEaselTemplate implements templateEngine.Template {
       group: c.content,
     }
     this.updateMode = c.updateMode || ''
-    this.disallowNativeNode = c.disallowNativeNode || false
+    this.fallbackListenerOnNativeNode = c.fallbackListenerOnNativeNode || false
     this.eventObjectFilter = c.eventObjectFilter
   }
 
-  createInstance(comp: GeneralComponent): templateEngine.TemplateInstance {
-    return new GlassEaselTemplateInstance(this, comp)
+  createInstance(
+    comp: GeneralComponent,
+    createShadowRoot: (component: GeneralComponent) => ShadowRoot,
+  ): TemplateInstance {
+    return new GlassEaselTemplateInstance(this, comp, createShadowRoot(comp))
   }
 }
 
-class GlassEaselTemplateInstance implements templateEngine.TemplateInstance {
+class GlassEaselTemplateInstance implements TemplateInstance {
   comp: GeneralComponent
   shadowRoot: ShadowRoot
   procGenWrapper!: ProcGenWrapper
   forceBindingMapUpdate!: BindingMapUpdateEnabled
   bindingMapGen: { [field: string]: BindingMapGen[] } | undefined
 
-  constructor(template: GlassEaselTemplate, comp: GeneralComponent) {
+  constructor(template: GlassEaselTemplate, comp: GeneralComponent, shadowRoot: ShadowRoot) {
     this.comp = comp
-    this.shadowRoot = ShadowRoot.createShadowRoot(comp)
+    this.shadowRoot = shadowRoot
     this.shadowRoot.destroyBackendElementOnDetach()
     this._$applyTemplate(template)
   }
@@ -130,7 +127,7 @@ class GlassEaselTemplateInstance implements templateEngine.TemplateInstance {
     this.procGenWrapper = new ProcGenWrapper(
       this.shadowRoot,
       procGen,
-      template.disallowNativeNode,
+      template.fallbackListenerOnNativeNode,
       template.eventObjectFilter,
     )
     this.bindingMapGen = undefined
@@ -215,3 +212,14 @@ class GlassEaselTemplateInstance implements templateEngine.TemplateInstance {
     return this.procGenWrapper.bindingMapUpdate(path[0] as string, data, bindingMapGen)
   }
 }
+
+let defaultTemplateEngine: TemplateEngine | null = null
+
+export const getDefaultTemplateEngine = (): TemplateEngine => {
+  if (defaultTemplateEngine) {
+    return defaultTemplateEngine
+  }
+  const tmpl = new GlassEaselTemplateEngine()
+  defaultTemplateEngine = tmpl
+  return tmpl
+}

package/src/tmpl/native_rendering.ts

@@ -1,21 +1,16 @@
 /* global document: false */
 
-import {
-  ExternalShadowRoot,
-  DataValue,
-  templateEngine,
-  GeneralFuncType,
-  GeneralBehavior,
-  Event,
-  ShadowedEvent,
-  GeneralBackendElement,
-  BackendMode,
-  GeneralComponent,
-} from '..'
-import { DataChange } from '../data_proxy'
-import { ProcGenEnv, ProcGen, BindingMapGen } from './proc_gen_wrapper'
+import { BackendMode, type GeneralBackendElement } from '../backend'
+import { type GeneralBehavior } from '../behavior'
+import { type GeneralComponent } from '../component'
+import { type DataChange, type DataValue } from '../data_proxy'
+import { type Event, type ShadowedEvent } from '../event'
+import { type ExternalShadowRoot } from '../external_shadow_tree'
+import { type GeneralFuncType } from '../func_arr'
+import { type Template, type TemplateInstance } from '../template_engine'
+import { type ComponentTemplate, type ProcGenGroupList } from './index'
+import { type BindingMapGen, type ProcGen, type ProcGenEnv } from './proc_gen_wrapper'
 import { ProcGenWrapperDom } from './proc_gen_wrapper_dom'
-import { ComponentTemplate, ProcGenGroupList } from './index'
 
 type ElementWithEvent = Element & {
   _$wxTmplEv: { [ev: string]: (event: ShadowedEvent<unknown>) => unknown }
@@ -30,7 +25,7 @@ const DEFAULT_PROC_GEN_DOM: ProcGen = () => ({
 })
 export const DEFAULT_PROC_GEN_GROUP_DOM: (name: string) => ProcGen = () => DEFAULT_PROC_GEN_DOM
 
-export class GlassEaselTemplateDOM implements templateEngine.Template {
+export class GlassEaselTemplateDOM implements Template {
   data: DataValue
   innerData: DataValue
   genObjectGroupEnv: ProcGenEnv
@@ -55,14 +50,12 @@ export class GlassEaselTemplateDOM implements templateEngine.Template {
     this.methods = behavior._$methodMap
   }
 
-  createInstance(comp: GeneralComponent): templateEngine.TemplateInstance {
+  createInstance(comp: GeneralComponent): TemplateInstance {
     return new GlassEaselTemplateDOMInstance(this, comp)
   }
 }
 
-export class GlassEaselTemplateDOMInstance
-  implements templateEngine.TemplateInstance, ExternalShadowRoot
-{
+export class GlassEaselTemplateDOMInstance implements TemplateInstance, ExternalShadowRoot {
   template: GlassEaselTemplateDOM
   comp: GeneralComponent
   shadowRoot: ExternalShadowRoot
@@ -144,7 +137,7 @@ export class GlassEaselTemplateDOMInstance
     const target = elem as unknown as ElementWithEvent
     let cur: Element = target
     const root = this.shadowRootElement
-    const evName = event.type
+    const evName = event.getEventName()
     const bubbles = event.bubbles
     for (;;) {
       const shadowedEvent = event.wrapShadowedEvent(target as any, null, cur as any)