feat: fixed tm to td conversion (#172) (#173)

* feat:fixed tm to td conversion

Signed-off-by: Rohith <[email protected]>

* feat:fixed tm to td conversion

Signed-off-by: Rohith <[email protected]>

* committing changes

* modified according to pr_review

* modified test

* test: cover both partial and full deletion of @type array

* test: verify @type filtering for both string and array inputs

---------

Signed-off-by: Rohith <[email protected]>

Author: Rohithgvmg

src/services/operations.test.ts

@@ -401,22 +401,43 @@ describe("processConversionTMtoTD", () => {
   });
 
   test("removes TM-specific fields", () => {
-    const tmContent = `{
+    const stringTypeContent = `{
       "@type": "tm:ThingModel",
       "tm:required": ["#properties/prop1"],
       "properties": { "prop1": {} }
     }`;
 
-    const result = processConversionTMtoTD(
-      tmContent,
+    const stringResult = processConversionTMtoTD(
+      stringTypeContent,
       {},
       ["prop1"],
       [],
       [],
       ""
     );
 
-    expect(result).not.toHaveProperty("tm:required");
+    expect(stringResult).not.toHaveProperty("tm:required");
+    expect(stringResult).not.toHaveProperty("@type");
+
+    const arrayTypeContent = `{
+      "@type": ["tm:ThingModel","example_key:example_val"],
+      "tm:required": ["#properties/prop1"],
+      "properties": { "prop1": {} }
+    }`;
+
+    const arrayResult = processConversionTMtoTD(
+      arrayTypeContent,
+      {},
+      ["prop1"],
+      [],
+      [],
+      ""
+    );
+
+    expect(Array.isArray(arrayResult["@type"])).toBe(true);
+    expect(arrayResult["@type"]).toContain("example_key:example_val");
+    expect(arrayResult["@type"]).not.toContain("tm:ThingModel");
+    expect(arrayResult).not.toHaveProperty("tm:required");
   });
 
   test("handles complex TM to TD conversion", () => {

src/services/operations.ts

@@ -134,9 +134,19 @@ export function processConversionTMtoTD(
       };
     }
 
-    delete parsed["@type"];
+    if (parsed["@type"]) {
+      if (Array.isArray(parsed["@type"])) {
+        parsed["@type"] = parsed["@type"].filter(
+          (x: String) => x != "tm:ThingModel"
+        );
+        if (parsed["@type"].length == 0) {
+          delete parsed["@type"];
+        }
+      } else {
+        delete parsed["@type"];
+      }
+    }
     delete parsed["tm:required"];
-
     return parsed;
   } catch (error) {
     console.error("Error processing TM:", error);