@ibyar/expressions 0.5.4 → 0.5.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 @ibyar/expressions
+Copyright (c) 2020-2022 @ibyar/expressions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -19,6 +19,7 @@
 Aurora expression, is a JavaScript expression parsing and evaluation. and template expression evaluation, with stack and scope.
 
  - this package has no dependance, can work on both (Node.js) and any Web Browsers, that support modules and class syntax
+ - An 100% spec compliant ES2022 JavaScript toolchain
 
 ## `Install`
 

package/api/abstract.d.ts

@@ -1,9 +1,9 @@
 import type { Scope } from '../scope/scope.js';
 import type { AwaitPromiseInfo, Stack } from '../scope/stack.js';
-import type { NodeDeserializer, ExpressionNode, NodeExpressionClass, NodeJsonType, CanDeclareExpression, ExpressionEventMap, ExpressionEventPath, VisitNodeType } from './expression.js';
+import type { NodeDeserializer, ExpressionNode, ExpressionNodConstructor, NodeJsonType, DeclarationExpression, ExpressionEventMap, ExpressionEventPath, VisitNodeType } from './expression.js';
 export declare abstract class AbstractExpressionNode implements ExpressionNode {
     static fromJSON(node: ExpressionNode, deserializer: NodeDeserializer): ExpressionNode;
-    getClass(): NodeExpressionClass<ExpressionNode>;
+    getClass(): ExpressionNodConstructor<ExpressionNode>;
     toJSON(key?: string): NodeJsonType;
     events(): ExpressionEventMap;
     abstract shareVariables(scopeList: Scope<any>[]): void;
@@ -50,7 +50,7 @@ export declare class YieldDelegateValue {
 }
 export declare class AwaitPromise implements AwaitPromiseInfo {
     promise: Promise<any>;
-    node: CanDeclareExpression;
+    node: DeclarationExpression;
     declareVariable: boolean;
     constructor(promise: Promise<any>);
 }

package/api/abstract.js

@@ -21,9 +21,9 @@ export class AbstractExpressionNode {
         return this.constructor;
     }
     toJSON(key) {
+        const type = this.getClass().type;
         const json = this.toJson(key);
-        json.type = Reflect.get(this.constructor, 'type');
-        return json;
+        return { type, ...json };
     }
     events() {
         const dependencyNodes = this.dependency();

package/api/abstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../src/expressions/api/abstract.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Scope } from '../scope/scope.js';\nimport type { AwaitPromiseInfo, Stack } from '../scope/stack.js';\nimport type {\n\tNodeDeserializer, ExpressionNode, NodeExpressionClass,\n\tNodeJsonType, CanDeclareExpression, ExpressionEventMap,\n\tExpressionEventPath, VisitNodeType\n} from './expression.js';\n\nfunction initPathExpressionEventMap(rootEventMap: ExpressionEventMap, path: ExpressionEventPath[]): void {\n\tlet lastMap = rootEventMap;\n\t// let index = 0;\n\tfor (const node of path) {\n\t\tconst scopeName = node.path;\n\t\tlet eventMap = lastMap[scopeName];\n\t\tif (eventMap) {\n\t\t\tlastMap = eventMap;\n\t\t\tcontinue;\n\t\t}\n\t\t// if ((index++) === path.length - 1) {\n\t\t// \tlastMap[scopeName] = undefined;\n\t\t// \tcontinue;\n\t\t// }\n\t\tlastMap = lastMap[scopeName] = {};\n\t\tif (node.computed) {\n\t\t\tnode.computedPath.forEach(path => initPathExpressionEventMap(rootEventMap, path));\n\t\t}\n\t}\n}\nexport abstract class AbstractExpressionNode implements ExpressionNode {\n\tstatic fromJSON(node: ExpressionNode, deserializer: NodeDeserializer): ExpressionNode {\n\t\treturn deserializer(node as any);\n\t}\n\tgetClass(): NodeExpressionClass<ExpressionNode> {\n\t\treturn this.constructor as NodeExpressionClass<ExpressionNode>;\n\t}\n\ttoJSON(key?: string): NodeJsonType {\n\t\tconst json = this.toJson(key) as NodeJsonType;\n\t\tjson.type = Reflect.get(this.constructor, 'type');\n\t\treturn json;\n\t}\n\tevents(): ExpressionEventMap {\n\t\tconst dependencyNodes = this.dependency();\n\t\tconst eventMap: ExpressionEventMap = {};\n\t\tfor (const node of dependencyNodes) {\n\t\t\tconst dependencyPath = node.dependencyPath();\n\t\t\tinitPathExpressionEventMap(eventMap, dependencyPath);\n\t\t}\n\t\treturn eventMap;\n\t}\n\tabstract shareVariables(scopeList: Scope<any>[]): void;\n\tabstract set(stack: Stack, value: any): any;\n\tabstract get(stack: Stack, thisContext?: any): any;\n\tabstract dependency(computed?: true): ExpressionNode[];\n\tabstract dependencyPath(computed?: true): ExpressionEventPath[];\n\tabstract toString(): string;\n\tabstract toJson(key?: string): { [key: string]: any };\n}\nexport abstract class InfixExpressionNode<T> extends AbstractExpressionNode {\n\tstatic visit(node: InfixExpressionNode<any>, visitNode: VisitNodeType): void {\n\t\tvisitNode(node.getLeft());\n\t\tvisitNode(node.getRight())\n\t}\n\tconstructor(protected operator: T, protected left: ExpressionNode, protected right: ExpressionNode) {\n\t\tsuper();\n\t}\n\tgetOperator() {\n\t\treturn this.operator;\n\t}\n\tgetLeft() {\n\t\treturn this.left;\n\t}\n\tgetRight() {\n\t\treturn this.right;\n\t}\n\tshareVariables(scopeList: Scope<any>[]): void {\n\t\tthis.left.shareVariables(scopeList);\n\t\tthis.right.shareVariables(scopeList);\n\t}\n\tset(context: object, value: any) {\n\t\tthrow new Error(`${this.constructor.name}#set() of operator: '${this.operator}' has no implementation.`);\n\t}\n\tabstract get(stack: Stack): any;\n\tdependency(computed?: true): ExpressionNode[] {\n\t\treturn this.left.dependency(computed).concat(this.right.dependency(computed));\n\t}\n\tdependencyPath(computed?: true): ExpressionEventPath[] {\n\t\treturn this.left.dependencyPath(computed).concat(this.right.dependencyPath(computed));\n\t}\n\ttoString() {\n\t\treturn `${this.left.toString()} ${this.operator} ${this.right.toString()}`;\n\t}\n\ttoJson(key: string): object {\n\t\treturn {\n\t\t\toperator: this.operator,\n\t\t\tleft: this.left.toJSON(),\n\t\t\tright: this.right.toJSON()\n\t\t};\n\t}\n}\n\nexport class ReturnValue {\n\tconstructor(public value: any) { }\n\tgetValue() {\n\t\treturn this.value;\n\t}\n}\n\nexport class YieldValue {\n\tconstructor(public value: any) { }\n\tgetValue() {\n\t\treturn this.value;\n\t}\n}\n\nexport class YieldDelegateValue {\n\tconstructor(public value: any) { }\n\tgetValue() {\n\t\treturn this.value;\n\t}\n}\n\nexport class AwaitPromise implements AwaitPromiseInfo {\n\tnode: CanDeclareExpression;\n\tdeclareVariable: boolean;\n\tconstructor(public promise: Promise<any>) { }\n}\n"]}
+{"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../src/expressions/api/abstract.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Scope } from '../scope/scope.js';\nimport type { AwaitPromiseInfo, Stack } from '../scope/stack.js';\nimport type {\n\tNodeDeserializer, ExpressionNode, ExpressionNodConstructor,\n\tNodeJsonType, DeclarationExpression, ExpressionEventMap,\n\tExpressionEventPath, VisitNodeType\n} from './expression.js';\n\nfunction initPathExpressionEventMap(rootEventMap: ExpressionEventMap, path: ExpressionEventPath[]): void {\n\tlet lastMap = rootEventMap;\n\t// let index = 0;\n\tfor (const node of path) {\n\t\tconst scopeName = node.path;\n\t\tlet eventMap = lastMap[scopeName];\n\t\tif (eventMap) {\n\t\t\tlastMap = eventMap;\n\t\t\tcontinue;\n\t\t}\n\t\t// if ((index++) === path.length - 1) {\n\t\t// \tlastMap[scopeName] = undefined;\n\t\t// \tcontinue;\n\t\t// }\n\t\tlastMap = lastMap[scopeName] = {};\n\t\tif (node.computed) {\n\t\t\tnode.computedPath.forEach(path => initPathExpressionEventMap(rootEventMap, path));\n\t\t}\n\t}\n}\nexport abstract class AbstractExpressionNode implements ExpressionNode {\n\tstatic fromJSON(node: ExpressionNode, deserializer: NodeDeserializer): ExpressionNode {\n\t\treturn deserializer(node as any);\n\t}\n\tgetClass(): ExpressionNodConstructor<ExpressionNode> {\n\t\treturn this.constructor as ExpressionNodConstructor<ExpressionNode>;\n\t}\n\ttoJSON(key?: string): NodeJsonType {\n\t\tconst type = this.getClass().type;\n\t\tconst json = this.toJson(key);\n\t\treturn { type, ...json };\n\t}\n\tevents(): ExpressionEventMap {\n\t\tconst dependencyNodes = this.dependency();\n\t\tconst eventMap: ExpressionEventMap = {};\n\t\tfor (const node of dependencyNodes) {\n\t\t\tconst dependencyPath = node.dependencyPath();\n\t\t\tinitPathExpressionEventMap(eventMap, dependencyPath);\n\t\t}\n\t\treturn eventMap;\n\t}\n\tabstract shareVariables(scopeList: Scope<any>[]): void;\n\tabstract set(stack: Stack, value: any): any;\n\tabstract get(stack: Stack, thisContext?: any): any;\n\tabstract dependency(computed?: true): ExpressionNode[];\n\tabstract dependencyPath(computed?: true): ExpressionEventPath[];\n\tabstract toString(): string;\n\tabstract toJson(key?: string): { [key: string]: any };\n}\nexport abstract class InfixExpressionNode<T> extends AbstractExpressionNode {\n\tstatic visit(node: InfixExpressionNode<any>, visitNode: VisitNodeType): void {\n\t\tvisitNode(node.getLeft());\n\t\tvisitNode(node.getRight())\n\t}\n\tconstructor(protected operator: T, protected left: ExpressionNode, protected right: ExpressionNode) {\n\t\tsuper();\n\t}\n\tgetOperator() {\n\t\treturn this.operator;\n\t}\n\tgetLeft() {\n\t\treturn this.left;\n\t}\n\tgetRight() {\n\t\treturn this.right;\n\t}\n\tshareVariables(scopeList: Scope<any>[]): void {\n\t\tthis.left.shareVariables(scopeList);\n\t\tthis.right.shareVariables(scopeList);\n\t}\n\tset(context: object, value: any) {\n\t\tthrow new Error(`${this.constructor.name}#set() of operator: '${this.operator}' has no implementation.`);\n\t}\n\tabstract get(stack: Stack): any;\n\tdependency(computed?: true): ExpressionNode[] {\n\t\treturn this.left.dependency(computed).concat(this.right.dependency(computed));\n\t}\n\tdependencyPath(computed?: true): ExpressionEventPath[] {\n\t\treturn this.left.dependencyPath(computed).concat(this.right.dependencyPath(computed));\n\t}\n\ttoString() {\n\t\treturn `${this.left.toString()} ${this.operator} ${this.right.toString()}`;\n\t}\n\ttoJson(key: string): object {\n\t\treturn {\n\t\t\toperator: this.operator,\n\t\t\tleft: this.left.toJSON(),\n\t\t\tright: this.right.toJSON()\n\t\t};\n\t}\n}\n\nexport class ReturnValue {\n\tconstructor(public value: any) { }\n\tgetValue() {\n\t\treturn this.value;\n\t}\n}\n\nexport class YieldValue {\n\tconstructor(public value: any) { }\n\tgetValue() {\n\t\treturn this.value;\n\t}\n}\n\nexport class YieldDelegateValue {\n\tconstructor(public value: any) { }\n\tgetValue() {\n\t\treturn this.value;\n\t}\n}\n\nexport class AwaitPromise implements AwaitPromiseInfo {\n\tnode: DeclarationExpression;\n\tdeclareVariable: boolean;\n\tconstructor(public promise: Promise<any>) { }\n}\n"]}

package/api/class/class.d.ts

@@ -1,4 +1,4 @@
-import type { CanDeclareExpression, ExpressionEventPath, ExpressionNode, NodeDeserializer, VisitNodeType } from '../expression.js';
+import type { DeclarationExpression, ExpressionEventPath, ExpressionNode, NodeDeserializer, VisitNodeType } from '../expression.js';
 import type { Scope } from '../../scope/scope.js';
 import { Stack } from '../../scope/stack.js';
 import { AbstractExpressionNode } from '../abstract.js';
@@ -11,26 +11,23 @@ declare const STACK: unique symbol;
 declare const GET_PARAMETERS: unique symbol;
 declare const CONSTRUCTOR: unique symbol;
 declare const PRIVATE_SYMBOL: unique symbol;
-declare const INIT_PRIVATE_SYMBOL: unique symbol;
+declare const INSTANCE_PRIVATE_SYMBOL: unique symbol;
 declare const STATIC_INITIALIZATION_BLOCK: unique symbol;
 interface ClassConstructor {
     readonly prototype: ClassInstance;
     [GET_PARAMETERS](args: any[]): any[];
     [STATIC_INITIALIZATION_BLOCK]: Function[];
-    [INIT_PRIVATE_SYMBOL]: {
+    [PRIVATE_SYMBOL]: {
         [key: PropertyKey]: any;
     };
-    [PRIVATE_SYMBOL]: {
+    [INSTANCE_PRIVATE_SYMBOL]: {
         [key: PropertyKey]: any;
     };
+    [CONSTRUCTOR]: Function;
     [key: string]: any;
 }
 declare var ClassInstance: ClassConstructor;
 interface ClassInstance {
-    [CONSTRUCTOR]: Function;
-    [INIT_PRIVATE_SYMBOL]: {
-        [key: PropertyKey]: any;
-    };
     [PRIVATE_SYMBOL]: {
         [key: PropertyKey]: any;
     };
@@ -73,7 +70,7 @@ export declare class PrivateIdentifier extends AbstractExpressionNode {
     constructor(name: string);
     getName(): string;
     set(stack: Stack, value: any): void;
-    get(stack: Stack, thisContext?: any): any;
+    get(stack: Stack, thisContext?: ClassInstance | ClassConstructor): any;
     dependency(computed?: true): ExpressionNode[];
     dependencyPath(computed?: true): ExpressionEventPath[];
     shareVariables(scopeList: Scope<any>[]): void;
@@ -84,9 +81,10 @@ export declare class PrivateIdentifier extends AbstractExpressionNode {
 }
 export declare class StaticBlock extends BlockStatement {
     static fromJSON(node: StaticBlock, deserializer: NodeDeserializer<any>): StaticBlock;
-    constructor(body: ExpressionNode[], isStatement: boolean);
+    constructor(body: ExpressionNode[]);
     get(stack: Stack, classConstructor?: ClassConstructor): void;
     toString(): string;
+    toJson(): object;
 }
 export declare abstract class AbstractDefinition extends AbstractExpressionNode {
     protected key: ExpressionNode | PrivateIdentifier;
@@ -104,6 +102,12 @@ export declare abstract class AbstractDefinition extends AbstractExpressionNode
     set(stack: Stack, value: any): void;
     dependency(computed?: true): ExpressionNode[];
     dependencyPath(computed?: true): ExpressionEventPath[];
+    getTarget(classConstructor: ClassConstructor): {
+        [key: string]: any;
+        [key: number]: any;
+        [key: symbol]: any;
+    };
+    getKeyName(stack: Stack): any;
     abstract get(stack: Stack, classConstructor: ClassConstructor): void;
     abstract toString(): string;
     abstract toJson(): {
@@ -182,12 +186,14 @@ export declare class Class extends AbstractExpressionNode {
     toString(): string;
     toJson(): object;
 }
-export declare class ClassDeclaration extends Class implements CanDeclareExpression {
+export declare class ClassDeclaration extends Class implements DeclarationExpression {
     static fromJSON(node: ClassDeclaration, deserializer: NodeDeserializer<any>): ClassDeclaration;
     static visit(node: ClassDeclaration, visitNode: VisitNodeType): void;
-    protected id?: Identifier;
+    protected id: Identifier;
+    constructor(body: ClassBody, decorators: Decorator[], id: Identifier, superClass?: ExpressionNode);
     declareVariable(stack: Stack, propertyValue?: any): void;
     getDeclarationName(): string;
+    get(stack: Stack): ClassConstructor;
 }
 export declare class ClassExpression extends Class {
     static fromJSON(node: ClassExpression, deserializer: NodeDeserializer<any>): ClassExpression;

package/api/class/class.js

@@ -8,18 +8,18 @@ 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');
 let Super = Super_1 = class Super extends AbstractExpressionNode {
     constructor() {
         super();
@@ -121,7 +121,14 @@ let PrivateIdentifier = PrivateIdentifier_1 = class PrivateIdentifier extends Ab
         privateScope.getScope(PRIVATE_SYMBOL)?.set(this.name, value);
     }
     get(stack, thisContext) {
-        const privateObj = stack.get(PRIVATE_SYMBOL);
+        if (thisContext) {
+            return thisContext[PRIVATE_SYMBOL][this.name];
+        }
+        let privateObj = stack.get('this');
+        if (privateObj) {
+            return privateObj[PRIVATE_SYMBOL][this.name];
+        }
+        privateObj = stack.get(PRIVATE_SYMBOL);
         return privateObj[this.name];
     }
     dependency(computed) {
@@ -147,10 +154,10 @@ PrivateIdentifier = PrivateIdentifier_1 = __decorate_1([
 export { PrivateIdentifier };
 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;
@@ -159,10 +166,15 @@ let StaticBlock = StaticBlock_1 = class StaticBlock extends BlockStatement {
     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,6 +211,19 @@ 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();
+        }
+    }
 }
 let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends AbstractDefinition {
     constructor(kind, key, value, decorators, computed, isStatic) {
@@ -224,23 +249,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 +274,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 +296,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 +307,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() {
@@ -328,21 +367,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 +407,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 +427,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 +477,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 {
@@ -489,22 +522,21 @@ export class Class extends AbstractExpressionNode {
         };
         let classConstructor = this.createClass(stack, parentClass, className);
         this.body.get(stack, classConstructor);
-        classConstructor[PRIVATE_SYMBOL] = Object.assign(classConstructor[PRIVATE_SYMBOL], classConstructor[INIT_PRIVATE_SYMBOL]);
-        Reflect.deleteProperty(classConstructor, INIT_PRIVATE_SYMBOL);
         const decorators = this.decorators.map(decorator => decorator.get(stack));
         classConstructor = __decorate(decorators, classConstructor);
+        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();
@@ -514,20 +546,18 @@ export class Class extends AbstractExpressionNode {
                         instanceStack.declareVariable(CALL_SUPER_Method, (name) => super[name]());
                         instanceStack.declareVariable(GET_SUPER_PROPERTY, (name) => super[name]);
                         instanceStack.pushReactiveScope();
-                        this[CONSTRUCTOR]();
+                        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 +576,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 +593,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);
     }