@bikky/compiler 0.0.10 → 0.0.12

package/Transformers/MixinTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MixinTransformer.d.ts","sourceRoot":"","sources":["MixinTransformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAiVjC,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,aAC7C,GAAG,qBAAqB,kBAEpB,GAAG,UAAU,aAQlC"}
+{"version":3,"file":"MixinTransformer.d.ts","sourceRoot":"","sources":["MixinTransformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAkKjC,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,aAC7C,GAAG,qBAAqB,kBAEpB,GAAG,UAAU,aAKlC"}

package/Transformers/MixinTransformer.js

@@ -100,220 +100,46 @@ Class_1.Class.onClass((mixClass) => {
     });
     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);
+//Resolve ERROR_INFO macro:
+Crawler_1.Crawler.Register((node) => {
+    if (ts.isIdentifier(node) && node.text === "ERROR_INFO") {
+        let arg = node;
+        let parent = node.parent;
+        while (!ts.isCallExpression(parent) || !parent.arguments.includes(arg)) {
+            arg = parent;
+            parent = arg.parent;
+            if (ts.isSourceFile(parent))
+                return false;
         }
-
- */
-// 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");
+        return true;
+    }
+    return false;
+}, (node) => {
+    if (ts.isIdentifier(node) && node.text === "ERROR_INFO") {
+        let thisArg = node;
+        let parent = node.parent;
+        while (!ts.isCallExpression(parent) || !parent.arguments.includes(thisArg)) {
+            thisArg = parent;
+            parent = thisArg.parent;
+            if (ts.isSourceFile(parent))
+                return node;
+        }
+        let text = [];
+        for (let arg of parent.arguments) {
+            if (arg === thisArg)
+                continue;
+            text.push(ts.factory.createStringLiteral(arg.getText()));
+        }
+        return ts.factory.createArrayLiteralExpression(text);
+    }
+    return node;
+});
 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;
         };
     };
 }

package/Transformers/SuperTransformer.d.ts

@@ -1,3 +1 @@
-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":"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"}
+{"version":3,"file":"SuperTransformer.d.ts","sourceRoot":"","sources":["SuperTransformer.ts"],"names":[],"mappings":""}

package/Transformers/SuperTransformer.js

@@ -1,139 +1,155 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// transformer1-module
-const ts = require("typescript");
-const typescript_1 = require("typescript");
-const ASTHelper_1 = require("../Source/ASTHelper");
-const ASTBuilder_1 = require("../Source/ASTBuilder");
-class SuperTransformer {
-    constructor(line, context, iter) {
-        this.has_super = false;
-        this.iter = iter;
-        this.context = context;
-        //TODO: Check that this is OK.
-        this.result = this.find_super(line);
-        if (this.has_super) {
-            const f = ts.factory;
-            ts.createSourceFile("SuperTransformer.ts", `
-			`, typescript_1.ScriptTarget.ES5, true, typescript_1.ScriptKind.TS);
-            this.result = (0, ASTBuilder_1.IF)((0, ASTBuilder_1.SUPER)().DOT((0, ASTBuilder_1.ID)(this.identifier)).OP("!==", (0, ASTBuilder_1.LITERAL)("undefined")).toAST(), this.result);
-        }
-    }
-    find_identifier(node) {
-        if (node.kind == ts.SyntaxKind.Identifier) {
-            if (node.getText() != "_super") {
-                this.identifier = node.getText();
-            }
-        }
-    }
-    //Change the _super call over to super.
-    find_super(node) {
-        var result;
-        if (ts.isPropertyAccessExpression(node)) {
-            var has_super = false;
-            var id;
-            result = ts.visitEachChild(node, (node) => {
-                if (ts.isIdentifier(node)) {
-                    if (node.text == "_super") {
-                        has_super = true;
-                        let result = ts.factory.createIdentifier("super");
-                        //ts.setOriginalNode(result, ts.getOriginalNode(node));
-                        return result;
-                    }
-                    else {
-                        id = node.text;
-                    }
-                }
-                return node;
-            }, this.context);
-            if (has_super && id) {
-                this.has_super = has_super;
-                this.identifier = id;
-            }
-            return result;
-        }
-        if (ts.isBlock(node) || ts.isCaseBlock(node) || ts.isModuleBlock(node)) {
-            return this.iter(node);
-        }
-        result = ts.visitEachChild(node, this.find_super.bind(this), this.context);
-        return result;
-    }
-}
-function default_1(program, pluginOptions) {
-    // let checker = program.getTypeChecker();
-    return (context) => {
-        (0, ASTHelper_1.setContext)(context);
-        return (sourceFile) => {
-            var parent = {
-                kind: ts.SyntaxKind[sourceFile.kind],
-                flags: []
-            };
-            var map = new Map();
-            map.set(sourceFile, parent);
-            function visitor(node) {
-                console.log(node);
-                if (!node.parent)
-                    node.parent = sourceFile;
-                // if (ts.isCallExpression(node)) {
-                //     return ts.createLiteral('call');
-                // }
-                var description = {
-                    kind: ts.SyntaxKind[node.kind],
-                    flags: []
-                };
-                parent[node.escapedText || node.getText()] = description;
-                //console.log(ts.SyntaxKind[node.kind], (node as any).escapedText || node.getText());
-                for (var prop in ts.NodeFlags) {
-                    if (typeof prop == "string") {
-                        if ((node.flags & ts.NodeFlags[prop]) != 0) {
-                            description.flags.push(prop);
-                        }
-                    }
-                }
-                //console.log(node.modifiers);
-                //if (node.kind == ts.SyntaxKind.Block) {
-                //	console.log(node);
-                //}
-                //console.log(node.decorators)
-                var temp = parent;
-                parent = description;
-                var result;
-                switch (node.kind) {
-                    case ts.SyntaxKind.ExpressionStatement:
-                    case ts.SyntaxKind.FirstStatement:
-                    case ts.SyntaxKind.ReturnStatement:
-                        var transformed = new SuperTransformer(node, context, visitor);
-                        result = transformed.result;
-                        ts.visitEachChild(node, visitor, context);
-                        break;
-                    default:
-                        result = ts.visitEachChild(node, visitor, context);
-                        break;
-                }
-                parent = temp;
-                if (ts.isClassDeclaration(node)) {
-                    ASTHelper_1.ClassDeclaration.eachContextualNode(node, (node) => {
-                        // if (ts.isFunctionLike(node)) {
-                        // 	ts.visitEachChild(node);
-                        // }
-                        // if (ts.)
-                        return node;
-                    }, context);
-                }
-                else {
-                    ts.visitEachChild(node, visitor, context);
-                }
-                return result;
-            }
-            var result = ts.visitNode(sourceFile, visitor);
-            //console.log(sourceFile.fileName);
-            //console.log(parent);
-            //console.log(JSON.stringify(parent, null, 4));
-            return result;
-        };
-    };
-}
-exports.default = default_1;
-console.log("_SUPER ENABLED");
-console.log("SHOTO!");
+// // transformer1-module
+// import * as ts from "typescript";
+// import {ScriptKind, ScriptTarget} from "typescript";
+// import {ClassDeclaration, setContext} from "../Source/ASTHelper";
+// import {ID, IF, LITERAL, SUPER} from "../Source/ASTBuilder";
+//
+// class SuperTransformer {
+// 	has_super = false;
+// 	identifier!: string;
+// 	context: ts.TransformationContext;
+// 	result: ts.Statement;
+// 	iter: (node: ts.Node) => ts.Node;
+// 	constructor(line: ts.Statement, context: ts.TransformationContext, iter: (node: ts.Node) => ts.Node) {
+// 		this.iter = iter;
+// 		this.context = context;
+// 		//TODO: Check that this is OK.
+// 		this.result = <ts.Statement>this.find_super(line);
+// 		if (this.has_super) {
+// 			const f = ts.factory;
+// 			ts.createSourceFile("SuperTransformer.ts", `
+// 			`, ScriptTarget.ES5, true, ScriptKind.TS)
+//			
+// 			this.result = IF(
+// 				SUPER().DOT(ID(this.identifier)).OP("!==", LITERAL("undefined")).toAST(),
+// 				this.result
+// 			);
+// 		}
+// 	}
+//
+// 	find_identifier(node: ts.Node) {
+// 		if (node.kind == ts.SyntaxKind.Identifier) {
+// 			if (node.getText() != "_super") {
+// 				this.identifier = node.getText();
+// 			}
+// 		}
+// 	}
+//
+// 	//Change the _super call over to super.
+// 	find_super(node: ts.Node) {
+// 		var result: ts.Node;
+// 		if (ts.isPropertyAccessExpression(node)) {
+// 			var has_super = false;
+// 			var id: string | undefined;
+// 			result = ts.visitEachChild(node, (node) => {
+// 				if (ts.isIdentifier(node)) {
+// 					if (node.text == "_super") {
+// 						has_super = true;
+// 						let result: ts.Node = ts.factory.createIdentifier("super");
+// 						//ts.setOriginalNode(result, ts.getOriginalNode(node));
+// 						return result;
+// 					}
+// 					else {
+// 						id = node.text;
+// 					}
+// 				}
+// 				return node;
+// 			}, this.context);
+// 			if (has_super && id) {
+// 				this.has_super = has_super;
+// 				this.identifier = id;
+// 			}
+// 			return result;
+// 		}
+// 		if (ts.isBlock(node) || ts.isCaseBlock(node) || ts.isModuleBlock(node)) {
+// 			return this.iter(node);
+// 		}
+// 		result = ts.visitEachChild(node, this.find_super.bind(this), this.context);
+// 		return result;
+// 	}
+// }
+//
+// export default function (program: ts.Program, pluginOptions: {}) {
+// 	// let checker = program.getTypeChecker();
+// 	return (context: ts.TransformationContext) => {
+// 		setContext(context);
+// 		return (sourceFile: ts.SourceFile) => {
+// 			var parent = <any>{
+// 				kind: ts.SyntaxKind[sourceFile.kind],
+// 				flags: []
+// 			};
+// 			var map = new Map<ts.Node, any>();
+// 			map.set(sourceFile, parent);
+//
+// 			function visitor(node: ts.Node): ts.Node {
+// 				console.log(node);
+// 				if (!node.parent) (node as any).parent = sourceFile;
+// 				// if (ts.isCallExpression(node)) {
+// 				//     return ts.createLiteral('call');
+// 				// }
+// 				var description = {
+// 					kind: ts.SyntaxKind[node.kind],
+// 					flags: <string[]>[]
+// 				};
+// 				parent[(node as any).escapedText || node.getText()] = description;
+//
+//				
+// 				//console.log(ts.SyntaxKind[node.kind], (node as any).escapedText || node.getText());
+// 				for (var prop in ts.NodeFlags) {
+// 					if (typeof prop == "string") {
+// 						if ((node.flags & (ts.NodeFlags as any)[prop]) != 0) {
+// 							description.flags.push(prop);
+// 						}
+// 					}
+// 				}
+// 				//console.log(node.modifiers);
+// 				//if (node.kind == ts.SyntaxKind.Block) {
+// 				//	console.log(node);
+// 				//}
+// 				//console.log(node.decorators)
+// 				var temp = parent;
+// 				parent = description;
+// 				var result: ts.Node;
+// 				switch (node.kind) {
+// 					case ts.SyntaxKind.ExpressionStatement: case ts.SyntaxKind.FirstStatement:
+// 					case ts.SyntaxKind.ReturnStatement:
+// 						var transformed = new SuperTransformer(<ts.Statement>node, context, visitor);
+// 						result = transformed.result;
+// 						ts.visitEachChild(node, visitor, context);
+// 						break;
+// 					default:
+// 						result = ts.visitEachChild(node, visitor, context);
+// 					break;
+// 				}
+// 				parent = temp;
+//				
+// 				if (ts.isClassDeclaration(node)) {
+// 					ClassDeclaration.eachContextualNode(node, (node) => {
+// 						// if (ts.isFunctionLike(node)) {
+// 						// 	ts.visitEachChild(node);
+// 						// }
+// 						// if (ts.)
+// 						return node;
+// 					}, context);
+// 				}
+// 				else {
+// 					ts.visitEachChild(node, visitor, context);
+// 				}
+//
+//
+// 				return result;
+// 			}
+// 			var result =  ts.visitNode(sourceFile, visitor);
+// 			//console.log(sourceFile.fileName);
+// 			//console.log(parent);
+// 			//console.log(JSON.stringify(parent, null, 4));
+//
+// 			return result;
+// 		};
+// 	};
+// }
+// console.log("_SUPER ENABLED");
+//
+// console.log("SHOTO!");
 //# sourceMappingURL=SuperTransformer.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bikky/compiler",
-    "version": "0.0.10",
+    "version": "0.0.12",
     "description": "Typescript modified for compiling space squad",
     "main": "./Libraries/BiscuitLibraries.js",
     "author": {