@dbml/parse 8.2.4 → 8.2.5

package/dist/dbml-parse.mjs

@@ -14705,49 +14705,31 @@ function findDiagramViewBlocks(r) {
 	}
 	return j;
 }
-function emitTablesBlock(r, j) {
-	let M = j.map((r) => {
-		let j = addDoubleQuoteIfNeeded(r.name);
-		return r.schemaName === "public" ? j : `${addDoubleQuoteIfNeeded(r.schemaName)}.${j}`;
-	});
-	r.push("  Tables {"), M.forEach((j) => r.push(`    ${j}`)), r.push("  }");
-}
-function emitTableGroupsBlock(r, j) {
-	r.push("  TableGroups {"), j.forEach((j) => r.push(`    ${addDoubleQuoteIfNeeded(j.name)}`)), r.push("  }");
+function emitListSubBlock(r, j, M) {
+	r.push(`  ${j} {`), M.forEach((j) => r.push(`    ${j}`)), r.push("  }");
 }
-function emitSchemasBlock(r, j) {
-	r.push("  Schemas {"), j.forEach((j) => r.push(`    ${addDoubleQuoteIfNeeded(j.name)}`)), r.push("  }");
+function emitWildcardSubBlock(r, j) {
+	r.push(`  ${j} { * }`);
 }
-function emitNotesBlock(r, j) {
-	r.push("  Notes {"), j.forEach((j) => r.push(`    ${addDoubleQuoteIfNeeded(j.name)}`)), r.push("  }");
+function classifyDim(r) {
+	return r == null ? "null" : r.length === 0 ? "empty" : "items";
 }
 function generateDiagramViewBlock(r, j) {
-	let M = `DiagramView ${addDoubleQuoteIfNeeded(r)} {`;
+	let M = `DiagramView ${addDoubleQuoteIfNeeded(r)} {`, N = (r) => addDoubleQuoteIfNeeded(r.name), P = j?.tables?.map((r) => {
+		let j = addDoubleQuoteIfNeeded(r.name);
+		return r.schemaName === "public" ? j : `${addDoubleQuoteIfNeeded(r.schemaName)}.${j}`;
+	}) ?? [], F = j?.tableGroups?.map(N) ?? [], I = j?.schemas?.map(N) ?? [], L = j?.stickyNotes?.map(N) ?? [];
 	if (!j) return `${M}\n}`;
-	let { tables: N, tableGroups: P, schemas: F, stickyNotes: I } = j, L = N === null, R = P === null, z = F === null;
-	if (L && R && z && I === null) return `${M}\n}`;
-	if (L || R || z) {
-		let r = !L && N.length > 0, j = !R && P.length > 0, B = !z && F.length > 0;
-		if (!(r || j || B)) {
-			if (I && I.length > 0) {
-				let r = [M];
-				return emitNotesBlock(r, I), r.push("}"), r.join("\n");
-			}
-			return `${M}\n  Notes { * }\n}`;
-		}
-		let V = [M];
-		return r && emitTablesBlock(V, N), j && emitTableGroupsBlock(V, P), B && emitSchemasBlock(V, F), I && I.length > 0 && emitNotesBlock(V, I), V.push("}"), V.join("\n");
-	}
-	let B = N, V = P, H = F, U = B.length === 0 && V.length === 0 && H.length === 0, W = I != null && I.length > 0;
-	if (U) {
-		if (W) {
-			let r = [M, "  Tables { * }"];
-			return emitNotesBlock(r, I), r.push("}"), r.join("\n");
-		}
-		return `${M}\n  *\n}`;
-	}
-	let G = [M];
-	return B.length > 0 && emitTablesBlock(G, B), V.length > 0 && emitTableGroupsBlock(G, V), H.length > 0 && emitSchemasBlock(G, H), W && emitNotesBlock(G, I), G.push("}"), G.join("\n");
+	let R = {
+		tables: classifyDim(j.tables),
+		tableGroups: classifyDim(j.tableGroups),
+		schemas: classifyDim(j.schemas),
+		stickyNotes: classifyDim(j.stickyNotes)
+	};
+	if (Object.values(R).every((r) => r === "null")) return `${M}\n}`;
+	if (Object.values(R).every((r) => r === "empty")) return `${M}\n  *\n}`;
+	let z = R.tables === "items" || R.tableGroups === "items" || R.schemas === "items", B = R.tables === "empty" && R.tableGroups === "empty" && R.schemas === "empty", V = [M];
+	return z ? (R.tables === "items" && emitListSubBlock(V, "Tables", P), R.tableGroups === "items" && emitListSubBlock(V, "TableGroups", F), R.schemas === "items" && emitListSubBlock(V, "Schemas", I)) : B && emitWildcardSubBlock(V, "Tables"), R.stickyNotes === "items" ? emitListSubBlock(V, "Notes", L) : R.stickyNotes === "empty" && emitWildcardSubBlock(V, "Notes"), V.push("}"), V.join("\n");
 }
 function syncDiagramView(r, j, M) {
 	let N = this.getSource(r) ?? "", P = M ?? findDiagramViewBlocks(N), F = [];

package/dist/src/compiler/queries/transform/syncDiagramView.d.ts

@@ -27,12 +27,8 @@ export interface DiagramViewBlock {
     endIndex: number;
 }
 /**
- * Returns the start/end byte positions of every DiagramView block in `source`.
- *
- * Returns an empty array on any lex or parse error - callers cannot
- * distinguish "no DiagramView blocks present" from "malformed DBML" based on
- * the return value alone. If you need to detect malformed input, lex/parse
- * the source separately and check for errors before calling this function.
+ * Returns the position of every DiagramView block in `source`
+ * Note that onany lex or parse errors, we return [], as there's no reliable way to detect diagram views from malformed DBML
  */
 export declare function findDiagramViewBlocks(source: string): DiagramViewBlock[];
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "8.2.4",
+  "version": "8.2.5",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "a8358e7ca39ab47272ee59a1915709d8f0f82f06"
+  "gitHead": "4593cadfa6fc22c3fad2acbdefb839e118aa0c53"
 }