@needle-tools/needle-component-compiler 1.1.0 → 1.2.0

package/Changelog.md

@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2022-06-15
+- allow adding ``@type(MyNamespace.MyType)`` to class declaration
+
 ## [1.1.0] - 2022-06-13
 - add ``@type(MyNamespace.MyType)`` decorator for fields to specifiy C# type
 - add minimal docs to readme

package/dist/NavigationManager.cs

@@ -0,0 +1,13 @@
+// auto generated code - do not edit directly
+
+#pragma warning disable
+
+namespace Needle.Typescript.GeneratedComponents
+{
+	public partial class NavigationManager : RoomEntity
+	{
+		public float @fl = 1f;
+		public void nav_forward(){}
+		public void nav_backward(){}
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/needle-component-compiler",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "description": "Compile mock unity components from typescript",
     "main": "index.js",
     "scripts": {

package/src/component-compiler.js

@@ -11,7 +11,7 @@ var exportNextClassCommand = "@generate-component";
 var dontExportNextClassCommand = "@dont-generate-component";
 // add above field to add [SerializeField] attribute
 var serializeCommand = "@serializeField";
-var typePattern = new RegExp("@type\((?<type>.+)\)");
+var typePattern = new RegExp("@type ?\((?<type>.+)\)");
 // will be set to true when e.g. a comment for export is found
 var exportNextClass = false;
 var dontExportNextClass = false;
@@ -78,16 +78,18 @@ function run(program, outputDir, sourceFile) {
         ts.forEachChild(node, traverseFile);
     }
     function visit(node) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         var context = contexts.length > 0 ? contexts[contexts.length - 1] : null;
-        if ((context === null || context === void 0 ? void 0 : context.classEnd) > 0 && node.pos >= (context === null || context === void 0 ? void 0 : context.classEnd)) {
-            while (context.indentLevel > 0) {
-                context.indentLevel -= 1;
-                context.append("}\n");
+        if (context) {
+            if ((context === null || context === void 0 ? void 0 : context.classEnd) > 0 && node.pos >= (context === null || context === void 0 ? void 0 : context.classEnd)) {
+                while (context.indentLevel > 0) {
+                    context.indentLevel -= 1;
+                    context.append("}\n");
+                }
+                context.flush();
+                context = null;
+                contexts.pop();
             }
-            context.flush();
-            context = null;
-            contexts.pop();
         }
         console.log("\t", ts.SyntaxKind[node.kind]);
         var commentRanges = ts.getLeadingCommentRanges(sourceFile.getFullText(), node.getFullStart());
@@ -107,26 +109,23 @@ function run(program, outputDir, sourceFile) {
                     }
                     else if (comment.includes(serializeCommand))
                         serializeField = true;
-                    else {
-                        console.log(comment);
-                        var match = typePattern.exec(comment);
-                        if (match && match.groups) {
-                            // for some reason our regex does also match surrounding ( ) even tho: https://regex101.com/r/PoWK6V/1
-                            // so we remove them
-                            var type = match.groups["type"];
-                            if (type.startsWith("("))
-                                type = type.slice(1);
-                            if (type.endsWith(")"))
-                                type = type.slice(0, -1);
-                            console.log("found type: ", type);
-                            lastTypeFound = type;
-                        }
-                    }
                 }
                 if (comment.includes(exportNextClassCommand))
                     exportNextClass = true;
                 if (comment.includes(dontExportNextClassCommand))
                     dontExportNextClass = true;
+                var match = typePattern.exec(comment);
+                if (match && match.groups) {
+                    // for some reason our regex does also match surrounding ( ) even tho: https://regex101.com/r/PoWK6V/1
+                    // so we remove them
+                    var type = match.groups["type"];
+                    if (type.startsWith("("))
+                        type = type.slice(1);
+                    if (type.endsWith(")"))
+                        type = type.slice(0, -1);
+                    console.log("found type: ", type);
+                    lastTypeFound = type;
+                }
             }
         }
         switch (node.kind) {
@@ -147,8 +146,8 @@ function run(program, outputDir, sourceFile) {
                 // const isCoroutine = func.asteriskToken;
                 if (meth.name) {
                     var paramsStr = "";
-                    for (var _d = 0, _e = meth.parameters; _d < _e.length; _d++) {
-                        var param = _e[_d];
+                    for (var _e = 0, _f = meth.parameters; _e < _f.length; _e++) {
+                        var param = _f[_e];
                         if (!param || !param.name)
                             continue;
                         if (paramsStr.length > 0)
@@ -181,8 +180,8 @@ function run(program, outputDir, sourceFile) {
                 var prefix = typeString === undefined ? "// " : "";
                 var assignment = "";
                 if (typeString !== undefined) {
-                    for (var _f = 0, _g = node.getChildren(); _f < _g.length; _f++) {
-                        var ch = _g[_f];
+                    for (var _g = 0, _h = node.getChildren(); _g < _h.length; _g++) {
+                        var ch = _h[_g];
                         switch (ch.kind) {
                             case ts.SyntaxKind.FalseKeyword:
                             case ts.SyntaxKind.TrueKeyword:
@@ -217,12 +216,11 @@ function run(program, outputDir, sourceFile) {
                 break;
             case ts.SyntaxKind.ClassDeclaration:
                 serializeField = false;
-                lastTypeFound = null;
                 var dec = node;
                 // a class must inherit a component
-                if (!dontExportNextClass && (exportNextClass || testInheritsComponent(node))) {
+                if (!dontExportNextClass && (lastTypeFound || exportNextClass || testInheritsComponent(node))) {
                     resetExportNextClass();
-                    var name_2 = dec.name.escapedText;
+                    var name_2 = (_d = dec.name) === null || _d === void 0 ? void 0 : _d.escapedText;
                     console.log("Found class: ", name_2);
                     var newContext = new ExportContext(outputDir, name_2 + ".cs");
                     newContext.appendLine("// auto generated code - do not edit directly");
@@ -233,12 +231,15 @@ function run(program, outputDir, sourceFile) {
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     // newContext.appendLine("// source: " + path.resolve(sourceFile.fileName));
-                    newContext.appendLine("public partial class " + name_2 + " : UnityEngine.MonoBehaviour");
+                    var typeName = lastTypeFound !== null && lastTypeFound !== void 0 ? lastTypeFound : "UnityEngine.MonoBehaviour";
+                    console.log(name_2 + " inherits " + typeName);
+                    newContext.appendLine("public partial class " + name_2 + " : " + typeName);
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     newContext.classEnd = dec.end;
                     contexts.push(newContext);
                 }
+                lastTypeFound = null;
                 break;
         }
         function testInheritsComponent(node) {

package/src/component-compiler.ts

@@ -11,7 +11,7 @@ const exportNextClassCommand = "@generate-component";
 const dontExportNextClassCommand = "@dont-generate-component";
 // add above field to add [SerializeField] attribute
 const serializeCommand = "@serializeField";
-const typePattern = new RegExp("@type\((?<type>.+)\)");
+const typePattern = new RegExp("@type ?\((?<type>.+)\)");
 
 // will be set to true when e.g. a comment for export is found
 let exportNextClass: boolean = false;
@@ -81,7 +81,7 @@ class ExportContext {
 
 const contexts: ExportContext[] = [];
 
-let lastTypeFound : string | null = null;
+let lastTypeFound: string | null = null;
 
 export function run(program: ts.Program, outputDir: string, sourceFile: ts.SourceFile) {
 
@@ -100,14 +100,16 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
     function visit(node: ts.Node) {
         let context: ExportContext | null = contexts.length > 0 ? contexts[contexts.length - 1] : null;
 
-        if (context?.classEnd > 0 && node.pos >= context?.classEnd) {
-            while (context.indentLevel > 0) {
-                context.indentLevel -= 1;
-                context.append("}\n");
+        if (context) {
+            if (context?.classEnd > 0 && node.pos >= context?.classEnd) {
+                while (context.indentLevel > 0) {
+                    context.indentLevel -= 1;
+                    context.append("}\n");
+                }
+                context.flush();
+                context = null;
+                contexts.pop();
             }
-            context.flush();
-            context = null;
-            contexts.pop();
         }
         console.log("\t", ts.SyntaxKind[node.kind]);
 
@@ -128,24 +130,21 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     }
                     else if (comment.includes(serializeCommand))
                         serializeField = true;
-                    else {
-                        console.log(comment);
-                        const match = typePattern.exec(comment);
-                        if(match && match.groups){
-                            // for some reason our regex does also match surrounding ( ) even tho: https://regex101.com/r/PoWK6V/1
-                            // so we remove them
-                            let type = match.groups["type"];
-                            if(type.startsWith("(")) type = type.slice(1);
-                            if(type.endsWith(")")) type = type.slice(0, -1);
-                            console.log("found type: ", type);
-                            lastTypeFound = type;
-                        }
-                    }
                 }
                 if (comment.includes(exportNextClassCommand))
                     exportNextClass = true;
                 if (comment.includes(dontExportNextClassCommand))
                     dontExportNextClass = true;
+                const match = typePattern.exec(comment);
+                if (match && match.groups) {
+                    // for some reason our regex does also match surrounding ( ) even tho: https://regex101.com/r/PoWK6V/1
+                    // so we remove them
+                    let type = match.groups["type"];
+                    if (type.startsWith("(")) type = type.slice(1);
+                    if (type.endsWith(")")) type = type.slice(0, -1);
+                    console.log("found type: ", type);
+                    lastTypeFound = type;
+                }
             }
         }
 
@@ -232,12 +231,11 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
 
             case ts.SyntaxKind.ClassDeclaration:
                 serializeField = false;
-                lastTypeFound = null;
                 const dec = <ts.ClassDeclaration>node;
                 // a class must inherit a component
-                if (!dontExportNextClass && (exportNextClass || testInheritsComponent(node))) {
+                if (!dontExportNextClass && (lastTypeFound || exportNextClass || testInheritsComponent(node))) {
                     resetExportNextClass();
-                    const name = dec.name.escapedText;
+                    const name = dec.name?.escapedText;
                     console.log("Found class: ", name);
                     const newContext = new ExportContext(outputDir, name + ".cs");
                     newContext.appendLine("// auto generated code - do not edit directly");
@@ -248,12 +246,15 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     // newContext.appendLine("// source: " + path.resolve(sourceFile.fileName));
-                    newContext.appendLine("public partial class " + name + " : UnityEngine.MonoBehaviour");
+                    const typeName = lastTypeFound ?? "UnityEngine.MonoBehaviour";
+                    console.log(name + " inherits " + typeName);
+                    newContext.appendLine("public partial class " + name + " : " + typeName);
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     newContext.classEnd = dec.end;
                     contexts.push(newContext);
                 }
+                lastTypeFound = null;
                 break;
         }
 

package/src/test.ts

@@ -1,22 +1,36 @@
 
 // @generate-component
 
+//@type (RoomEntity)
+export class NavigationManager extends RoomEntity {
 
-export class PointOfInterest extends Behaviour {
+    fl:number = 1;
 
-    myVal:number = 12;
-    
-    // @type(HELLO)
-    myFunction(){
+    nav_forward() {
 
     }
 
-    // @type(UnityEngine.Camera)
-    view?:Camera;
-    test:string = "123";
-    // test
+    nav_backward() { 
+
+    }
 }
 
+
+// export class PointOfInterest extends Behaviour {
+
+//     myVal:number = 12;
+    
+//     // @type(HELLO)
+//     myFunction(){
+
+//     }
+
+//     // @type(UnityEngine.Camera)
+//     view?:Camera;
+//     test:string = "123";
+//     // test
+// }
+
 // export class MaterialColorHandler extends Behaviour {
 
 //     @serializeable(Renderer)