@dbml/parse 7.0.0-alpha.1 → 7.0.0

package/dist/dbml-parse.mjs

@@ -9107,7 +9107,7 @@ function createConstraintErrors(r, j, M) {
 }
 var getConstraintType$1 = (r) => r > 1 ? "Composite PK" : "PK";
 function validatePrimaryKey(r) {
-	return flatMap_default(Array.from(r.records), ([j, M]) => {
+	return flatMap_default(Array.from(r.records), ([j, { rows: M }]) => {
 		if (isEmpty_default(M)) return [];
 		r.cachedMergedTables.has(j) || r.cachedMergedTables.set(j, mergeTableAndPartials(j, r));
 		let N = r.cachedMergedTables.get(j), P = collectPkConstraints(N), F = collectAvailableColumns(M), I = keyBy_default(N.fields, "name");
@@ -9150,7 +9150,7 @@ function checkMissingPkColumns(r, j, M, N, P) {
 }
 var getConstraintType = (r) => r > 1 ? "Composite UNIQUE" : "UNIQUE";
 function validateUnique(r) {
-	return flatMap_default(Array.from(r.records), ([j, M]) => {
+	return flatMap_default(Array.from(r.records), ([j, { rows: M }]) => {
 		r.cachedMergedTables.has(j) || r.cachedMergedTables.set(j, mergeTableAndPartials(j, r));
 		let N = r.cachedMergedTables.get(j);
 		if (isEmpty_default(M)) return [];
@@ -9174,7 +9174,7 @@ function validateForeignKeys(r) {
 function buildTableInfoMap(r) {
 	let j = /* @__PURE__ */ new Map();
 	for (let M of r.tables.values()) {
-		let N = makeTableKey(M.schemaName, M.name), P = r.records.get(M) || [];
+		let N = makeTableKey(M.schemaName, M.name), P = r.records.get(M)?.rows || [];
 		r.cachedMergedTables.has(M) || r.cachedMergedTables.set(M, mergeTableAndPartials(M, r));
 		let F = r.cachedMergedTables.get(M);
 		j.set(N, {
@@ -9219,16 +9219,20 @@ var RecordsInterpreter = class {
 				j.push(new CompileError(CompileErrorCode.DUPLICATE_RECORDS_FOR_TABLE, `Duplicate Records blocks for the same Table '${r.name}' - A Table can only have one Records block`, F)), j.push(new CompileError(CompileErrorCode.DUPLICATE_RECORDS_FOR_TABLE, `Duplicate Records blocks for the same Table '${r.name}' - A Table can only have one Records block`, N));
 				continue;
 			}
-			this.tableToRecordMap.set(r, N);
-			for (let F of N.body.body) {
-				let N = F, I = extractDataFromRow(N, P, this.env);
-				j.push(...I.getErrors()), M.push(...I.getWarnings());
-				let L = I.getValue();
-				L.row && (this.env.records.has(r) || this.env.records.set(r, []), this.env.records.get(r).push({
+			this.tableToRecordMap.set(r, N), this.env.records.has(r) || this.env.records.set(r, {
+				element: N,
+				rows: []
+			});
+			let I = this.env.records.get(r);
+			for (let r of N.body.body) {
+				let N = r, F = extractDataFromRow(N, P, this.env);
+				j.push(...F.getErrors()), M.push(...F.getWarnings());
+				let L = F.getValue();
+				L.row && I.rows.push({
 					values: L.row,
 					node: N,
 					columnNodes: L.columnNodes
-				}));
+				});
 			}
 		}
 		let N = this.validateConstraints();
@@ -9399,14 +9403,15 @@ function expandDiagramViewWildcards(r) {
 }
 function convertEnvToDb(r) {
 	let j = [];
-	for (let [M, N] of r.records) {
-		if (!N.length) continue;
-		let r = Object.keys(N[0].columnNodes);
+	for (let [M, { element: N, rows: P }] of r.records) {
+		if (!P.length) continue;
+		let r = Object.keys(P[0].columnNodes);
 		j.push({
 			schemaName: M.schemaName || void 0,
 			tableName: M.name,
 			columns: r,
-			values: N.map((j) => r.map((r) => {
+			token: getTokenPosition(N),
+			values: P.map((j) => r.map((r) => {
 				let M = j.values[r];
 				return M ? {
 					value: M.value,
@@ -10350,7 +10355,7 @@ var DBMLDefinitionProvider = class {
 		"notes",
 		"schemas"
 	],
-	symbols: /[=><!~?:&|+\-\/\^%]+/,
+	symbols: /[=><!~?:&|+\-/^%]+/,
 	escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
 	newline: /[\r\n]/,
 	digits: /\d+(_+\d+)*/,
@@ -10359,7 +10364,7 @@ var DBMLDefinitionProvider = class {
 	unicode: !0,
 	tokenizer: {
 		root: [
-			[/[{}\[\]\(\)]/, "@bracket"],
+			[/[{}[\]()]/, "@bracket"],
 			[/[,.:]/, "delimiter"],
 			{ include: "@numbers" },
 			{ include: "common" }
@@ -10424,7 +10429,7 @@ var DBMLDefinitionProvider = class {
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, "number"],
 			[/[$][+-]*\d*(\.\d*)?/, "number"],
-			[/((\d+(\.\d*)?)|(\.\d+))([eE][\-+]?\d+)?/, "number"],
+			[/((\d+(\.\d*)?)|(\.\d+))([eE][-+]?\d+)?/, "number"],
 			[/#([0-9A-F]{3}){1,2}/, "number.hex"]
 		],
 		string_double: [
@@ -10481,13 +10486,13 @@ var DBMLDefinitionProvider = class {
 			]
 		],
 		comment: [
-			[/[^\/*]+/, "comment"],
+			[/[^/*]+/, "comment"],
 			[
 				/\*\//,
 				"comment",
 				"@pop"
 			],
-			[/[\/*]/, "comment"]
+			[/[/*]/, "comment"]
 		]
 	}
 }, services_exports = /* @__PURE__ */ __export({
@@ -10746,7 +10751,7 @@ function findDiagramViewBlocks(r) {
 	let N = new Parser(r, M.getValue(), new SyntaxNodeIdGenerator()).parse();
 	if (N.getErrors().length > 0) return j;
 	let P = N.getValue().ast;
-	for (let r of P.body) if (r.type?.value === "DiagramView") {
+	for (let r of P.body) if (r.type?.value.toLowerCase() === ElementKind.DiagramView) {
 		let M = r.name ? destructureComplexVariable(r.name).unwrap_or([]) : [], N = M.length > 0 ? M[M.length - 1] : "";
 		j.push({
 			name: N,
@@ -10756,14 +10761,8 @@ function findDiagramViewBlocks(r) {
 	}
 	return j;
 }
-function needsQuoting(r) {
-	return !/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(r);
-}
-function quoteName(r) {
-	return needsQuoting(r) ? `"${r.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"` : r;
-}
 function generateDiagramViewBlock(r, j) {
-	let M = [`DiagramView ${quoteName(r)} {`];
+	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}`);

package/dist/src/core/interpreter/types.d.ts

@@ -51,7 +51,10 @@ export interface InterpreterDatabase {
     tablePartials: Map<ElementDeclarationNode, TablePartial>;
     aliases: Alias[];
     project: Map<ElementDeclarationNode, Project>;
-    records: Map<Table, TableRecordRow[]>;
+    records: Map<Table, {
+        element: ElementDeclarationNode;
+        rows: TableRecordRow[];
+    }>;
     recordsElements: ElementDeclarationNode[];
     cachedMergedTables: Map<Table, Table>;
     source: string;
@@ -82,6 +85,7 @@ export interface TableRecord {
     tableName: string;
     columns: string[];
     values: RecordValue[][];
+    token: TokenPosition;
 }
 export interface Database {
     schemas: [];

package/package.json

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