@needle-tools/needle-component-compiler 1.12.1 → 1.12.2-b540994

package/Changelog.md

@@ -4,11 +4,10 @@ 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.12.1] - 2025-06-06
+## [1.12.2] - 2025-06-06
 - Fix: Private fields decorated with `@serializable()` should be annotated with `UnityEngine.SerializeField`
 - Fix: Comment for `// @serializeField` should not affect subsequent fields
 
-
 ## [1.12.0] - 2025-06-02
 - Add: Support to serialize unknown classes when annotated with `// @type object` 
 

package/Readme.md

@@ -15,4 +15,13 @@ Please run ``npm install`` first before using.
 - ``@type MyNamespace.MyType`` decorator for fields or classes, specifiy C# type of field or class
 - ``@ifdef MY_IFDEF`` field decorator only at the moment
 - ``@tooltip My Text`` field decorator, generates a Unity `[Tooltip("My Text")]`
-- ``@contextmenu MethodName`` method decorator, generates a `[ContextMenu("MethodName")]`
+- ``@contextmenu MethodName`` method decorator, generates a `[ContextMenu("MethodName")]`
+
+
+# Contact ✒️
+<b>[🌵 Needle](https://needle.tools)</b> •
+[Github](https://github.com/needle-tools) •
+[Twitter](https://twitter.com/NeedleTools) • 
+[Discord](https://discord.needle.tools) • 
+[Forum](https://forum.needle.tools) • 
+[Youtube](https://youtube.com/@needle-tools)

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "@needle-tools/needle-component-compiler",
-    "version": "1.12.1",
+    "version": "1.12.2-b540994",
     "description": "Compile mock unity components from typescript",
     "main": "index.js",
     "scripts": {
         "tsc": "tsc",
         "dev": "npm-watch compile",
-        "compile" : "tsc src/component-compiler.ts",
-        "test": "mocha -r ts-node/register test/**/*.test.ts"
+        "compile": "tsc src/component-compiler.ts",
+        "test": "mocha -r ts-node/register test/**/*.test.ts",
+        "test:dev": "mocha -r ts-node/register test/**/*.serializable.test.ts"
     },
     "dependencies": {
         "typescript": "^4.5.5"
@@ -22,13 +23,13 @@
         "npm-watch": "^0.13.0"
     },
     "watch": {
-      "compile": {
-        "patterns": [
-          "src/component-compiler.ts"
-        ],
-        "extensions": "ts",
-        "quiet": false
-      }
+        "compile": {
+            "patterns": [
+                "src/component-compiler.ts"
+            ],
+            "extensions": "ts",
+            "quiet": false
+        }
     },
     "author": {
         "name": "Needle",
@@ -40,7 +41,7 @@
         "url": "git+https://github.com/needle-tools/needle-tiny-component-compiler.git"
     },
     "publishConfig": {
-      "access": "public",
-      "registry": "https://registry.npmjs.org/"
+        "access": "public",
+        "registry": "https://registry.npmjs.org/"
     }
 }

package/src/component-compiler.js

@@ -247,15 +247,6 @@ function run(program, outputDir, sourceFile) {
             // case ts.SyntaxKind.SingleLineCommentTrivia:
             //     console.log("comment: " + node.getText())
             //     break;
-            case ts.SyntaxKind.Decorator:
-                {
-                    // If a field is decorated with @serializable then we want to serialize it
-                    var name_1 = node.getText();
-                    if (name_1.startsWith("@serializable(")) {
-                        serializeField = true;
-                    }
-                }
-                break;
             case ts.SyntaxKind.MethodDeclaration:
                 lastTypeFound = null;
                 serializeField = false;
@@ -318,6 +309,8 @@ function run(program, outputDir, sourceFile) {
                 var pub = shouldEmitMethod(vardec);
                 var visibility = pub ? "public" : "private";
                 var isAccessible = pub;
+                if (!pub)
+                    serializeField || (serializeField = testIsMarkedWithSerializable(node));
                 if (serializeField) {
                     if (allowDebugLogs)
                         console.log("Emit [UnityEngine.SerializeField]");
@@ -333,10 +326,10 @@ function run(program, outputDir, sourceFile) {
                         console.log("Skip because not public or serializeable");
                     break;
                 }
-                var name_2 = vardec.name.getText();
+                var name_1 = vardec.name.getText();
                 if (allowDebugLogs)
-                    console.log("Variable:", name_2);
-                if (name_2.startsWith("\"@") || name_2.startsWith("\"$") || name_2.startsWith("$"))
+                    console.log("Variable:", name_1);
+                if (name_1.startsWith("\"@") || name_1.startsWith("\"$") || name_1.startsWith("$"))
                     break;
                 var typeString = lastTypeFound !== null && lastTypeFound !== void 0 ? lastTypeFound : tryResolveTypeRecursive(node);
                 var postFix = "";
@@ -419,13 +412,13 @@ function run(program, outputDir, sourceFile) {
                 var inheritsComponent = testInheritsComponent(node);
                 if (!dontExportNextClass && (lastTypeFound || exportNextClass || inheritsComponent)) {
                     resetExportNextClass();
-                    var name_3 = (_g = dec.name) === null || _g === void 0 ? void 0 : _g.escapedText;
+                    var name_2 = (_g = dec.name) === null || _g === void 0 ? void 0 : _g.escapedText;
                     if (allowDebugLogs)
-                        console.log("Found class: ", name_3);
+                        console.log("Found class: ", name_2);
                     var namespace = (_h = tryParseNamespace(node)) !== null && _h !== void 0 ? _h : "Needle.Typescript.GeneratedComponents";
                     if (allowDebugLogs)
                         console.log("NAMESPACE", namespace);
-                    var newContext = new ExportContext(outputDir, name_3 + ".cs");
+                    var newContext = new ExportContext(outputDir, name_2 + ".cs");
                     newContext.appendLine("// auto generated code - do not edit directly");
                     newContext.appendLine("");
                     newContext.appendLine("#pragma warning disable");
@@ -440,7 +433,7 @@ function run(program, outputDir, sourceFile) {
                     if (lastTypeFound)
                         typeName_1 = lastTypeFound;
                     if (allowDebugLogs)
-                        console.log(name_3 + " inherits " + typeName_1);
+                        console.log(name_2 + " inherits " + typeName_1);
                     var modifiers = "";
                     if (dec.modifiers) {
                         for (var _p = 0, _q = dec.modifiers; _p < _q.length; _p++) {
@@ -449,7 +442,7 @@ function run(program, outputDir, sourceFile) {
                                 case "abstract":
                                     modifiers += " abstract";
                                     if (allowDebugLogs)
-                                        console.log(name_3 + " is abstract");
+                                        console.log(name_2 + " is abstract");
                                     break;
                             }
                         }
@@ -459,7 +452,7 @@ function run(program, outputDir, sourceFile) {
                     if (typeName_1 === "object") {
                         newContext.appendLine("[System.Serializable]");
                     }
-                    newContext.appendLine("public " + modifiers.trim() + " class " + name_3 + " : " + typeName_1);
+                    newContext.appendLine("public " + modifiers.trim() + " class " + name_2 + " : " + typeName_1);
                     newContext.appendLine("{");
                     newContext.indentLevel += 1;
                     newContext.classEnd = dec.end;
@@ -472,6 +465,22 @@ function run(program, outputDir, sourceFile) {
                 lastTypeFound = null;
                 break;
         }
+        function testIsMarkedWithSerializable(node) {
+            if (node.kind === ts.SyntaxKind.Decorator) {
+                // If a field is decorated with @serializable then we want to serialize it
+                var name_3 = node.getText();
+                if (name_3.startsWith("@serializable(")) {
+                    // if(allowDebugLogs) console.log("Found @serializable decorator");
+                    return true;
+                }
+            }
+            for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
+                var ch = _a[_i];
+                if (testIsMarkedWithSerializable(ch))
+                    return true;
+            }
+            return false;
+        }
         function testInheritsComponent(node) {
             switch (node.kind) {
                 case ts.SyntaxKind.ClassDeclaration:

package/tsconfig.json

@@ -1,8 +0,0 @@
-{
-    "compilerOptions": {
-        "types": [
-            "mocha",
-            "node"
-        ]
-    }
-}

package/workspace.code-workspace

@@ -1,15 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "../.github"
-		},
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"files.exclude": {
-		  "test/*.js": true
-		}
-	}
-}