@zxsylph/dbml-formatter 1.0.13 → 1.0.15

package/package.json

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

package/src/formatter/formatter.ts

@@ -41,7 +41,7 @@ export function format(input: string, options: FormatterOptions = {}): string {
                  if (t.type === TokenType.Symbol && (t.value === '}' || t.value === '{')) break;
                  if (t.type === TokenType.Word) {
                      // Check case-insensitive
-                     if (t.value.toLowerCase() === 'table') {
+                     if (t.value.toLowerCase().startsWith('table')) {
                          isTable = true;
                          break;
                      }
@@ -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++;
     }