@needle-tools/needle-component-compiler 1.6.0 → 1.6.3

package/Changelog.md

@@ -4,7 +4,13 @@ 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.6.0] - 2022-07-10
+## [1.6.3] - 2022-07-12
+- add warning when class type is unknown
+
+## [1.6.2] - 2022-07-11
+- fix ``@type`` for class declaration
+
+## [1.6.1] - 2022-07-10
 - add using ``types.json`` json file that will be generated from Unity
 - change ``@type`` annotiation to only work without braces to be consistent
 

package/package.json

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

package/src/component-compiler.js

@@ -12,8 +12,8 @@ var exportNextClassCommand = "@generate-component";
 var dontExportNextClassCommand = "@dont-generate-component";
 // add above field to add [SerializeField] attribute
 var serializeCommand = "@serializeField";
-// https://regex101.com/r/ltpcKT/1
-var typePattern = new RegExp("@type ?(<type>[\w\.]+)");
+// https://regex101.com/r/ltpcKT/2
+var typePattern = new RegExp("@type ?(?<type>.+)");
 var ifdefPattern = new RegExp("@ifdef ?(?<ifdef>.+)");
 var CODEGEN_MARKER_START = "// NEEDLE_CODEGEN_START";
 var CODEGEN_MARKER_END = "// NEEDLE_CODEGEN_END";
@@ -38,7 +38,8 @@ function tryGetKnownType(str) {
     }
     if (typesFileContent) {
         var fullType = typesFileContent[str];
-        console.log(fullType);
+        if (fullType)
+            console.log(fullType);
         return fullType;
     }
     return null;
@@ -114,7 +115,7 @@ function run(program, outputDir, sourceFile) {
         ts.forEachChild(node, traverseFile);
     }
     function visit(node) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         var context = contexts.length > 0 ? contexts[contexts.length - 1] : null;
         if (context) {
             if ((context === null || context === void 0 ? void 0 : context.classEnd) > 0 && node.pos >= (context === null || context === void 0 ? void 0 : context.classEnd)) {
@@ -156,7 +157,7 @@ function run(program, outputDir, sourceFile) {
                     // so we remove them
                     var type = typeMatch.groups["type"];
                     type = type.replace(/\(/, "").replace(/\)/, "");
-                    console.log("found type: ", type);
+                    console.log("Found type: ", type);
                     lastTypeFound = type;
                 }
                 var ifdefMatch = ifdefPattern.exec(comment);
@@ -194,8 +195,8 @@ function run(program, outputDir, sourceFile) {
                 // const isCoroutine = func.asteriskToken;
                 if (meth.name) {
                     var paramsStr = "";
-                    for (var _f = 0, _g = meth.parameters; _f < _g.length; _f++) {
-                        var param = _g[_f];
+                    for (var _g = 0, _h = meth.parameters; _g < _h.length; _g++) {
+                        var param = _h[_g];
                         if (!param || !param.name)
                             continue;
                         if (paramsStr.length > 0)
@@ -228,8 +229,8 @@ function run(program, outputDir, sourceFile) {
                 var prefix = typeString === undefined ? "// " : "";
                 var assignment = "";
                 if (typeString !== undefined) {
-                    for (var _h = 0, _j = node.getChildren(); _h < _j.length; _h++) {
-                        var ch = _j[_h];
+                    for (var _j = 0, _k = node.getChildren(); _j < _k.length; _j++) {
+                        var ch = _k[_j];
                         switch (ch.kind) {
                             case ts.SyntaxKind.FalseKeyword:
                             case ts.SyntaxKind.TrueKeyword:
@@ -290,9 +291,11 @@ function run(program, outputDir, sourceFile) {
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     // newContext.appendLine("// source: " + path.resolve(sourceFile.fileName));
-                    var typeName = lastTypeFound !== null && lastTypeFound !== void 0 ? lastTypeFound : "UnityEngine.MonoBehaviour";
+                    var typeName = "UnityEngine.MonoBehaviour";
                     if (typeof inheritsComponent === "string")
                         typeName = inheritsComponent;
+                    if (lastTypeFound)
+                        typeName = lastTypeFound;
                     console.log(name_2 + " inherits " + typeName);
                     newContext.appendLine("public partial class " + name_2 + " : " + typeName);
                     newContext.appendLine("{");
@@ -300,6 +303,9 @@ function run(program, outputDir, sourceFile) {
                     newContext.classEnd = dec.end;
                     contexts.push(newContext);
                 }
+                else {
+                    console.log("Class type is unknown and will not generate a component: ", (_f = dec.name) === null || _f === void 0 ? void 0 : _f.escapedText);
+                }
                 lastTypeFound = null;
                 break;
         }
@@ -321,7 +327,6 @@ function run(program, outputDir, sourceFile) {
                                     return true;
                                 if (text === "Behaviour")
                                     return true;
-                                console.log(text);
                                 var known = tryGetKnownType(text);
                                 if (known)
                                     return known;

package/src/component-compiler.ts

@@ -11,8 +11,8 @@ const exportNextClassCommand = "@generate-component";
 const dontExportNextClassCommand = "@dont-generate-component";
 // add above field to add [SerializeField] attribute
 const serializeCommand = "@serializeField";
-// https://regex101.com/r/ltpcKT/1
-const typePattern = new RegExp("@type ?(<type>[\w\.]+)");
+// https://regex101.com/r/ltpcKT/2
+const typePattern = new RegExp("@type ?(?<type>.+)");
 const ifdefPattern = new RegExp("@ifdef ?(?<ifdef>.+)")
 
 const CODEGEN_MARKER_START = "// NEEDLE_CODEGEN_START";
@@ -43,7 +43,8 @@ function tryGetKnownType(str: string): string | null {
 
     if (typesFileContent) {
         const fullType = typesFileContent[str];
-        console.log(fullType);
+        if (fullType)
+            console.log(fullType);
         return fullType;
     }
     return null;
@@ -181,7 +182,7 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     // so we remove them
                     let type = typeMatch.groups["type"];
                     type = type.replace(/\(/, "").replace(/\)/, "");
-                    console.log("found type: ", type);
+                    console.log("Found type: ", type);
                     lastTypeFound = type;
                 }
 
@@ -312,8 +313,9 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     // newContext.appendLine("// source: " + path.resolve(sourceFile.fileName));
-                    let typeName = lastTypeFound ?? "UnityEngine.MonoBehaviour";
+                    let typeName = "UnityEngine.MonoBehaviour";
                     if (typeof inheritsComponent === "string") typeName = inheritsComponent;
+                    if (lastTypeFound) typeName = lastTypeFound;
                     console.log(name + " inherits " + typeName);
                     newContext.appendLine("public partial class " + name + " : " + typeName);
                     newContext.appendLine("{");
@@ -321,6 +323,9 @@ export function run(program: ts.Program, outputDir: string, sourceFile: ts.Sourc
                     newContext.classEnd = dec.end;
                     contexts.push(newContext);
                 }
+                else {
+                    console.log("Class type is unknown and will not generate a component: ", dec.name?.escapedText);
+                }
                 lastTypeFound = null;
                 break;
         }

package/src/test.ts

@@ -1,13 +1,28 @@
 
+class Test123 {}
+
+export class Bla extends Test123
+{
+
+} 
+
+// //@type UnityEngine.MonoBehaviour
+// export class ButtonObject extends Interactable implements IPointerClickHandler, ISerializable {
+
+//     //@type UnityEngine.Transform[]
+//     myType?: SceneFXWindow;
+// }
+
 // import { Behaviour } from "needle.tiny.engine/engine-components/Component";
 // import { RoomEntity } from "./Room";
 
-import { Behaviour } from "needle.tiny.engine/engine-components/Component";
+// import { Behaviour } from "needle.tiny.engine/engine-components/Component";
 
-export class MyNewScript extends DriveClient
-{
-    texture : RenderTexture;  
-}    
+// export class MyNewScript extends DriveClient
+// {
+//     //@type test
+//     texture : RenderTexture;  
+// }    
 
 // namespace Hello.World
 // {

package/src/component.cs

@@ -1 +0,0 @@
-public class MyClass : MonoBehaviour {