@dbml/core 7.0.0-alpha.1 → 7.0.0

package/lib/index.mjs

@@ -10289,7 +10289,7 @@ function createConstraintErrors(_, HY, P) {
 }
 var getConstraintType$1 = (_) => _ > 1 ? "Composite PK" : "PK";
 function validatePrimaryKey(_) {
-	return flatMap_default(Array.from(_.records), ([HY, P]) => {
+	return flatMap_default(Array.from(_.records), ([HY, { rows: P }]) => {
 		if (isEmpty_default$1(P)) return [];
 		_.cachedMergedTables.has(HY) || _.cachedMergedTables.set(HY, mergeTableAndPartials(HY, _));
 		let UY = _.cachedMergedTables.get(HY), WY = collectPkConstraints(UY), GY = collectAvailableColumns(P), KY = keyBy_default(UY.fields, "name");
@@ -10332,7 +10332,7 @@ function checkMissingPkColumns(_, HY, P, UY, WY) {
 }
 var getConstraintType = (_) => _ > 1 ? "Composite UNIQUE" : "UNIQUE";
 function validateUnique(_) {
-	return flatMap_default(Array.from(_.records), ([HY, P]) => {
+	return flatMap_default(Array.from(_.records), ([HY, { rows: P }]) => {
 		_.cachedMergedTables.has(HY) || _.cachedMergedTables.set(HY, mergeTableAndPartials(HY, _));
 		let UY = _.cachedMergedTables.get(HY);
 		if (isEmpty_default$1(P)) return [];
@@ -10356,7 +10356,7 @@ function validateForeignKeys(_) {
 function buildTableInfoMap(_) {
 	let HY = /* @__PURE__ */ new Map();
 	for (let P of _.tables.values()) {
-		let UY = makeTableKey(P.schemaName, P.name), WY = _.records.get(P) || [];
+		let UY = makeTableKey(P.schemaName, P.name), WY = _.records.get(P)?.rows || [];
 		_.cachedMergedTables.has(P) || _.cachedMergedTables.set(P, mergeTableAndPartials(P, _));
 		let GY = _.cachedMergedTables.get(P);
 		HY.set(UY, {
@@ -10401,16 +10401,20 @@ var RecordsInterpreter = class {
 				HY.push(new CompileError(CompileErrorCode.DUPLICATE_RECORDS_FOR_TABLE, `Duplicate Records blocks for the same Table '${_.name}' - A Table can only have one Records block`, GY)), HY.push(new CompileError(CompileErrorCode.DUPLICATE_RECORDS_FOR_TABLE, `Duplicate Records blocks for the same Table '${_.name}' - A Table can only have one Records block`, UY));
 				continue;
 			}
-			this.tableToRecordMap.set(_, UY);
-			for (let GY of UY.body.body) {
-				let UY = GY, KY = extractDataFromRow(UY, WY, this.env);
-				HY.push(...KY.getErrors()), P.push(...KY.getWarnings());
-				let qY = KY.getValue();
-				qY.row && (this.env.records.has(_) || this.env.records.set(_, []), this.env.records.get(_).push({
+			this.tableToRecordMap.set(_, UY), this.env.records.has(_) || this.env.records.set(_, {
+				element: UY,
+				rows: []
+			});
+			let KY = this.env.records.get(_);
+			for (let _ of UY.body.body) {
+				let UY = _, GY = extractDataFromRow(UY, WY, this.env);
+				HY.push(...GY.getErrors()), P.push(...GY.getWarnings());
+				let qY = GY.getValue();
+				qY.row && KY.rows.push({
 					values: qY.row,
 					node: UY,
 					columnNodes: qY.columnNodes
-				}));
+				});
 			}
 		}
 		let UY = this.validateConstraints();
@@ -10581,14 +10585,15 @@ function expandDiagramViewWildcards(_) {
 }
 function convertEnvToDb(_) {
 	let HY = [];
-	for (let [P, UY] of _.records) {
-		if (!UY.length) continue;
-		let _ = Object.keys(UY[0].columnNodes);
+	for (let [P, { element: UY, rows: WY }] of _.records) {
+		if (!WY.length) continue;
+		let _ = Object.keys(WY[0].columnNodes);
 		HY.push({
 			schemaName: P.schemaName || void 0,
 			tableName: P.name,
 			columns: _,
-			values: UY.map((HY) => _.map((_) => {
+			token: getTokenPosition(UY),
+			values: WY.map((HY) => _.map((_) => {
 				let P = HY.values[_];
 				return P ? {
 					value: P.value,
@@ -11531,7 +11536,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+)*/,
@@ -11540,7 +11545,7 @@ var DBMLDefinitionProvider = class {
 	unicode: !0,
 	tokenizer: {
 		root: [
-			[/[{}\[\]\(\)]/, "@bracket"],
+			[/[{}[\]()]/, "@bracket"],
 			[/[,.:]/, "delimiter"],
 			{ include: "@numbers" },
 			{ include: "common" }
@@ -11605,7 +11610,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: [
@@ -11662,13 +11667,13 @@ var DBMLDefinitionProvider = class {
 			]
 		],
 		comment: [
-			[/[^\/*]+/, "comment"],
+			[/[^/*]+/, "comment"],
 			[
 				/\*\//,
 				"comment",
 				"@pop"
 			],
-			[/[\/*]/, "comment"]
+			[/[/*]/, "comment"]
 		]
 	}
 };
@@ -11918,7 +11923,7 @@ function findDiagramViewBlocks$1(_) {
 	let UY = new Parser$1(_, P.getValue(), new SyntaxNodeIdGenerator()).parse();
 	if (UY.getErrors().length > 0) return HY;
 	let WY = UY.getValue().ast;
-	for (let _ of WY.body) if (_.type?.value === "DiagramView") {
+	for (let _ of WY.body) if (_.type?.value.toLowerCase() === ElementKind.DiagramView) {
 		let P = _.name ? destructureComplexVariable(_.name).unwrap_or([]) : [], UY = P.length > 0 ? P[P.length - 1] : "";
 		HY.push({
 			name: UY,
@@ -11928,14 +11933,8 @@ function findDiagramViewBlocks$1(_) {
 	}
 	return HY;
 }
-function needsQuoting(_) {
-	return !/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(_);
-}
-function quoteName(_) {
-	return needsQuoting(_) ? `"${_.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"` : _;
-}
 function generateDiagramViewBlock(_, HY) {
-	let P = [`DiagramView ${quoteName(_)} {`];
+	let P = [`DiagramView ${addDoubleQuoteIfNeeded(_)} {`];
 	if (HY?.tables !== void 0 && HY.tables !== null) if (HY.tables.length === 0) P.push("  Tables { * }");
 	else {
 		let _ = HY.tables.map((_) => _.schemaName === "public" ? _.name : `${_.schemaName}.${_.name}`);
@@ -16819,13 +16818,14 @@ var database_default = class extends element_default {
 		});
 	}
 	processRecords(_) {
-		_.forEach(({ schemaName: _, tableName: HY, columns: P, values: UY }) => {
+		_.forEach(({ schemaName: _, tableName: HY, columns: P, values: UY, token: WY }) => {
 			this.records.push({
 				id: this.dbState.generateId("recordId"),
 				schemaName: _,
 				tableName: HY,
 				columns: P,
-				values: UY
+				values: UY,
+				token: WY
 			});
 		});
 	}
@@ -1821809,5 +1821809,5 @@ function findDiagramViewBlocks(_) {
 	let HY = new Compiler();
 	return HY.setSource(_), HY.findDiagramViewBlocks();
 }
-const VERSION = "7.0.0-alpha.1";
+const VERSION = "7.0.0";
 export { CompilerError, ModelExporter_default as ModelExporter, Parser_default as Parser, VERSION, addDoubleQuoteIfNeeded, dbmlMonarchTokensProvider, export_default as exporter, findDiagramViewBlocks, formatRecordValue, import_default as importer, isBinaryType, isBooleanType, isDateTimeType, isFloatType, isIntegerType, isNumericType, isSerialType, isStringType, renameTable, syncDiagramView, tryExtractBoolean, tryExtractDateTime, tryExtractEnum, tryExtractInteger, tryExtractNumeric, tryExtractString };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,7 +46,7 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@dbml/parse": "^7.0.0-alpha.1",
+    "@dbml/parse": "^7.0.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
@@ -57,7 +57,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "283f3bcf7373ecab1e808e8a8035ce906ee6a52e",
+  "gitHead": "d9579d7cf95b7cafa9f083529393f0206c0acc98",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/database.d.ts

@@ -30,6 +30,7 @@ export interface RawTableRecord {
     schemaName: string | undefined;
     tableName: string;
     columns: string[];
+    token: Token;
     values: {
         value: any;
         type: RecordValueType;