@ibyar/expressions 0.3.0 → 0.3.8

package/api/definition/array.js

@@ -2,7 +2,7 @@ var ArrayExpression_1, ArrayPattern_1;
 import { __decorate, __metadata } from "tslib";
 import { AbstractExpressionNode } from '../abstract.js';
 import { Deserializer } from '../deserialize/deserialize.js';
-import { SpreadElement } from '../computing/spread.js';
+import { RestElement } from '../computing/rest.js';
 let ArrayExpression = ArrayExpression_1 = class ArrayExpression extends AbstractExpressionNode {
     constructor(elements) {
         super();
@@ -20,11 +20,8 @@ let ArrayExpression = ArrayExpression_1 = class ArrayExpression extends Abstract
     get(stack) {
         return this.elements.map(item => item.get(stack));
     }
-    entry() {
-        return this.elements.flatMap(item => item.entry());
-    }
-    event(parent) {
-        return this.elements.flatMap(item => item.event());
+    events(parent) {
+        return this.elements.flatMap(item => item.events());
     }
     toString() {
         return this.elements.map(item => item.toString()).toString();
@@ -52,24 +49,55 @@ let ArrayPattern = ArrayPattern_1 = class ArrayPattern extends AbstractExpressio
         return this.elements;
     }
     set(stack, values) {
+        throw new Error('ArrayPattern#set() has no implementation.');
+    }
+    get(scopeProvider) {
+        throw new Error('ArrayPattern#get() has no implementation.');
+    }
+    declareVariable(stack, scopeType, values) {
+        if (Array.isArray(values)) {
+            this.declareVariableFromArray(stack, scopeType, values);
+        }
+        else if (Reflect.has(values, Symbol.iterator)) {
+            this.declareVariableFromIterator(stack, scopeType, values);
+        }
+    }
+    declareVariableFromArray(stack, scopeType, values) {
         for (let index = 0; index < this.elements.length; index++) {
             const elem = this.elements[index];
-            if (elem instanceof SpreadElement) {
+            if (elem instanceof RestElement) {
                 const rest = values.slice(index);
-                elem.set(stack, rest);
+                elem.declareVariable(stack, 'block', rest);
                 break;
             }
-            elem.set(stack, values[index]);
+            elem.declareVariable(stack, 'block', values[index]);
         }
     }
-    get(scopeProvider, values) {
-        this.set(scopeProvider, values);
-    }
-    entry() {
-        return this.elements.flatMap(item => item.entry());
+    declareVariableFromIterator(stack, scopeType, iterator) {
+        let index = 0;
+        while (true) {
+            let iteratorResult = iterator.next();
+            if (iteratorResult.done) {
+                break;
+            }
+            const elem = this.elements[index++];
+            if (elem instanceof RestElement) {
+                const rest = [iteratorResult.value];
+                while (!iteratorResult.done) {
+                    iteratorResult = iterator.next();
+                    rest.push(iteratorResult.value);
+                }
+                elem.declareVariable(stack, 'block', rest);
+                break;
+            }
+            elem.declareVariable(stack, 'block', iteratorResult.value);
+            if (index >= this.elements.length) {
+                break;
+            }
+        }
     }
-    event(parent) {
-        return this.elements.flatMap(item => item.event());
+    events(parent) {
+        return this.elements.flatMap(item => item.events());
     }
     toString() {
         return this.elements.map(item => item.toString()).toString();

package/api/definition/array.js.map

@@ -1 +1 @@
-{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../src/expressions/api/definition/array.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NodeDeserializer, ExpressionNode } from '../expression.js';\nimport type { Stack } from '../../scope/stack.js';\nimport { AbstractExpressionNode } from '../abstract.js';\nimport { Deserializer } from '../deserialize/deserialize.js';\nimport { SpreadElement } from '../computing/spread.js';\n\n@Deserializer('ArrayExpression')\nexport class ArrayExpression extends AbstractExpressionNode {\n\tstatic fromJSON(node: ArrayExpression, deserializer: NodeDeserializer): ArrayExpression {\n\t\treturn new ArrayExpression(node.elements.map(expression => deserializer(expression)));\n\t}\n\tconstructor(private elements: ExpressionNode[]) {\n\t\tsuper();\n\t}\n\tgetElements() {\n\t\treturn this.elements;\n\t}\n\tset(stack: Stack) {\n\t\tthrow new Error(\"ArrayExpression#set() has no implementation.\");\n\t}\n\tget(stack: Stack) {\n\t\treturn this.elements.map(item => item.get(stack));\n\t}\n\tentry(): string[] {\n\t\treturn this.elements.flatMap(item => item.entry());\n\t}\n\tevent(parent?: string): string[] {\n\t\treturn this.elements.flatMap(item => item.event());\n\t}\n\ttoString() {\n\t\treturn this.elements.map(item => item.toString()).toString();\n\t}\n\ttoJson(): object {\n\t\treturn {\n\t\t\telements: this.elements.map(item => item.toJSON())\n\t\t};\n\t}\n}\n\n\n@Deserializer('ArrayPattern')\nexport class ArrayPattern extends AbstractExpressionNode {\n\tstatic fromJSON(node: ArrayPattern, deserializer: NodeDeserializer): ArrayPattern {\n\t\treturn new ArrayPattern(node.elements.map(expression => deserializer(expression)));\n\t}\n\tconstructor(private elements: ExpressionNode[]) {\n\t\tsuper();\n\t}\n\tgetElements() {\n\t\treturn this.elements;\n\t}\n\tset(stack: Stack, values: any[]) {\n\t\tfor (let index = 0; index < this.elements.length; index++) {\n\t\t\tconst elem = this.elements[index];\n\t\t\tif (elem instanceof SpreadElement) {\n\t\t\t\tconst rest = values.slice(index);\n\t\t\t\telem.set(stack, rest);\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\telem.set(stack, values[index]);\n\t\t}\n\t}\n\tget(scopeProvider: Stack, values: any[]) {\n\t\tthis.set(scopeProvider, values);\n\t}\n\tentry(): string[] {\n\t\treturn this.elements.flatMap(item => item.entry());\n\t}\n\tevent(parent?: string): string[] {\n\t\treturn this.elements.flatMap(item => item.event());\n\t}\n\ttoString() {\n\t\treturn this.elements.map(item => item.toString()).toString();\n\t}\n\ttoJson(): object {\n\t\treturn {\n\t\t\telements: this.elements.map(item => item.toJSON())\n\t\t};\n\t}\n}\n"]}
+{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../src/expressions/api/definition/array.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NodeDeserializer, ExpressionNode, CanDeclareExpression } from '../expression.js';\nimport type { Stack } from '../../scope/stack.js';\nimport { AbstractExpressionNode } from '../abstract.js';\nimport { Deserializer } from '../deserialize/deserialize.js';\nimport { RestElement } from '../computing/rest.js';\nimport { ScopeType } from '../../scope/scope.js';\n\n@Deserializer('ArrayExpression')\nexport class ArrayExpression extends AbstractExpressionNode {\n\tstatic fromJSON(node: ArrayExpression, deserializer: NodeDeserializer): ArrayExpression {\n\t\treturn new ArrayExpression(node.elements.map(expression => deserializer(expression)));\n\t}\n\tconstructor(private elements: ExpressionNode[]) {\n\t\tsuper();\n\t}\n\tgetElements() {\n\t\treturn this.elements;\n\t}\n\tset(stack: Stack) {\n\t\tthrow new Error(\"ArrayExpression#set() has no implementation.\");\n\t}\n\tget(stack: Stack) {\n\t\treturn this.elements.map(item => item.get(stack));\n\t}\n\tevents(parent?: string): string[] {\n\t\treturn this.elements.flatMap(item => item.events());\n\t}\n\ttoString() {\n\t\treturn this.elements.map(item => item.toString()).toString();\n\t}\n\ttoJson(): object {\n\t\treturn {\n\t\t\telements: this.elements.map(item => item.toJSON())\n\t\t};\n\t}\n}\n\n\n@Deserializer('ArrayPattern')\nexport class ArrayPattern extends AbstractExpressionNode implements CanDeclareExpression {\n\tstatic fromJSON(node: ArrayPattern, deserializer: NodeDeserializer): ArrayPattern {\n\t\treturn new ArrayPattern(node.elements.map(expression => deserializer(expression)) as CanDeclareExpression[]);\n\t}\n\tconstructor(private elements: CanDeclareExpression[]) {\n\t\tsuper();\n\t}\n\tgetElements() {\n\t\treturn this.elements;\n\t}\n\tset(stack: Stack, values: any) {\n\t\tthrow new Error('ArrayPattern#set() has no implementation.');\n\t}\n\tget(scopeProvider: Stack) {\n\t\tthrow new Error('ArrayPattern#get() has no implementation.');\n\t}\n\tdeclareVariable(stack: Stack, scopeType: ScopeType, values: any) {\n\t\tif (Array.isArray(values)) {\n\t\t\tthis.declareVariableFromArray(stack, scopeType, values);\n\t\t} else if (Reflect.has(values, Symbol.iterator)) {\n\t\t\tthis.declareVariableFromIterator(stack, scopeType, values);\n\t\t}\n\t}\n\tdeclareVariableFromArray(stack: Stack, scopeType: ScopeType, values: any[]) {\n\t\tfor (let index = 0; index < this.elements.length; index++) {\n\t\t\tconst elem = this.elements[index];\n\t\t\tif (elem instanceof RestElement) {\n\t\t\t\tconst rest = values.slice(index);\n\t\t\t\telem.declareVariable(stack, 'block', rest);\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\telem.declareVariable(stack, 'block', values[index]);\n\t\t}\n\t}\n\tdeclareVariableFromIterator(stack: Stack, scopeType: ScopeType, iterator: Iterator<any>) {\n\t\tlet index = 0;\n\t\twhile (true) {\n\t\t\tlet iteratorResult = iterator.next();\n\t\t\tif (iteratorResult.done) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tconst elem = this.elements[index++];\n\t\t\tif (elem instanceof RestElement) {\n\t\t\t\tconst rest = [iteratorResult.value];\n\t\t\t\twhile (!iteratorResult.done) {\n\t\t\t\t\titeratorResult = iterator.next();\n\t\t\t\t\trest.push(iteratorResult.value);\n\t\t\t\t}\n\t\t\t\telem.declareVariable(stack, 'block', rest);\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\telem.declareVariable(stack, 'block', iteratorResult.value);\n\t\t\tif (index >= this.elements.length) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\tevents(parent?: string): string[] {\n\t\treturn this.elements.flatMap(item => item.events());\n\t}\n\ttoString() {\n\t\treturn this.elements.map(item => item.toString()).toString();\n\t}\n\ttoJson(): object {\n\t\treturn {\n\t\t\telements: this.elements.map(item => item.toJSON())\n\t\t};\n\t}\n}\n"]}

package/api/definition/bind.d.ts

@@ -0,0 +1,21 @@
+import type { NodeDeserializer, ExpressionNode, CanFindScope } from '../expression.js';
+import type { Scope } from '../../scope/scope.js';
+import type { Stack } from '../../scope/stack.js';
+import { AbstractExpressionNode } from '../abstract.js';
+export declare class BindExpression extends AbstractExpressionNode implements CanFindScope {
+    protected object: ExpressionNode;
+    protected property: ExpressionNode;
+    private computed;
+    private optional;
+    static fromJSON(node: BindExpression, deserializer: NodeDeserializer): BindExpression;
+    constructor(object: ExpressionNode, property: ExpressionNode, computed: boolean, optional?: boolean);
+    getObject(): ExpressionNode;
+    getProperty(): ExpressionNode;
+    set(stack: Stack): void;
+    get(stack: Stack, thisContext?: any): any;
+    findScope<T extends object>(stack: Stack): Scope<T>;
+    findScope<T extends object>(stack: Stack, scope: Scope<any>): Scope<T>;
+    events(parent?: string): string[];
+    toString(): string;
+    toJson(): object;
+}

package/api/definition/bind.js

@@ -0,0 +1,81 @@
+var BindExpression_1;
+import { __decorate, __metadata } from "tslib";
+import { Deserializer } from '../deserialize/deserialize.js';
+import { AbstractExpressionNode } from '../abstract.js';
+let BindExpression = BindExpression_1 = class BindExpression extends AbstractExpressionNode {
+    constructor(object, property, computed, optional = false) {
+        super();
+        this.object = object;
+        this.property = property;
+        this.computed = computed;
+        this.optional = optional;
+    }
+    static fromJSON(node, deserializer) {
+        return new BindExpression_1(deserializer(node.object), deserializer(node.property), node.computed, node.optional);
+    }
+    getObject() {
+        return this.object;
+    }
+    getProperty() {
+        return this.property;
+    }
+    set(stack) {
+        throw new Error("BindExpression#set() has no implementation.");
+    }
+    get(stack, thisContext) {
+        const objectRef = thisContext ?? this.object.get(stack);
+        if (typeof objectRef === 'undefined') {
+            throw new TypeError(`Cannot read property '${this.property.toString()}' of undefined`);
+        }
+        let value;
+        if (this.computed) {
+            value = objectRef[this.property.get(stack)];
+        }
+        else {
+            value = this.property.get(stack, objectRef);
+        }
+        if (this.optional && (value === undefined || value === null)) {
+            return;
+        }
+        if (typeof value !== 'function') {
+            throw new Error(`can't bind to non-function type ${value}`);
+        }
+        return value.bind(objectRef);
+    }
+    findScope(stack, objectScope) {
+        if (!objectScope) {
+            objectScope = this.object.findScope(stack);
+        }
+        return this.property.findScope(stack, objectScope);
+    }
+    events(parent) {
+        if (this.computed) {
+            parent ??= '';
+            parent = `${parent}${this.object.events(parent)}`;
+            return [parent, `${parent}[${this.property.toString()}]`];
+        }
+        parent ||= '';
+        parent += this.object.toString() + '.';
+        return [...this.object.events(), ...this.property.events(parent)];
+    }
+    toString() {
+        if (this.computed) {
+            return `${this.object.toString()}${this.optional ? '?::' : '::'}[${this.property.toString()}]`;
+        }
+        return `${this.object.toString()}${this.optional ? '?::' : '::'}${this.property.toString()}`;
+    }
+    toJson() {
+        return {
+            object: this.object.toJSON(),
+            property: this.property.toJSON(),
+            computed: this.computed,
+            optional: this.optional
+        };
+    }
+};
+BindExpression = BindExpression_1 = __decorate([
+    Deserializer('BindExpression'),
+    __metadata("design:paramtypes", [Object, Object, Boolean, Boolean])
+], BindExpression);
+export { BindExpression };
+//# sourceMappingURL=bind.js.map

package/api/definition/bind.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bind.js","sourceRoot":"","sources":["../../../../src/expressions/api/definition/bind.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NodeDeserializer, ExpressionNode, CanFindScope } from '../expression.js';\nimport type { Scope } from '../../scope/scope.js';\nimport type { Stack } from '../../scope/stack.js';\nimport { Deserializer } from '../deserialize/deserialize.js';\nimport { AbstractExpressionNode } from '../abstract.js';\n\n@Deserializer('BindExpression')\nexport class BindExpression extends AbstractExpressionNode implements CanFindScope {\n\tstatic fromJSON(node: BindExpression, deserializer: NodeDeserializer): BindExpression {\n\t\treturn new BindExpression(\n\t\t\tdeserializer(node.object),\n\t\t\tdeserializer(node.property),\n\t\t\tnode.computed,\n\t\t\tnode.optional\n\t\t);\n\t}\n\tconstructor(\n\t\tprotected object: ExpressionNode,\n\t\tprotected property: ExpressionNode,\n\t\tprivate computed: boolean,\n\t\tprivate optional: boolean = false) {\n\t\tsuper();\n\t}\n\tgetObject() {\n\t\treturn this.object;\n\t}\n\tgetProperty() {\n\t\treturn this.property;\n\t}\n\tset(stack: Stack) {\n\t\tthrow new Error(\"BindExpression#set() has no implementation.\");\n\t}\n\tget(stack: Stack, thisContext?: any) {\n\t\tconst objectRef = thisContext ?? this.object.get(stack);\n\t\tif (typeof objectRef === 'undefined') {\n\t\t\tthrow new TypeError(`Cannot read property '${this.property.toString()}' of undefined`);\n\t\t}\n\t\tlet value;\n\t\tif (this.computed) {\n\t\t\tvalue = objectRef[this.property.get(stack)];\n\t\t} else {\n\t\t\tvalue = this.property.get(stack, objectRef);\n\t\t}\n\t\tif (this.optional && (value === undefined || value === null)) {\n\t\t\treturn;\n\t\t}\n\t\tif (typeof value !== 'function') {\n\t\t\tthrow new Error(`can't bind to non-function type ${value}`);\n\t\t}\n\t\treturn (<Function>value).bind(objectRef);\n\t}\n\tfindScope<T extends object>(stack: Stack): Scope<T>;\n\tfindScope<T extends object>(stack: Stack, scope: Scope<any>): Scope<T>;\n\tfindScope<T extends object>(stack: Stack, objectScope?: Scope<any>): Scope<T> | undefined {\n\t\tif (!objectScope) {\n\t\t\tobjectScope = (this.object as ExpressionNode & CanFindScope).findScope(stack);\n\t\t}\n\t\treturn (this.property as ExpressionNode & CanFindScope).findScope(stack, objectScope);\n\t}\n\tevents(parent?: string): string[] {\n\t\tif (this.computed) {\n\t\t\tparent ??= '';\n\t\t\tparent = `${parent}${this.object.events(parent)}`;\n\t\t\treturn [parent, `${parent}[${this.property.toString()}]`];\n\t\t}\n\t\tparent ||= '';\n\t\tparent += this.object.toString() + '.';\n\t\treturn [...this.object.events(), ...this.property.events(parent)];\n\t}\n\ttoString() {\n\t\tif (this.computed) {\n\t\t\treturn `${this.object.toString()}${this.optional ? '?::' : '::'}[${this.property.toString()}]`;\n\t\t}\n\t\treturn `${this.object.toString()}${this.optional ? '?::' : '::'}${this.property.toString()}`;\n\t}\n\ttoJson(): object {\n\t\treturn {\n\t\t\tobject: this.object.toJSON(),\n\t\t\tproperty: this.property.toJSON(),\n\t\t\tcomputed: this.computed,\n\t\t\toptional: this.optional\n\t\t};\n\t}\n}\n"]}

package/api/definition/comment.d.ts

@@ -7,8 +7,7 @@ export declare class CommentExpression extends AbstractExpressionNode {
     getComment(): string;
     set(stack: Stack, ...values: any[]): void;
     get(stack: Stack): void;
-    entry(): string[];
-    event(parent?: string): string[];
+    events(parent?: string): string[];
     toString(): string;
     toJson(): object;
 }

package/api/definition/comment.js

@@ -17,10 +17,7 @@ let CommentExpression = CommentExpression_1 = class CommentExpression extends Ab
     }
     get(stack) {
     }
-    entry() {
-        return [];
-    }
-    event(parent) {
+    events(parent) {
         return [];
     }
     toString() {

package/api/definition/comment.js.map

@@ -1 +1 @@
-{"version":3,"file":"comment.js","sourceRoot":"","sources":["../../../../src/expressions/api/definition/comment.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,IAAa,iBAAiB,yBAA9B,MAAa,iBAAkB,SAAQ,sBAAsB;IAI5D,YAAoB,OAAe;QAClC,KAAK,EAAE,CAAC;QADW,YAAO,GAAP,OAAO,CAAQ;IAEnC,CAAC;IALD,MAAM,CAAC,QAAQ,CAAC,OAA0B;QACzC,OAAO,IAAI,mBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAID,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAOD,GAAG,CAAC,KAAY,EAAE,GAAG,MAAa;IAElC,CAAC;IAMD,GAAG,CAAC,KAAY;IAEhB,CAAC;IACD,KAAK;QACJ,OAAO,EAAE,CAAC;IACX,CAAC;IACD,KAAK,CAAC,MAAe;QACpB,OAAO,EAAE,CAAC;IACX,CAAC;IACD,QAAQ;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IACD,MAAM;QACL,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;CACD,CAAA;AAvCY,iBAAiB;IAD7B,YAAY,CAAC,mBAAmB,CAAC;;GACrB,iBAAiB,CAuC7B;SAvCY,iBAAiB","sourcesContent":["\nimport type { Stack } from '../../scope/stack.js';\nimport { AbstractExpressionNode } from '../abstract.js';\nimport { Deserializer } from '../deserialize/deserialize.js';\n\n@Deserializer('CommentExpression')\nexport class CommentExpression extends AbstractExpressionNode {\n\tstatic fromJSON(nodeExp: CommentExpression): CommentExpression {\n\t\treturn new CommentExpression(nodeExp.comment);\n\t}\n\tconstructor(private comment: string) {\n\t\tsuper();\n\t}\n\tgetComment() {\n\t\treturn this.comment;\n\t}\n\n\t/**\n\t * \n\t * @param context execution stack/scope context\n\t * @param value any paramter\n\t */\n\tset(stack: Stack, ...values: any[]) {\n\n\t}\n\n\t/**\n\t * used when define a function\n\t * @param context execution stack/scope context\n\t */\n\tget(stack: Stack) {\n\n\t}\n\tentry(): string[] {\n\t\treturn [];\n\t}\n\tevent(parent?: string): string[] {\n\t\treturn [];\n\t}\n\ttoString(): string {\n\t\treturn this.comment;\n\t}\n\ttoJson(): object {\n\t\treturn { comment: this.comment };\n\t}\n}\n"]}
+{"version":3,"file":"comment.js","sourceRoot":"","sources":["../../../../src/expressions/api/definition/comment.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,IAAa,iBAAiB,yBAA9B,MAAa,iBAAkB,SAAQ,sBAAsB;IAI5D,YAAoB,OAAe;QAClC,KAAK,EAAE,CAAC;QADW,YAAO,GAAP,OAAO,CAAQ;IAEnC,CAAC;IALD,MAAM,CAAC,QAAQ,CAAC,OAA0B;QACzC,OAAO,IAAI,mBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAID,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAOD,GAAG,CAAC,KAAY,EAAE,GAAG,MAAa;IAElC,CAAC;IAMD,GAAG,CAAC,KAAY;IAEhB,CAAC;IACD,MAAM,CAAC,MAAe;QACrB,OAAO,EAAE,CAAC;IACX,CAAC;IACD,QAAQ;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IACD,MAAM;QACL,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;CACD,CAAA;AApCY,iBAAiB;IAD7B,YAAY,CAAC,mBAAmB,CAAC;;GACrB,iBAAiB,CAoC7B;SApCY,iBAAiB","sourcesContent":["\nimport type { Stack } from '../../scope/stack.js';\nimport { AbstractExpressionNode } from '../abstract.js';\nimport { Deserializer } from '../deserialize/deserialize.js';\n\n@Deserializer('CommentExpression')\nexport class CommentExpression extends AbstractExpressionNode {\n\tstatic fromJSON(nodeExp: CommentExpression): CommentExpression {\n\t\treturn new CommentExpression(nodeExp.comment);\n\t}\n\tconstructor(private comment: string) {\n\t\tsuper();\n\t}\n\tgetComment() {\n\t\treturn this.comment;\n\t}\n\n\t/**\n\t * \n\t * @param context execution stack/scope context\n\t * @param value any paramter\n\t */\n\tset(stack: Stack, ...values: any[]) {\n\n\t}\n\n\t/**\n\t * used when define a function\n\t * @param context execution stack/scope context\n\t */\n\tget(stack: Stack) {\n\n\t}\n\tevents(parent?: string): string[] {\n\t\treturn [];\n\t}\n\ttoString(): string {\n\t\treturn this.comment;\n\t}\n\ttoJson(): object {\n\t\treturn { comment: this.comment };\n\t}\n}\n"]}

package/api/definition/function.d.ts

@@ -1,4 +1,4 @@
-import type { ExpressionNode, NodeDeserializer } from '../expression.js';
+import type { CanDeclareExpression, ExpressionNode, NodeDeserializer } from '../expression.js';
 import type { Stack } from '../../scope/stack.js';
 import { AbstractExpressionNode } from '../abstract.js';
 export declare enum FunctionKind {
@@ -21,17 +21,16 @@ export declare enum ArrowFunctionType {
     NORMAL = "NORMAL",
     ASYNC = "ASYNC"
 }
-export declare class Paramter extends AbstractExpressionNode {
+export declare class Param extends AbstractExpressionNode {
     private identifier;
     private defaultValue?;
-    static fromJSON(node: Paramter, deserializer: NodeDeserializer): Paramter;
+    static fromJSON(node: Param, deserializer: NodeDeserializer): Param;
     constructor(identifier: ExpressionNode, defaultValue?: ExpressionNode | undefined);
     getIdentifier(): ExpressionNode;
     getDefaultValue(): ExpressionNode | undefined;
     set(stack: Stack, value: Function): void;
     get(stack: Stack): void;
-    entry(): string[];
-    event(): string[];
+    events(): string[];
     toString(): string;
     toJson(): object;
 }
@@ -39,27 +38,26 @@ export declare class FunctionExpression extends AbstractExpressionNode {
     protected params: ExpressionNode[];
     protected body: ExpressionNode[];
     protected kind: FunctionKind;
-    protected id?: ExpressionNode | undefined;
+    protected id?: CanDeclareExpression | undefined;
     protected rest?: boolean | undefined;
     protected generator?: boolean | undefined;
     static fromJSON(node: FunctionExpression, deserializer: NodeDeserializer): FunctionExpression;
-    constructor(params: ExpressionNode[], body: ExpressionNode[], kind: FunctionKind, id?: ExpressionNode | undefined, rest?: boolean | undefined, generator?: boolean | undefined);
+    constructor(params: ExpressionNode[], body: ExpressionNode[], kind: FunctionKind, id?: CanDeclareExpression | undefined, rest?: boolean | undefined, generator?: boolean | undefined);
     getParams(): ExpressionNode[];
     getBody(): ExpressionNode[];
     getKind(): FunctionKind;
-    getId(): ExpressionNode | undefined;
+    getId(): CanDeclareExpression | undefined;
     getRest(): boolean | undefined;
     set(stack: Stack, value: Function): void;
-    private setParamter;
+    private setParameter;
     get(stack: Stack): Function;
-    entry(): string[];
-    event(): string[];
+    events(): string[];
     toString(): string;
     toJson(): object;
 }
 export declare class FunctionDeclaration extends FunctionExpression {
     static fromJSON(node: FunctionDeclaration, deserializer: NodeDeserializer): FunctionDeclaration;
-    constructor(params: ExpressionNode[], body: ExpressionNode[], kind: FunctionKind, id: ExpressionNode, rest?: boolean, generator?: boolean);
+    constructor(params: ExpressionNode[], body: ExpressionNode[], kind: FunctionKind, id: CanDeclareExpression, rest?: boolean, generator?: boolean);
 }
 export declare class ArrowFunctionExpression extends AbstractExpressionNode {
     private params;
@@ -73,10 +71,9 @@ export declare class ArrowFunctionExpression extends AbstractExpressionNode {
     getBody(): ExpressionNode[];
     getRest(): boolean | undefined;
     set(stack: Stack, value: Function): void;
-    private setParamter;
+    private setParameter;
     get(stack: Stack): Function;
-    entry(): string[];
-    event(): string[];
+    events(): string[];
     toString(): string;
     toJson(): object;
 }

package/api/definition/function.js

@@ -1,8 +1,8 @@
-var Paramter_1, FunctionExpression_1, FunctionDeclaration_1, ArrowFunctionExpression_1;
+var Param_1, FunctionExpression_1, FunctionDeclaration_1, ArrowFunctionExpression_1;
 import { __decorate, __metadata } from "tslib";
 import { AbstractExpressionNode, AwaitPromise, ReturnValue } from '../abstract.js';
 import { Deserializer } from '../deserialize/deserialize.js';
-import { BreakStatement, ContinueStatement } from '../statement/controlflow/terminate.js';
+import { BreakStatement, ContinueStatement } from '../statement/control/terminate.js';
 export var FunctionKind;
 (function (FunctionKind) {
     FunctionKind["NORMAL"] = "NORMAL";
@@ -25,14 +25,14 @@ export var ArrowFunctionType;
     ArrowFunctionType["NORMAL"] = "NORMAL";
     ArrowFunctionType["ASYNC"] = "ASYNC";
 })(ArrowFunctionType || (ArrowFunctionType = {}));
-let Paramter = Paramter_1 = class Paramter extends AbstractExpressionNode {
+let Param = Param_1 = class Param extends AbstractExpressionNode {
     constructor(identifier, defaultValue) {
         super();
         this.identifier = identifier;
         this.defaultValue = defaultValue;
     }
     static fromJSON(node, deserializer) {
-        return new Paramter_1(deserializer(node.identifier), node.defaultValue ? deserializer(node.defaultValue) : void 0);
+        return new Param_1(deserializer(node.identifier), node.defaultValue ? deserializer(node.defaultValue) : void 0);
     }
     getIdentifier() {
         return this.identifier;
@@ -44,13 +44,10 @@ let Paramter = Paramter_1 = class Paramter extends AbstractExpressionNode {
         this.identifier.set(stack, value || this.defaultValue?.get(stack));
     }
     get(stack) {
-        throw new Error('Paramter#get() has no implementation.');
+        throw new Error('Param#get() has no implementation.');
     }
-    entry() {
-        return this.identifier.entry().concat(this.defaultValue?.entry() || []);
-    }
-    event() {
-        return this.identifier.event().concat(this.defaultValue?.event() || []);
+    events() {
+        return this.identifier.events().concat(this.defaultValue?.events() || []);
     }
     toString() {
         let init = this.defaultValue ? (' = ' + this.defaultValue.toString()) : '';
@@ -63,11 +60,11 @@ let Paramter = Paramter_1 = class Paramter extends AbstractExpressionNode {
         };
     }
 };
-Paramter = Paramter_1 = __decorate([
-    Deserializer('Paramter'),
+Param = Param_1 = __decorate([
+    Deserializer('Param'),
     __metadata("design:paramtypes", [Object, Object])
-], Paramter);
-export { Paramter };
+], Param);
+export { Param };
 let FunctionExpression = FunctionExpression_1 = class FunctionExpression extends AbstractExpressionNode {
     constructor(params, body, kind, id, rest, generator) {
         super();
@@ -99,7 +96,7 @@ let FunctionExpression = FunctionExpression_1 = class FunctionExpression extends
     set(stack, value) {
         throw new Error('FunctionExpression#set() has no implementation.');
     }
-    setParamter(stack, args) {
+    setParameter(stack, args) {
         const limit = this.rest ? this.params.length - 1 : this.params.length;
         for (let i = 0; i < limit; i++) {
             this.params[i].set(stack, args[i]);
@@ -114,9 +111,9 @@ let FunctionExpression = FunctionExpression_1 = class FunctionExpression extends
         switch (this.kind) {
             case FunctionKind.ASYNC:
                 func = async function (...args) {
-                    stack.pushFunctionScope();
+                    const scope = stack.pushFunctionScope();
                     stack.declareVariable('function', 'this', this);
-                    self.setParamter(stack, args);
+                    self.setParameter(stack, args);
                     let returnValue;
                     for (const state of self.body) {
                         returnValue = state.get(stack);
@@ -152,35 +149,35 @@ let FunctionExpression = FunctionExpression_1 = class FunctionExpression extends
                             returnValue = returnValue.value;
                             if (returnValue instanceof AwaitPromise) {
                                 returnValue = await returnValue.promise;
-                                stack.popScope();
+                                stack.clearTo(scope);
                                 return returnValue;
                             }
                         }
                     }
-                    stack.popScope();
+                    stack.clearTo(scope);
                 };
                 break;
             case FunctionKind.GENERATOR:
                 func = function* (...args) {
-                    stack.pushFunctionScope();
+                    const scope = stack.pushFunctionScope();
                     stack.declareVariable('function', 'this', this);
-                    self.setParamter(stack, args);
+                    self.setParameter(stack, args);
                     let returnValue;
                     for (const state of self.body) {
                         returnValue = state.get(stack);
                         if (returnValue instanceof ReturnValue) {
-                            stack.popScope();
+                            stack.clearTo(scope);
                             return returnValue.value;
                         }
                     }
-                    stack.popScope();
+                    stack.clearTo(scope);
                 };
                 break;
             case FunctionKind.ASYNC_GENERATOR:
                 func = async function* (...args) {
-                    stack.pushFunctionScope();
+                    const scope = stack.pushFunctionScope();
                     stack.declareVariable('function', 'this', this);
-                    self.setParamter(stack, args);
+                    self.setParameter(stack, args);
                     let returnValue;
                     for (const state of self.body) {
                         returnValue = state.get(stack);
@@ -207,7 +204,7 @@ let FunctionExpression = FunctionExpression_1 = class FunctionExpression extends
                                 }
                                 else if (result instanceof ReturnValue) {
                                     returnValue = result;
-                                    stack.popScope();
+                                    stack.clearTo(scope);
                                     break;
                                 }
                             }
@@ -216,45 +213,38 @@ let FunctionExpression = FunctionExpression_1 = class FunctionExpression extends
                         if (returnValue instanceof ReturnValue) {
                             returnValue = returnValue.value;
                             if (returnValue instanceof AwaitPromise) {
-                                stack.popScope();
+                                stack.clearTo(scope);
                                 return await returnValue.promise;
                             }
                         }
                     }
-                    stack.popScope();
+                    stack.clearTo(scope);
                 };
                 break;
             default:
             case FunctionKind.NORMAL:
                 func = function (...args) {
-                    stack.pushFunctionScope();
+                    const scope = stack.pushFunctionScope();
                     stack.declareVariable('function', 'this', this);
-                    self.setParamter(stack, args);
+                    self.setParameter(stack, args);
                     let returnValue;
                     for (const state of self.body) {
                         returnValue = state.get(stack);
                         if (returnValue instanceof ReturnValue) {
-                            stack.popScope();
+                            stack.clearTo(scope);
                             return returnValue.value;
                         }
                     }
-                    stack.popScope();
+                    stack.clearTo(scope);
                 };
                 break;
         }
-        if (this.id) {
-            this.id.set(stack, func);
-        }
+        this.id?.declareVariable(stack, 'block', func);
         return func;
     }
-    entry() {
-        return [
-            ...this.params.flatMap(param => param.entry()),
-        ];
-    }
-    event() {
+    events() {
         return [
-            ...this.params.flatMap(param => param.event()),
+            ...this.params.flatMap(param => param.events()),
         ];
     }
     toString() {
@@ -336,7 +326,7 @@ let ArrowFunctionExpression = ArrowFunctionExpression_1 = class ArrowFunctionExp
     set(stack, value) {
         throw new Error('ArrowFunctionExpression#set() has no implementation.');
     }
-    setParamter(stack, args) {
+    setParameter(stack, args) {
         const limit = this.rest ? this.params.length - 1 : this.params.length;
         for (let i = 0; i < limit; i++) {
             this.params[i].set(stack, args[i]);
@@ -350,8 +340,8 @@ let ArrowFunctionExpression = ArrowFunctionExpression_1 = class ArrowFunctionExp
         switch (this.kind) {
             case ArrowFunctionType.ASYNC:
                 func = async (...args) => {
-                    stack.pushFunctionScope();
-                    this.setParamter(stack, args);
+                    const scope = stack.pushFunctionScope();
+                    this.setParameter(stack, args);
                     let returnValue;
                     for (const state of this.body) {
                         returnValue = state.get(stack);
@@ -386,41 +376,42 @@ let ArrowFunctionExpression = ArrowFunctionExpression_1 = class ArrowFunctionExp
                         if (returnValue instanceof ReturnValue) {
                             returnValue = returnValue.value;
                             if (returnValue instanceof AwaitPromise) {
-                                stack.popScope();
+                                stack.clearTo(scope);
                                 return await returnValue.promise;
                             }
                         }
                     }
-                    stack.popScope();
+                    stack.clearTo(scope);
+                    if (this.body.length === 1) {
+                        return returnValue;
+                    }
                 };
                 break;
             default:
             case ArrowFunctionType.NORMAL:
                 func = (...args) => {
-                    stack.pushFunctionScope();
-                    this.setParamter(stack, args);
+                    const scope = stack.pushFunctionScope();
+                    this.setParameter(stack, args);
                     let returnValue;
                     for (const state of this.body) {
                         returnValue = state.get(stack);
                         if (returnValue instanceof ReturnValue) {
-                            stack.popScope();
+                            stack.clearTo(scope);
                             return returnValue.value;
                         }
                     }
-                    stack.popScope();
+                    stack.clearTo(scope);
+                    if (this.body.length === 1) {
+                        return returnValue;
+                    }
                 };
                 break;
         }
         return func;
     }
-    entry() {
-        return [
-            ...this.params.flatMap(param => param.entry()),
-        ];
-    }
-    event() {
+    events() {
         return [
-            ...this.params.flatMap(param => param.event()),
+            ...this.params.flatMap(param => param.events()),
         ];
     }
     toString() {