@bikky/compiler 0.0.45 → 0.0.47

package/Source/ASTBuilder.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STATEMENT = exports.IF = exports.LITERAL = exports.ID = exports.TYPEOF = exports.FUNC_BIND = exports.FUNC_CALL = exports.METHOD_CALL = exports.CALL = exports.THIS = exports.SUPER = exports.NOT = exports.PROP = exports.LET = exports.VAR = exports.EXP = exports.Expression = exports.asAST = void 0;
+exports.STATEMENT = exports.COMMENT = exports.RETURN = exports.CONSTRUCTOR = exports.CLASS = exports.THROW = exports.NEW_ERROR = exports.NEW = exports.IF = exports.LITERAL = exports.PARAM_DECL = exports.ID = exports.TYPEOF = exports.LAMBDA_DECL = exports.FUNCTION_DECL = exports.DOT_BIND = exports.DOT_CALL = exports.FUNCTION_EXEC = exports.THIS = exports.SUPER = exports.NOT = exports.PROP = exports.LET = exports.VAR = exports.EXPR = exports.Expression = exports.asAST = void 0;
 const ts = require("typescript");
 const Tokens_1 = require("./ASTInterface/Tokens");
-const Crawler_1 = require("./ASTInterface/Crawler");
+const Crawler_js_1 = require("./ASTInterface/Crawler.js");
+const Class_js_1 = require("./ASTInterface/Class.js");
 `EXP(SUPER().ACCESS(Name)).OP(!==, "undefined")`;
 function asAST(item) {
     if (typeof item === "string")
         return ID(item).toAST();
-    if (item instanceof Expression || item instanceof Statement)
+    if (item instanceof Expression)
         return item.toAST();
     return item;
 }
@@ -28,12 +29,12 @@ class Expression {
     DOT(other) {
         if (!this.ast)
             throw new Error("Can't dot access undefined.");
-        return new Expression(Crawler_1.Crawler.getContext().factory.createPropertyAccessExpression(this.getExpression(), asAST(other)));
+        return new Expression(Crawler_js_1.Crawler.getContext().factory.createPropertyAccessExpression(this.getExpression(), asAST(other)));
     }
     LOOKUP(other) {
         if (!this.ast)
             throw new Error("Can't [] access undefined.");
-        return new Expression(Crawler_1.Crawler.getContext().factory.createElementAccessExpression(this.getExpression(), typeof other === "number" ? other : asAST(other)));
+        return new Expression(Crawler_js_1.Crawler.getContext().factory.createElementAccessExpression(this.getExpression(), typeof other === "number" ? other : asAST(other)));
     }
     OP(op, other) {
         other = asAST(other);
@@ -41,18 +42,18 @@ class Expression {
             throw new Error("Can't use nothing as lhs of operator expression..");
         if (op in Tokens_1.ComparisonOperators) {
             let opType = Tokens_1.ComparisonOperators[op];
-            return new Expression(Crawler_1.Crawler.getContext().factory.createBinaryExpression(this.getExpression(), opType, other));
+            return new Expression(Crawler_js_1.Crawler.getContext().factory.createBinaryExpression(this.getExpression(), opType, other));
         }
         if (op in Tokens_1.LogicalOperators) {
             switch (op) {
                 case "??":
-                    return new Expression(Crawler_1.Crawler.getContext().factory.createBinaryExpression(this.getExpression(), ts.SyntaxKind.QuestionQuestionToken, other));
+                    return new Expression(Crawler_js_1.Crawler.getContext().factory.createBinaryExpression(this.getExpression(), ts.SyntaxKind.QuestionQuestionToken, other));
                 case "||":
-                    return new Expression(Crawler_1.Crawler.getContext().factory.createLogicalOr(this.getExpression(), other));
+                    return new Expression(Crawler_js_1.Crawler.getContext().factory.createLogicalOr(this.getExpression(), other));
                 case "&&":
-                    return new Expression(Crawler_1.Crawler.getContext().factory.createLogicalAnd(this.getExpression(), other));
+                    return new Expression(Crawler_js_1.Crawler.getContext().factory.createLogicalAnd(this.getExpression(), other));
                 case "!":
-                    return new Expression(Crawler_1.Crawler.getContext().factory.createLogicalNot(this.getExpression()));
+                    return new Expression(Crawler_js_1.Crawler.getContext().factory.createLogicalNot(this.getExpression()));
             }
         }
         return this;
@@ -61,13 +62,23 @@ class Expression {
      * If (not inline).
      */
     IF(then, otherwise) {
-        return new Expression(Crawler_1.Crawler.getContext().factory.createIfStatement(this.getExpression(), asAST(then), otherwise && asAST(otherwise)));
+        if (then instanceof Statement)
+            then = then.toAST();
+        if (Array.isArray(then)) {
+            then = Crawler_js_1.Crawler.getContext().factory.createBlock(then);
+        }
+        if (otherwise instanceof Statement)
+            otherwise = otherwise.toAST();
+        if (Array.isArray(otherwise)) {
+            otherwise = Crawler_js_1.Crawler.getContext().factory.createBlock(otherwise);
+        }
+        return new Expression(Crawler_js_1.Crawler.getContext().factory.createIfStatement(this.getExpression(), asAST(then), otherwise && asAST(otherwise)));
     }
     /**
      * If inline.
      */
     IFI(then, otherwise) {
-        return new Expression(Crawler_1.Crawler.getContext().factory.createConditionalExpression(this.getExpression(), ts.factory.createToken(ts.SyntaxKind.QuestionToken), ts.factory.createParenthesizedExpression(asAST(then)), ts.factory.createToken(ts.SyntaxKind.ColonToken), ts.factory.createParenthesizedExpression(asAST(otherwise))));
+        return new Expression(Crawler_js_1.Crawler.getContext().factory.createConditionalExpression(this.getExpression(), ts.factory.createToken(ts.SyntaxKind.QuestionToken), ts.factory.createParenthesizedExpression(asAST(then)), ts.factory.createToken(ts.SyntaxKind.ColonToken), ts.factory.createParenthesizedExpression(asAST(otherwise))));
     }
     ASGN(op, other) {
         other = asAST(other);
@@ -80,16 +91,16 @@ class Expression {
         }
         switch (op) {
             case "=":
-                return new Expression(Crawler_1.Crawler.getContext().factory.createAssignment(this.getExpression(), other));
+                return new Expression(Crawler_js_1.Crawler.getContext().factory.createAssignment(this.getExpression(), other));
                 break;
             default:
-                return new Expression(Crawler_1.Crawler.getContext().factory.createBinaryExpression(this.getExpression(), Tokens_1.AssignmentSymbols[op], other));
+                return new Expression(Crawler_js_1.Crawler.getContext().factory.createBinaryExpression(this.getExpression(), Tokens_1.AssignmentSymbols[op], other));
                 break;
         }
         return this;
     }
     CALL(...args) {
-        return new Expression(Crawler_1.Crawler.getContext().factory.createCallExpression(this.getExpression(), undefined, args.map((e) => asAST(e))));
+        return new Expression(Crawler_js_1.Crawler.getContext().factory.createCallExpression(this.getExpression(), undefined, args.map((e) => asAST(e))));
     }
     toAST() {
         return this.ast;
@@ -97,12 +108,12 @@ class Expression {
     ;
 }
 exports.Expression = Expression;
-function EXP(exp) {
+function EXPR(exp) {
     if (exp instanceof Expression)
         return exp;
     return new Expression(exp);
 }
-exports.EXP = EXP;
+exports.EXPR = EXPR;
 function isValidVarInitialiser(val) {
     if (!val)
         return true;
@@ -141,68 +152,162 @@ function NOT(exp) {
         exp = new Expression(exp);
     if (ts.isVariableStatement(exp.ast))
         throw new Error("Cannot NOT a variable declaration.");
-    exp.ast = Crawler_1.Crawler.getContext().factory.createLogicalNot(exp.ast);
+    exp.ast = Crawler_js_1.Crawler.getContext().factory.createLogicalNot(exp.ast);
     return exp;
 }
 exports.NOT = NOT;
 function SUPER() {
-    return new Expression(Crawler_1.Crawler.getContext().factory.createSuper());
+    return new Expression(Crawler_js_1.Crawler.getContext().factory.createSuper());
 }
 exports.SUPER = SUPER;
 function THIS() {
-    return new Expression(Crawler_1.Crawler.getContext().factory.createThis());
+    return new Expression(Crawler_js_1.Crawler.getContext().factory.createThis());
 }
 exports.THIS = THIS;
 ///Call a function.
-function CALL(name, ...args) {
-    return new Expression(Crawler_1.Crawler.getContext().factory.createCallExpression(asAST(name), undefined, args.map((e) => asAST(e))));
-}
-exports.CALL = CALL;
-///Call parent.method.call
-function METHOD_CALL(parent, name, ...args) {
-    if (!(parent instanceof Expression))
-        parent = new Expression(parent);
-    return CALL(parent.DOT(name).DOT(ID("call")), ...args);
-}
-exports.METHOD_CALL = METHOD_CALL;
-function FUNC_CALL(name, ...args) {
+function FUNCTION_EXEC(name, ...args) {
+    return new Expression(Crawler_js_1.Crawler.getContext().factory.createCallExpression(asAST(name), undefined, args.map((e) => asAST(e))));
+}
+exports.FUNCTION_EXEC = FUNCTION_EXEC;
+// export function FUNCTION_CALL(name: AnyExpr, ...args: AnyExpr[]): Expression {
+//     if (!(name instanceof Expression)) name = new Expression(name);
+//     return CALL(name.DOT(ID("call")), ...args)
+// }
+function DOT_CALL(name, ...args) {
     if (!(name instanceof Expression))
         name = new Expression(name);
-    return CALL(name.DOT(ID("call")), ...args);
+    return FUNCTION_EXEC(name.DOT(ID("call")), ...args);
 }
-exports.FUNC_CALL = FUNC_CALL;
-function FUNC_BIND(name, newThis) {
+exports.DOT_CALL = DOT_CALL;
+function DOT_BIND(name, newThis, ...args) {
     if (!(name instanceof Expression))
         name = new Expression(name);
-    return FUNC_CALL(name, ID("bind"), newThis);
+    return FUNCTION_EXEC(name, ID("bind"), newThis, ...args);
+}
+exports.DOT_BIND = DOT_BIND;
+function FUNCTION_DECL(name, parameters, contents) {
+    let factory = Crawler_js_1.Crawler.getContext().factory;
+    return new Expression(factory.createFunctionExpression(undefined, undefined, name, undefined, parameters, undefined, factory.createBlock(contents)));
 }
-exports.FUNC_BIND = FUNC_BIND;
+exports.FUNCTION_DECL = FUNCTION_DECL;
+function LAMBDA_DECL(parameters, contents, inline = false) {
+    let factory = Crawler_js_1.Crawler.getContext().factory;
+    if (contents instanceof Statement)
+        contents = contents.toAST();
+    if (!Array.isArray(contents)) {
+        contents = [contents];
+    }
+    return new Expression(factory.createArrowFunction(undefined, undefined, parameters, undefined, factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), factory.createBlock(contents, !inline)));
+}
+exports.LAMBDA_DECL = LAMBDA_DECL;
 function TYPEOF(other) {
-    return new Expression(Crawler_1.Crawler.getContext().factory.createTypeOfExpression(other));
+    return new Expression(Crawler_js_1.Crawler.getContext().factory.createTypeOfExpression(other));
 }
 exports.TYPEOF = TYPEOF;
 function ID(name) {
-    return new Expression(Crawler_1.Crawler.getContext().factory.createIdentifier(name));
+    return new Expression(Crawler_js_1.Crawler.getContext().factory.createIdentifier(name));
 }
 exports.ID = ID;
+function PARAM_DECL(name, type) {
+    return Crawler_js_1.Crawler.getContext().factory.createParameterDeclaration(undefined, undefined, name, undefined, type ? asAST(type) : undefined);
+}
+exports.PARAM_DECL = PARAM_DECL;
 function LITERAL(name) {
-    return new Expression(Crawler_1.Crawler.getContext().factory.createStringLiteral(name));
+    return new Expression(Crawler_js_1.Crawler.getContext().factory.createStringLiteral(name));
 }
 exports.LITERAL = LITERAL;
 function IF(ifs, then, elses) {
-    return Crawler_1.Crawler.getContext().factory.createIfStatement(asAST(ifs), asAST(then), elses ? asAST(elses) : elses);
+    if (then instanceof Statement)
+        then = then.toAST();
+    if (Array.isArray(then)) {
+        then = Crawler_js_1.Crawler.getContext().factory.createBlock(then);
+    }
+    if (elses instanceof Statement)
+        elses = elses.toAST();
+    if (Array.isArray(elses)) {
+        elses = Crawler_js_1.Crawler.getContext().factory.createBlock(elses);
+    }
+    return Crawler_js_1.Crawler.getContext().factory.createIfStatement(asAST(ifs), asAST(then), elses ? asAST(elses) : elses);
 }
 exports.IF = IF;
+function NEW(id, args, types) {
+    return Crawler_js_1.Crawler.getContext().factory.createNewExpression(asAST(id), undefined, args.map((e) => asAST(e)));
+}
+exports.NEW = NEW;
+function NEW_ERROR(arg) {
+    if (typeof arg === "string") {
+        arg = LITERAL(arg);
+    }
+    return NEW(ID("Error"), [arg]);
+}
+exports.NEW_ERROR = NEW_ERROR;
+function THROW(expr) {
+    return Crawler_js_1.Crawler.getContext().factory.createThrowStatement(asAST(expr));
+}
+exports.THROW = THROW;
+function CLASS(name) {
+    return new Class_js_1.Class(asAST(name));
+}
+exports.CLASS = CLASS;
+function CONSTRUCTOR(args, block) {
+    let exprBlock;
+    if (block) {
+        exprBlock = Crawler_js_1.Crawler.getContext().factory.createBlock(block.map((e) => asAST(e)));
+    }
+    return Crawler_js_1.Crawler.getContext().factory.createConstructorDeclaration(undefined, args, exprBlock);
+}
+exports.CONSTRUCTOR = CONSTRUCTOR;
+function RETURN(expr) {
+    return Crawler_js_1.Crawler.getContext().factory.createReturnStatement(expr ? asAST(expr) : undefined);
+}
+exports.RETURN = RETURN;
+function COMMENT(node, comment, beforeNode = true, newlineAfter = true) {
+    if (beforeNode) {
+        return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, comment, newlineAfter);
+    }
+    else {
+        return ts.addSyntheticTrailingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, comment, newlineAfter);
+    }
+}
+exports.COMMENT = COMMENT;
 class Statement {
     constructor() {
         this.statements = [];
+        this.comments = [];
     }
     LINE(exp) {
         this.statements.push(exp);
+        return this;
+    }
+    COMMENT(comment, trailingNewLine = true) {
+        let type = "post";
+        if (this.statements.length == 0) {
+            type = "pre";
+        }
+        if (!this.comments[this.statements.length]) {
+            this.comments[this.statements.length] = [];
+        }
+        this.comments[this.statements.length].push((node) => {
+            if (type == "pre") {
+                return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, comment, trailingNewLine);
+            }
+            else {
+                return ts.addSyntheticTrailingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, comment, trailingNewLine);
+            }
+        });
+        return this;
     }
     toAST() {
-        let statements = this.statements.map((e) => Crawler_1.Crawler.getContext().factory.createExpressionStatement(asAST(e)));
-        return Crawler_1.Crawler.getContext().factory.createBlock(statements);
+        let factory = Crawler_js_1.Crawler.getContext().factory;
+        return this.statements.map((e, i) => {
+            let node = asAST(e);
+            if (this.comments[i]) {
+                for (let comment of this.comments[i]) {
+                    node = comment(node);
+                }
+            }
+            return factory.createExpressionStatement(node);
+        });
     }
 }
 function STATEMENT() {

package/Source/ASTHelper.d.ts

@@ -1,5 +1,5 @@
 import * as ts from "typescript";
-import { Expression } from "./ASTBuilder.js";
+import type { Expression } from "./ASTBuilder.js";
 export interface fromable {
     from: (param: any) => any;
 }

package/Source/ASTHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ASTHelper.d.ts","sourceRoot":"","sources":["ASTHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAS,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGpD,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;CAC7B;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,UAK/D;AAED,qBAAa,eAAe;IACxB,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC;gBAER,IAAI,EAAE,EAAE,CAAC,UAAU;IAI/B,OAAO;IAIP,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU;CAI7B;AAED,qBAAa,mBAAoB,SAAQ,eAAe;IACpD,SAAS,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAM;IAC/B,KAAK,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;IAGtB,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU;IAK7B,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ;IAQjC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB,GAAG,EAAE,CAAC,IAAI;CAKnD;AAED,yBAAc,mBAAmB,CAAC;IAC9B,SAAgB,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,mBAAmB,GAAG,mBAAmB,CAK1E;CACJ;AAED,qBAAa,mBAAoB,SAAQ,mBAAmB;gBAG5C,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,oBAAoB;IAIzD,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB;CAGzC;AAED,yBAAc,mBAAmB,CAAC;IAC9B,SAAgB,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,mBAAmB,GAAG,mBAAmB,CAKnG;CACJ;AAID,qBAAa,gBAAgB;IACzB,KAAK,EAAG,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;IACtC,KAAK,EAAG,EAAE,CAAC,gBAAgB,CAAC;gBAEhB,KAAK,EAAE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU;IAIhD,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,oBAAoB;IAapE,IAAI;CAGP;AAED,qBAAa,gBAAgB;IAgCc,SAAS,CAAC,IAAI,CAAC;IA/BtD,OAAO,CAAC,UAAU,CAAgB;IAClC,QAAQ,CAAC,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,eAAe,CAAC;IACpD,UAAU,EAAE,EAAE,CAAC,SAAS,EAAE,CAAM;IAChC,SAAS,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAM;IAC9B,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC;IACnC,OAAO,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAM;IAElC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAgBpE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB;IAI7C,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB;gBAIlC,UAAU,EAAE,EAAE,CAAC,UAAU,EAAY,IAAI,CAAC,2BAAe;IAIrE,OAAO,IAAI,MAAM,GAAG,SAAS;IAM7B,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC;IAKtE,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY;IAKjC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU;IAa/C,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU;IAelD,UAAU;IAIV,UAAU;IAIV,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,SAAS;IAK7C,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,qBAAqB;IAmCxG,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB;CAgB3C;AAED,qBAAa,UAAU;IACnB,QAAQ,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;IACzB,UAAU,EAAE,EAAE,CAAC,SAAS,EAAE,CAAM;IAEhC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU;IAOlC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,SAAS;IASxD,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS;IAUrC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB;CAM3C;AAGD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAahE;AAED,yBAAc,OAAO,CAAC;IAGlB,SAAgB,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,UAEjE;IAED,SAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,UAM1E;CACJ"}
+{"version":3,"file":"ASTHelper.d.ts","sourceRoot":"","sources":["ASTHelper.ts"],"names":[],"mappings":"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"}

package/Source/ASTHelper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Printer = exports.logError = exports.SourceFile = exports.ClassDeclaration = exports.AccessExpression = exports.PropertyDeclaration = exports.VariableDeclaration = exports.NamedExpression = exports.getNodeText = void 0;
 const ts = require("typescript");
-const ASTBuilder_js_1 = require("./ASTBuilder.js");
 const Crawler_js_1 = require("./ASTInterface/Crawler.js");
 function getNodeText(node, source) {
     if (node.pos > 0 && node.end < source.end) {
@@ -136,7 +135,7 @@ class ClassDeclaration {
         return getNodeText(id, this.sourceFile);
     }
     addMemberAtStart(member) {
-        this.members.unshift((0, ASTBuilder_js_1.asAST)(member));
+        this.members.unshift("toAST" in member ? member.toAST() : member);
         return this;
     }
     addMember(member) {

package/Source/ASTInterface/Class.d.ts

@@ -1,33 +1,43 @@
 import * as ts from "typescript";
-import { NamedExpression } from "../ASTHelper";
+import { NamedExpression } from "../ASTHelper.js";
 type APICallback<T, R = T> = (obj: T | null) => R | null;
 export declare class Decorator extends NamedExpression {
-    base: ts.Decorator;
+    private base;
     constructor(base: ts.Decorator | ts.Identifier | string);
+    isCallExpression(): boolean;
+    numArguments(): number;
+    getArgument(index: number): ts.Expression | undefined;
     update(): ts.Decorator;
 }
-export declare class Class extends NamedExpression {
-    base: ts.ClassDeclaration | ts.ClassExpression;
+export declare class Class<T extends ts.ClassDeclaration | ts.ClassExpression = ts.ClassDeclaration | ts.ClassExpression> extends NamedExpression {
+    private base;
     modifiers: ts.Modifier[];
     decorators: Decorator[];
     extends: ts.HeritageClause | undefined;
     implements: ts.HeritageClause[];
     members: (ts.ClassElement)[];
     typeParams: ts.TypeParameterDeclaration[];
-    constructor(base: ts.ClassDeclaration | ts.ClassExpression | string | ts.Identifier);
+    constructor(base: T | string | ts.Identifier);
+    isClassExpression(): this is Class<ts.ClassExpression>;
+    isClassDeclaration(): this is Class<ts.ClassDeclaration>;
     hasExtends(): boolean;
-    setExtends(extend: ts.ExpressionWithTypeArguments): void;
+    EXTENDS(extend: ts.ExpressionWithTypeArguments): void;
     unshiftDecorator(...dec: Decorator[]): this;
     pushDecorator(...dec: Decorator[]): this;
-    decorator(identifier: string | ts.Identifier, cb: APICallback<Decorator>): this;
-    decorator(cb: APICallback<Decorator>): this;
+    DECORATOR(identifier: string | ts.Identifier, cb: APICallback<Decorator>): this;
+    DECORATOR(cb: APICallback<Decorator>): this;
     unshift(...members: ts.ClassElement[]): this;
     push(...members: ts.ClassElement[]): this;
-    property(identifier: string | ts.Identifier | ts.PropertyDeclaration, cb: APICallback<ts.PropertyDeclaration, ts.ClassElement>): this;
-    property(cb: APICallback<ts.PropertyDeclaration, ts.ClassElement>): this;
-    method(identifier: string | ts.Identifier | ts.MethodDeclaration, cb: APICallback<ts.MethodDeclaration, ts.ClassElement>): this;
-    method(cb: APICallback<ts.MethodDeclaration, ts.ClassElement>): this;
-    update(): ts.ClassDeclaration | ts.ClassExpression;
+    PROPERTY(identifier: string | ts.Identifier | ts.PropertyDeclaration, cb: APICallback<ts.PropertyDeclaration, ts.ClassElement>): this;
+    PROPERTY(cb: APICallback<ts.PropertyDeclaration, ts.ClassElement>): this;
+    METHOD(identifier: string | ts.Identifier | ts.MethodDeclaration, cb: APICallback<ts.MethodDeclaration, ts.ClassElement>): this;
+    METHOD(cb: APICallback<ts.MethodDeclaration, ts.ClassElement>): this;
+    CONSTRUCTOR(): this;
+    CONSTRUCTOR(cb: APICallback<ts.ConstructorDeclaration, ts.ClassElement>): this;
+    copyFrom(other: Class): this;
+    update(): T;
+    toClassExpression(): ts.ClassExpression;
+    toClassDeclaration(): ts.ClassDeclaration;
 }
 export declare namespace Class {
     function getModifiers(node: ts.ClassDeclaration | ts.ClassExpression): ts.Modifier[];

package/Source/ASTInterface/Class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["Class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C,KAAK,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,KAAI,CAAC,GAAG,IAAI,CAAC;AAExD,qBAAa,SAAU,SAAQ,eAAe;IAC1C,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC;gBAEP,IAAI,EAAE,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,UAAU,GAAG,MAAM;IAqBvD,MAAM;CAUT;AAED,qBAAa,KAAM,SAAQ,eAAe;IACtC,IAAI,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,eAAe,CAAC;IAE/C,SAAS,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;IACzB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,OAAO,EAAE,EAAE,CAAC,cAAc,GAAG,SAAS,CAAC;IACvC,UAAU,EAAE,EAAE,CAAC,cAAc,EAAE,CAAC;IAChC,OAAO,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;IAC7B,UAAU,EAAE,EAAE,CAAC,wBAAwB,EAAE,CAAC;gBAE9B,IAAI,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,eAAe,GAAG,MAAM,GAAG,EAAE,CAAC,UAAU;IA4BnF,UAAU;IAIV,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,2BAA2B;IAIjD,gBAAgB,CAAC,GAAG,GAAG,EAAE,SAAS,EAAE;IAKpC,aAAa,CAAC,GAAG,GAAG,EAAE,SAAS,EAAE;IAKjC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI;IAC/E,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI;IAoC3C,OAAO,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,YAAY,EAAE;IAKrC,IAAI,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,YAAY,EAAE;IAKlC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,mBAAmB,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,mBAAmB,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,IAAI;IACrI,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,mBAAmB,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,IAAI;IAsDxE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,iBAAiB,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,IAAI;IAC/H,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,IAAI;IA0CpE,MAAM;CAgBT;AAGD,yBAAc,KAAK,CAAC;IAEhB,SAAgB,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,eAAe,iBAE1E;IAED,SAAgB,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,eAAe,kBAE3E;IAID,SAAgB,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,QAE1E;CAeJ"}
+{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["Class.ts"],"names":[],"mappings":"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"}

package/Source/ASTInterface/Class.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Class = exports.Decorator = void 0;
 const ts = require("typescript");
-const ASTHelper_1 = require("../ASTHelper");
-const Crawler_1 = require("./Crawler");
-class Decorator extends ASTHelper_1.NamedExpression {
+const ASTHelper_js_1 = require("../ASTHelper.js");
+const Crawler_js_1 = require("./Crawler.js");
+class Decorator extends ASTHelper_js_1.NamedExpression {
     constructor(base) {
         if (typeof base === "string")
             base = ts.factory.createIdentifier(base);
@@ -26,6 +26,15 @@ class Decorator extends ASTHelper_1.NamedExpression {
         super(name);
         this.base = base;
     }
+    isCallExpression() {
+        return ts.isCallExpression(this.base.expression);
+    }
+    numArguments() {
+        return this.isCallExpression() ? this.base.expression.arguments.length : 0;
+    }
+    getArgument(index) {
+        return this.isCallExpression() ? this.base.expression.arguments[index] : undefined;
+    }
     update() {
         if (ts.isCallExpression(this.base.expression)) {
             ts.factory.updateCallExpression(this.base.expression, this.name, this.base.expression.typeArguments, this.base.expression.arguments);
@@ -38,7 +47,7 @@ class Decorator extends ASTHelper_1.NamedExpression {
     }
 }
 exports.Decorator = Decorator;
-class Class extends ASTHelper_1.NamedExpression {
+class Class extends ASTHelper_js_1.NamedExpression {
     constructor(base) {
         if (typeof base === "string")
             base = ts.factory.createIdentifier(base);
@@ -68,10 +77,16 @@ class Class extends ASTHelper_1.NamedExpression {
             this.base = ts.factory.createClassDeclaration(undefined, undefined, undefined, undefined, []);
         }
     }
+    isClassExpression() {
+        return ts.isClassExpression(this.base);
+    }
+    isClassDeclaration() {
+        return ts.isClassDeclaration(this.base);
+    }
     hasExtends() {
         return !!this.extends;
     }
-    setExtends(extend) {
+    EXTENDS(extend) {
         this.extends = ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [extend]);
     }
     unshiftDecorator(...dec) {
@@ -82,7 +97,7 @@ class Class extends ASTHelper_1.NamedExpression {
         this.decorators.push(...dec);
         return this;
     }
-    decorator(identifier, cb) {
+    DECORATOR(identifier, cb) {
         let name;
         if (typeof identifier === "function") {
             cb = identifier;
@@ -124,7 +139,7 @@ class Class extends ASTHelper_1.NamedExpression {
         this.members.push(...members);
         return this;
     }
-    property(identifier, cb) {
+    PROPERTY(identifier, cb) {
         let name;
         if (typeof identifier === "function") {
             cb = identifier;
@@ -176,7 +191,7 @@ class Class extends ASTHelper_1.NamedExpression {
         }
         return this;
     }
-    method(identifier, cb) {
+    METHOD(identifier, cb) {
         let name;
         if (typeof identifier === "function") {
             cb = identifier;
@@ -215,14 +230,61 @@ class Class extends ASTHelper_1.NamedExpression {
         }
         return this;
     }
+    CONSTRUCTOR(cb) {
+        let didWork = false;
+        for (let i = 0; i < this.members.length; i++) {
+            let property = this.members[i];
+            if (!ts.isConstructorDeclaration(property)) {
+                continue;
+            }
+            let newProp = cb(property);
+            didWork = true;
+            if (newProp) {
+                this.members.splice(i, 1, newProp);
+            }
+            else {
+                this.members.splice(i, 1);
+                i--;
+            }
+        }
+        if (!didWork) {
+            let newDec = cb(null);
+            if (newDec) {
+                this.members.push(newDec);
+            }
+        }
+        return this;
+    }
+    copyFrom(other) {
+        this.modifiers = [...other.modifiers];
+        this.decorators = [...other.decorators];
+        this.extends = other.extends;
+        this.implements = [...other.implements];
+        this.members = [...other.members];
+        this.typeParams = [...other.typeParams];
+        return this;
+    }
     update() {
+        let factory = Crawler_js_1.Crawler.getContext().factory;
         if (ts.isClassDeclaration(this.base)) {
-            return ts.factory.updateClassDeclaration(this.base, [...this.modifiers, ...this.decorators.map((e) => e.update())], this.name, this.typeParams, [...(this.extends ? [this.extends] : []), ...this.implements], this.members);
+            return factory.updateClassDeclaration(this.base, [...this.modifiers, ...this.decorators.map((e) => e.update())], this.name, this.typeParams, [...(this.extends ? [this.extends] : []), ...this.implements], this.members);
         }
         else {
-            return ts.factory.updateClassExpression(this.base, [...this.modifiers, ...this.decorators.map((e) => e.update())], this.name, this.typeParams, [...(this.extends ? [this.extends] : []), ...this.implements], this.members);
+            return factory.updateClassExpression(this.base, [...this.modifiers, ...this.decorators.map((e) => e.update())], this.name, this.typeParams, [...(this.extends ? [this.extends] : []), ...this.implements], this.members);
         }
     }
+    toClassExpression() {
+        if (ts.isClassExpression(this.base)) {
+            return this.base;
+        }
+        return Crawler_js_1.Crawler.getContext().factory.createClassExpression([...this.modifiers, ...this.decorators.map((e) => e.update())], this.name, this.typeParams, [...(this.extends ? [this.extends] : []), ...this.implements], this.members);
+    }
+    toClassDeclaration() {
+        if (ts.isClassDeclaration(this.base)) {
+            return this.base;
+        }
+        return Crawler_js_1.Crawler.getContext().factory.createClassDeclaration([...this.modifiers, ...this.decorators.map((e) => e.update())], this.name, this.typeParams, [...(this.extends ? [this.extends] : []), ...this.implements], this.members);
+    }
 }
 exports.Class = Class;
 (function (Class) {
@@ -241,18 +303,24 @@ exports.Class = Class;
         foos.push(repl);
     }
     Class.onClass = onClass;
-    Crawler_1.Crawler.Register((node) => {
+    Crawler_js_1.Crawler.Register((node) => {
         return ts.isClassExpression(node) || ts.isClassDeclaration(node);
     }, (node) => {
-        let val = new Class(node);
+        let val = node;
         for (let foo of foos) {
-            let result = foo(val);
-            if (!(result instanceof Class)) {
+            let _class = new Class(node);
+            let result = foo(_class);
+            if (Array.isArray(result)) {
                 return result;
             }
-            val = result;
+            if (result instanceof Class) {
+                val = result.update();
+            }
+            else {
+                val = result;
+            }
         }
-        return val.update();
+        return val;
     });
 })(Class || (exports.Class = Class = {}));
 //# sourceMappingURL=Class.js.map

package/Source/ASTInterface/Crawler.d.ts

@@ -1,5 +1,19 @@
 import * as ts from "typescript";
 export declare namespace Crawler {
+    function SetProgram(tsProgram: ts.Program): void;
+    function SetFile(tsFile: ts.SourceFile): void;
+    function OnFile(callback: (file: {
+        ts: ts.SourceFile;
+        data: any;
+    }) => void): void;
+    function GetProgram(): {
+        ts: ts.Program;
+        data: any;
+    };
+    function GetFile(): {
+        ts: ts.SourceFile;
+        data: any;
+    };
     function Register(checker: (node: ts.Node) => boolean, replacer: (node: ts.Node) => (ts.Node | ts.Node[])): void;
     function setContext(newContext: ts.TransformationContext): void;
     function getContext(): ts.TransformationContext;

package/Source/ASTInterface/Crawler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Crawler.d.ts","sourceRoot":"","sources":["Crawler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,yBAAc,OAAO,CAAC;IAGlB,SAAgB,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,QAE3G;IAED,SAAgB,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,qBAAqB,QAE9D;IAED,SAAgB,UAAU,6BAEzB;IAED,SAAgB,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAI,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,WA4BvF;CAEJ"}
+{"version":3,"file":"Crawler.d.ts","sourceRoot":"","sources":["Crawler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,yBAAc,OAAO,CAAC;IAOlB,SAAgB,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,QAE/C;IAED,SAAgB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,QAK5C;IAED,SAAgB,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,KAAG,IAAI,QAE9E;IAED,SAAgB,UAAU;;;MAEzB;IAED,SAAgB,OAAO;;;MAEtB;IAED,SAAgB,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,QAE3G;IAED,SAAgB,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,qBAAqB,QAE9D;IAED,SAAgB,UAAU,6BAEzB;IAED,SAAgB,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAI,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,WA8BvF;CAEJ"}