Fix: theta in vehicleTypeNodeProperties is not required

Change schema and generated models.

Versions:
+ Python: 1.0.0.5
+ C#: 1.0.0.2
+ TypeScript: 1.0.0-4

Author: Marc Walker

config/csharp.json

@@ -14,7 +14,7 @@
   "buildCommand": "dotnet pack",
   "publish": {
     "packageName": "Vdma.Lif",
-    "packageVersion": "1.0.0.1",
+    "packageVersion": "1.0.0.2",
     "packageDirectory": "Vdma.Lif/bin/Release"
   }
 }

config/python.json

@@ -11,7 +11,7 @@
   "buildCommand": "python -m build",
   "publish": {
     "packageName": "vdma_lif",
-    "packageVersion": "1.0.0.4",
+    "packageVersion": "1.0.0.5",
     "packageDirectory": "dist"
   }
 }

examples/example.lif.json

@@ -68,8 +68,7 @@
           },
           "vehicleTypeNodeProperties": [
             {
-              "vehicleTypeId": "vehicle-001",
-              "theta": 45.0
+              "vehicleTypeId": "vehicle-002"
             }
           ]
         }

schema/lif-schema.json

@@ -156,8 +156,7 @@
                                             }
                                         },
                                         "required": [
-                                            "vehicleTypeId",
-                                            "theta"
+                                            "vehicleTypeId"
                                         ]
                                     }
                                 }

src/csharp/Vdma.Lif/LifModels.cs

@@ -350,8 +350,9 @@ public partial class VehicleTypeNodeProperty
     ///     Absolute orientation of the vehicle on the node in reference to the global origin’s
     ///     rotation. Range: [-Pi ... Pi]
     /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("theta")]
-    public double Theta { get; set; }
+    public double? Theta { get; set; }
 
     /// <summary>
     ///     Identifier for the vehicle type.

src/csharp/Vdma.Lif/Vdma.Lif.csproj

@@ -5,7 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageId>Vdma.Lif</PackageId>
-        <Version>1.0.0.1</Version>
+        <Version>1.0.0.2</Version>
         <Authors>Marc Walker</Authors>
         <Company>Continua Systems GmbH</Company>
         <PackageReadmeFile>README.md</PackageReadmeFile>

src/python/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vdma-lif"
-version = "1.0.0.4"
+version = "1.0.0.5"
 description = "JSON parsers and models for the VDMA - LIF (Layout Interchange Format), which is used for defining track layouts and exchanging information between the integrator of driverless transport vehicles and a third-party master control system."
 readme = "README.md"
 authors = [{ name = "Continua Systems GmbH", email = "info@continua.systems" }]

src/python/vdma_lif/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.0.3"
+__version__ = "1.0.0.5"

src/python/vdma_lif/models.py

@@ -374,31 +374,33 @@ def to_dict(self) -> dict:
 
 @dataclass
 class VehicleTypeNodeProperty:
-    theta: float
-    """Absolute orientation of the vehicle on the node in reference to the global origin’s
-    rotation. Range: [-Pi ... Pi]
-    """
     vehicle_type_id: str
     """Identifier for the vehicle type."""
 
     actions: Optional[List[Action]] = None
     """List of actions that the vehicle can perform at the node. *Optional*."""
 
+    theta: Optional[float] = None
+    """Absolute orientation of the vehicle on the node in reference to the global origin’s
+    rotation. Range: [-Pi ... Pi]
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'VehicleTypeNodeProperty':
         assert isinstance(obj, dict)
-        theta = from_float(obj.get("theta"))
         vehicle_type_id = from_str(obj.get("vehicleTypeId"))
         actions = from_union([lambda x: from_list(Action.from_dict, x), from_none], obj.get("actions"))
-        return VehicleTypeNodeProperty(theta, vehicle_type_id, actions)
+        theta = from_union([from_float, from_none], obj.get("theta"))
+        return VehicleTypeNodeProperty(vehicle_type_id, actions, theta)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["theta"] = to_float(self.theta)
         result["vehicleTypeId"] = from_str(self.vehicle_type_id)
         if self.actions is not None:
             result["actions"] = from_union([lambda x: from_list(
                 lambda x: to_class(Action, x), x), from_none], self.actions)
+        if self.theta is not None:
+            result["theta"] = from_union([to_float, from_none], self.theta)
         return result
 
 

src/typescript/package.json

@@ -1,9 +1,20 @@
 {
   "name": "vdma-lif",
-  "version": "1.0.0-1",
+  "version": "1.0.0-4",
   "description": "JSON parsers and models for the VDMA - LIF (Layout Interchange Format), which is used for defining track layouts and exchanging information between the integrator of driverless transport vehicles and a third-party master control system.",
-  "main": "index.js",
+  "main": "dist/index.js",
   "types": "index.d.ts",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist/",
+    "README.md"
+  ],
   "prepublish": "tsc",
   "scripts": {
     "build": "tsc",

src/typescript/src/lifModels.ts

@@ -239,7 +239,7 @@ export interface VehicleTypeNodeProperty {
    * Absolute orientation of the vehicle on the node in reference to the global origin’s
    * rotation. Range: [-Pi ... Pi]
    */
-  theta: number;
+  theta?: number;
   /**
    * Identifier for the vehicle type.
    */
@@ -682,7 +682,7 @@ const typeMap: any = {
   VehicleTypeNodeProperty: o(
     [
       { json: "actions", js: "actions", typ: u(undefined, a(r("Action"))) },
-      { json: "theta", js: "theta", typ: 3.14 },
+      { json: "theta", js: "theta", typ: u(undefined, 3.14) },
       { json: "vehicleTypeId", js: "vehicleTypeId", typ: "" },
     ],
     "any",

src/typescript/src/lifParser.spec.ts

@@ -62,6 +62,9 @@ describe("LIFParser", () => {
     expect(action1.actionParameters![0].key).to.equal("speed");
     expect(action1.actionParameters![0].value).to.equal("fast");
 
+    const vehicleType2 = node1.vehicleTypeNodeProperties[1];
+    expect(vehicleType2.vehicleTypeId).to.equal("vehicle-002");
+
     // Layout Edges
     const edge1 = layout1.edges[0];
     expect(edge1.edgeId).to.equal("edge-001");

src/typescript/src/lifParser.ts

@@ -1,5 +1,5 @@
 import fs from "fs";
-import { Convert, LIFLayoutCollection } from "./lifModels";
+import { Convert, type LIFLayoutCollection } from "./lifModels";
 
 export class LIFParser {
   static fromJson(jsonData: string): LIFLayoutCollection | null {