Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
egekorkan merged 8 commits into from
Dec 25, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3bdbd8d
feat:fixed tm to td conversion
Rohithgvmg Dec 19, 2025
2c3f30e
feat:fixed tm to td conversion
Rohithgvmg Dec 19, 2025
845220d
committing changes
Rohithgvmg Dec 22, 2025
1954647
modified according to pr_review
Rohithgvmg Dec 22, 2025
b8b2503
removed comment
Rohithgvmg Dec 22, 2025
b8e33e5
modified test
Rohithgvmg Dec 23, 2025
bb0200c
test: cover both partial and full deletion of @type array
Rohithgvmg Dec 24, 2025
20f8403
test: verify @type filtering for both string and array inputs
Rohithgvmg Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/services/operations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
14 changes: 12 additions & 2 deletions src/services/operations.ts
View file
Open in desktop
Copy link
Contributor

@TejInaco TejInaco Dec 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Rohithgvmg for this PR. You need to run the prettier --write src/services/operations.ts in order to the code being formatted according to the prettier rules.
Another thing is the unit tests also need to be changed in operations.test.ts file. You can see them failing when you run yarn test
The comment on line 144 is unnecessary.

Copy link
Contributor Author

@Rohithgvmg Rohithgvmg Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for detailed review, fixed the code , kindly review

Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down