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

package/Changelog.md

@@ -4,6 +4,14 @@ 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.11.1] - 2023-12-02
+- Fix: Use Unity AnimatorController type
+- Fix: method inline anonymous type declaration (e.g. `myMethod(arg: {x:number})`)
+
+## [1.11.0] - 2023-11-18
+- Add: support to wrap fields with `#if UNITY_EDITOR` if their namespace contains UnityEditor
+- Add: more threejs types to generate Unity Material fields for
+
 ## [1.10.3] - 2023-09-08
 - Add: Needle Engine type `RGBAColor` is now automatically emitted as `UnityEngine.Color`
 

package/package.json

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

package/src/component-compiler.js

@@ -270,7 +270,17 @@ function run(program, outputDir, sourceFile) {
                         var type = tryResolveTypeRecursive(param);
                         if (type === undefined)
                             type = "object";
-                        paramsStr += type + " @" + param.name.getText();
+                        var paramName = "";
+                        var paramNameKind = param.name.kind;
+                        switch (paramNameKind) {
+                            case ts.SyntaxKind.ObjectBindingPattern:
+                                paramName = "obj";
+                                break;
+                            default:
+                                paramName = param.name.getText();
+                                break;
+                        }
+                        paramsStr += type + " @" + paramName;
                     }
                     var methodName = meth.name.getText();
                     switch (methodName) {
@@ -377,7 +387,14 @@ function run(program, outputDir, sourceFile) {
                 if (allowDebugLogs)
                     console.log("EMIT member: \"" + typeString + "\" " + varName, assignment, "Last type found:", lastTypeFound);
                 var prefix = shouldCommentTheLine ? "// " : "";
+                var isUnityEditorType = typeString === null || typeString === void 0 ? void 0 : typeString.includes("UnityEditor");
+                if (isUnityEditorType) {
+                    context.appendLine("#if UNITY_EDITOR");
+                }
                 context.append(prefix + visibility + " " + typeString + " " + varName + assignment + ";" + postFix + "\n");
+                if (isUnityEditorType) {
+                    context.appendLine("#endif");
+                }
                 lastTypeFound = null;
                 if (requireEndIf) {
                     context.appendLine("#endif");
@@ -603,8 +620,30 @@ function run(program, outputDir, sourceFile) {
                 typeName = varDec.type.getText();
             }
             var res = undefined;
+            // if it's a { x: number } inline object type:
+            if (typeName.startsWith("{")) {
+                // check if it has XYZW we assume it's a vector
+                var hasX = typeName.includes("x");
+                var hasY = typeName.includes("y");
+                var hasZ = typeName.includes("z");
+                var hasW = typeName.includes("w");
+                if (hasX && hasY && hasZ && hasW) {
+                    return tryGetTypeFromText("Vector4");
+                }
+                else if (hasX && hasY && hasZ) {
+                    return tryGetTypeFromText("Vector3");
+                }
+                else if (hasX && hasY) {
+                    return tryGetTypeFromText("Vector2");
+                }
+                return "object";
+            }
+            // const kindName = ts.SyntaxKind[node.kind];
             // console.log("Unknown type: " + typeName);
             switch (node.kind) {
+                case ts.SyntaxKind.ObjectBindingPattern:
+                    res = "object";
+                    break;
                 // case ts.SyntaxKind.SyntaxList:
                 //     const list = node as ts.SyntaxList;
                 //     for (const ch of list._children) {

package/src/component-compiler.ts

@@ -305,7 +305,17 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
                         if (paramsStr.length > 0) paramsStr += ", ";
                         let type = tryResolveTypeRecursive(param);
                         if (type === undefined) type = "object";
-                        paramsStr += type + " @" + param.name.getText();
+                        let paramName = "";
+                        const paramNameKind = param.name.kind;
+                        switch (paramNameKind) {
+                            case ts.SyntaxKind.ObjectBindingPattern:
+                                paramName = "obj"
+                                break;
+                            default:
+                                paramName = param.name.getText();
+                                break;
+                        }
+                        paramsStr += type + " @" + paramName;
                     }
                     let methodName = meth.name.getText();
                     switch (methodName) {
@@ -409,7 +419,14 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
                 if (allowDebugLogs)
                     console.log("EMIT member: \"" + typeString + "\" " + varName, assignment, "Last type found:", lastTypeFound);
                 const prefix = shouldCommentTheLine ? "// " : "";
+                const isUnityEditorType = typeString?.includes("UnityEditor");
+                if (isUnityEditorType) {
+                    context.appendLine("#if UNITY_EDITOR");
+                }
                 context.append(prefix + visibility + " " + typeString + " " + varName + assignment + ";" + postFix + "\n");
+                if (isUnityEditorType) {
+                    context.appendLine("#endif");
+                }
                 lastTypeFound = null;
                 if (requireEndIf) {
                     context.appendLine("#endif");
@@ -632,11 +649,33 @@ export function run(program: ts.Program, outputDir: string | null, sourceFile: t
 
             let res: string | undefined = undefined;
 
+            // if it's a { x: number } inline object type:
+            if (typeName.startsWith("{")) {
+                // check if it has XYZW we assume it's a vector
+                const hasX = typeName.includes("x");
+                const hasY = typeName.includes("y");
+                const hasZ = typeName.includes("z");
+                const hasW = typeName.includes("w");
+                if (hasX && hasY && hasZ && hasW) {
+                    return tryGetTypeFromText("Vector4");
+                }
+                else if (hasX && hasY && hasZ) {
+                    return tryGetTypeFromText("Vector3");
+                }
+                else if (hasX && hasY) {
+                    return tryGetTypeFromText("Vector2");
+                }
 
+                return "object";
+            }
 
+            // const kindName = ts.SyntaxKind[node.kind];
             // console.log("Unknown type: " + typeName);
 
             switch (node.kind) {
+                case ts.SyntaxKind.ObjectBindingPattern:
+                    res = "object";
+                    break;
                 // case ts.SyntaxKind.SyntaxList:
                 //     const list = node as ts.SyntaxList;
                 //     for (const ch of list._children) {

package/src/types.js

@@ -37,10 +37,17 @@ const dict = {
     "AnimationClip" : "UnityEngine.AnimationClip",
     "SignalAsset" : "UnityEngine.Timeline.SignalAsset",
     "PlayableDirector" : "UnityEngine.Playables.PlayableDirector",
+    "AnimatorController": "UnityEditor.Animations.AnimatorController",
     // Rendering
     "Renderer" : "UnityEngine.Renderer",
     "Material" : "UnityEngine.Material",
+    "MeshBasicMaterial": "UnityEngine.Material",
+    "MeshPhysicalMaterial": "UnityEngine.Material",
+    "MeshStandardMaterial": "UnityEngine.Material",
+    "ShaderMaterial": "UnityEngine.Material",
+    "RawShaderMaterial": "UnityEngine.Material",
     "Mesh" : "UnityEngine.Mesh",
+    "SkinnedMesh" : "UnityEngine.Mesh",
     "Texture" : "UnityEngine.Texture",
     // UI
     "Text" : "UnityEngine.UI.Text",