@ibyar/expressions 0.8.3 → 0.8.5

package/README.md

@@ -117,9 +117,6 @@ console.log(
 
  - [V8 JavaScript engine](https://github.com/v8/v8) to parse js source code.
  - for now this parser does not provide any info about `SourceLocation`
-
-## Future Feature
-
  - class expression
  - Import/Export module
  - Custom Factory Builder to convert the code to ESTree directly or to executable expression node

package/api/abstract.d.ts

@@ -1,7 +1,11 @@
 import type { AwaitPromiseInfo, Stack } from '../scope/stack.js';
-import type { NodeDeserializer, ExpressionNode, ExpressionNodConstructor, NodeJsonType, DeclarationExpression, ExpressionEventMap, ExpressionEventPath, VisitNodeType } from './expression.js';
+import type { NodeDeserializer, ExpressionNode, ExpressionNodConstructor, NodeJsonType, DeclarationExpression, ExpressionEventMap, ExpressionEventPath, VisitNodeType, SourceLocation } from './expression.js';
 export declare abstract class AbstractExpressionNode implements ExpressionNode {
     static fromJSON(node: ExpressionNode, deserializer: NodeDeserializer): ExpressionNode;
+    type: string;
+    loc?: SourceLocation;
+    range?: [number, number];
+    constructor(range?: [number, number], loc?: SourceLocation);
     getClass(): ExpressionNodConstructor<ExpressionNode>;
     toJSON(key?: string): NodeJsonType;
     events(): ExpressionEventMap;
@@ -19,7 +23,7 @@ export declare abstract class InfixExpressionNode<T> extends AbstractExpressionN
     protected left: ExpressionNode;
     protected right: ExpressionNode;
     static visit(node: InfixExpressionNode<any>, visitNode: VisitNodeType): void;
-    constructor(operator: T, left: ExpressionNode, right: ExpressionNode);
+    constructor(operator: T, left: ExpressionNode, right: ExpressionNode, range?: [number, number], loc?: SourceLocation);
     getOperator(): T;
     getLeft(): ExpressionNode;
     getRight(): ExpressionNode;

package/api/abstract.js

@@ -22,13 +22,20 @@ export class AbstractExpressionNode {
     static fromJSON(node, deserializer) {
         return deserializer(node);
     }
+    constructor(range, loc) {
+        this.type = this.getClass().type;
+        range && (this.range = range);
+        loc && (this.loc = loc);
+    }
     getClass() {
         return this.constructor;
     }
     toJSON(key) {
-        const type = this.getClass().type;
         const json = this.toJson(key);
-        return { type, ...json };
+        const index = {};
+        this.range && (index.range = this.range);
+        this.loc && (index.loc = this.loc);
+        return Object.assign({ type: this.type }, json, index);
     }
     events() {
         const dependencyNodes = this.dependency();
@@ -41,16 +48,16 @@ export class AbstractExpressionNode {
     }
 }
 export class InfixExpressionNode extends AbstractExpressionNode {
-    constructor(operator, left, right) {
-        super();
-        this.operator = operator;
-        this.left = left;
-        this.right = right;
-    }
     static visit(node, visitNode) {
         visitNode(node.getLeft());
         visitNode(node.getRight());
     }
+    constructor(operator, left, right, range, loc) {
+        super(range, loc);
+        this.operator = operator;
+        this.left = left;
+        this.right = right;
+    }
     getOperator() {
         return this.operator;
     }

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 { 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 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\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"]}
+{"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../src/expressions/api/abstract.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AwaitPromiseInfo, Stack } from '../scope/stack.js';\nimport type {\n\tNodeDeserializer, ExpressionNode, ExpressionNodConstructor,\n\tNodeJsonType, DeclarationExpression, ExpressionEventMap,\n\tExpressionEventPath, VisitNodeType, SourceLocation\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}\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\ttype: string;\n\tloc?: SourceLocation;\n\trange?: [number, number];\n\tconstructor(range?: [number, number], loc?: SourceLocation) {\n\t\tthis.type = this.getClass().type;\n\t\trange && (this.range = range);\n\t\tloc && (this.loc = loc);\n\t}\n\tgetClass(): ExpressionNodConstructor<ExpressionNode> {\n\t\treturn this.constructor as ExpressionNodConstructor<ExpressionNode>;\n\t}\n\ttoJSON(key?: string): NodeJsonType {\n\t\tconst json = this.toJson(key);\n\t\tconst index: { range?: [number, number], loc?: SourceLocation } = {};\n\t\tthis.range && (index.range = this.range);\n\t\tthis.loc && (index.loc = this.loc);\n\t\treturn Object.assign({ type: this.type }, json, index);\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 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}\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, range?: [number, number], loc?: SourceLocation) {\n\t\tsuper(range, loc);\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\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 { DeclarationExpression, ExpressionEventPath, ExpressionNode, NodeDeserializer, VisitNodeType } from '../expression.js';
+import type { DeclarationExpression, ExpressionEventPath, ExpressionNode, NodeDeserializer, SourceLocation, VisitNodeType } from '../expression.js';
 import { Stack } from '../../scope/stack.js';
 import { AbstractExpressionNode } from '../abstract.js';
 import { Identifier } from '../definition/values.js';
@@ -31,7 +31,7 @@ interface ClassInstance {
      */
     [key: PropertyKey]: any;
 }
-declare type PropertyInitializer = () => {
+type PropertyInitializer = () => {
     key: PropertyKey;
     value: any;
     isPrivate: boolean;
@@ -85,9 +85,8 @@ declare class ClassInitializer {
  * A `super` pseudo-expression.
  */
 export declare class Super extends AbstractExpressionNode {
-    static INSTANCE: Super;
     static fromJSON(node: Super): Super;
-    constructor();
+    constructor(range?: [number, number], loc?: SourceLocation);
     set(stack: Stack, value: any): void;
     get(stack: Stack, thisContext?: any): any;
     dependency(computed?: true): ExpressionNode[];
@@ -107,12 +106,9 @@ export declare class Super extends AbstractExpressionNode {
 export declare class MetaProperty extends AbstractExpressionNode {
     private meta;
     private property;
-    static NewTarget: MetaProperty;
-    static ImportMeta: MetaProperty;
-    private static getJsonName;
     static fromJSON(node: MetaProperty, deserializer: NodeDeserializer<any>): MetaProperty;
     static visit(node: MetaProperty, visitNode: VisitNodeType): void;
-    constructor(meta: Identifier, property: Identifier);
+    constructor(meta: Identifier, property: Identifier, range?: [number, number], loc?: SourceLocation);
     getMeta(): Identifier;
     getProperty(): Identifier;
     get(stack: Stack): any;
@@ -138,7 +134,6 @@ export declare class PrivateIdentifier extends Identifier {
  */
 export declare class StaticBlock extends BlockStatement {
     static fromJSON(node: StaticBlock, deserializer: NodeDeserializer<any>): StaticBlock;
-    constructor(body: ExpressionNode[]);
     get(stack: Stack, classInitializer?: ClassInitializer): void;
     toString(): string;
     toJson(): object;
@@ -149,7 +144,7 @@ export declare abstract class AbstractDefinition extends AbstractExpressionNode
     protected computed: boolean;
     protected value?: ExpressionNode | undefined;
     protected 'static': boolean;
-    constructor(key: ExpressionNode | PrivateIdentifier, decorators: Decorator[], computed: boolean, isStatic: boolean, value?: ExpressionNode | undefined);
+    constructor(key: ExpressionNode | PrivateIdentifier, decorators: Decorator[], computed: boolean, isStatic: boolean, value?: ExpressionNode | undefined, range?: [number, number], loc?: SourceLocation);
     getKey(): ExpressionNode | PrivateIdentifier;
     getValue(): ExpressionNode | undefined;
     isComputed(): boolean;
@@ -166,7 +161,7 @@ export declare abstract class AbstractDefinition extends AbstractExpressionNode
         [key: string]: any;
     };
 }
-export declare type MethodDefinitionKind = 'constructor' | 'method' | 'set' | 'get';
+export type MethodDefinitionKind = 'constructor' | 'method' | 'set' | 'get';
 /**
  * - When key is a PrivateIdentifier, computed must be false and kind can not be "constructor".
  */
@@ -174,9 +169,10 @@ export declare class MethodDefinition extends AbstractDefinition {
     private kind;
     static fromJSON(node: MethodDefinition, deserializer: NodeDeserializer<any>): MethodDefinition;
     static visit(node: MethodDefinition, visitNode: VisitNodeType): void;
-    protected value: FunctionExpression;
+    protected 'static': boolean;
+    value: FunctionExpression;
     afterInstanceConstruct: any;
-    constructor(kind: MethodDefinitionKind, key: ExpressionNode | PrivateIdentifier, value: FunctionExpression, decorators: Decorator[], computed: boolean, isStatic: boolean);
+    constructor(kind: MethodDefinitionKind, key: ExpressionNode | PrivateIdentifier, value: FunctionExpression, decorators: Decorator[], computed: boolean, isStatic: boolean, range?: [number, number], loc?: SourceLocation);
     getKind(): MethodDefinitionKind;
     getValue(): FunctionExpression;
     get(stack: Stack, initializer: ClassInitializer): void;
@@ -193,7 +189,7 @@ export declare class MethodDefinition extends AbstractDefinition {
 export declare class PropertyDefinition extends AbstractDefinition {
     static fromJSON(node: PropertyDefinition, deserializer: NodeDeserializer<any>): PropertyDefinition;
     static visit(node: PropertyDefinition, visitNode: VisitNodeType): void;
-    constructor(key: ExpressionNode | PrivateIdentifier, decorators: Decorator[], computed: boolean, isStatic: boolean, value?: ExpressionNode);
+    constructor(key: ExpressionNode | PrivateIdentifier, decorators: Decorator[], computed: boolean, isStatic: boolean, value?: ExpressionNode, range?: [number, number], loc?: SourceLocation);
     get(stack: Stack, initializer: ClassInitializer): void;
     toString(): string;
     toJson(): {
@@ -203,7 +199,7 @@ export declare class PropertyDefinition extends AbstractDefinition {
 export declare class AccessorProperty extends AbstractDefinition {
     static fromJSON(node: AccessorProperty, deserializer: NodeDeserializer): AccessorProperty;
     static visit(node: AccessorProperty, visitNode: VisitNodeType): void;
-    constructor(key: ExpressionNode, decorators: Decorator[], computed: boolean, isStatic: boolean, value?: ExpressionNode);
+    constructor(key: ExpressionNode, decorators: Decorator[], computed: boolean, isStatic: boolean, value?: ExpressionNode, range?: [number, number], loc?: SourceLocation);
     get(stack: Stack, initializer: ClassInitializer): void;
     toString(): string;
     toJson(): {
@@ -214,7 +210,7 @@ export declare class ClassBody extends AbstractExpressionNode {
     private body;
     static fromJSON(node: ClassBody, deserializer: NodeDeserializer<any>): ClassBody;
     static visit(node: ClassBody, visitNode: VisitNodeType): void;
-    constructor(body: (MethodDefinition | PropertyDefinition | AccessorProperty | StaticBlock)[]);
+    constructor(body: (MethodDefinition | PropertyDefinition | AccessorProperty | StaticBlock)[], range?: [number, number], loc?: SourceLocation);
     getBody(): (StaticBlock | MethodDefinition | PropertyDefinition | AccessorProperty)[];
     set(stack: Stack, value: any): void;
     get(stack: Stack, initializer: ClassInitializer): void;
@@ -230,7 +226,7 @@ export declare class Class extends AbstractExpressionNode {
     protected decorators: Decorator[];
     protected id?: Identifier | undefined;
     protected superClass?: ExpressionNode | undefined;
-    constructor(body: ClassBody, decorators: Decorator[], id?: Identifier | undefined, superClass?: ExpressionNode | undefined);
+    constructor(body: ClassBody, decorators: Decorator[], id?: Identifier | undefined, superClass?: ExpressionNode | undefined, range?: [number, number], loc?: SourceLocation);
     getBody(): ClassBody;
     getDecorators(): Decorator[];
     getId(): Identifier | undefined;
@@ -247,7 +243,7 @@ export declare class ClassDeclaration extends Class implements DeclarationExpres
     static fromJSON(node: ClassDeclaration, deserializer: NodeDeserializer<any>): ClassDeclaration;
     static visit(node: ClassDeclaration, visitNode: VisitNodeType): void;
     protected id: Identifier;
-    constructor(body: ClassBody, decorators: Decorator[], id: Identifier, superClass?: ExpressionNode);
+    constructor(body: ClassBody, decorators: Decorator[], id: Identifier, superClass?: ExpressionNode, range?: [number, number], loc?: SourceLocation);
     declareVariable(stack: Stack, propertyValue?: any): void;
     getDeclarationName(): string;
     get(stack: Stack): ClassConstructor;
@@ -255,5 +251,6 @@ export declare class ClassDeclaration extends Class implements DeclarationExpres
 export declare class ClassExpression extends Class {
     static fromJSON(node: ClassExpression, deserializer: NodeDeserializer<any>): ClassExpression;
     static visit(node: ClassExpression, visitNode: VisitNodeType): void;
+    constructor(body: ClassBody, decorators: Decorator[], id?: Identifier, superClass?: ExpressionNode, range?: [number, number], loc?: SourceLocation);
 }
 export {};

package/api/class/class.js

@@ -87,11 +87,11 @@ class ClassInitializer {
  * A `super` pseudo-expression.
  */
 let Super = Super_1 = class Super extends AbstractExpressionNode {
-    constructor() {
-        super();
-    }
     static fromJSON(node) {
-        return Super_1.INSTANCE;
+        return new Super_1(node.range, node.loc);
+    }
+    constructor(range, loc) {
+        super(range, loc);
     }
     set(stack, value) {
         throw new Error('Super.#set() Method not implemented.');
@@ -112,10 +112,9 @@ let Super = Super_1 = class Super extends AbstractExpressionNode {
         return {};
     }
 };
-Super.INSTANCE = new Super_1();
 Super = Super_1 = __decorate([
     Deserializer('Super'),
-    __metadata("design:paramtypes", [])
+    __metadata("design:paramtypes", [Array, Object])
 ], Super);
 export { Super };
 /**
@@ -126,27 +125,18 @@ export { Super };
  * In the future, it will represent other meta properties as well.
  */
 let MetaProperty = MetaProperty_1 = class MetaProperty extends AbstractExpressionNode {
-    constructor(meta, property) {
-        super();
-        this.meta = meta;
-        this.property = property;
-    }
-    static getJsonName(identifier) {
-        return Reflect.get(identifier, 'name');
-    }
     static fromJSON(node, deserializer) {
-        if (MetaProperty_1.getJsonName(node.meta) === 'new' && MetaProperty_1.getJsonName(node.property) === 'target') {
-            return MetaProperty_1.NewTarget;
-        }
-        else if (MetaProperty_1.getJsonName(node.meta) === 'import' && MetaProperty_1.getJsonName(node.property) === 'meta') {
-            return MetaProperty_1.ImportMeta;
-        }
-        return new MetaProperty_1(deserializer(node.meta), deserializer(node.property));
+        return new MetaProperty_1(deserializer(node.meta), deserializer(node.property), node.range, node.loc);
     }
     static visit(node, visitNode) {
         visitNode(node.meta);
         visitNode(node.property);
     }
+    constructor(meta, property, range, loc) {
+        super(range, loc);
+        this.meta = meta;
+        this.property = property;
+    }
     getMeta() {
         return this.meta;
     }
@@ -179,11 +169,9 @@ let MetaProperty = MetaProperty_1 = class MetaProperty extends AbstractExpressio
         };
     }
 };
-MetaProperty.NewTarget = new MetaProperty_1(new Identifier('new'), new Identifier('target'));
-MetaProperty.ImportMeta = new MetaProperty_1(new Identifier('import'), new Identifier('meta'));
 MetaProperty = MetaProperty_1 = __decorate([
     Deserializer('MetaProperty'),
-    __metadata("design:paramtypes", [Identifier, Identifier])
+    __metadata("design:paramtypes", [Identifier, Identifier, Array, Object])
 ], MetaProperty);
 export { MetaProperty };
 /**
@@ -191,7 +179,7 @@ export { MetaProperty };
  */
 let PrivateIdentifier = PrivateIdentifier_1 = class PrivateIdentifier extends Identifier {
     static fromJSON(node) {
-        return new PrivateIdentifier_1(node.name);
+        return new PrivateIdentifier_1(node.name, node.range, node.loc);
     }
     get(stack, thisContext) {
         return thisContext[PRIVATE_SYMBOL][this.name];
@@ -213,10 +201,7 @@ export { PrivateIdentifier };
  */
 let StaticBlock = StaticBlock_1 = class StaticBlock extends BlockStatement {
     static fromJSON(node, deserializer) {
-        return new StaticBlock_1(deserializer(node.body));
-    }
-    constructor(body) {
-        super(body);
+        return new StaticBlock_1(deserializer(node.body), node.range, node.loc);
     }
     get(stack, classInitializer) {
         classInitializer?.addStaticInitializerBlock(super.get(stack));
@@ -231,13 +216,12 @@ let StaticBlock = StaticBlock_1 = class StaticBlock extends BlockStatement {
     }
 };
 StaticBlock = StaticBlock_1 = __decorate([
-    Deserializer('StaticBlock'),
-    __metadata("design:paramtypes", [Array])
+    Deserializer('StaticBlock')
 ], StaticBlock);
 export { StaticBlock };
 export class AbstractDefinition extends AbstractExpressionNode {
-    constructor(key, decorators, computed, isStatic, value) {
-        super();
+    constructor(key, decorators, computed, isStatic, value, range, loc) {
+        super(range, loc);
         this.key = key;
         this.decorators = decorators;
         this.computed = computed;
@@ -286,18 +270,18 @@ export class AbstractDefinition extends AbstractExpressionNode {
  * - 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);
-        this.kind = kind;
-    }
     static fromJSON(node, deserializer) {
-        return new MethodDefinition_1(node.kind, deserializer(node.key), deserializer(node.value), node.decorators.map(deserializer), node.computed, node.static);
+        return new MethodDefinition_1(node.kind, deserializer(node.key), deserializer(node.value), node.decorators.map(deserializer), node.computed, node.static, node.range, node.loc);
     }
     static visit(node, visitNode) {
         visitNode(node.key);
         visitNode(node.value);
         node.decorators.forEach(visitNode);
     }
+    constructor(kind, key, value, decorators, computed, isStatic, range, loc) {
+        super(key, decorators, computed, isStatic, value, range, loc);
+        this.kind = kind;
+    }
     getKind() {
         return this.kind;
     }
@@ -422,7 +406,7 @@ let MethodDefinition = MethodDefinition_1 = class MethodDefinition extends Abstr
 };
 MethodDefinition = MethodDefinition_1 = __decorate([
     Deserializer('MethodDefinition'),
-    __metadata("design:paramtypes", [String, Object, FunctionExpression, Array, Boolean, Boolean])
+    __metadata("design:paramtypes", [String, Object, FunctionExpression, Array, Boolean, Boolean, Array, Object])
 ], MethodDefinition);
 export { MethodDefinition };
 /**
@@ -430,14 +414,14 @@ export { MethodDefinition };
  */
 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));
+        return new PropertyDefinition_1(deserializer(node.key), node.decorators.map(deserializer), node.computed, node.static, node.value && deserializer(node.value), node.range, node.loc);
     }
     static visit(node, visitNode) {
         visitNode(node.key);
         node.value && visitNode(node.value);
     }
-    constructor(key, decorators, computed, isStatic, value) {
-        super(key, decorators, computed, isStatic, value);
+    constructor(key, decorators, computed, isStatic, value, range, loc) {
+        super(key, decorators, computed, isStatic, value, range, loc);
     }
     get(stack, initializer) {
         const name = this.getKeyName(stack);
@@ -471,20 +455,20 @@ let PropertyDefinition = PropertyDefinition_1 = class PropertyDefinition extends
 };
 PropertyDefinition = PropertyDefinition_1 = __decorate([
     Deserializer('PropertyDefinition'),
-    __metadata("design:paramtypes", [Object, Array, Boolean, Boolean, Object])
+    __metadata("design:paramtypes", [Object, Array, Boolean, Boolean, Object, Array, Object])
 ], PropertyDefinition);
 export { PropertyDefinition };
 let AccessorProperty = AccessorProperty_1 = class AccessorProperty extends AbstractDefinition {
     static fromJSON(node, deserializer) {
-        return new AccessorProperty_1(deserializer(node.key), node.decorators.map(deserializer), node.computed, node.static, node.value ? deserializer(node.value) : void 0);
+        return new AccessorProperty_1(deserializer(node.key), node.decorators.map(deserializer), node.computed, node.static, node.value ? deserializer(node.value) : void 0, node.range, node.loc);
     }
     static visit(node, visitNode) {
         visitNode(node.key);
         node.value && visitNode(node.value);
         node.decorators.forEach(visitNode);
     }
-    constructor(key, decorators, computed, isStatic, value) {
-        super(key, decorators, computed, isStatic, value);
+    constructor(key, decorators, computed, isStatic, value, range, loc) {
+        super(key, decorators, computed, isStatic, value, range, loc);
     }
     get(stack, initializer) {
         const name = this.getKeyName(stack);
@@ -526,20 +510,20 @@ let AccessorProperty = AccessorProperty_1 = class AccessorProperty extends Abstr
 };
 AccessorProperty = AccessorProperty_1 = __decorate([
     Deserializer('AccessorProperty'),
-    __metadata("design:paramtypes", [Object, Array, Boolean, Boolean, Object])
+    __metadata("design:paramtypes", [Object, Array, Boolean, Boolean, Object, Array, Object])
 ], AccessorProperty);
 export { AccessorProperty };
 let ClassBody = ClassBody_1 = class ClassBody extends AbstractExpressionNode {
-    constructor(body) {
-        super();
-        this.body = body;
-    }
     static fromJSON(node, deserializer) {
-        return new ClassBody_1(node.body.map(deserializer));
+        return new ClassBody_1(node.body.map(deserializer), node.range, node.loc);
     }
     static visit(node, visitNode) {
         node.body.forEach(visitNode);
     }
+    constructor(body, range, loc) {
+        super(range, loc);
+        this.body = body;
+    }
     getBody() {
         return this.body;
     }
@@ -566,12 +550,12 @@ let ClassBody = ClassBody_1 = class ClassBody extends AbstractExpressionNode {
 };
 ClassBody = ClassBody_1 = __decorate([
     Deserializer('ClassBody'),
-    __metadata("design:paramtypes", [Array])
+    __metadata("design:paramtypes", [Array, Array, Object])
 ], ClassBody);
 export { ClassBody };
 export class Class extends AbstractExpressionNode {
-    constructor(body, decorators, id, superClass) {
-        super();
+    constructor(body, decorators, id, superClass, range, loc) {
+        super(range, loc);
         this.body = body;
         this.decorators = decorators;
         this.id = id;
@@ -657,7 +641,7 @@ export class Class extends AbstractExpressionNode {
 }
 let ClassDeclaration = ClassDeclaration_1 = class ClassDeclaration extends Class {
     static fromJSON(node, deserializer) {
-        return new ClassDeclaration_1(deserializer(node.body), deserializer(node.id), node.superClass && deserializer(node.superClass));
+        return new ClassDeclaration_1(deserializer(node.body), node.decorators.map(deserializer), deserializer(node.id), node.superClass && deserializer(node.superClass), node.range, node.loc);
     }
     static visit(node, visitNode) {
         visitNode(node.body);
@@ -665,8 +649,8 @@ let ClassDeclaration = ClassDeclaration_1 = class ClassDeclaration extends Class
         visitNode(node.id);
         node.superClass && visitNode(node.superClass);
     }
-    constructor(body, decorators, id, superClass) {
-        super(body, decorators, id, superClass);
+    constructor(body, decorators, id, superClass, range, loc) {
+        super(body, decorators, id, superClass, range, loc);
     }
     declareVariable(stack, propertyValue) {
         stack.declareVariable(this.id.getName(), propertyValue);
@@ -682,12 +666,12 @@ let ClassDeclaration = ClassDeclaration_1 = class ClassDeclaration extends Class
 };
 ClassDeclaration = ClassDeclaration_1 = __decorate([
     Deserializer('ClassDeclaration'),
-    __metadata("design:paramtypes", [ClassBody, Array, Identifier, Object])
+    __metadata("design:paramtypes", [ClassBody, Array, Identifier, Object, Array, Object])
 ], ClassDeclaration);
 export { ClassDeclaration };
 let ClassExpression = ClassExpression_1 = class ClassExpression extends Class {
     static fromJSON(node, deserializer) {
-        return new ClassExpression_1(deserializer(node.body), node.superClass && deserializer(node.superClass));
+        return new ClassExpression_1(deserializer(node.body), node.decorators.map(deserializer), node.id && deserializer(node.id), node.superClass && deserializer(node.superClass), node.range, node.loc);
     }
     static visit(node, visitNode) {
         visitNode(node.body);
@@ -695,9 +679,13 @@ let ClassExpression = ClassExpression_1 = class ClassExpression extends Class {
         node.id && visitNode(node.id);
         node.superClass && visitNode(node.superClass);
     }
+    constructor(body, decorators, id, superClass, range, loc) {
+        super(body, decorators, id, superClass, range, loc);
+    }
 };
 ClassExpression = ClassExpression_1 = __decorate([
-    Deserializer('ClassExpression')
+    Deserializer('ClassExpression'),
+    __metadata("design:paramtypes", [ClassBody, Array, Identifier, Object, Array, Object])
 ], ClassExpression);
 export { ClassExpression };
 //# sourceMappingURL=class.js.map