feat: add indentDSL to improve checkDSL parsing reliability

src/indent-dsl.ts

@@ -0,0 +1,29 @@
+export const indentDSL = (rawDsl: string, removeEmptyLines = false) => {
+ const indentType = "";
+ const indentRelation = " ";
+ const indentDefine = " ";
+
+ return rawDsl
+ .split("\n")
+ .filter((line: string) => (removeEmptyLines ? line.trim().length > 0 : true))
+ .map((line: string) => {
+ const selectedLine = line.trim();
+ const keyword = selectedLine.split(" ")[0];
+ let indentation = "";
+ switch (keyword) {
+ case "type":
+ indentation = indentType;
+ break;
+ case "relations":
+ indentation = indentRelation;
+ break;
+ case "define":
+ indentation = indentDefine;
+ break;
+ default:
+ break;
+ }
+ return `${indentation}${selectedLine}`;
+ })
+ .join("\n");
+};

src/index.ts

@@ -1,3 +1,4 @@
 export { friendlySyntaxToApiSyntax } from "./friendly-to-api";
 export { apiSyntaxToFriendlySyntax } from "./api-to-friendly";
 export { checkDSL } from "./check-dsl";
+export { indentDSL } from "./indent-dsl";

tests/indent-dsl.test.ts

@@ -0,0 +1,62 @@
+import { friendlySyntaxToApiSyntax, indentDSL } from "../src";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import { testModels } from "./data";
+
+const getRandomNumber = (min: number, max: number) => {
+ return Math.floor(Math.random() * (max - min + 1)) + min;
+};
+
+const generateRandomNumberOfSpaces = () => {
+ return " ".repeat(getRandomNumber(0, 30));
+};
+
+const generateRandomNewLines = () => {
+ return "\n".repeat(getRandomNumber(0, 15));
+};
+
+describe("indent-dsl", () => {
+ testModels.forEach((testCase) => {
+ it(`should indent ${testCase.name}`, () => {
+ const rawFriendly = testCase.friendly
+ .split("\n")
+ .map((line) => generateRandomNumberOfSpaces() + line.trim())
+ .join("\n");
+ const apiSyntax = friendlySyntaxToApiSyntax(indentDSL(rawFriendly));
+ expect(apiSyntax).toEqual(testCase.json);
+ });
+ });
+
+ testModels.forEach((testCase) => {
+ it(`should indent ${testCase.name} with random spaces and empty lines removed`, () => {
+ const rawFriendly = testCase.friendly
+ .split("\n")
+ .map((line) => generateRandomNumberOfSpaces() + line.trim() + generateRandomNewLines())
+ .join("\n");
+ const apiSyntax = friendlySyntaxToApiSyntax(indentDSL(rawFriendly, true));
+ expect(apiSyntax).toEqual(testCase.json);
+ });
+ });
+
+ testModels.forEach((testCase) => {
+ it(`should indent ${testCase.name} with empty lines removed`, () => {
+ const rawFriendly = testCase.friendly
+ .split("\n")
+ .map((line) => line.trim() + generateRandomNewLines())
+ .join("\n");
+ const apiSyntax = friendlySyntaxToApiSyntax(indentDSL(rawFriendly, true));
+ expect(apiSyntax).toEqual(testCase.json);
+ });
+ });
+
+ testModels.forEach((testCase) => {
+ it(`should indent ${testCase.name} with empty lines not removed`, () => {
+ const rawFriendly = testCase.friendly
+ .split("\n")
+ .map((line) => line.trim() + generateRandomNewLines())
+ .join("\n");
+ const apiSyntax = friendlySyntaxToApiSyntax(indentDSL(rawFriendly, false));
+ expect(apiSyntax).toEqual(testCase.json);
+ });
+ });
+});