npm - @zxsylph/dbml-formatter - Versions diffs - 1.0.12 → 1.0.14 - Mend

@zxsylph/dbml-formatter 1.0.12 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/src/formatter/formatter.ts +11 -4

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zxsylph/dbml-formatter",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "",
   "files": [
     "bin",

package/src/formatter/formatter.ts CHANGED Viewed

@@ -203,7 +203,7 @@ export function format(input: string, options: FormatterOptions = {}): string {
                                    const newLineTokens = [...line];
                                    newLineTokens[newLineTokens.length - 1] = {
                                        ...last,
-                                       value: last.value.replace(/\n+/g, '\n')
+                                       value: '\n'
                                    };
                                    normalized.push(newLineTokens);
@@ -660,10 +660,13 @@ export function format(input: string, options: FormatterOptions = {}): string {
         }
         // Apply spacing based on GLOBAL `output`
+        if (token.type === TokenType.Symbol && token.value === '}') {
+             indentLevel--;
+             if (indentLevel < 0) indentLevel = 0;
+        }
         if (output.endsWith('\n')) {
-             if (token.value !== '}') {
-                 output += getIndent();
-             }
+             output += getIndent();
         } else if (output.length > 0) {
             let needsSpace = true;
             const lastChar = output[output.length - 1];
@@ -722,6 +725,10 @@ export function format(input: string, options: FormatterOptions = {}): string {
                 break;
         }
+        if (token.type === TokenType.Symbol && token.value === '{') {
+            indentLevel++;
+        }
         i++;
     }