@needle-tools/needle-component-compiler 1.7.2 → 1.7.3

package/Changelog.md

@@ -4,7 +4,12 @@ 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.7.1] - 2022-07-27
+## [1.7.3] - 2022-09-02
+- Fix codegen for unknown array types
+- Fix codegen for abstract classes
+- Fix codegen for types imported as e.g. THREE.AnimationClip
+
+## [1.7.2] - 2022-07-27
 - fix UnityEvent codegen
 
 ## [1.7.1] - 2022-07-25

package/PUBLISH.bat

@@ -0,0 +1,8 @@
+@echo off
+echo Press a key to publish! (close the window if you changed your mind)
+pause
+echo Publishing in 2 sec
+timeout 2
+npm set registry https://registry.npmjs.org && npm publish
+echo Finished...
+timeout 10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/needle-component-compiler",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "description": "Compile mock unity components from typescript",
     "main": "index.js",
     "scripts": {
@@ -16,5 +16,9 @@
         "name": "Needle",
         "email": "help@needle.tools",
         "url": "https://needle.tools/"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/needle-tools/needle-tiny-component-compiler.git"
     }
-}
+}

package/src/component-compiler.js

@@ -155,10 +155,10 @@ function run(program, outputDir, sourceFile) {
                 if (typeMatch && typeMatch.groups) {
                     // for some reason our regex does also match surrounding ( ) even tho: https://regex101.com/r/PoWK6V/1
                     // so we remove them
-                    var type = typeMatch.groups["type"];
-                    type = type.replace(/\(/, "").replace(/\)/, "");
-                    console.log("Found type: ", type);
-                    lastTypeFound = type;
+                    var type_1 = typeMatch.groups["type"];
+                    type_1 = type_1.replace(/\(/, "").replace(/\)/, "");
+                    console.log("Found type: ", type_1);
+                    lastTypeFound = type_1;
                 }
                 var ifdefMatch = ifdefPattern.exec(comment);
                 if (ifdefMatch && ifdefMatch.groups) {
@@ -201,10 +201,10 @@ function run(program, outputDir, sourceFile) {
                             continue;
                         if (paramsStr.length > 0)
                             paramsStr += ", ";
-                        var type = tryResolveTypeRecursive(param);
-                        if (type === undefined)
-                            type = "object";
-                        paramsStr += type + " @" + param.name.getText();
+                        var type_2 = tryResolveTypeRecursive(param);
+                        if (type_2 === undefined)
+                            type_2 = "object";
+                        paramsStr += type_2 + " @" + param.name.getText();
                     }
                     var methodName = meth.name.getText();
                     context.onBeforeMethod(methodName);
@@ -241,7 +241,6 @@ function run(program, outputDir, sourceFile) {
                 if (typeString === undefined) {
                     postFix = " → Could not resolve C# type";
                 }
-                var prefix = typeString === undefined ? "// " : "";
                 var assignment = "";
                 if (typeString !== undefined) {
                     for (var _j = 0, _k = node.getChildren(); _j < _k.length; _j++) {
@@ -284,7 +283,13 @@ function run(program, outputDir, sourceFile) {
                 }
                 if (typeString === undefined)
                     typeString = typeName;
-                console.log("EMIT member: " + typeString + " " + varName);
+                if (typeString === "[]") {
+                    console.log("Unknown array type for \"" + varName + " " + typeName + "\" - your type is probably not known (did you just create it this session?) and you might need to regenerate the Typemap in Unity. Go to \"Needle Engine/Internal/Generate Type Map for component compiler");
+                    typeString = "object[]";
+                    assignment = " = new object[0]";
+                }
+                console.log("EMIT member: \"" + typeString + "\" " + varName, assignment, "Last type found:", lastTypeFound);
+                var prefix = typeString === undefined ? "// " : "";
                 context.append(prefix + visibility + " " + typeString + " " + varName + assignment + ";" + postFix + "\n");
                 lastTypeFound = null;
                 if (requireEndIf) {
@@ -317,7 +322,20 @@ function run(program, outputDir, sourceFile) {
                     if (lastTypeFound)
                         typeName_1 = lastTypeFound;
                     console.log(name_2 + " inherits " + typeName_1);
-                    newContext.appendLine("public partial class " + name_2 + " : " + typeName_1);
+                    var modifiers = "";
+                    if (dec.modifiers) {
+                        for (var _l = 0, _m = dec.modifiers; _l < _m.length; _l++) {
+                            var mod = _m[_l];
+                            switch (mod.getText()) {
+                                case "abstract":
+                                    modifiers += " abstract";
+                                    console.log(name_2 + " is abstract");
+                                    break;
+                            }
+                        }
+                    }
+                    modifiers += " partial";
+                    newContext.appendLine("public " + modifiers.trim() + " class " + name_2 + " : " + typeName_1);
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     newContext.classEnd = dec.end;
@@ -339,10 +357,10 @@ function run(program, outputDir, sourceFile) {
                             if (h.types.length <= 0)
                                 continue;
                             for (var _b = 0, _c = h.types; _b < _c.length; _b++) {
-                                var type = _c[_b];
+                                var type_3 = _c[_b];
                                 // const symbol = program.getTypeChecker().getSymbolAtLocation(type.expression);
                                 // console.log(symbol);
-                                var text = type.expression.getText();
+                                var text = type_3.expression.getText();
                                 if (text === "Component")
                                     return true;
                                 if (text === "Behaviour")
@@ -363,7 +381,7 @@ function run(program, outputDir, sourceFile) {
                 case ts.SyntaxKind.FirstLiteralToken:
                     return node.getText();
                 case ts.SyntaxKind.NewExpression:
-                    var type = undefined;
+                    var type_4 = undefined;
                     var args = undefined;
                     for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
                         var ch = _a[_i];
@@ -372,7 +390,7 @@ function run(program, outputDir, sourceFile) {
                         switch (ch.kind) {
                             case ts.SyntaxKind.Identifier:
                             case ts.SyntaxKind.PropertyAccessExpression:
-                                type = tryGetTypeFromText(text);
+                                type_4 = tryGetTypeFromText(text);
                                 break;
                             case ts.SyntaxKind.SyntaxList:
                                 args = text;
@@ -381,8 +399,8 @@ function run(program, outputDir, sourceFile) {
                     }
                     if (!args)
                         args = "";
-                    if (type)
-                        return "new " + type + "(" + args + ")";
+                    if (type_4)
+                        return "new " + type_4 + "(" + args + ")";
                     // const expType = node.getChildren().find(c => c.kind === ts.SyntaxKind.Identifier);
                     break;
             }
@@ -430,6 +448,14 @@ function run(program, outputDir, sourceFile) {
             return namespace;
         }
         function tryGetTypeFromText(typeName) {
+            // if a type is imported via some namespace e.g. THREE.AnimationClip
+            // we want to remove that namespace / import name
+            var separatorIndex = typeName.lastIndexOf(".");
+            if (separatorIndex > 0) {
+                var newName = typeName.substring(separatorIndex + 1);
+                console.log("Remove import name from type: \"" + typeName + "\" → \"" + newName + "\"");
+                typeName = newName;
+            }
             var res = dict[typeName];
             if (res === undefined) {
                 switch (typeName) {
@@ -441,6 +467,7 @@ function run(program, outputDir, sourceFile) {
                         break;
                 }
             }
+            // console.log(typeName, res);
             return res;
         }
         function tryResolveTypeRecursive(node) {

package/src/component-compiler.ts

@@ -4,6 +4,7 @@ import * as fs from "fs";
 import * as path from 'path';
 
 import * as types from "./types";
+import { type } from "os";
 const dict = types.dict;
 
 // add either of these two comments above a class to enforce code gen or disable it for the next class
@@ -264,7 +265,6 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                 if (typeString === undefined) {
                     postFix = " → Could not resolve C# type";
                 }
-                const prefix = typeString === undefined ? "// " : "";
                 let assignment = "";
                 if (typeString !== undefined) {
                     for (const ch of node.getChildren()) {
@@ -305,7 +305,13 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     context.appendLine("#ifdef " + ifdefSections.pop());
                 }
                 if (typeString === undefined) typeString = typeName;
-                console.log("EMIT member: " + typeString + " " + varName)
+                if (typeString === "[]") {
+                    console.log("Unknown array type for \"" + varName + " " + typeName + "\" - your type is probably not known (did you just create it this session?) and you might need to regenerate the Typemap in Unity. Go to \"Needle Engine/Internal/Generate Type Map for component compiler")
+                    typeString = "object[]";
+                    assignment = " = new object[0]";
+                }
+                console.log("EMIT member: \"" + typeString + "\" " + varName, assignment, "Last type found:", lastTypeFound);
+                const prefix = typeString === undefined ? "// " : "";
                 context.append(prefix + visibility + " " + typeString + " " + varName + assignment + ";" + postFix + "\n");
                 lastTypeFound = null;
                 if (requireEndIf) {
@@ -337,7 +343,19 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     if (typeof inheritsComponent === "string") typeName = inheritsComponent;
                     if (lastTypeFound) typeName = lastTypeFound;
                     console.log(name + " inherits " + typeName);
-                    newContext.appendLine("public partial class " + name + " : " + typeName);
+                    let modifiers = "";
+                    if (dec.modifiers) {
+                        for (const mod of dec.modifiers) {
+                            switch (mod.getText()) {
+                                case "abstract":
+                                    modifiers += " abstract";
+                                    console.log(name + " is abstract");
+                                    break;
+                            }
+                        }
+                    }
+                    modifiers += " partial";
+                    newContext.appendLine("public " + modifiers.trim() + " class " + name + " : " + typeName);
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     newContext.classEnd = dec.end;
@@ -444,6 +462,16 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
         }
 
         function tryGetTypeFromText(typeName: string) {
+
+            // if a type is imported via some namespace e.g. THREE.AnimationClip
+            // we want to remove that namespace / import name
+            const separatorIndex = typeName.lastIndexOf(".");
+            if (separatorIndex > 0) {
+                let newName = typeName.substring(separatorIndex + 1);
+                console.log("Remove import name from type: \"" + typeName + "\" → \"" + newName + "\"");
+                typeName = newName;
+            }
+
             let res = dict[typeName];
             if (res === undefined) {
                 switch (typeName) {
@@ -455,6 +483,7 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                         break;
                 }
             }
+            // console.log(typeName, res);
             return res;
         }
 

package/src/test.ts

@@ -1,34 +1,49 @@
 import { ThisExpression } from "typescript";
 
 
-    
-export class EventComponent extends Behaviour {    
-    @serializeable(EventList)
-    roomChanged: EventList = new EventList();
-}
+// export class ComponentWithAnimationClip extends Behaviour implements IPointerClickHandler {
 
-export class SocLoader extends Behaviour {    
+//     @serializeable(AnimationClip)
+//     animation?: THREE.AnimationClip;
+// }
 
-    @serializeable(AssetReference) 
-    scenes: Array<AssetReference> = [];
+export abstract class MyAbstractComponent extends Behaviour {
+    abstract myMethod();
 }
-// class Test123 {}
-
-export class Bla extends Behaviour
-{
-    myNumber:number = 42;
-    myBool:boolean = true;
-    myString:string = "test";
-    numberArr: number[] = [1,2,3];
-    myColor : THREE.Color = new THREE.Color(255, 0, 0);
-    renderers = new Array<Renderer>();
-    renderers2 : Renderer[] = [];
-    objArr : object[];
-    colArr: THREE.Color[] = [new THREE.Color(1,2,3)];
-    map : Map<string> = new Map<string>();
-    map2 : Map<object> = new Map<object>();
-    private myThing : Test123;
-} 
+
+
+// export class CameraView extends Behaviour {
+//     static views: CameraView[] = [];
+// }
+
+    
+// export class EventComponent extends Behaviour {    
+//     @serializeable(EventList)
+//     roomChanged: EventList = new EventList();
+// }
+
+// export class SocLoader extends Behaviour {    
+
+//     @serializeable(AssetReference) 
+//     scenes: Array<AssetReference> = [];
+// }
+// // class Test123 {}
+
+// export class Bla extends Behaviour
+// {
+//     myNumber:number = 42;
+//     myBool:boolean = true;
+//     myString:string = "test";
+//     numberArr: number[] = [1,2,3];
+//     myColor : THREE.Color = new THREE.Color(255, 0, 0);
+//     renderers = new Array<Renderer>();
+//     renderers2 : Renderer[] = [];
+//     objArr : object[];
+//     colArr: THREE.Color[] = [new THREE.Color(1,2,3)];
+//     map : Map<string> = new Map<string>();
+//     map2 : Map<object> = new Map<object>();
+//     private myThing : Test123;
+// } 
 
 // //@type UnityEngine.MonoBehaviour
 // export class ButtonObject extends Interactable implements IPointerClickHandler, ISerializable {