@dbml/parse 7.1.0-alpha.0 → 7.1.0

package/dist/dbml-parse.mjs

@@ -8653,8 +8653,14 @@ function processColumnInDb(r) {
 }
 function expandDiagramViewWildcards(r) {
 	for (let j of r.diagramViews.values()) {
-		let M = j.visibleEntities, N = r.diagramViewWildcards.get(j), P = r.diagramViewExplicitlySet.get(j);
-		!N || !P || N.has("tableGroups") && M.tableGroups && M.tableGroups.length === 0 && (P.has("tables") || P.has("schemas") || (M.tableGroups = Array.from(r.tableGroups.values()).map((r) => ({ name: r.name }))));
+		let M = j.visibleEntities, N = r.diagramViewWildcards.get(j);
+		if (N) {
+			if (N.has("tables") || N.has("schemas")) {
+				M.tables = [], M.tableGroups = [], M.schemas = [];
+				continue;
+			}
+			N.has("tableGroups") && M.tableGroups && M.tableGroups.length === 0 && (M.tableGroups = Array.from(r.tableGroups.values()).map((r) => ({ name: r.name })));
+		}
 	}
 }
 function convertEnvToDb(r, j) {
@@ -10945,14 +10951,46 @@ function findDiagramViewBlocks(r) {
 	}
 	return j;
 }
+function emitTablesBlock(r, j) {
+	let M = j.map((r) => r.schemaName === "public" ? r.name : `${r.schemaName}.${r.name}`);
+	r.push("  Tables {"), M.forEach((j) => r.push(`    ${j}`)), r.push("  }");
+}
+function emitTableGroupsBlock(r, j) {
+	r.push("  TableGroups {"), j.forEach((j) => r.push(`    ${j.name}`)), r.push("  }");
+}
+function emitSchemasBlock(r, j) {
+	r.push("  Schemas {"), j.forEach((j) => r.push(`    ${j.name}`)), r.push("  }");
+}
+function emitNotesBlock(r, j) {
+	r.push("  Notes {"), j.forEach((j) => r.push(`    ${j.name}`)), r.push("  }");
+}
 function generateDiagramViewBlock(r, j) {
-	let M = [`DiagramView ${addDoubleQuoteIfNeeded(r)} {`];
-	if (j?.tables !== void 0 && j.tables !== null) if (j.tables.length === 0) M.push("  Tables { * }");
-	else {
-		let r = j.tables.map((r) => r.schemaName === "public" ? r.name : `${r.schemaName}.${r.name}`);
-		M.push("  Tables {"), r.forEach((r) => M.push(`    ${r}`)), M.push("  }");
+	let M = `DiagramView ${addDoubleQuoteIfNeeded(r)} {`;
+	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}`;
 	}
-	return j?.stickyNotes !== void 0 && (j.stickyNotes === null || (j.stickyNotes.length === 0 ? M.push("  Notes { * }") : (M.push("  Notes {"), j.stickyNotes.forEach((r) => M.push(`    ${r.name}`)), M.push("  }")))), j?.tableGroups !== void 0 && (j.tableGroups === null || (j.tableGroups.length === 0 ? M.push("  TableGroups { * }") : (M.push("  TableGroups {"), j.tableGroups.forEach((r) => M.push(`    ${r.name}`)), M.push("  }")))), j?.schemas !== void 0 && (j.schemas === null || (j.schemas.length === 0 ? M.push("  Schemas { * }") : (M.push("  Schemas {"), j.schemas.forEach((r) => M.push(`    ${r.name}`)), M.push("  }")))), M.push("}"), M.join("\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");
 }
 function syncDiagramView(r, j, M) {
 	let N = M ?? findDiagramViewBlocks(r), P = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "7.1.0-alpha.0",
+  "version": "7.1.0",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "109c30cccebfcb36b793945798d40963fb24d08c"
+  "gitHead": "ff4e35e824dfebc5237678dc03c983b409fbddc9"
 }