@needle-tools/needle-component-compiler 1.9.1 → 1.9.2

package/Changelog.md

@@ -4,6 +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.9.2] - 2022-11-29
+- Fix codegen deleting code added manually outside of codegen sections
+- Fix codegen creating output directory if it does not exist yet
+
 ## [1.9.1] - 2022-11-05
 - Fix ``new Vector2(1, .5)`` generating invalid C# where number arguments were emitted as double instead of float
 

package/package.json

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

package/schemes/MyNew.component.json

@@ -0,0 +1 @@
+{
    "MyNew": {
    }

package/schemes/MyTest.component.json

@@ -0,0 +1 @@
+{
    "MyTest": {
        "myMethod": {
            "type": "fn"
        }
    }

package/src/component-compiler.js

@@ -95,9 +95,11 @@ var ExportContext = /** @class */ (function () {
         this.textBuffer = CODEGEN_MARKER_START + "\n" + this.textBuffer + "\n" + CODEGEN_MARKER_END;
         var code = this.textBuffer;
         if (this.outputDir !== null) {
+            if (!fs.existsSync(this.outputDir))
+                fs.mkdirSync(this.outputDir);
             var dir = this.outputDir + "/";
             var path_1 = dir + this.fileName;
-            this.replaceGeneratedCodeSection(path_1);
+            code = this.replaceGeneratedCodeSection(path_1, code);
             if (allowDebugLogs)
                 console.log("Write to " + path_1);
             fs.writeFileSync(path_1, code);
@@ -109,7 +111,7 @@ var ExportContext = /** @class */ (function () {
         this.textBuffer = "";
         this.classEnd = -1;
     };
-    ExportContext.prototype.replaceGeneratedCodeSection = function (path) {
+    ExportContext.prototype.replaceGeneratedCodeSection = function (path, code) {
         if (fs.existsSync(path)) {
             var existing = fs.readFileSync(path, "utf8");
             var regex = new RegExp("(?<before>.*?)\/\/ ?NEEDLE_CODEGEN_START.+\/\/ ?NEEDLE_CODEGEN_END(?<after>.*)", "s");
@@ -119,9 +121,10 @@ var ExportContext = /** @class */ (function () {
                     console.log("Found codegen sections");
                 var before_1 = matches.groups.before;
                 var after_1 = matches.groups.after;
-                this.textBuffer = before_1 + this.textBuffer + after_1;
+                return before_1 + code + after_1;
             }
         }
+        return code;
     };
     return ExportContext;
 }());

package/src/component-compiler.ts

@@ -112,11 +112,13 @@ class ExportContext {
     flush(): string {
         if (this.textBuffer.length <= 0) return;
         this.textBuffer = CODEGEN_MARKER_START + "\n" + this.textBuffer + "\n" + CODEGEN_MARKER_END;
-        const code = this.textBuffer;
+        let code = this.textBuffer;
         if (this.outputDir !== null) {
+            if(!fs.existsSync(this.outputDir)) 
+                fs.mkdirSync(this.outputDir);
             const dir = this.outputDir + "/";
             const path = dir + this.fileName;
-            this.replaceGeneratedCodeSection(path);
+            code = this.replaceGeneratedCodeSection(path, code);
             if (allowDebugLogs)
                 console.log("Write to " + path);
             fs.writeFileSync(path, code);
@@ -130,7 +132,7 @@ class ExportContext {
         this.classEnd = -1;
     }
 
-    private replaceGeneratedCodeSection(path: string) {
+    private replaceGeneratedCodeSection(path: string, code:string) {
         if (fs.existsSync(path)) {
             const existing = fs.readFileSync(path, "utf8");
             const regex = new RegExp("(?<before>.*?)\/\/ ?NEEDLE_CODEGEN_START.+\/\/ ?NEEDLE_CODEGEN_END(?<after>.*)", "s");
@@ -140,9 +142,10 @@ class ExportContext {
                     console.log("Found codegen sections")
                 const before = matches.groups.before;
                 const after = matches.groups.after;
-                this.textBuffer = before + this.textBuffer + after;
+                return before + code + after;
             }
         }
+        return code;
     }
 }
 

package/src/test.js

@@ -20,7 +20,7 @@ var MyTestComponent = /** @class */ (function (_super) {
     __extends(MyTestComponent, _super);
     function MyTestComponent() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.myVector2 = new Vector2(1, .5);
+        _this.myVecgfdsgtor2 = new Vector2(1, .5);
         return _this;
     }
     MyTestComponent.prototype.myMethod = function () {

package/src/test.ts

@@ -1,7 +1,7 @@
 import { ThisExpression } from "typescript";
 
 export class MyTestComponent extends Behaviour {
-    public myVector2: Vector2 = new Vector2(1, .5);
+    public myVecgfdsgtor2: Vector2 = new Vector2(1, .5);
     private myMethod(){
         
     }

package/test/blender/codegen/basic/expected.component.json

@@ -0,0 +1,4 @@
+{
+            "BasicComponent": {
+            }
+        }

package/test/blender/codegen/basic/input.js

@@ -0,0 +1,26 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.BasicComponent = void 0;
+var BasicComponent = /** @class */ (function (_super) {
+    __extends(BasicComponent, _super);
+    function BasicComponent() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return BasicComponent;
+}(Behaviour));
+exports.BasicComponent = BasicComponent;

package/test/blender/codegen/basic/input.ts

@@ -0,0 +1,3 @@
+export class BasicComponent extends Behaviour {
+  }
+  

package/test/blender/codegen/basic/output.component.json

@@ -0,0 +1 @@
+{
    "BasicComponent": {
    }

package/test/blender/codegen/float field/expected.component.json

@@ -0,0 +1,8 @@
+{
+            "BasicComponent": {
+                "myFloat": {
+                    "type": "float",
+                    "value": 42
+                }
+            }
+        }

package/test/blender/codegen/float field/input.js

@@ -0,0 +1,28 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.BasicComponent = void 0;
+var BasicComponent = /** @class */ (function (_super) {
+    __extends(BasicComponent, _super);
+    function BasicComponent() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.myFloat = 42;
+        return _this;
+    }
+    return BasicComponent;
+}(Behaviour));
+exports.BasicComponent = BasicComponent;

package/test/blender/codegen/float field/input.ts

@@ -0,0 +1,4 @@
+export class BasicComponent extends Behaviour {
+            myFloat:number = 42;
+  }
+  

package/test/blender/codegen/float field/output.component.json

@@ -0,0 +1 @@
+{
    "BasicComponent": {
        "myFloat": {
            "type": "float",
            "value": 42
        }
    }

package/test/blender/codegen/reference_animation/expected.component.json

@@ -0,0 +1,7 @@
+{
+        "BasicComponent": {
+            "animation": {
+                "type": "comp"
+            }
+        }
+    }

package/test/blender/codegen/reference_animation/input.js

@@ -0,0 +1,35 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+exports.__esModule = true;
+exports.BasicComponent = void 0;
+var BasicComponent = /** @class */ (function (_super) {
+    __extends(BasicComponent, _super);
+    function BasicComponent() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    __decorate([
+        serializable(Behaviour)
+    ], BasicComponent.prototype, "animation");
+    return BasicComponent;
+}(Behaviour));
+exports.BasicComponent = BasicComponent;

package/test/blender/codegen/reference_animation/input.ts

@@ -0,0 +1,4 @@
+export class BasicComponent extends Behaviour {
+        @serializable(Behaviour)
+        animation : Animation;
+}

package/test/blender/codegen/reference_animation/output.component.json

@@ -0,0 +1 @@
+{
    "BasicComponent": {
        "animation": {
            "type": "animation"
        }
    }

package/test/blender/codegen/reference_behaviour/expected.component.json

@@ -0,0 +1,7 @@
+{
+          "BasicComponent": {
+              "basicComponent": {
+                  "type": "comp"
+              }
+          }
+      }

package/test/blender/codegen/reference_behaviour/input.js

@@ -0,0 +1,35 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+exports.__esModule = true;
+exports.BasicComponent = void 0;
+var BasicComponent = /** @class */ (function (_super) {
+    __extends(BasicComponent, _super);
+    function BasicComponent() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    __decorate([
+        serializable(Behaviour)
+    ], BasicComponent.prototype, "basicComponent");
+    return BasicComponent;
+}(Behaviour));
+exports.BasicComponent = BasicComponent;

package/test/blender/codegen/reference_behaviour/input.ts

@@ -0,0 +1,5 @@
+export class BasicComponent extends Behaviour {
+          @serializable(Behaviour)
+          basicComponent : Behaviour;
+  }
+  

package/test/blender/codegen/reference_behaviour/output.component.json

@@ -0,0 +1 @@
+{
    "BasicComponent": {
        "basicComponent": {
            "type": "comp"
        }
    }

package/test/component.basic.test.ts

@@ -50,3 +50,4 @@ describe('Basic typescript', () => {
 
 });
 
+

package/test/csharp/codegen/abstract method/expected.cs

@@ -0,0 +1,14 @@
+// NEEDLE_CODEGEN_START
+    // auto generated code - do not edit directly
+    
+    #pragma warning disable
+    
+    namespace Needle.Typescript.GeneratedComponents
+    {
+    	public partial class MyComponent : UnityEngine.MonoBehaviour
+	{
+    public void OnDisable(){}
+	}
+    }
+    
+    // NEEDLE_CODEGEN_END

package/test/csharp/codegen/abstract method/input.js

@@ -0,0 +1,27 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.MyComponent = void 0;
+var MyComponent = /** @class */ (function (_super) {
+    __extends(MyComponent, _super);
+    function MyComponent() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    MyComponent.prototype.onDisable = function () { };
+    return MyComponent;
+}(Behaviour));
+exports.MyComponent = MyComponent;

package/test/csharp/codegen/abstract method/input.ts

@@ -0,0 +1,4 @@
+export class MyComponent extends Behaviour {
+      onDisable() {}
+    }
+}

package/test/csharp/codegen/abstract method/output.cs

@@ -0,0 +1,14 @@
+// NEEDLE_CODEGEN_START
+// auto generated code - do not edit directly
+
+#pragma warning disable
+
+namespace Needle.Typescript.GeneratedComponents
+{
+	public partial class MyComponent : UnityEngine.MonoBehaviour
+	{
+		public void OnDisable(){}
+	}
+}
+
+// NEEDLE_CODEGEN_END

package/test/csharp/codegen/basic/expected.cs

@@ -0,0 +1,13 @@
+// NEEDLE_CODEGEN_START
+    // auto generated code - do not edit directly
+    
+    #pragma warning disable
+    
+    namespace Needle.Typescript.GeneratedComponents
+    {
+    	public partial class BasicComponet : UnityEngine.MonoBehaviour
+	{
+	}
+    }
+    
+    // NEEDLE_CODEGEN_END

package/test/csharp/codegen/basic/input.js

@@ -0,0 +1,26 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.BasicComponet = void 0;
+var BasicComponet = /** @class */ (function (_super) {
+    __extends(BasicComponet, _super);
+    function BasicComponet() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return BasicComponet;
+}(Behaviour));
+exports.BasicComponet = BasicComponet;

package/test/csharp/codegen/basic/input.ts

@@ -0,0 +1,2 @@
+export class BasicComponet extends Behaviour {
+}

package/test/csharp/codegen/basic/output.cs

@@ -0,0 +1,13 @@
+// NEEDLE_CODEGEN_START
+// auto generated code - do not edit directly
+
+#pragma warning disable
+
+namespace Needle.Typescript.GeneratedComponents
+{
+	public partial class BasicComponet : UnityEngine.MonoBehaviour
+	{
+	}
+}
+
+// NEEDLE_CODEGEN_END

package/test/csharp/codegen/basic-no-export/input.js

@@ -0,0 +1,27 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.BasicComponet = void 0;
+//@dont-generate-component
+var BasicComponet = /** @class */ (function (_super) {
+    __extends(BasicComponet, _super);
+    function BasicComponet() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return BasicComponet;
+}(Behaviour));
+exports.BasicComponet = BasicComponet;

package/test/csharp/codegen/basic-no-export/input.ts

@@ -0,0 +1,4 @@
+
+      //@dont-generate-component
+      export abstract class BasicComponet extends Behaviour {
+}

package/test/csharp/codegen/bool/expected.cs

@@ -0,0 +1,14 @@
+// NEEDLE_CODEGEN_START
+    // auto generated code - do not edit directly
+    
+    #pragma warning disable
+    
+    namespace Needle.Typescript.GeneratedComponents
+    {
+    	public partial class MyComponent : UnityEngine.MonoBehaviour
+	{
+    public bool @myField;
+	}
+    }
+    
+    // NEEDLE_CODEGEN_END

package/test/csharp/codegen/bool/input.js

@@ -0,0 +1,26 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.MyComponent = void 0;
+var MyComponent = /** @class */ (function (_super) {
+    __extends(MyComponent, _super);
+    function MyComponent() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return MyComponent;
+}(Behaviour));
+exports.MyComponent = MyComponent;

package/test/csharp/codegen/bool/input.ts

@@ -0,0 +1,3 @@
+export class MyComponent extends Behaviour {
+    public myField: boolean;
+}

package/test/csharp/codegen/bool/output.cs

@@ -0,0 +1,14 @@
+// NEEDLE_CODEGEN_START
+// auto generated code - do not edit directly
+
+#pragma warning disable
+
+namespace Needle.Typescript.GeneratedComponents
+{
+	public partial class MyComponent : UnityEngine.MonoBehaviour
+	{
+		public bool @myField;
+	}
+}
+
+// NEEDLE_CODEGEN_END

package/test/csharp/codegen/fields with default values/expected.cs

@@ -0,0 +1,18 @@
+// NEEDLE_CODEGEN_START
+    // auto generated code - do not edit directly
+    
+    #pragma warning disable
+    
+    namespace Needle.Typescript.GeneratedComponents
+    {
+    	public partial class MyComponent : UnityEngine.MonoBehaviour
+	{
+    public float @myField = 42f;
+    public string @myField2 = "hello";
+    public bool @myField3 = true;
+    public UnityEngine.Object @myField4;
+		public UnityEngine.Vector2 @myVector2 = new UnityEngine.Vector2(1f,.5f);
+	}
+    }
+    
+    // NEEDLE_CODEGEN_END

package/test/csharp/codegen/fields with default values/input.js

@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+exports.MyComponent = void 0;
+var MyComponent = /** @class */ (function (_super) {
+    __extends(MyComponent, _super);
+    function MyComponent() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.myField = 42;
+        _this.myField2 = "hello";
+        _this.myField3 = true;
+        _this.myField4 = null;
+        _this.myVector2 = new Vector2(1, .5);
+        return _this;
+    }
+    return MyComponent;
+}(Behaviour));
+exports.MyComponent = MyComponent;

package/test/csharp/codegen/fields with default values/input.ts

@@ -0,0 +1,7 @@
+export class MyComponent extends Behaviour {
+    public myField: number = 42;
+    public myField2: string = "hello";
+    public myField3: boolean = true;
+    public myField4: object = null;
+    public myVector2: Vector2 = new Vector2(1, .5);
+}