@needle-tools/needle-component-compiler 1.10.1 → 1.10.3

package/Changelog.md

@@ -4,6 +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.10.3] - 2023-09-08
+- Add: Needle Engine type `RGBAColor` is now automatically emitted as `UnityEngine.Color`
+
+## [1.10.2] - 2023-09-08
+- Fix: `@type` was not properly applied for `new expression` cases (e.g. `new RGBAColor` should produce a `new Color` when decorated with `@type Color`)
+
 ## [1.10.1] - 2023-08-02
 - Add: use `@tooltip` to emit a UnityEngine.Tooltip
 - Update Readme

package/package.json

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

package/src/component-compiler.js

@@ -333,7 +333,7 @@ function run(program, outputDir, sourceFile) {
                                 // console.log("Unknown assignment:", ts.SyntaxKind[ch.kind]);
                                 break;
                             case ts.SyntaxKind.NewExpression:
-                                assignment = " = " + getTypeForAssignment(ch);
+                                assignment = " = " + getTypeForAssignment(ch, typeString);
                                 break;
                             case ts.SyntaxKind.FalseKeyword:
                             case ts.SyntaxKind.TrueKeyword:
@@ -467,7 +467,7 @@ function run(program, outputDir, sourceFile) {
             }
             return false;
         }
-        function getTypeForAssignment(node) {
+        function getTypeForAssignment(node, typeString) {
             // console.log("-------------------\nAssign", ts.SyntaxKind[node.kind]);
             switch (node.kind) {
                 case ts.SyntaxKind.FirstLiteralToken:
@@ -478,7 +478,7 @@ function run(program, outputDir, sourceFile) {
                     for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
                         var ch = _a[_i];
                         var text = ch.getText();
-                        // console.log("child", ts.SyntaxKind[ch.kind], text);
+                        console.log("child", ts.SyntaxKind[ch.kind], text);
                         switch (ch.kind) {
                             case ts.SyntaxKind.Identifier:
                             case ts.SyntaxKind.PropertyAccessExpression:
@@ -489,7 +489,7 @@ function run(program, outputDir, sourceFile) {
                                     var arg = _c[_b];
                                     if (args === undefined)
                                         args = "";
-                                    var res = getTypeForAssignment(arg);
+                                    var res = getTypeForAssignment(arg, typeString);
                                     // handle floats being assigned with "f" suffix
                                     if (Number.parseFloat(res) >= 0) {
                                         args += res + "f";
@@ -505,8 +505,11 @@ function run(program, outputDir, sourceFile) {
                     }
                     if (!args)
                         args = "";
-                    if (type) {
-                        console.log(type, args);
+                    if (type || typeString) {
+                        if (typeString) {
+                            console.log("Override type", type, typeString);
+                            type = typeString;
+                        }
                         return "new " + type + "(" + args + ")";
                     }
                     // const expType = node.getChildren().find(c => c.kind === ts.SyntaxKind.Identifier);

package/src/component-compiler.ts

@@ -366,7 +366,7 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
                                 // console.log("Unknown assignment:", ts.SyntaxKind[ch.kind]);
                                 break;
                             case ts.SyntaxKind.NewExpression:
-                                assignment = " = " + getTypeForAssignment(ch);
+                                assignment = " = " + getTypeForAssignment(ch, typeString);
                                 break;
                             case ts.SyntaxKind.FalseKeyword:
                             case ts.SyntaxKind.TrueKeyword:
@@ -493,7 +493,7 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
             return false;
         }
 
-        function getTypeForAssignment(node: ts.Node) {
+        function getTypeForAssignment(node: ts.Node, typeString?: string) {
             // console.log("-------------------\nAssign", ts.SyntaxKind[node.kind]);
             switch (node.kind) {
                 case ts.SyntaxKind.FirstLiteralToken:
@@ -503,7 +503,7 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
                     let args: string | undefined = undefined;
                     for (const ch of node.getChildren()) {
                         const text = ch.getText();
-                        // console.log("child", ts.SyntaxKind[ch.kind], text);
+                        console.log("child", ts.SyntaxKind[ch.kind], text);
                         switch (ch.kind) {
                             case ts.SyntaxKind.Identifier:
                             case ts.SyntaxKind.PropertyAccessExpression:
@@ -512,7 +512,7 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
                             case ts.SyntaxKind.SyntaxList:
                                 for (const arg of ch.getChildren()) {
                                     if (args === undefined) args = "";
-                                    const res = getTypeForAssignment(arg);
+                                    const res = getTypeForAssignment(arg, typeString);
                                     // handle floats being assigned with "f" suffix
                                     if (Number.parseFloat(res) >= 0) {
                                         args += res + "f";
@@ -526,13 +526,17 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
                         }
                     }
                     if (!args) args = "";
-                    if (type) {
-                        console.log(type, args)
+                    if (type || typeString) {
+                        if (typeString) {
+                            console.log("Override type", type, typeString)
+                            type = typeString;
+                        }
                         return "new " + type + "(" + args + ")";
                     }
                     // const expType = node.getChildren().find(c => c.kind === ts.SyntaxKind.Identifier);
                     break;
             }
+
             const str = node.getText();
             if (allowDebugLogs)
                 console.log("Unknown assignment:", str, ts.SyntaxKind[node.kind]);

package/src/types.js

@@ -24,6 +24,7 @@ const dict = {
     "AudioSource" : "UnityEngine.AudioSource",
     "THREE.Color" : "UnityEngine.Color",
     "Color" : "UnityEngine.Color",
+    "RGBAColor" : "UnityEngine.Color",
     "THREE.Vector2" : "UnityEngine.Vector2",
     "Vector2" : "UnityEngine.Vector2",
     "THREE.Vector3" : "UnityEngine.Vector3",