@bikky/compiler 0.0.8 → 0.0.10

package/Transformers/MixinTransformer.js

@@ -1,125 +1,321 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const ASTHelper_js_1 = require("../Source/ASTHelper.js");
-//This transform replaces super. usage with this.parent. 
-// - this is to make sure macros work properly.
-var mixMakerName = "Mixable";
-var MixinMagicNumbers = {
-    decoratorEditExport: ts.SyntaxKind.ExtendsKeyword,
-    identifier: ts.SyntaxKind.Identifier,
-    mixinDescriptionKind: ts.SyntaxKind.PropertySignature,
-};
-/**
- * This is a multi-process thing:
- * 2) Remove the @mixin decorator.
- * 3) Add var Super = Symbol("super") at the top of the file.
- * 4) Add this[super] = prototype and static Super = Super to class.
- * 5) Change all super.function references to this[super].function.
- */
-function MixClass(context, RawClass, symbolName) {
-    //Add symbol definition to the top of the file.
-    var computedSymbolName = context.factory.createComputedPropertyName(symbolName);
-    var Class = ASTHelper_js_1.ClassDeclaration.from(RawClass);
-    if (!Class.hasExtends()) {
-        (0, ASTHelper_js_1.logError)(RawClass, "Mixins need to extend from something");
-        return RawClass;
-    }
-    //Remove Decorator.
-    Class.removeDecorator("mixin");
-    //Store the symbol statically on the class so we can access it in the mixin maker.
-    var declareStaticSymbol = (new ASTHelper_js_1.PropertyDeclaration((0, ASTHelper_js_1.Identifier)(context, "Super"))
-        .addModifier((0, ASTHelper_js_1.StaticModifier)(context))
-        .setValue(symbolName));
-    Class.addMemberAtStart(declareStaticSymbol.make(context));
-    //Can't add prototype manually because it will override the prototype provided by MixinCode.ts (because the constructor
-    // runs after the mixin code, and class variables are assigned in the constructor).
-    //var declareSuperPrototype = (new PropertyDeclaration(computedSymbolName))
-    //	.setValue(Class.getExtends()!);
-    //Class.addMemberAtStart(declareSuperPrototype.make(context));
-    Class.setExtends((new ASTHelper_js_1.CallExpression((0, ASTHelper_js_1.Identifier)(context, mixMakerName))
-        .addArgument(Class.getExtends())).make(context));
-    var newRawClass = Class.update(context);
-    newRawClass = ts.visitNode(newRawClass, ReplaceSuper(Class.getName(), symbolName, context));
-    return newRawClass;
-}
-//Change all references in member functions of super. to this[Super].
-function ReplaceSuper(classID, computedSuperID, context) {
-    var className = classID.text;
-    return (node) => {
-        return ASTHelper_js_1.ClassDeclaration.eachContextualNode(node, (node) => {
-            //check to see if node chain represents this.method().
-            if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.expression.kind === ts.SyntaxKind.SuperKeyword) {
-                var f = context.factory;
-                var access = (new ASTHelper_js_1.AccessExpression(context)).this().access(computedSuperID)
-                    /*.access(f.createIdentifier("prototype"))*/ .access(f.createIdentifier(node.expression.name.text)).access((new ASTHelper_js_1.CallExpression(f.createIdentifier("call")))
-                    .addArgument(f.createThis())
-                    .addArgument(...Array.from(node.arguments)).make(context));
-                //this[super].prototype.method.call(this, arguments);
-                return access.make();
-            }
-            else {
-                return node;
-            }
-        }, context);
-    };
-}
-/**
- *
- * Searching stuff!
- * 1) Find classes defined with the @mixin decorator.
- *
- */
-class MixinSource {
-    constructor(sourceFile) {
-        this.sourceFile = sourceFile;
-    }
-    //Look for a class with the @mixin decorator!
-    update(context) {
-        var _a;
-        this.context = context;
-        var declarations = [];
-        var crawl = (node) => {
-            if (node.kind === ts.SyntaxKind.ClassDeclaration) {
-                var Class = ASTHelper_js_1.ClassDeclaration.from(node);
-                if (Class.hasDecorator("mixin")) {
-                    var name = Class.getName().text;
-                    var symbolName = (0, ASTHelper_js_1.Identifier)(context, "Super_" + declarations.length);
-                    var declareSuperSymbol = (new ASTHelper_js_1.VariableDeclaration(symbolName))
-                        .setValue((new ASTHelper_js_1.CallExpression((0, ASTHelper_js_1.Identifier)(context, "Symbol")))
-                        .addArgument((0, ASTHelper_js_1.StringLiteral)(context, "super_" + name))
-                        .make(context)).make(context);
-                    declarations.push(declareSuperSymbol);
-                    var test = MixClass(this.context, node, symbolName);
-                    return test;
-                }
-            }
-            return ts.visitEachChild(node, crawl, this.context);
-        };
-        var source = ts.visitNode(this.sourceFile, crawl);
-        var file = ASTHelper_js_1.SourceFile.from(source);
-        for (var declaration of declarations) {
-            file.insertUnderImports(declaration);
-        }
-        var result = file.update(context);
-        this.sourceFile = result;
-        if (declarations.length > 0) {
-            console.log("Updated file", (_a = file.original) === null || _a === void 0 ? void 0 : _a.fileName, "with mixin data");
-            //	console.log("~~~~~~~~~~~");
-            //	console.log(Printer.printNode(result, this.sourceFile));
-            //	console.log("~~~~~~~~~~~");
-        }
-        return result;
-    }
-}
-console.log("MIXINS ENABLED");
-function default_1(program, pluginOptions) {
-    return (context) => {
-        return (sourceFile) => {
-            return (new MixinSource(sourceFile)).update(context);
-            //return sourceFile;
-        };
-    };
-}
-exports.default = default_1;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts = require("typescript");
+const ASTHelper_js_1 = require("../Source/ASTHelper.js");
+const ASTBuilder_1 = require("../Source/ASTBuilder");
+const Class_1 = require("../Source/ASTInterface/Class");
+const ASTSearcher_1 = require("../Source/ASTSearcher");
+const Crawler_1 = require("../Source/ASTInterface/Crawler");
+//This transform replaces super. usage with this.parent. 
+// - this is to make sure macros work properly.
+const mixMakerName = "Mixable";
+const superName = "Super";
+var MixinMagicNumbers = {
+    decoratorEditExport: ts.SyntaxKind.ExtendsKeyword,
+    identifier: ts.SyntaxKind.Identifier,
+    mixinDescriptionKind: ts.SyntaxKind.PropertySignature,
+};
+/**
+ * This is a multi-process thing:
+ * 2) Remove the @mixin decorator.
+ * 3) Add var Super = Symbol("super") at the top of the file.
+ * 4) Add this[super] = prototype and static Super = Super to class.
+ * 5) Change all super.function references to this[super].function.
+ */
+let source;
+let numDeclarations = 0;
+Class_1.Class.onClass((mixClass) => {
+    let isMixin = false;
+    ts.SyntaxKind.ClassDeclaration;
+    console.log(`Found class: ${mixClass.name.text}, decorators: ${mixClass.decorators.map((e) => e.name.text)}`);
+    // console.log(mixClass.base);
+    // console.log(`${((mixClass.base as any).decorators ?? []).map((e: any)=>e.getText())}`);
+    //Find out if the class has the @mixin decorator. If it does, remove it (by returning null).
+    mixClass.decorator("mixin", (dec) => {
+        if (dec == null)
+            return null;
+        console.log(`Found class with mixin decorator! ${mixClass.name.text}, ${dec.name.text}`);
+        isMixin = true;
+        return null;
+    });
+    if (!isMixin)
+        return mixClass;
+    let name = mixClass.name.text;
+    let symbolName = (0, ASTBuilder_1.ID)("Super_" + numDeclarations++).toAST();
+    //Create symbol named Super_0 at the top of the file.
+    let declareSuperSymbol = (new ASTHelper_js_1.VariableDeclaration(symbolName))
+        .setValue((0, ASTBuilder_1.CALL)((0, ASTBuilder_1.ID)("Symbol"), (0, ASTBuilder_1.LITERAL)("super_" + name)).toAST()).make(Crawler_1.Crawler.getContext());
+    //Add Symbol = Super_0 to the class.
+    mixClass.unshift(ts.factory.createPropertyDeclaration([], (0, ASTBuilder_1.ID)(superName).toAST(), undefined, undefined, symbolName));
+    let getSuperClass = () => ts.factory.createElementAccessExpression(ts.factory.createThis(), symbolName);
+    let isSuperCall = (node) => ts.isElementAccessExpression(node) && node.expression.kind === ts.SyntaxKind.ThisKeyword
+        && ts.isIdentifier(node.argumentExpression) /*&& node.expression.argumentExpression.text === symbolName.text*/;
+    mixClass.extends = ts.factory.updateHeritageClause(mixClass.extends, [ts.factory.createExpressionWithTypeArguments(ts.factory.createIdentifier(mixMakerName), undefined)]);
+    mixClass.method((method) => {
+        if (!method)
+            return null;
+        if (method.body) {
+            let newBody = Crawler_1.Crawler.Crawl(method.body, (node) => {
+                //Replace all `super` instances with `this[SuperSymbol_0]`;
+                if (node.kind === ts.SyntaxKind.SuperKeyword) {
+                    console.log(`Found super! ${node}`);
+                    return getSuperClass();
+                }
+                //Replace all instances of [_super.stuff(), value;] with [(this[SuperSymbol].stuff) ? (this[SuperSymbol].stuff()) : (value)];
+                //First find a binary expression with comma (A, B) where _super occurs somewhere in A.
+                if ((0, ASTSearcher_1.FROM)(node).MATCH.BINARY((0, ASTSearcher_1.HAS_ID_IN_STATEMENT)("_super"), ",", undefined)) {
+                    console.log(`Found _super! ${node}`);
+                    let bin = node;
+                    //Step one, replace all instances of _super with this[Super_0]
+                    //Step two, find `this[Super_0].stuff` (without the function call and extra stuff).
+                    let superAccessExpression = (0, ASTSearcher_1.FIND_IN_STATEMENT)(node, (node) => {
+                        while (ts.isPropertyAccessExpression(node)) {
+                            if (ts.isIdentifier(node.expression) && node.expression.text == "_super") {
+                                return true;
+                            }
+                            node = node.expression;
+                        }
+                        return false;
+                    });
+                    if (!superAccessExpression)
+                        throw new Error(`Something went wrong finding _super. ${node.getText()}`);
+                    let replace_Super = (node) => {
+                        if (ts.isIdentifier(node) && node.text == "_super") {
+                            return getSuperClass();
+                        }
+                        return node;
+                    };
+                    bin = Crawler_1.Crawler.Crawl(bin, replace_Super);
+                    superAccessExpression = Crawler_1.Crawler.Crawl(superAccessExpression, replace_Super);
+                    // Finally, create (this[Super_0].stuff) ? (this[Super_0].stuff()) : (value) syntax.
+                    return ts.factory.createConditionalExpression(ts.factory.createParenthesizedExpression(superAccessExpression), ts.factory.createToken(ts.SyntaxKind.QuestionToken), ts.factory.createParenthesizedExpression(bin.left), ts.factory.createToken(ts.SyntaxKind.ColonToken), ts.factory.createParenthesizedExpression(bin.right));
+                }
+                return node;
+            });
+            // console.log(newBody.getText(source));
+            method = ts.factory.updateMethodDeclaration(method, method.modifiers, method.asteriskToken, method.name, method.questionToken, method.typeParameters, method.parameters, method.type, newBody);
+            return method;
+        }
+        return method;
+    });
+    return [declareSuperSymbol, mixClass.update()];
+});
+/*
+
+        var crawl = (node: ts.Node): ts.Node => {
+            if (ts.canHaveDecorators(node)) {
+                console.log("DECORATOR?");
+                let text =  getNodeText(node, this.sourceFile).split("\n")[0].replace("\r", "");
+                console.log(node.kind, text);
+                if (text.includes("implements")) {
+                    console.log(node);
+                }
+                console.log(ts.getDecorators(node));
+            }
+            // if (node.pos > 0 && node.end < this.sourceFile.end) {
+            // 	console.log(node.getText(this.sourceFile));
+            // }
+            if (ts.isDecorator(node)) {
+                // console.log("FOUND DECORATOR");
+                // console.log(getNodeText(node, this.sourceFile));
+            }
+            else if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) {
+                var Class = ClassDeclaration.from(<ts.ClassDeclaration>node);
+                // console.log("FOUND CLASS");
+                // console.log(getNodeText(node, this.sourceFile).split("\n")[0].replace("\r", ""));
+                // if (ts.isClassExpression(node)) {
+                // 	console.log(node);
+                // 	console.log(ts.getModifiers(node));
+                // 	console.log(node.modifiers);
+                // }
+                if (Class.hasDecorator("mixin")) {
+                    console.log("FOUND ONE", Class.name);
+                    var name = Class.getName().text;
+                    var symbolName = ID("Super_" + declarations.length).toAST();
+                    var declareSuperSymbol = (new VariableDeclaration(symbolName))
+                        .setValue(
+                            CALL(ID("Symbol"), LITERAL("super_"+name)).toAST()
+                        ).make(context);
+                    declarations.push(<ts.Statement>declareSuperSymbol);
+                    var test = MixClass(this.context, <ts.ClassDeclaration>node, symbolName);
+                    return test;
+                }
+            }
+            else {
+                // let text = getNodeText(node, this.sourceFile).substring(0, 50);
+                // if (text.includes("class")) {
+                // 	console.log("FOUND OTHER", node.kind);
+                // 	console.log(getNodeText(node, this.sourceFile).substring(0, 50));
+                // 	console.log(node);
+                // }
+            }
+            return ts.visitEachChild(node, crawl, this.context);
+        }
+
+ */
+// function MixClass(context: ts.TransformationContext, RawClass: ts.ClassDeclaration, symbolName: ts.Identifier): ts.ClassDeclaration {
+// 	//Add symbol definition to the top of the file.
+// 	var computedSymbolName = context.factory.createComputedPropertyName(symbolName);
+//
+// 	var Class = ClassDeclaration.from(RawClass);
+// 	if (!Class.hasExtends()) {
+// 		logError(RawClass, "Mixins need to extend from something");
+// 		return RawClass;
+// 	}
+// 	//Remove Decorator.
+// 	Class.removeDecorator("mixin");
+// 	console.log("FOUND MIXIN CLASS", Class.getName());
+//
+// 	//Store the symbol statically on the class so we can access it in the mixin maker.
+// 	var declareStaticSymbol = (new PropertyDeclaration(ID("Super").toAST())
+// 		.addModifier(ts.factory.createModifier(ts.SyntaxKind.StaticKeyword))
+// 		.setValue(symbolName)
+// 	);
+// 	Class.addMemberAtStart(declareStaticSymbol.make(context));
+//
+// 	//Can't add prototype manually because it will override the prototype provided by MixinCode.ts (because the constructor
+// 	// runs after the mixin code, and class variables are assigned in the constructor).
+// 	//var declareSuperPrototype = (new PropertyDeclaration(computedSymbolName))
+// 	//	.setValue(Class.getExtends()!);
+// 	//Class.addMemberAtStart(declareSuperPrototype.make(context));
+//
+// 	Class.setExtends(CALL(ID(mixMakerName), Class.getExtends()!).toAST());
+//
+// 	var newRawClass = Class.update(context)!;
+//
+// 	newRawClass = ts.visitNode(newRawClass, ReplaceSuper(Class.getName(), symbolName, context)) as ts.ClassDeclaration;
+//
+// 	return newRawClass;
+// }
+//
+// //Change all references in member functions of super. to this[Super].
+// function ReplaceSuper(classID: ts.Identifier, computedSuperID: ts.Identifier, context: ts.TransformationContext) {
+// 	var className = classID.text;
+// 	return (node: ts.Node) => {
+// 		return ClassDeclaration.eachContextualNode(<ts.ClassDeclaration>node, (node: ts.Node) => {
+// 			//check to see if node chain represents this.method().
+// 			if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.expression.kind === ts.SyntaxKind.SuperKeyword) {
+// 				var f = context.factory;
+// 				var access = METHOD_CALL(THIS().LOOKUP(computedSuperID), ID(node.expression.name.text), THIS(), ...Array.from(node.arguments));
+// 				//DOT(ID(node.expression.name.text))
+// 				//	.DOT(CALL(ID("call"), THIS(), ...Array.from(node.arguments)));
+// 				// var access = (new AccessExpression(context)).this().access(computedSuperID)
+// 				// 	/*.access(f.createIdentifier("prototype"))*/.access(f.createIdentifier(node.expression.name.text)).access(
+// 				// 		(new CallExpression(f.createIdentifier("call")))
+// 				// 			.addArgument(f.createThis())
+// 				// 			.addArgument(...Array.from(node.arguments)
+// 				// 		).make(context)
+// 				// );
+// 				//this[super].prototype.method.call(this, arguments);
+// 				// return access.make();
+// 				return access.toAST();
+// 			}
+// 			else {
+// 				return node;
+// 			}
+// 		}, context);
+// 	}
+// }
+//
+// /**
+//  *
+//  * Searching stuff!
+//  * 1) Find classes defined with the @mixin decorator.
+//  *
+//  */
+//
+// class MixinSource {
+// 	sourceFile: ts.SourceFile;
+// 	context!: ts.TransformationContext;
+// 	constructor(sourceFile: ts.SourceFile) {
+// 		this.sourceFile = sourceFile;
+// 	}
+//
+// 	//Look for a class with the @mixin decorator!
+// 	update(context: ts.TransformationContext) {
+// 		this.context = context;
+// 		var declarations = <ts.Statement[]>[];
+//
+// 		var crawl = (node: ts.Node): ts.Node => {
+// 			if (ts.canHaveDecorators(node)) {
+// 				console.log("DECORATOR?");
+// 				let text =  getNodeText(node, this.sourceFile).split("\n")[0].replace("\r", "");
+// 				console.log(node.kind, text);
+// 				if (text.includes("implements")) {
+// 					console.log(node);
+// 				}
+// 				console.log(ts.getDecorators(node));
+// 			}
+// 			// if (node.pos > 0 && node.end < this.sourceFile.end) {
+// 			// 	console.log(node.getText(this.sourceFile));
+// 			// }
+// 			if (ts.isDecorator(node)) {
+// 				// console.log("FOUND DECORATOR");
+// 				// console.log(getNodeText(node, this.sourceFile));
+// 			}
+// 			else if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) {
+// 				var Class = ClassDeclaration.from(<ts.ClassDeclaration>node);
+// 				// console.log("FOUND CLASS");
+// 				// console.log(getNodeText(node, this.sourceFile).split("\n")[0].replace("\r", ""));
+// 				// if (ts.isClassExpression(node)) {
+// 				// 	console.log(node);
+// 				// 	console.log(ts.getModifiers(node));
+// 				// 	console.log(node.modifiers);
+// 				// }
+// 				if (Class.hasDecorator("mixin")) {
+// 					console.log("FOUND ONE", Class.name);
+// 					var name = Class.getName().text;
+// 					var symbolName = ID("Super_" + declarations.length).toAST();
+// 					var declareSuperSymbol = (new VariableDeclaration(symbolName))
+// 						.setValue(
+// 							CALL(ID("Symbol"), LITERAL("super_"+name)).toAST()
+// 						).make(context);
+// 					declarations.push(<ts.Statement>declareSuperSymbol);
+// 					var test = MixClass(this.context, <ts.ClassDeclaration>node, symbolName);
+// 					return test;
+// 				}
+// 			}
+// 			else {
+// 				// let text = getNodeText(node, this.sourceFile).substring(0, 50);
+// 				// if (text.includes("class")) {
+// 				// 	console.log("FOUND OTHER", node.kind);
+// 				// 	console.log(getNodeText(node, this.sourceFile).substring(0, 50));
+// 				// 	console.log(node);
+// 				// }
+// 			}
+// 			return ts.visitEachChild(node, crawl, this.context);
+// 		}
+//
+// 		var source = ts.visitNode(this.sourceFile, crawl);
+//
+// 		var file = SourceFile.from(source as ts.SourceFile);
+// 		for (var declaration of declarations) {
+// 			file.insertUnderImports(declaration);
+// 		}
+// 		var result = file.update(context);
+// 		this.sourceFile = result;
+// 		if (declarations.length > 0) {
+// 			console.log("Updated file", file.original?.fileName, "with mixin data");
+// 		//	console.log("~~~~~~~~~~~");
+// 		//	console.log(Printer.printNode(result, this.sourceFile));
+// 		//	console.log("~~~~~~~~~~~");
+// 		}
+// 		return result;
+// 	}
+// }
+//
+// console.log("MIXINS ENABLED lalala");
+function default_1(program, pluginOptions) {
+    return (context) => {
+        Crawler_1.Crawler.setContext(context);
+        return (sourceFile) => {
+            numDeclarations = 0;
+            return Crawler_1.Crawler.Crawl(sourceFile);
+            // console.log(sourceFile.fileName);
+            // return (new MixinSource(sourceFile)).update(context);
+            //return sourceFile;
+        };
+    };
+}
+exports.default = default_1;
 //# sourceMappingURL=MixinTransformer.js.map

package/Transformers/SuperTransformer.d.ts

@@ -1,3 +1,3 @@
-import * as ts from "typescript";
-export default function (program: ts.Program, pluginOptions: {}): (context: ts.TransformationContext) => (sourceFile: ts.SourceFile) => ts.SourceFile;
+import * as ts from "typescript";
+export default function (program: ts.Program, pluginOptions: {}): (context: ts.TransformationContext) => (sourceFile: ts.SourceFile) => ts.Node;
 //# sourceMappingURL=SuperTransformer.d.ts.map

package/Transformers/SuperTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SuperTransformer.d.ts","sourceRoot":"","sources":["SuperTransformer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AA8DjC,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,aAC7C,GAAG,qBAAqB,kBACpB,GAAG,UAAU,mBA2DlC"}
+{"version":3,"file":"SuperTransformer.d.ts","sourceRoot":"","sources":["SuperTransformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAsEjC,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,aAE7C,GAAG,qBAAqB,kBAEpB,GAAG,UAAU,aA0ElC"}