@ibyar/core 2.5.0 → 3.0.0

package/signals/factory.js

@@ -10,30 +10,24 @@ class SignalScopeFactory {
             throw new Error('expect scope is not matching');
         }
     }
-    signal(initValue, signalType) {
+    factory(creator) {
         this.assertValidContext();
-        return this.scopes.at(-1).createSignal(initValue, signalType);
+        const scope = this.scopes.at(-1);
+        return creator(scope, scope.getNextKey());
     }
-    signalFn(initValue, signalType) {
+    signal(initValue) {
         this.assertValidContext();
-        return this.scopes.at(-1).createSignalFn(initValue, signalType);
+        const scope = this.scopes.at(-1);
+        return this.scopes.at(-1).createSignal(initValue);
     }
     computed(computation) {
         this.assertValidContext();
         return this.scopes.at(-1).createComputed(computation);
     }
-    computedFn(computation) {
-        this.assertValidContext();
-        return this.scopes.at(-1).createComputedFn(computation);
-    }
     lazy(computation) {
         this.assertValidContext();
         return this.scopes.at(-1).createLazy(computation);
     }
-    lazyFn(computation) {
-        this.assertValidContext();
-        return this.scopes.at(-1).createLazyFn(computation);
-    }
     effect(effectFn) {
         this.assertValidContext();
         const scope = this.scopes.at(-1);

package/signals/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/core/signals/factory.ts"],"names":[],"mappings":"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","sourcesContent":["import { ReactiveNode, Signal, SignalScope } from '@ibyar/expressions';\n\ntype EffectFn = (onCleanup?: (clean: () => void) => void) => void;\n\nclass SignalScopeFactory {\n\n\tprivate scopes: SignalScope[] = [SignalScope.create()];\n\tprivate effectState: SignalScope[] = [];\n\n\tpush(scope: SignalScope) {\n\t\tthis.scopes.push(scope);\n\t}\n\n\tpop(scop: SignalScope) {\n\t\tif (this.scopes.pop() !== scop) {\n\t\t\tthrow new Error('expect scope is not matching');\n\t\t}\n\t}\n\n\tsignal<T, S extends typeof Signal<T>>(initValue?: T, signalType?: S): InstanceType<S> {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createSignal(initValue, signalType);\n\t}\n\n\tsignalFn<T, S extends typeof Signal<T>>(initValue: T, signalType?: S) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createSignalFn(initValue, signalType);\n\t}\n\n\tcomputed<T>(computation: () => T) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createComputed(computation);\n\t}\n\tcomputedFn<T>(computation: () => T) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createComputedFn(computation);\n\t}\n\n\tlazy<T>(computation: () => T) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createLazy(computation);\n\t}\n\tlazyFn<T>(computation: () => T) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createLazyFn(computation);\n\t}\n\teffect(effectFn: (onCleanup?: (clean: () => void) => void) => void) {\n\t\tthis.assertValidContext();\n\t\tconst scope = this.scopes.at(-1)!;\n\t\treturn scope.createEffect(this.wrapEffect(scope, effectFn));\n\t}\n\tuntracked<T>(reactiveNode: ReactiveNode<T>): T;\n\tuntracked<T>(nonReactiveReadsFn: () => T): T;\n\tuntracked<T>(nonReactiveReads: (() => T) | ReactiveNode<T>): T {\n\t\tconst scope = this.effectState.at(-1);\n\t\tscope?.untrack();\n\t\tconst value = nonReactiveReads instanceof ReactiveNode\n\t\t\t? nonReactiveReads.get()\n\t\t\t: nonReactiveReads();\n\t\tscope?.track();\n\t\treturn value;\n\t}\n\tprivate assertValidContext(): void {\n\t\tif (this.scopes.length <= 0) {\n\t\t\tthrow new Error('Create a Signal, Computed and Effect is only allowed in class constructor.');\n\t\t}\n\t}\n\tprivate wrapEffect<T>(scope: SignalScope, effectFn: EffectFn): EffectFn {\n\t\treturn (onCleanup) => {\n\t\t\tthis.effectState.push(scope);\n\t\t\teffectFn(onCleanup);\n\t\t\tthis.effectState.pop();\n\t\t};\n\t}\n}\n\nexport const signalScopeFactory = new SignalScopeFactory();\n"]}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/core/signals/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIvE,MAAM,kBAAkB;IAEf,MAAM,GAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,WAAW,GAAkB,EAAE,CAAC;IAExC,IAAI,CAAC,KAAkB;QACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,IAAiB;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;IACD,OAAO,CAAmB,OAA+C;QACxE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAClC,OAAO,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,MAAM,CAAI,SAAa;QACtB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IACD,QAAQ,CAAI,WAAoB;QAC/B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,CAAI,WAAoB;QAC3B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,CAAC,QAA2D;QACjE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAClC,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC7D,CAAC;IAGD,SAAS,CAAI,gBAA6C;QACzD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,EAAE,OAAO,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,gBAAgB,YAAY,YAAY;YACrD,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACxB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtB,KAAK,EAAE,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACd,CAAC;IACO,kBAAkB;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAC/F,CAAC;IACF,CAAC;IACO,UAAU,CAAI,KAAkB,EAAE,QAAkB;QAC3D,OAAO,CAAC,SAAS,EAAE,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpB,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QACxB,CAAC,CAAC;IACH,CAAC;CACD;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC","sourcesContent":["import { ReactiveNode, Signal, SignalScope } from '@ibyar/expressions';\n\ntype EffectFn = (onCleanup?: (clean: () => void) => void) => void;\n\nclass SignalScopeFactory {\n\n\tprivate scopes: SignalScope[] = [SignalScope.create()];\n\tprivate effectState: SignalScope[] = [];\n\n\tpush(scope: SignalScope) {\n\t\tthis.scopes.push(scope);\n\t}\n\n\tpop(scop: SignalScope) {\n\t\tif (this.scopes.pop() !== scop) {\n\t\t\tthrow new Error('expect scope is not matching');\n\t\t}\n\t}\n\tfactory<T, S = Signal<T>>(creator: (scope: SignalScope, key: number) => S): S {\n\t\tthis.assertValidContext();\n\t\tconst scope = this.scopes.at(-1)!;\n\t\treturn creator(scope, scope.getNextKey());\n\t}\n\tsignal<T>(initValue?: T) {\n\t\tthis.assertValidContext();\n\t\tconst scope = this.scopes.at(-1)!;\n\t\treturn this.scopes.at(-1)!.createSignal(initValue);\n\t}\n\tcomputed<T>(computation: () => T) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createComputed(computation);\n\t}\n\tlazy<T>(computation: () => T) {\n\t\tthis.assertValidContext();\n\t\treturn this.scopes.at(-1)!.createLazy(computation);\n\t}\n\teffect(effectFn: (onCleanup?: (clean: () => void) => void) => void) {\n\t\tthis.assertValidContext();\n\t\tconst scope = this.scopes.at(-1)!;\n\t\treturn scope.createEffect(this.wrapEffect(scope, effectFn));\n\t}\n\tuntracked<T>(reactiveNode: ReactiveNode<T>): T;\n\tuntracked<T>(nonReactiveReadsFn: () => T): T;\n\tuntracked<T>(nonReactiveReads: (() => T) | ReactiveNode<T>): T {\n\t\tconst scope = this.effectState.at(-1);\n\t\tscope?.untrack();\n\t\tconst value = nonReactiveReads instanceof ReactiveNode\n\t\t\t? nonReactiveReads.get()\n\t\t\t: nonReactiveReads();\n\t\tscope?.track();\n\t\treturn value;\n\t}\n\tprivate assertValidContext(): void {\n\t\tif (this.scopes.length <= 0) {\n\t\t\tthrow new Error('Create a Signal, Computed and Effect is only allowed in class constructor.');\n\t\t}\n\t}\n\tprivate wrapEffect<T>(scope: SignalScope, effectFn: EffectFn): EffectFn {\n\t\treturn (onCleanup) => {\n\t\t\tthis.effectState.push(scope);\n\t\t\teffectFn(onCleanup);\n\t\t\tthis.effectState.pop();\n\t\t};\n\t}\n}\n\nexport const signalScopeFactory = new SignalScopeFactory();\n"]}

package/signals/runtime.d.ts

@@ -1,5 +1,5 @@
 import { CallExpression, ExpressionNode, MemberExpression, VisitorCallback } from '@ibyar/expressions';
-type Key = 'input' | 'output' | 'model' | 'formValue' | 'view' | 'viewChild' | 'viewChildren' | 'signal' | 'computed' | 'lazy' | 'signalNode' | 'computedNode' | 'lazyNode';
+type Key = 'input' | 'output' | 'formValue' | 'view' | 'viewChild' | 'viewChildren' | 'signal' | 'computed' | 'lazy' | 'signalNode' | 'computedNode' | 'lazyNode';
 type RuntimeOption = {
     name: Key;
     alias: string;
@@ -14,16 +14,16 @@ export type SignalRuntimeMetadata = {
  */
 export declare class RuntimeClassMetadata {
     static INSTANCE: RuntimeClassMetadata;
-    static scanMetadata(modelClass: Function): SignalRuntimeMetadata[];
-    static scanClass(modelClass: Function, visitorCallback: VisitorCallback): void;
-    scan(modelClass: Function): SignalRuntimeMetadata[];
+    static scanMetadata(modelClass: Function, scanParent?: boolean): SignalRuntimeMetadata[];
+    static scanClass(modelClass: Function, visitorCallback: VisitorCallback, scanParent?: boolean): void;
+    scan(modelClass: Function, scanParent: boolean): SignalRuntimeMetadata[];
     /**
      * scan class `Function` for properties and methods definitions.
      * @param modelClass
      * @param visitorCallback
      */
-    scanModelClass(modelClass: Function, visitorCallback: VisitorCallback): void;
-    getClassScript(modelClass: Function): string;
+    scanModelClass(modelClass: Function, visitorCallback: VisitorCallback, scanParent: boolean): void;
+    getClassScript(modelClass: Function, scanParent: boolean): string;
     getClassList(modelClass: Function): Function[];
     newModelInitializers(): SignalRuntimeMetadata[];
     createVisitor(properties: SignalRuntimeMetadata[]): VisitorCallback;

package/signals/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/core/signals/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,cAAc,EAAE,cAAc,EAG9B,gBAAgB,EAEA,eAAe,EAC/B,MAAM,oBAAoB,CAAC;AAE5B,KAAK,GAAG,GACL,OAAO,GACP,QAAQ,GACR,OAAO,GACP,WAAW,GACX,MAAM,GACN,WAAW,GACX,cAAc,GACd,QAAQ,GACR,UAAU,GACV,MAAM,GACN,YAAY,GACZ,cAAc,GACd,UAAU,CAAC;AAEd,KAAK,aAAa,GAAG;IACpB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IACnC,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAoB;IAEhC,MAAM,CAAC,QAAQ,uBAA8B;IAE7C,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ;IAIxC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe;IAIvE,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,qBAAqB,EAAE;IAOnD;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe;IAMrE,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM;IAI5C,YAAY,CAAC,UAAU,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAS9C,oBAAoB,IAAI,qBAAqB,EAAE;IAqB/C,aAAa,CAAC,UAAU,EAAE,qBAAqB,EAAE,GAAG,eAAe;IA4CnE,8BAA8B,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAgBxE,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAK3D,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO;IAUlF,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAcvF,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,GAAG,KAAK;CAgBpD"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/core/signals/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,cAAc,EAAE,cAAc,EAG9B,gBAAgB,EAGhB,eAAe,EACf,MAAM,oBAAoB,CAAC;AAE5B,KAAK,GAAG,GACL,OAAO,GACP,QAAQ,GACR,WAAW,GACX,MAAM,GACN,WAAW,GACX,cAAc,GACd,QAAQ,GACR,UAAU,GACV,MAAM,GACN,YAAY,GACZ,cAAc,GACd,UAAU,CAAC;AAEd,KAAK,aAAa,GAAG;IACpB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IACnC,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,qBAAa,oBAAoB;IAEhC,MAAM,CAAC,QAAQ,uBAA8B;IAE7C,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,UAAO;IAI3D,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,UAAO;IAI1F,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,GAAG,qBAAqB,EAAE;IAOxE;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO;IAM1F,cAAc,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM;IAKjE,YAAY,CAAC,UAAU,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAS9C,oBAAoB,IAAI,qBAAqB,EAAE;IAoB/C,aAAa,CAAC,UAAU,EAAE,qBAAqB,EAAE,GAAG,eAAe;IAsDnE,8BAA8B,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS;IAgBxE,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAK3D,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO;IAUlF,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAcvF,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,GAAG,KAAK;CAgBpD"}

package/signals/runtime.js

@@ -1,19 +1,19 @@
-import { CallExpression, expressionVisitor, Identifier, JavaScriptParser, Literal, MemberExpression, Property, ThisExpression } from '@ibyar/expressions';
+import { CallExpression, expressionVisitor, Identifier, JavaScriptParser, Literal, MemberExpression, Property, SequenceExpression, ThisExpression } from '@ibyar/expressions';
 /**
  * scan model class for (inputs and output) property definitions with value by function call.
  */
 export class RuntimeClassMetadata {
     static INSTANCE = new RuntimeClassMetadata();
-    static scanMetadata(modelClass) {
-        return RuntimeClassMetadata.INSTANCE.scan(modelClass);
+    static scanMetadata(modelClass, scanParent = true) {
+        return RuntimeClassMetadata.INSTANCE.scan(modelClass, scanParent);
     }
-    static scanClass(modelClass, visitorCallback) {
-        return RuntimeClassMetadata.INSTANCE.scanModelClass(modelClass, visitorCallback);
+    static scanClass(modelClass, visitorCallback, scanParent = true) {
+        return RuntimeClassMetadata.INSTANCE.scanModelClass(modelClass, visitorCallback, scanParent);
     }
-    scan(modelClass) {
+    scan(modelClass, scanParent) {
         const metadata = this.newModelInitializers();
         const visitor = this.createVisitor(metadata);
-        this.scanModelClass(modelClass, visitor);
+        this.scanModelClass(modelClass, visitor, scanParent);
         return metadata;
     }
     /**
@@ -21,13 +21,14 @@ export class RuntimeClassMetadata {
      * @param modelClass
      * @param visitorCallback
      */
-    scanModelClass(modelClass, visitorCallback) {
-        const script = this.getClassScript(modelClass);
+    scanModelClass(modelClass, visitorCallback, scanParent) {
+        const script = this.getClassScript(modelClass, scanParent);
         const expr = JavaScriptParser.parse(script);
         expressionVisitor.visit(expr, visitorCallback);
     }
-    getClassScript(modelClass) {
-        return this.getClassList(modelClass).map((ref, index) => `const Class${index} = ${ref};`).join('\n');
+    getClassScript(modelClass, scanParent) {
+        const modelList = scanParent ? this.getClassList(modelClass) : [modelClass];
+        return modelList.map((ref, index) => `const Class${index} = ${ref};`).join('\n');
         ;
     }
     getClassList(modelClass) {
@@ -43,12 +44,11 @@ export class RuntimeClassMetadata {
             { signal: 'input', options: [] },
             { signal: 'input', necessity: 'required', options: [] },
             { signal: 'output', options: [] },
-            { signal: 'model', options: [] },
-            { signal: 'model', necessity: 'required', options: [] },
             { signal: 'signal', options: [] },
             { signal: 'computed', options: [] },
             { signal: 'lazy', options: [] },
             { signal: 'formValue', options: [] },
+            { signal: 'formValue', necessity: 'required', options: [] },
             { signal: 'view', options: [] },
             { signal: 'viewChild', options: [] },
             { signal: 'viewChild', necessity: 'required', options: [] },
@@ -63,17 +63,28 @@ export class RuntimeClassMetadata {
             if (type === 'PropertyDefinition') {
                 const definition = expression;
                 const key = definition.getKey();
-                const value = definition.getValue();
+                let value = definition.getValue();
                 if (definition.isPrivate()
                     || definition.isStatic()
-                    || !(key instanceof Identifier || key instanceof Literal)
-                    || !(value instanceof CallExpression)) {
+                    || !(key instanceof Identifier || key instanceof Literal)) {
                     return;
                 }
-                const property = properties.find(property => this.isCallOf(value, property.signal, property.necessity));
+                if (!(value instanceof CallExpression)) {
+                    if (value instanceof SequenceExpression) {
+                        value = value.getExpressions().find(node => node instanceof CallExpression && properties.find(property => this.isCallOf(node, property.signal, property.necessity)));
+                        if (!value) {
+                            return;
+                        }
+                    }
+                    else {
+                        return;
+                    }
+                }
+                const call = value;
+                const property = properties.find(property => this.isCallOf(call, property.signal, property.necessity));
                 if (property) {
                     const name = key instanceof Identifier ? key.getName() : key.getValue();
-                    const alias = this.getAliasNameFromOptionArgument(value);
+                    const alias = this.getAliasNameFromOptionArgument(call);
                     property.options.push({ name, alias: alias ?? name });
                 }
             }

package/signals/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/core/signals/runtime.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tAssignmentExpression,\n\tCallExpression, ExpressionNode,\n\texpressionVisitor, Identifier,\n\tJavaScriptParser, Literal,\n\tMemberExpression, MethodDefinition,\n\tProperty, PropertyDefinition,\n\tThisExpression, VisitorCallback\n} from '@ibyar/expressions';\n\ntype Key =\n\t| 'input'\n\t| 'output'\n\t| 'model'\n\t| 'formValue'\n\t| 'view'\n\t| 'viewChild'\n\t| 'viewChildren'\n\t| 'signal'\n\t| 'computed'\n\t| 'lazy'\n\t| 'signalNode'\n\t| 'computedNode'\n\t| 'lazyNode';\n\ntype RuntimeOption = {\n\tname: Key,\n\talias: string,\n};\n\nexport type SignalRuntimeMetadata = {\n\tsignal: Key;\n\tnecessity?: 'required';\n\toptions: Array<RuntimeOption>;\n};\n\n/**\n * scan model class for (inputs and output) property definitions with value by function call.\n */\nexport class RuntimeClassMetadata {\n\n\tstatic INSTANCE = new RuntimeClassMetadata();\n\n\tstatic scanMetadata(modelClass: Function) {\n\t\treturn RuntimeClassMetadata.INSTANCE.scan(modelClass);\n\t}\n\n\tstatic scanClass(modelClass: Function, visitorCallback: VisitorCallback) {\n\t\treturn RuntimeClassMetadata.INSTANCE.scanModelClass(modelClass, visitorCallback);\n\t}\n\n\tscan(modelClass: Function): SignalRuntimeMetadata[] {\n\t\tconst metadata = this.newModelInitializers();\n\t\tconst visitor = this.createVisitor(metadata);\n\t\tthis.scanModelClass(modelClass, visitor);\n\t\treturn metadata;\n\t}\n\n\t/**\n\t * scan class `Function` for properties and methods definitions.\n\t * @param modelClass \n\t * @param visitorCallback \n\t */\n\tscanModelClass(modelClass: Function, visitorCallback: VisitorCallback) {\n\t\tconst script = this.getClassScript(modelClass);\n\t\tconst expr = JavaScriptParser.parse(script);\n\t\texpressionVisitor.visit(expr, visitorCallback);\n\t}\n\n\tgetClassScript(modelClass: Function): string {\n\t\treturn this.getClassList(modelClass).map((ref, index) => `const Class${index} = ${ref};`).join('\\n');;\n\t}\n\n\tgetClassList(modelClass: Function): Function[] {\n\t\tconst list: Function[] = [];\n\t\twhile (modelClass instanceof Function) {\n\t\t\tlist.push(modelClass);\n\t\t\tmodelClass = Object.getPrototypeOf(modelClass);\n\t\t}\n\t\treturn list.reverse();\n\t}\n\n\tnewModelInitializers(): SignalRuntimeMetadata[] {\n\t\treturn [\n\t\t\t{ signal: 'input', options: [] },\n\t\t\t{ signal: 'input', necessity: 'required', options: [] },\n\t\t\t{ signal: 'output', options: [] },\n\t\t\t{ signal: 'model', options: [] },\n\t\t\t{ signal: 'model', necessity: 'required', options: [] },\n\t\t\t{ signal: 'signal', options: [] },\n\t\t\t{ signal: 'computed', options: [] },\n\t\t\t{ signal: 'lazy', options: [] },\n\t\t\t{ signal: 'formValue', options: [] },\n\t\t\t{ signal: 'view', options: [] },\n\t\t\t{ signal: 'viewChild', options: [] },\n\t\t\t{ signal: 'viewChild', necessity: 'required', options: [] },\n\t\t\t{ signal: 'viewChildren', options: [] },\n\t\t\t{ signal: 'signalNode', options: [] },\n\t\t\t{ signal: 'computedNode', options: [] },\n\t\t\t{ signal: 'lazyNode', options: [] },\n\t\t];\n\t}\n\n\tcreateVisitor(properties: SignalRuntimeMetadata[]): VisitorCallback {\n\t\treturn (expression, type) => {\n\t\t\tif (type === 'PropertyDefinition') {\n\t\t\t\tconst definition = expression as PropertyDefinition;\n\t\t\t\tconst key = definition.getKey();\n\t\t\t\tconst value = definition.getValue();\n\t\t\t\tif (definition.isPrivate()\n\t\t\t\t\t|| definition.isStatic()\n\t\t\t\t\t|| !(key instanceof Identifier || key instanceof Literal)\n\t\t\t\t\t|| !(value instanceof CallExpression)) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst property = properties.find(property => this.isCallOf(value, property.signal, property.necessity));\n\t\t\t\tif (property) {\n\t\t\t\t\tconst name = key instanceof Identifier ? key.getName() : key.getValue();\n\t\t\t\t\tconst alias = this.getAliasNameFromOptionArgument(value);\n\t\t\t\t\tproperty.options.push({ name, alias: alias ?? name });\n\t\t\t\t}\n\t\t\t} else if (type === 'MethodDefinition') {\n\t\t\t\tconst definition = expression as MethodDefinition;\n\t\t\t\tif (definition.getKind() !== 'constructor') {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\texpressionVisitor.visit(definition.getValue(), (exp, expType) => {\n\t\t\t\t\tif (expType === 'AssignmentExpression') {\n\t\t\t\t\t\tconst assignment = exp as AssignmentExpression;\n\t\t\t\t\t\tconst right = assignment.getRight();\n\t\t\t\t\t\tif (right instanceof CallExpression) {\n\t\t\t\t\t\t\tconst property = properties.find(property => this.isCallOf(right, property.signal, property.necessity));\n\t\t\t\t\t\t\tif (!property) {\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tconst name = this.hasMemberOfThis(assignment.getLeft());\n\t\t\t\t\t\t\tif (name) {\n\t\t\t\t\t\t\t\tconst alias = this.getAliasNameFromOptionArgument(right);\n\t\t\t\t\t\t\t\tproperty.options.push({ name, alias: alias ?? name });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t}\n\t\t};\n\t}\n\n\tgetAliasNameFromOptionArgument(call: CallExpression): string | undefined {\n\t\tlet alias: string | undefined;\n\t\tcall.getArguments()?.forEach(argument => expressionVisitor.visit(argument, (exp, type, control) => {\n\t\t\tif (exp instanceof Property) {\n\t\t\t\tif (this.isProperty(exp.getKey(), 'alias')) {\n\t\t\t\t\tconst value = exp.getValue();\n\t\t\t\t\tif (value instanceof Literal) {\n\t\t\t\t\t\talias = value.getValue();\n\t\t\t\t\t\tcontrol.abort();\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}));\n\t\treturn alias;\n\t}\n\n\tisProperty(node: ExpressionNode, property: string): boolean {\n\t\treturn (node instanceof Identifier && node.getName() === property)\n\t\t\t|| (node instanceof Literal && node.getValue() === property);\n\t}\n\n\tisCallOf(call: CallExpression, objectName: string, propertyName?: string): boolean {\n\t\tconst callee = call.getCallee();\n\t\tif (propertyName && callee instanceof MemberExpression) {\n\t\t\treturn this.isMemberOf(callee, objectName, propertyName);\n\t\t} else if (!propertyName && callee instanceof Identifier && callee.getName() === objectName) {\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tisMemberOf(member: MemberExpression, objectName: string, propertyName: string): boolean {\n\t\tconst object = member.getObject();\n\t\tconst property = member.getProperty();\n\t\tif (object instanceof Identifier && object.getName() === objectName) {\n\t\t\tif (property instanceof Identifier && property.getName() === propertyName) {\n\t\t\t\treturn true;\n\t\t\t} else if (property instanceof Literal && property.getValue() === propertyName) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\thasMemberOfThis(member: ExpressionNode): Key | false {\n\t\tif (!(member instanceof MemberExpression)) {\n\t\t\treturn false;\n\t\t}\n\t\tconst object = member.getObject();\n\t\tconst property = member.getProperty();\n\t\tif (object instanceof ThisExpression) {\n\t\t\tif (property instanceof Identifier) {\n\t\t\t\treturn property.getName() as Key;\n\t\t\t} else if (property instanceof Literal) {\n\t\t\t\treturn property.getValue() as Key;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\n}\n\n"]}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/core/signals/runtime.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tAssignmentExpression,\n\tCallExpression, ExpressionNode,\n\texpressionVisitor, Identifier,\n\tJavaScriptParser, Literal,\n\tMemberExpression, MethodDefinition,\n\tProperty, PropertyDefinition,\n\tSequenceExpression, ThisExpression,\n\tVisitorCallback\n} from '@ibyar/expressions';\n\ntype Key =\n\t| 'input'\n\t| 'output'\n\t| 'formValue'\n\t| 'view'\n\t| 'viewChild'\n\t| 'viewChildren'\n\t| 'signal'\n\t| 'computed'\n\t| 'lazy'\n\t| 'signalNode'\n\t| 'computedNode'\n\t| 'lazyNode';\n\ntype RuntimeOption = {\n\tname: Key,\n\talias: string,\n};\n\nexport type SignalRuntimeMetadata = {\n\tsignal: Key;\n\tnecessity?: 'required';\n\toptions: Array<RuntimeOption>;\n};\n\n/**\n * scan model class for (inputs and output) property definitions with value by function call.\n */\nexport class RuntimeClassMetadata {\n\n\tstatic INSTANCE = new RuntimeClassMetadata();\n\n\tstatic scanMetadata(modelClass: Function, scanParent = true) {\n\t\treturn RuntimeClassMetadata.INSTANCE.scan(modelClass, scanParent);\n\t}\n\n\tstatic scanClass(modelClass: Function, visitorCallback: VisitorCallback, scanParent = true) {\n\t\treturn RuntimeClassMetadata.INSTANCE.scanModelClass(modelClass, visitorCallback, scanParent);\n\t}\n\n\tscan(modelClass: Function, scanParent: boolean): SignalRuntimeMetadata[] {\n\t\tconst metadata = this.newModelInitializers();\n\t\tconst visitor = this.createVisitor(metadata);\n\t\tthis.scanModelClass(modelClass, visitor, scanParent);\n\t\treturn metadata;\n\t}\n\n\t/**\n\t * scan class `Function` for properties and methods definitions.\n\t * @param modelClass \n\t * @param visitorCallback \n\t */\n\tscanModelClass(modelClass: Function, visitorCallback: VisitorCallback, scanParent: boolean) {\n\t\tconst script = this.getClassScript(modelClass, scanParent);\n\t\tconst expr = JavaScriptParser.parse(script);\n\t\texpressionVisitor.visit(expr, visitorCallback);\n\t}\n\n\tgetClassScript(modelClass: Function, scanParent: boolean): string {\n\t\tconst modelList = scanParent ? this.getClassList(modelClass) : [modelClass];\n\t\treturn modelList.map((ref, index) => `const Class${index} = ${ref};`).join('\\n');;\n\t}\n\n\tgetClassList(modelClass: Function): Function[] {\n\t\tconst list: Function[] = [];\n\t\twhile (modelClass instanceof Function) {\n\t\t\tlist.push(modelClass);\n\t\t\tmodelClass = Object.getPrototypeOf(modelClass);\n\t\t}\n\t\treturn list.reverse();\n\t}\n\n\tnewModelInitializers(): SignalRuntimeMetadata[] {\n\t\treturn [\n\t\t\t{ signal: 'input', options: [] },\n\t\t\t{ signal: 'input', necessity: 'required', options: [] },\n\t\t\t{ signal: 'output', options: [] },\n\t\t\t{ signal: 'signal', options: [] },\n\t\t\t{ signal: 'computed', options: [] },\n\t\t\t{ signal: 'lazy', options: [] },\n\t\t\t{ signal: 'formValue', options: [] },\n\t\t\t{ signal: 'formValue', necessity: 'required', options: [] },\n\t\t\t{ signal: 'view', options: [] },\n\t\t\t{ signal: 'viewChild', options: [] },\n\t\t\t{ signal: 'viewChild', necessity: 'required', options: [] },\n\t\t\t{ signal: 'viewChildren', options: [] },\n\t\t\t{ signal: 'signalNode', options: [] },\n\t\t\t{ signal: 'computedNode', options: [] },\n\t\t\t{ signal: 'lazyNode', options: [] },\n\t\t];\n\t}\n\n\tcreateVisitor(properties: SignalRuntimeMetadata[]): VisitorCallback {\n\t\treturn (expression, type) => {\n\t\t\tif (type === 'PropertyDefinition') {\n\t\t\t\tconst definition = expression as PropertyDefinition;\n\t\t\t\tconst key = definition.getKey();\n\t\t\t\tlet value = definition.getValue();\n\t\t\t\tif (definition.isPrivate()\n\t\t\t\t\t|| definition.isStatic()\n\t\t\t\t\t|| !(key instanceof Identifier || key instanceof Literal)) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (!(value instanceof CallExpression)) {\n\t\t\t\t\tif (value instanceof SequenceExpression) {\n\t\t\t\t\t\tvalue = value.getExpressions().find(node => node instanceof CallExpression && properties.find(property => this.isCallOf(node, property.signal, property.necessity)));\n\t\t\t\t\t\tif (!value) {\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tconst call = value as CallExpression;\n\t\t\t\tconst property = properties.find(property => this.isCallOf(call, property.signal, property.necessity));\n\t\t\t\tif (property) {\n\t\t\t\t\tconst name = key instanceof Identifier ? key.getName() : key.getValue();\n\t\t\t\t\tconst alias = this.getAliasNameFromOptionArgument(call);\n\t\t\t\t\tproperty.options.push({ name, alias: alias ?? name });\n\t\t\t\t}\n\t\t\t} else if (type === 'MethodDefinition') {\n\t\t\t\tconst definition = expression as MethodDefinition;\n\t\t\t\tif (definition.getKind() !== 'constructor') {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\texpressionVisitor.visit(definition.getValue(), (exp, expType) => {\n\t\t\t\t\tif (expType === 'AssignmentExpression') {\n\t\t\t\t\t\tconst assignment = exp as AssignmentExpression;\n\t\t\t\t\t\tconst right = assignment.getRight();\n\t\t\t\t\t\tif (right instanceof CallExpression) {\n\t\t\t\t\t\t\tconst property = properties.find(property => this.isCallOf(right, property.signal, property.necessity));\n\t\t\t\t\t\t\tif (!property) {\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tconst name = this.hasMemberOfThis(assignment.getLeft());\n\t\t\t\t\t\t\tif (name) {\n\t\t\t\t\t\t\t\tconst alias = this.getAliasNameFromOptionArgument(right);\n\t\t\t\t\t\t\t\tproperty.options.push({ name, alias: alias ?? name });\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t}\n\t\t};\n\t}\n\n\tgetAliasNameFromOptionArgument(call: CallExpression): string | undefined {\n\t\tlet alias: string | undefined;\n\t\tcall.getArguments()?.forEach(argument => expressionVisitor.visit(argument, (exp, type, control) => {\n\t\t\tif (exp instanceof Property) {\n\t\t\t\tif (this.isProperty(exp.getKey(), 'alias')) {\n\t\t\t\t\tconst value = exp.getValue();\n\t\t\t\t\tif (value instanceof Literal) {\n\t\t\t\t\t\talias = value.getValue();\n\t\t\t\t\t\tcontrol.abort();\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}));\n\t\treturn alias;\n\t}\n\n\tisProperty(node: ExpressionNode, property: string): boolean {\n\t\treturn (node instanceof Identifier && node.getName() === property)\n\t\t\t|| (node instanceof Literal && node.getValue() === property);\n\t}\n\n\tisCallOf(call: CallExpression, objectName: string, propertyName?: string): boolean {\n\t\tconst callee = call.getCallee();\n\t\tif (propertyName && callee instanceof MemberExpression) {\n\t\t\treturn this.isMemberOf(callee, objectName, propertyName);\n\t\t} else if (!propertyName && callee instanceof Identifier && callee.getName() === objectName) {\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tisMemberOf(member: MemberExpression, objectName: string, propertyName: string): boolean {\n\t\tconst object = member.getObject();\n\t\tconst property = member.getProperty();\n\t\tif (object instanceof Identifier && object.getName() === objectName) {\n\t\t\tif (property instanceof Identifier && property.getName() === propertyName) {\n\t\t\t\treturn true;\n\t\t\t} else if (property instanceof Literal && property.getValue() === propertyName) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\thasMemberOfThis(member: ExpressionNode): Key | false {\n\t\tif (!(member instanceof MemberExpression)) {\n\t\t\treturn false;\n\t\t}\n\t\tconst object = member.getObject();\n\t\tconst property = member.getProperty();\n\t\tif (object instanceof ThisExpression) {\n\t\t\tif (property instanceof Identifier) {\n\t\t\t\treturn property.getName() as Key;\n\t\t\t} else if (property instanceof Literal) {\n\t\t\t\treturn property.getValue() as Key;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\n}\n\n"]}

package/signals/scopes.d.ts

@@ -0,0 +1,4 @@
+import { Context, ReactiveScopeControl } from '@ibyar/expressions';
+export declare class ReactiveSignalScopeControl<T extends Context> extends ReactiveScopeControl<T> {
+}
+//# sourceMappingURL=scopes.d.ts.map

package/signals/scopes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../../../src/core/signals/scopes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,OAAO,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;CAEzF"}

package/signals/scopes.js

@@ -0,0 +1,4 @@
+import { ReactiveScopeControl } from '@ibyar/expressions';
+export class ReactiveSignalScopeControl extends ReactiveScopeControl {
+}
+//# sourceMappingURL=scopes.js.map

package/signals/scopes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scopes.js","sourceRoot":"","sources":["../../../src/core/signals/scopes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,MAAM,OAAO,0BAA8C,SAAQ,oBAAuB;CAEzF","sourcesContent":["import { Context, ReactiveScopeControl } from '@ibyar/expressions';\n\n\nexport class ReactiveSignalScopeControl<T extends Context> extends ReactiveScopeControl<T> {\n\n}\n\n"]}

package/signals/signals.d.ts

@@ -2,15 +2,10 @@ import { ReactiveNode, SignalScope } from '@ibyar/expressions';
 export declare function pushNewSignalScope(): SignalScope;
 export declare function pushSignalScope(scope: SignalScope): void;
 export declare function clearSignalScope(scope: SignalScope): void;
-export declare function signal<T>(initialValue: T): import("@ibyar/expressions").Signal<T>;
-export declare function signalFn<T>(initialValue: T): import("@ibyar/expressions").WritableSignal<T>;
+export declare function signal<T>(initialValue?: T): import("@ibyar/expressions").Signal<T>;
 export declare function computed<T>(computation: () => T): import("@ibyar/expressions").Computed<T>;
-export declare function computedFn<T>(computation: () => T): import("@ibyar/expressions").ReactiveSignal<T>;
 export declare function lazy<T>(computation: () => T): import("@ibyar/expressions").Lazy<T>;
-export declare function lazyFn<T>(computation: () => T): import("@ibyar/expressions").ReactiveSignal<T>;
-export declare function effect(effectFn: (onCleanup?: (clean: () => void) => void) => void): {
-    destroy(): void;
-};
+export declare function effect(effectFn: (onCleanup?: (clean: () => void) => void) => void): import("@ibyar/expressions").SignalDestroyRef;
 export declare function untracked<T>(reactiveNode: ReactiveNode<T>): T;
 export declare function untracked<T>(nonReactiveReadsFn: () => T): T;
 //# sourceMappingURL=signals.d.ts.map

package/signals/signals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signals.d.ts","sourceRoot":"","sources":["../../../src/core/signals/signals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAG/D,wBAAgB,kBAAkB,gBAIjC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,QAEjD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,QAElD;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,0CAExC;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,kDAE1C;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,4CAE/C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,kDAEjD;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,wCAE3C;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,kDAE7C;AAED,wBAAgB,MAAM,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,KAAK,IAAI;;EAEjF;AACD,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/D,wBAAgB,SAAS,CAAC,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"signals.d.ts","sourceRoot":"","sources":["../../../src/core/signals/signals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAG/D,wBAAgB,kBAAkB,gBAIjC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,QAEjD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,QAElD;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,0CAEzC;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,4CAE/C;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,wCAE3C;AAED,wBAAgB,MAAM,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,KAAK,IAAI,iDAEjF;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/D,wBAAgB,SAAS,CAAC,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC"}

package/signals/signals.js

@@ -14,21 +14,12 @@ export function clearSignalScope(scope) {
 export function signal(initialValue) {
     return signalScopeFactory.signal(initialValue);
 }
-export function signalFn(initialValue) {
-    return signalScopeFactory.signalFn(initialValue);
-}
 export function computed(computation) {
     return signalScopeFactory.computed(computation);
 }
-export function computedFn(computation) {
-    return signalScopeFactory.computedFn(computation);
-}
 export function lazy(computation) {
     return signalScopeFactory.lazy(computation);
 }
-export function lazyFn(computation) {
-    return signalScopeFactory.lazyFn(computation);
-}
 export function effect(effectFn) {
     return signalScopeFactory.effect(effectFn);
 }

package/signals/signals.js.map

@@ -1 +1 @@
-{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../../src/core/signals/signals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,UAAU,kBAAkB;IACjC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAkB;IACjD,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAkB;IAClD,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,MAAM,CAAI,YAAe;IACxC,OAAO,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAI,YAAe;IAC1C,OAAO,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAI,WAAoB;IAC/C,OAAO,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,UAAU,CAAI,WAAoB;IACjD,OAAO,kBAAmB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,IAAI,CAAI,WAAoB;IAC3C,OAAO,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,MAAM,CAAI,WAAoB;IAC7C,OAAO,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,QAA2D;IACjF,OAAO,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAGD,MAAM,UAAU,SAAS,CAAI,gBAA6C;IACzE,OAAO,kBAAkB,CAAC,SAAS,CAAC,gBAAmC,CAAC,CAAC;AAC1E,CAAC","sourcesContent":["import { ReactiveNode, SignalScope } from '@ibyar/expressions';\nimport { signalScopeFactory } from './factory.js';\n\nexport function pushNewSignalScope() {\n\tconst scope = SignalScope.create();\n\tsignalScopeFactory.push(scope);\n\treturn scope;\n}\n\nexport function pushSignalScope(scope: SignalScope) {\n\tsignalScopeFactory.push(scope);\n}\n\nexport function clearSignalScope(scope: SignalScope) {\n\tsignalScopeFactory.pop(scope);\n}\n\nexport function signal<T>(initialValue: T) {\n\treturn signalScopeFactory.signal(initialValue);\n}\n\nexport function signalFn<T>(initialValue: T) {\n\treturn signalScopeFactory.signalFn(initialValue);\n}\n\nexport function computed<T>(computation: () => T) {\n\treturn signalScopeFactory.computed(computation);\n}\n\nexport function computedFn<T>(computation: () => T) {\n\treturn signalScopeFactory!.computedFn(computation);\n}\n\nexport function lazy<T>(computation: () => T) {\n\treturn signalScopeFactory.lazy(computation);\n}\n\nexport function lazyFn<T>(computation: () => T) {\n\treturn signalScopeFactory.lazyFn(computation);\n}\n\nexport function effect(effectFn: (onCleanup?: (clean: () => void) => void) => void) {\n\treturn signalScopeFactory.effect(effectFn);\n}\nexport function untracked<T>(reactiveNode: ReactiveNode<T>): T;\nexport function untracked<T>(nonReactiveReadsFn: () => T): T;\nexport function untracked<T>(nonReactiveReads: (() => T) | ReactiveNode<T>): T {\n\treturn signalScopeFactory.untracked(nonReactiveReads as ReactiveNode<T>);\n}\n"]}
+{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../../src/core/signals/signals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,UAAU,kBAAkB;IACjC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAkB;IACjD,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAkB;IAClD,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,MAAM,CAAI,YAAgB;IACzC,OAAO,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAI,WAAoB;IAC/C,OAAO,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,IAAI,CAAI,WAAoB;IAC3C,OAAO,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,QAA2D;IACjF,OAAO,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAID,MAAM,UAAU,SAAS,CAAI,gBAA6C;IACzE,OAAO,kBAAkB,CAAC,SAAS,CAAC,gBAAmC,CAAC,CAAC;AAC1E,CAAC","sourcesContent":["import { ReactiveNode, SignalScope } from '@ibyar/expressions';\nimport { signalScopeFactory } from './factory.js';\n\nexport function pushNewSignalScope() {\n\tconst scope = SignalScope.create();\n\tsignalScopeFactory.push(scope);\n\treturn scope;\n}\n\nexport function pushSignalScope(scope: SignalScope) {\n\tsignalScopeFactory.push(scope);\n}\n\nexport function clearSignalScope(scope: SignalScope) {\n\tsignalScopeFactory.pop(scope);\n}\n\nexport function signal<T>(initialValue?: T) {\n\treturn signalScopeFactory.signal(initialValue);\n}\n\nexport function computed<T>(computation: () => T) {\n\treturn signalScopeFactory.computed(computation);\n}\n\nexport function lazy<T>(computation: () => T) {\n\treturn signalScopeFactory.lazy(computation);\n}\n\nexport function effect(effectFn: (onCleanup?: (clean: () => void) => void) => void) {\n\treturn signalScopeFactory.effect(effectFn);\n}\n\nexport function untracked<T>(reactiveNode: ReactiveNode<T>): T;\nexport function untracked<T>(nonReactiveReadsFn: () => T): T;\nexport function untracked<T>(nonReactiveReads: (() => T) | ReactiveNode<T>): T {\n\treturn signalScopeFactory.untracked(nonReactiveReads as ReactiveNode<T>);\n}\n"]}

package/utils/elements-util.d.ts

@@ -1,4 +1,3 @@
-export declare function hasComponentAttr(element: HTMLElement, attr: string): boolean;
 export declare function hasAttrCustomElement(element: HTMLElement, attr: string): boolean;
 export declare function isDataAttributes(attr: string): boolean;
 export declare function hasAttr(element: HTMLElement, attr: string): boolean;

package/utils/elements-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"elements-util.d.ts","sourceRoot":"","sources":["../../../src/core/utils/elements-util.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAM5E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAQhF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,WAE5C;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAKnE"}
+{"version":3,"file":"elements-util.d.ts","sourceRoot":"","sources":["../../../src/core/utils/elements-util.ts"],"names":[],"mappings":"AAGA,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAQhF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,WAE5C;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAInE"}

package/utils/elements-util.js

@@ -1,12 +1,4 @@
 import { hasNativeAttr } from '@ibyar/elements';
-import { isHTMLComponent } from '../component/custom-element.js';
-export function hasComponentAttr(element, attr) {
-    if (isHTMLComponent(element)) {
-        var componentRef = element.getComponentRef();
-        return componentRef.inputs.some(input => input.viewAttribute === attr);
-    }
-    return false;
-}
 export function hasAttrCustomElement(element, attr) {
     if (Reflect.has(element.constructor, 'allAttributes')) {
         return Reflect.get(element.constructor, 'allAttributes').some((prop) => prop === attr);
@@ -22,7 +14,6 @@ export function isDataAttributes(attr) {
 export function hasAttr(element, attr) {
     return hasNativeAttr(element, attr)
         || hasAttrCustomElement(element, attr)
-        || hasComponentAttr(element, attr)
         || isDataAttributes(attr);
 }
 //# sourceMappingURL=elements-util.js.map

package/utils/elements-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"elements-util.js","sourceRoot":"","sources":["../../../src/core/utils/elements-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,UAAU,gBAAgB,CAAC,OAAoB,EAAE,IAAY;IAClE,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAsB,OAAO,CAAC,eAAe,EAAE,CAAC;QAChE,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAoB,EAAE,IAAY;IACtE,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;QACvD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAChG,CAAC;SACI,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,CAAC;QACjE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAoB,EAAE,IAAY;IACzD,OAAO,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;WAC/B,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC;WACnC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC;WAC/B,gBAAgB,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { hasNativeAttr } from '@ibyar/elements';\nimport { ComponentRef } from '../component/component.js';\nimport { isHTMLComponent } from '../component/custom-element.js';\n\nexport function hasComponentAttr(element: HTMLElement, attr: string): boolean {\n\tif (isHTMLComponent(element)) {\n\t\tvar componentRef: ComponentRef<any> = element.getComponentRef();\n\t\treturn componentRef.inputs.some(input => input.viewAttribute === attr);\n\t}\n\treturn false;\n}\n\nexport function hasAttrCustomElement(element: HTMLElement, attr: string): boolean {\n\tif (Reflect.has(element.constructor, 'allAttributes')) {\n\t\treturn Reflect.get(element.constructor, 'allAttributes').some((prop: string) => prop === attr);\n\t}\n\telse if (Reflect.has(element.constructor, 'observedAttributes')) {\n\t\treturn Reflect.get(element.constructor, 'observedAttributes').some((prop: string) => prop === attr);\n\t}\n\treturn false;\n}\n\nexport function isDataAttributes(attr: string) {\n\treturn attr.startsWith('data-');\n}\n\nexport function hasAttr(element: HTMLElement, attr: string): boolean {\n\treturn hasNativeAttr(element, attr)\n\t\t|| hasAttrCustomElement(element, attr)\n\t\t|| hasComponentAttr(element, attr)\n\t\t|| isDataAttributes(attr);\n}\n"]}
+{"version":3,"file":"elements-util.js","sourceRoot":"","sources":["../../../src/core/utils/elements-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,UAAU,oBAAoB,CAAC,OAAoB,EAAE,IAAY;IACtE,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;QACvD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAChG,CAAC;SACI,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,CAAC;QACjE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAoB,EAAE,IAAY;IACzD,OAAO,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;WAC/B,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC;WACnC,gBAAgB,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { hasNativeAttr } from '@ibyar/elements';\n\n\nexport function hasAttrCustomElement(element: HTMLElement, attr: string): boolean {\n\tif (Reflect.has(element.constructor, 'allAttributes')) {\n\t\treturn Reflect.get(element.constructor, 'allAttributes').some((prop: string) => prop === attr);\n\t}\n\telse if (Reflect.has(element.constructor, 'observedAttributes')) {\n\t\treturn Reflect.get(element.constructor, 'observedAttributes').some((prop: string) => prop === attr);\n\t}\n\treturn false;\n}\n\nexport function isDataAttributes(attr: string) {\n\treturn attr.startsWith('data-');\n}\n\nexport function hasAttr(element: HTMLElement, attr: string): boolean {\n\treturn hasNativeAttr(element, attr)\n\t\t|| hasAttrCustomElement(element, attr)\n\t\t|| isDataAttributes(attr);\n}\n"]}

package/view/base-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-view.d.ts","sourceRoot":"","sources":["../../../src/core/view/base-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAW/C,OAAO,EAAgC,aAAa,EAAa,MAAM,gCAAgC,CAAC;AAaxG,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CA0W5G"}
+{"version":3,"file":"base-view.d.ts","sourceRoot":"","sources":["../../../src/core/view/base-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAU/C,OAAO,EAAgC,aAAa,EAAa,MAAM,gCAAgC,CAAC;AAaxG,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwT5G"}

package/view/base-view.js

@@ -1,4 +1,4 @@
-import { ReactiveScope, ReactiveScopeControl, getReactiveNode, isReactive } from '@ibyar/expressions';
+import { ReactiveScope, ReactiveControlScope, isReactive } from '@ibyar/expressions';
 import { isAfterContentChecked, isAfterContentInit, isAfterViewChecked, isAfterViewInit, isDoCheck, isOnChanges, isOnDestroy, isOnInit } from '../component/lifecycle.js';
 import { EventEmitter } from '../component/events.js';
 import { ComponentRender } from './render.js';
@@ -43,19 +43,17 @@ export function baseFactoryView(htmlElementType) {
             removeProvider(this._provider);
             this._model = model;
             clearSignalScope(this._signalScope);
-            const modelScope = ReactiveScopeControl.for(model);
+            const modelScope = ReactiveControlScope.for(model);
             const modelProxyRef = this._zone instanceof ProxyAuroraZone
                 ? createProxyZone(model, this._zone)
                 : model;
             modelScope.getContextProxy = () => modelProxyRef;
             this._modelScope = modelScope;
             Object.keys(this._model).forEach(key => {
-                const value = this._model[key];
-                const node = getReactiveNode(value);
-                if (!node) {
-                    return;
+                const node = this._model[key];
+                if (isReactive(node)) {
+                    node.subscribe((value, old) => this._modelScope.emit(key, value, old));
                 }
-                node.subscribe((value, old) => this._modelScope.emit(key, value, old));
             });
             this._viewScope = ReactiveScope.for({ 'this': this });
             const elementScope = this._viewScope.getInnerScope('this');
@@ -64,12 +62,7 @@ export function baseFactoryView(htmlElementType) {
                     if (newValue === oldValue) {
                         return;
                     }
-                    if (isReactive(this._model[input.modelProperty])) {
-                        this._model[input.modelProperty].set(newValue);
-                    }
-                    else {
-                        this._modelScope.set(input.modelProperty, newValue);
-                    }
+                    this._render.modelStack.set(input.modelProperty, newValue);
                 });
                 this._modelScope.subscribe(input.modelProperty, (newValue, oldValue) => {
                     if (newValue === oldValue) {
@@ -107,9 +100,6 @@ export function baseFactoryView(htmlElementType) {
                 this.initView();
             }
         }
-        detectChanges() {
-            this._modelScope.detectChanges();
-        }
         doBlockCallback = () => {
             if (isDoCheck(this._model)) {
                 this._zone.run(this._model.doCheck, this._modelScope.getContextProxy());
@@ -118,58 +108,21 @@ export function baseFactoryView(htmlElementType) {
         getComponentRef() {
             return this._componentRef;
         }
-        hasInputStartWith(viewProp) {
-            let dotIndex = viewProp.indexOf('.');
-            if (dotIndex > 0) {
-                viewProp = viewProp.substring(0, dotIndex);
-            }
-            return this.hasInput(viewProp);
-        }
-        getInputStartWith(viewProp) {
-            let index = viewProp.indexOf('.');
-            if (index > 0) {
-                viewProp = viewProp.substring(0, index);
-            }
-            index = viewProp.indexOf('[');
-            if (index > 0) {
-                viewProp = viewProp.substring(0, index);
-            }
-            return this.getInput(viewProp);
-        }
-        hasInput(viewProp) {
-            return this._componentRef.inputs.some(input => input.viewAttribute === viewProp);
-        }
         getInput(viewProp) {
             return this._componentRef.inputs.find(input => input.viewAttribute === viewProp);
         }
         getInputValue(viewProp) {
             const inputRef = this.getInput(viewProp);
             if (inputRef) {
-                return this._model[inputRef.modelProperty];
+                return this._render.modelStack.get(inputRef.modelProperty);
             }
         }
         setInputValue(viewProp, value) {
             const inputRef = this.getInput(viewProp);
             if (inputRef) {
-                this._modelScope.set(inputRef.modelProperty, value);
+                this._render.modelStack.set(inputRef.modelProperty, value);
             }
         }
-        hasOutput(viewProp) {
-            return this._componentRef.outputs.some(output => output.viewAttribute === viewProp);
-        }
-        getOutput(viewProp) {
-            return this._componentRef.outputs.find(output => output.viewAttribute === viewProp);
-        }
-        getEventEmitter(viewProp) {
-            const outputRef = this.getOutput(viewProp);
-            if (outputRef) {
-                return this._model[outputRef.modelProperty];
-            }
-            return;
-        }
-        hasProp(propName) {
-            return Reflect.has(this._model, propName);
-        }
         setAttributeHelper(attrViewName, value) {
             if (value === null || value === undefined) {
                 this.removeAttribute(attrViewName);
@@ -262,7 +215,7 @@ export function baseFactoryView(htmlElementType) {
             this.dispatchEvent(event);
         }
         initOuterAttribute(attr) {
-            // [window, this] scop
+            // [window, this] scope
             let elementAttr = attr.name;
             let modelProperty = attr.value;
             if (elementAttr.startsWith('[')) {
@@ -271,31 +224,39 @@ export function baseFactoryView(htmlElementType) {
                     this.setInputValue(elementAttr, Reflect.get(window, modelProperty));
                 }
             }
-            else if (elementAttr.startsWith('(')) {
+            else if ((elementAttr.startsWith('(') && elementAttr.endsWith(')')) || elementAttr.startsWith('@') || elementAttr.startsWith('on')) {
                 // (elementAttr)="modelProperty()"
-                elementAttr = elementAttr.substring(1, elementAttr.length - 1);
-                // this.handleEvent(element, elementAttr, viewProperty);
-                modelProperty = modelProperty.endsWith('()') ?
-                    modelProperty.substring(0, modelProperty.length - 2) : modelProperty;
-                let callback = Reflect.get(window, modelProperty);
-                this.addEventListener(elementAttr, event => {
-                    callback(event);
-                });
-            }
-            else if (elementAttr.startsWith('on')) {
-                const modelEvent = this.getEventEmitter(elementAttr.substring(2));
-                if (modelEvent) {
-                    // modelEvent.subscribe(listener);
-                    modelProperty = modelProperty.endsWith('()') ?
-                        modelProperty.substring(0, modelProperty.length - 2) : modelProperty;
-                    let listener = Reflect.get(window, modelProperty);
-                    modelEvent.subscribe((data) => {
-                        listener(data);
-                    });
+                // @elementAttr="modelProperty()"
+                // onElementAttr="modelProperty()"
+                // lower-case-event-name = "modelProperty()"
+                let start = 0, end = undefined;
+                if (elementAttr.startsWith('(') || elementAttr.startsWith('@')) {
+                    start = 1;
+                }
+                else if (elementAttr.startsWith('on')) {
+                    start = 2;
+                }
+                if (elementAttr.endsWith(')')) {
+                    end = elementAttr.length - 1;
+                }
+                const eventName = elementAttr.substring(start, end)?.replaceAll('-', '').toLowerCase();
+                if (modelProperty.endsWith('()')) {
+                    modelProperty = modelProperty.substring(0, modelProperty.length - 2);
+                }
+                const callback = Reflect.get(window, modelProperty);
+                const customEvent = this._componentRef.outputs.find(output => output.viewAttribute.toLowerCase() === eventName);
+                if (customEvent) {
+                    this._modelScope.subscribe(customEvent.modelProperty, (data) => callback?.(data));
+                }
+                else {
+                    this.addEventListener(elementAttr, event => callback?.(event));
                 }
             }
             else {
-                this.setInputValue(attr.name, attr.value);
+                const inputRef = this.getInput(attr.name);
+                if (inputRef) {
+                    this._render.modelStack.set(inputRef.modelProperty, attr.value);
+                }
             }
         }
         onDestroy(callback) {
@@ -325,13 +286,6 @@ export function baseFactoryView(htmlElementType) {
             const event = new CustomEvent('disconnected', { cancelable: true, bubbles: false, composed: false });
             this.dispatchEvent(event);
         }
-        triggerOutput(eventName, value) {
-            const modelEvent = this.getEventEmitter(eventName);
-            if (modelEvent) {
-                modelEvent.emit(value);
-                return;
-            }
-        }
     };
 }
 //# sourceMappingURL=base-view.js.map