@ibyar/expressions 0.5.4 → 0.6.0

package/api/class/class.js

@@ -1,5 +1,6 @@
 var Super_1, MetaProperty_1, PrivateIdentifier_1, StaticBlock_1, MethodDefinition_1, PropertyDefinition_1, AccessorProperty_1, ClassBody_1, ClassDeclaration_1, ClassExpression_1;
 import { __decorate as __decorate_1, __metadata } from "tslib";
+import { ClassScope } from '../../scope/scope.js';
 import { __decorate } from 'tslib';
 import { AbstractExpressionNode } from '../abstract.js';
 import { Deserializer } from '../deserialize/deserialize.js';
@@ -8,18 +9,21 @@ import { MemberExpression } from '../definition/member.js';
 import { FunctionExpression } from '../definition/function.js';
 import { BlockStatement } from '../statement/control/block.js';
 import { CallExpression } from '../computing/call.js';
-const TEMP_CLASS_NAME = Symbol('temp_class_name');
-const SUPER = Symbol('super');
-const NEW_TARGET = Symbol('new.target');
-const IMPORT_META = Symbol('import.meta');
-const STACK = Symbol('stack');
-const GET_PARAMETERS = Symbol('getParameters');
-const GET_SUPER_PROPERTY = Symbol('getSuperProperty');
-const CALL_SUPER_Method = Symbol('callSuperMethod');
-const CONSTRUCTOR = Symbol('constructor');
-const PRIVATE_SYMBOL = Symbol('#private');
-const INIT_PRIVATE_SYMBOL = Symbol('#init_private');
-const STATIC_INITIALIZATION_BLOCK = Symbol('static_block');
+const TEMP_CLASS_NAME = Symbol('TempClassName');
+const SUPER = Symbol('Super');
+const NEW_TARGET = Symbol('NewTarget');
+const IMPORT_META = Symbol('ImportMeta');
+const STACK = Symbol('Stack');
+const GET_PARAMETERS = Symbol('GetParameters');
+const GET_SUPER_PROPERTY = Symbol('GetSuperProperty');
+const CALL_SUPER_Method = Symbol('CallSuperMethod');
+const CONSTRUCTOR = Symbol('Constructor');
+const PRIVATE_SYMBOL = Symbol('Private');
+const INSTANCE_PRIVATE_SYMBOL = Symbol('InstancePrivate');
+const STATIC_INITIALIZATION_BLOCK = Symbol('StaticBlock');
+/**
+ * A `super` pseudo-expression.
+ */
 let Super = Super_1 = class Super extends AbstractExpressionNode {
     constructor() {
         super();
@@ -53,6 +57,13 @@ Super = Super_1 = __decorate_1([
     __metadata("design:paramtypes", [])
 ], Super);
 export { Super };
+/**
+ * MetaProperty node represents
+ * - `new.target` meta property in ES2015.
+ * - `import.meta` meta property in ES2030.
+ *
+ * In the future, it will represent other meta properties as well.
+ */
 let MetaProperty = MetaProperty_1 = class MetaProperty extends MemberExpression {
     constructor(meta, property) {
         super(meta, property, false);
@@ -105,64 +116,59 @@ MetaProperty = MetaProperty_1 = __decorate_1([
     __metadata("design:paramtypes", [Identifier, Identifier])
 ], MetaProperty);
 export { MetaProperty };
-let PrivateIdentifier = PrivateIdentifier_1 = class PrivateIdentifier extends AbstractExpressionNode {
-    constructor(name) {
-        super();
-        this.name = name;
-    }
+/**
+ * A private identifier refers to private class elements. For a private name `#a`, its name is `a`.
+ */
+let PrivateIdentifier = PrivateIdentifier_1 = class PrivateIdentifier extends Identifier {
     static fromJSON(node) {
         return new PrivateIdentifier_1(node.name);
     }
-    getName() {
-        return this.name;
-    }
-    set(stack, value) {
-        const privateScope = stack.findScope(PRIVATE_SYMBOL);
-        privateScope.getScope(PRIVATE_SYMBOL)?.set(this.name, value);
-    }
-    get(stack, thisContext) {
-        const privateObj = stack.get(PRIVATE_SYMBOL);
-        return privateObj[this.name];
-    }
-    dependency(computed) {
-        return [];
-    }
-    dependencyPath(computed) {
-        return [];
+    get(stack) {
+        return stack.get(this.toString());
     }
-    shareVariables(scopeList) { }
     toString() {
         return `#${this.name}`;
     }
-    toJson() {
-        return {
-            name: this.name
-        };
-    }
 };
 PrivateIdentifier = PrivateIdentifier_1 = __decorate_1([
-    Deserializer('PrivateIdentifier'),
-    __metadata("design:paramtypes", [String])
+    Deserializer('PrivateIdentifier')
 ], PrivateIdentifier);
 export { PrivateIdentifier };
+/**
+ * A static block static { } is a block statement serving as an additional static initializer.
+ */
 let StaticBlock = StaticBlock_1 = class StaticBlock extends BlockStatement {
     static fromJSON(node, deserializer) {
-        return new StaticBlock_1(deserializer(node.body), node.isStatement);
+        return new StaticBlock_1(deserializer(node.body));
     }
-    constructor(body, isStatement) {
-        super(body, isStatement);
+    constructor(body) {
+        super(body);
     }
     get(stack, classConstructor) {
         const constructor = classConstructor;
-        constructor[STATIC_INITIALIZATION_BLOCK].push(() => super.get(stack));
+        constructor[STATIC_INITIALIZATION_BLOCK].push(() => {
+            const scope = new ClassScope(constructor);
+            stack.pushScope(scope);
+            try {
+                super.get(stack);
+            }
+            finally {
+                stack.clearTo(scope);
+            }
+        });
     }
     toString() {
         return `static ${super.toString()}`;
     }
+    toJson() {
+        return {
+            body: this.body.map(node => node.toJSON())
+        };
+    }
 };
 StaticBlock = StaticBlock_1 = __decorate_1([
     Deserializer('StaticBlock'),
-    __metadata("design:paramtypes", [Array, Boolean])
+    __metadata("design:paramtypes", [Array])
 ], StaticBlock);
 export { StaticBlock };
 export class AbstractDefinition extends AbstractExpressionNode {
@@ -199,7 +205,25 @@ export class AbstractDefinition extends AbstractExpressionNode {
     dependencyPath(computed) {
         return [];
     }
+    getTarget(classConstructor) {
+        return this.static
+            ? (this.key instanceof PrivateIdentifier ? classConstructor[PRIVATE_SYMBOL] : classConstructor)
+            : (this.key instanceof PrivateIdentifier ? classConstructor[INSTANCE_PRIVATE_SYMBOL] : classConstructor.prototype);
+    }
+    getKeyName(stack) {
+        switch (true) {
+            case this.computed:
+                return this.key.get(stack);
+            case this.key instanceof Identifier:
+            case this.key instanceof PrivateIdentifier:
+                return this.key.getName();
+            default: return this.key.toString();
+        }
+    }
 }
+/**
+ * - When key is a PrivateIdentifier, computed must be false and kind can not be "constructor".
+ */
 let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends AbstractDefinition {
     constructor(kind, key, value, decorators, computed, isStatic) {
         super(key, decorators, computed, isStatic, value);
@@ -224,23 +248,22 @@ let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends Abstr
             this.initConstructor(stack, classConstructor);
             return;
         }
-        const target = this.static ? classConstructor : classConstructor.prototype;
+        const target = this.getTarget(classConstructor);
+        const name = this.getKeyName(stack);
         const value = this.value?.get(stack);
-        const name = this.computed ? this.key.get(stack) : this.key.getName();
-        const ref = this.key instanceof PrivateIdentifier ? target[INIT_PRIVATE_SYMBOL] : target;
         switch (this.kind) {
             case 'method':
-                ref[name] = value;
+                target[name] = value;
                 break;
             case 'set':
-                Object.defineProperty(ref, name, {
+                Object.defineProperty(target, name, {
                     configurable: true,
                     enumerable: false,
                     set: value,
                 });
                 break;
             case 'get':
-                Object.defineProperty(ref, name, {
+                Object.defineProperty(target, name, {
                     configurable: true,
                     enumerable: false,
                     get: value,
@@ -250,17 +273,18 @@ let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends Abstr
                 break;
         }
         const decorators = this.decorators.map(decorator => decorator.get(stack));
-        __decorate(decorators, target, name, null);
+        decorators.length && __decorate(decorators, target, name, null);
     }
     initConstructor(stack, classConstructor) {
-        let superIndex = this.value.getBody()
+        const body = this.value.getBody().getBody();
+        let superIndex = body
             .findIndex(call => call instanceof CallExpression && Super.INSTANCE === call.getCallee());
         if (superIndex === -1) {
-            superIndex = this.value.getBody().length;
+            superIndex = body.length;
         }
-        const superCall = this.value.getBody()[superIndex];
-        const blockBeforeSuper = new BlockStatement(this.value.getBody().slice(0, superIndex), false);
-        const blockAfterSuper = new BlockStatement(this.value.getBody().slice(superIndex + 1), false);
+        const superCall = body[superIndex];
+        const blockBeforeSuper = new BlockStatement(body.slice(0, superIndex));
+        const blockAfterSuper = new BlockStatement(body.slice(superIndex + 1));
         if (superCall) {
             classConstructor[GET_PARAMETERS] = function (params) {
                 const scope = stack.pushBlockScope();
@@ -271,7 +295,7 @@ let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends Abstr
                 return parameters;
             };
         }
-        classConstructor.prototype[CONSTRUCTOR] = function (params) {
+        classConstructor[CONSTRUCTOR] = function (params) {
             const scope = this[STACK].pushBlockScope();
             blockAfterSuper.get(this[STACK]);
             stack.clearTo(scope);
@@ -282,22 +306,36 @@ let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends Abstr
         if (str.length) {
             str += ' ';
         }
-        let name = this.computed ? `[${this.key.toString()}]` : this.key.toString();
+        if (this.static) {
+            str += 'static ';
+        }
+        const methodName = this.key.toString();
         switch (this.kind) {
-            case 'constructor':
-                str += 'constructor ';
-                break;
             case 'get':
-                str += `get ${name} `;
+                str += 'get ' + methodName;
                 break;
             case 'set':
-                str += `set ${name} `;
+                str += 'set ' + methodName;
+                break;
+            case 'method':
+                if (this.value.getAsync() && this.value.getGenerator()) {
+                    str += 'async *';
+                }
+                else if (this.value.getAsync()) {
+                    str += 'async ';
+                }
+                else if (this.value.getGenerator()) {
+                    str += '*';
+                }
+                str += methodName;
+                break;
+            case 'constructor':
+                str += 'constructor';
                 break;
             default:
-                str = `${name} `;
                 break;
         }
-        str += this.value.toString();
+        str += this.value.paramsAndBodyToString();
         return str;
     }
     toJson() {
@@ -316,6 +354,9 @@ MethodDefinition = MethodDefinition_1 = __decorate_1([
     __metadata("design:paramtypes", [String, Object, FunctionExpression, Array, Boolean, Boolean])
 ], MethodDefinition);
 export { MethodDefinition };
+/**
+ * - When key is a PrivateIdentifier, computed must be false.
+ */
 let PropertyDefinition = PropertyDefinition_1 = class PropertyDefinition extends AbstractDefinition {
     static fromJSON(node, deserializer) {
         return new PropertyDefinition_1(deserializer(node.key), node.decorators.map(deserializer), node.computed, node.static, node.value && deserializer(node.value));
@@ -328,21 +369,17 @@ let PropertyDefinition = PropertyDefinition_1 = class PropertyDefinition extends
         super(key, decorators, computed, isStatic, value);
     }
     get(stack, classConstructor) {
-        const target = this.static ? classConstructor : classConstructor.prototype;
+        const target = this.getTarget(classConstructor);
+        const name = this.getKeyName(stack);
         const value = this.value?.get(stack);
-        const name = this.computed ? this.key.get(stack) : this.key.getName();
-        const ref = this.key instanceof PrivateIdentifier ? target[INIT_PRIVATE_SYMBOL] : target;
-        ref[name] = value;
+        target[name] = value;
         const decorators = this.decorators.map(decorator => decorator.get(stack));
-        __decorate(decorators, target, name, null);
+        decorators.length && __decorate(decorators, target, name, null);
     }
     toString() {
         const decorators = this.decorators.map(decorator => decorator.toString()).join('\n');
         const name = this.computed ? `[${this.key.toString()}]` : this.key.toString();
-        if (this.value) {
-            return `${name} = ${this.value.toString()};`;
-        }
-        return `${decorators.length ? decorators + ' ' : ''}${name};`;
+        return `${decorators.length ? decorators + ' ' : ''}${this.static ? 'static ' : ''}${name}${this.value ? ` = ${this.value.toString()}` : ''};`;
     }
     toJson() {
         return {
@@ -372,18 +409,19 @@ let AccessorProperty = AccessorProperty_1 = class AccessorProperty extends Abstr
         super(key, decorators, computed, isStatic, value);
     }
     get(stack, classConstructor) {
-        const target = this.static ? classConstructor : classConstructor.prototype;
+        const target = this.getTarget(classConstructor);
+        const name = this.getKeyName(stack);
         const value = this.value?.get(stack);
-        const name = this.computed ? this.key.get(stack) : this.key.getName();
-        target[INIT_PRIVATE_SYMBOL][name] = value;
-        Object.defineProperty(target, name, {
+        target[name] = value;
+        const ref = this.static ? classConstructor : classConstructor.prototype;
+        Object.defineProperty(ref, name, {
             configurable: true,
             enumerable: false,
             set: function (setValue) {
                 this[PRIVATE_SYMBOL][name] = setValue;
             },
         });
-        Object.defineProperty(target, name, {
+        Object.defineProperty(ref, name, {
             configurable: true,
             enumerable: false,
             get: function () {
@@ -391,15 +429,12 @@ let AccessorProperty = AccessorProperty_1 = class AccessorProperty extends Abstr
             },
         });
         const decorators = this.decorators.map(decorator => decorator.get(stack));
-        __decorate(decorators, target, name, null);
+        decorators.length && __decorate(decorators, ref, name, null);
     }
     toString() {
         const decorators = this.decorators.map(decorator => decorator.toString()).join('\n');
         const name = this.computed ? `[${this.key.toString()}]` : this.key.toString();
-        if (this.value) {
-            return `${name} = ${this.value.toString()};`;
-        }
-        return `${decorators.length ? decorators + ' ' : ''}accessor ${name};`;
+        return `${decorators.length ? decorators.concat(' ') : ''}${this.static ? 'static ' : ''}accessor ${name}${this.value ? ` = ${this.value.toString()}` : ''};`;
     }
     toJson() {
         return {
@@ -444,7 +479,7 @@ let ClassBody = ClassBody_1 = class ClassBody extends AbstractExpressionNode {
         throw new Error('Method not implemented.');
     }
     toString() {
-        return this.body.map(definition => definition.toString()).join('\n');
+        return this.body.map(definition => `\t${definition.toString()}`).join('\n');
     }
     toJson() {
         return {
@@ -488,46 +523,46 @@ export class Class extends AbstractExpressionNode {
         const parentClass = this.superClass?.get(stack) ?? class {
         };
         let classConstructor = this.createClass(stack, parentClass, className);
+        // build class body
         this.body.get(stack, classConstructor);
-        classConstructor[PRIVATE_SYMBOL] = Object.assign(classConstructor[PRIVATE_SYMBOL], classConstructor[INIT_PRIVATE_SYMBOL]);
-        Reflect.deleteProperty(classConstructor, INIT_PRIVATE_SYMBOL);
+        // apply class decorators
         const decorators = this.decorators.map(decorator => decorator.get(stack));
         classConstructor = __decorate(decorators, classConstructor);
+        // run static initialization block
+        classConstructor[STATIC_INITIALIZATION_BLOCK].forEach(block => block());
+        Reflect.deleteProperty(classConstructor, STATIC_INITIALIZATION_BLOCK);
         return classConstructor;
     }
     createClass(stack, parentClass, className = TEMP_CLASS_NAME) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const TEMP = {
-            [className]: (_a = class extends parentClass {
+            [className]: (_e = class extends parentClass {
                     constructor(...params) {
                         const parameters = TEMP[className][GET_PARAMETERS](params);
                         super(...parameters);
-                        this[_e] = {};
-                        this[_f] = {};
-                        this[PRIVATE_SYMBOL] = Object.assign(this[PRIVATE_SYMBOL], this[INIT_PRIVATE_SYMBOL]);
+                        this[_d] = {};
+                        this[PRIVATE_SYMBOL] = Object.assign(this[PRIVATE_SYMBOL], TEMP[className][INSTANCE_PRIVATE_SYMBOL]);
                         this[STACK] = stack.copyStack();
                         const instanceStack = this[STACK];
-                        instanceStack.pushBlockScope();
-                        instanceStack.declareVariable('this', this);
+                        instanceStack.pushScope(ClassScope.readOnlyScopeForThis(this));
                         instanceStack.declareVariable(NEW_TARGET, new.target);
                         instanceStack.declareVariable(PRIVATE_SYMBOL, this[PRIVATE_SYMBOL]);
                         instanceStack.declareVariable(CALL_SUPER_Method, (name) => super[name]());
                         instanceStack.declareVariable(GET_SUPER_PROPERTY, (name) => super[name]);
                         instanceStack.pushReactiveScope();
-                        this[CONSTRUCTOR]();
+                        // init fields and methods values
+                        TEMP[className][CONSTRUCTOR]();
                     }
                     static [GET_PARAMETERS](args) {
-                        return [];
+                        return args;
                     }
-                    [(_b = STATIC_INITIALIZATION_BLOCK, _c = INIT_PRIVATE_SYMBOL, _d = PRIVATE_SYMBOL, _e = PRIVATE_SYMBOL, _f = INIT_PRIVATE_SYMBOL, CONSTRUCTOR)]() { }
+                    static [(_a = STATIC_INITIALIZATION_BLOCK, _b = PRIVATE_SYMBOL, _c = INSTANCE_PRIVATE_SYMBOL, CONSTRUCTOR)]() { }
                 },
-                _a[_b] = [],
-                _a[_c] = {},
-                _a[_d] = {},
-                (() => {
-                    _a[STATIC_INITIALIZATION_BLOCK].forEach(block => block());
-                })(),
-                _a)
+                _d = PRIVATE_SYMBOL,
+                _e[_a] = [],
+                _e[_b] = {},
+                _e[_c] = {},
+                _e)
         };
         return TEMP[className];
     }
@@ -546,7 +581,7 @@ export class Class extends AbstractExpressionNode {
         if (this.superClass) {
             classDeclaration += ' extends ' + this.superClass.toString();
         }
-        return `${decorators}${classDeclaration} {${this.body.toString()}\n`;
+        return `${decorators}${classDeclaration} {\n${this.body.toString()}\n}`;
     }
     toJson() {
         return {
@@ -563,26 +598,37 @@ let ClassDeclaration = ClassDeclaration_1 = class ClassDeclaration extends Class
     }
     static visit(node, visitNode) {
         visitNode(node.body);
-        node.id && visitNode(node.id);
+        node.decorators.forEach(visitNode);
+        visitNode(node.id);
         node.superClass && visitNode(node.superClass);
     }
+    constructor(body, decorators, id, superClass) {
+        super(body, decorators, id, superClass);
+    }
     declareVariable(stack, propertyValue) {
-        this.id && stack.declareVariable(this.id.getName(), propertyValue);
+        stack.declareVariable(this.id.getName(), propertyValue);
     }
     getDeclarationName() {
-        return this.id?.getDeclarationName();
+        return this.id.getDeclarationName();
+    }
+    get(stack) {
+        const classConstructor = super.get(stack);
+        this.id.declareVariable(stack, classConstructor);
+        return classConstructor;
     }
 };
 ClassDeclaration = ClassDeclaration_1 = __decorate_1([
-    Deserializer('ClassDeclaration')
+    Deserializer('ClassDeclaration'),
+    __metadata("design:paramtypes", [ClassBody, Array, Identifier, Object])
 ], ClassDeclaration);
 export { ClassDeclaration };
 let ClassExpression = ClassExpression_1 = class ClassExpression extends Class {
     static fromJSON(node, deserializer) {
-        return new ClassExpression_1(deserializer(node.body), node.id && deserializer(node.id), node.superClass && deserializer(node.superClass));
+        return new ClassExpression_1(deserializer(node.body), node.superClass && deserializer(node.superClass));
     }
     static visit(node, visitNode) {
         visitNode(node.body);
+        node.decorators.forEach(visitNode);
         node.id && visitNode(node.id);
         node.superClass && visitNode(node.superClass);
     }