@dbml/core 7.1.0-alpha.0 → 7.1.1

package/lib/index.mjs

@@ -9839,8 +9839,14 @@ function processColumnInDb(_) {
 }
 function expandDiagramViewWildcards(_) {
 	for (let HY of _.diagramViews.values()) {
-		let P = HY.visibleEntities, UY = _.diagramViewWildcards.get(HY), WY = _.diagramViewExplicitlySet.get(HY);
-		!UY || !WY || UY.has("tableGroups") && P.tableGroups && P.tableGroups.length === 0 && (WY.has("tables") || WY.has("schemas") || (P.tableGroups = Array.from(_.tableGroups.values()).map((_) => ({ name: _.name }))));
+		let P = HY.visibleEntities, UY = _.diagramViewWildcards.get(HY);
+		if (UY) {
+			if (UY.has("tables") || UY.has("schemas")) {
+				P.tables = [], P.tableGroups = [], P.schemas = [];
+				continue;
+			}
+			UY.has("tableGroups") && P.tableGroups && P.tableGroups.length === 0 && (P.tableGroups = Array.from(_.tableGroups.values()).map((_) => ({ name: _.name })));
+		}
 	}
 }
 function convertEnvToDb(_, HY) {
@@ -12118,14 +12124,49 @@ function findDiagramViewBlocks$1(_) {
 	}
 	return HY;
 }
+function emitTablesBlock(_, HY) {
+	let P = HY.map((_) => {
+		let HY = addDoubleQuoteIfNeeded(_.name);
+		return _.schemaName === "public" ? HY : `${addDoubleQuoteIfNeeded(_.schemaName)}.${HY}`;
+	});
+	_.push("  Tables {"), P.forEach((HY) => _.push(`    ${HY}`)), _.push("  }");
+}
+function emitTableGroupsBlock(_, HY) {
+	_.push("  TableGroups {"), HY.forEach((HY) => _.push(`    ${addDoubleQuoteIfNeeded(HY.name)}`)), _.push("  }");
+}
+function emitSchemasBlock(_, HY) {
+	_.push("  Schemas {"), HY.forEach((HY) => _.push(`    ${addDoubleQuoteIfNeeded(HY.name)}`)), _.push("  }");
+}
+function emitNotesBlock(_, HY) {
+	_.push("  Notes {"), HY.forEach((HY) => _.push(`    ${addDoubleQuoteIfNeeded(HY.name)}`)), _.push("  }");
+}
 function generateDiagramViewBlock(_, HY) {
-	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}`);
-		P.push("  Tables {"), _.forEach((_) => P.push(`    ${_}`)), P.push("  }");
-	}
-	return HY?.stickyNotes !== void 0 && (HY.stickyNotes === null || (HY.stickyNotes.length === 0 ? P.push("  Notes { * }") : (P.push("  Notes {"), HY.stickyNotes.forEach((_) => P.push(`    ${_.name}`)), P.push("  }")))), HY?.tableGroups !== void 0 && (HY.tableGroups === null || (HY.tableGroups.length === 0 ? P.push("  TableGroups { * }") : (P.push("  TableGroups {"), HY.tableGroups.forEach((_) => P.push(`    ${_.name}`)), P.push("  }")))), HY?.schemas !== void 0 && (HY.schemas === null || (HY.schemas.length === 0 ? P.push("  Schemas { * }") : (P.push("  Schemas {"), HY.schemas.forEach((_) => P.push(`    ${_.name}`)), P.push("  }")))), P.push("}"), P.join("\n");
+	let P = `DiagramView ${addDoubleQuoteIfNeeded(_)} {`;
+	if (!HY) return `${P}\n}`;
+	let { tables: UY, tableGroups: WY, schemas: GY, stickyNotes: KY } = HY, qY = UY === null, JY = WY === null, YY = GY === null;
+	if (qY && JY && YY && KY === null) return `${P}\n}`;
+	if (qY || JY || YY) {
+		let _ = !qY && UY.length > 0, HY = !JY && WY.length > 0, XY = !YY && GY.length > 0;
+		if (!(_ || HY || XY)) {
+			if (KY && KY.length > 0) {
+				let _ = [P];
+				return emitNotesBlock(_, KY), _.push("}"), _.join("\n");
+			}
+			return `${P}\n  Notes { * }\n}`;
+		}
+		let ZY = [P];
+		return _ && emitTablesBlock(ZY, UY), HY && emitTableGroupsBlock(ZY, WY), XY && emitSchemasBlock(ZY, GY), KY && KY.length > 0 && emitNotesBlock(ZY, KY), ZY.push("}"), ZY.join("\n");
+	}
+	let XY = UY, ZY = WY, QY = GY, $Y = XY.length === 0 && ZY.length === 0 && QY.length === 0, eX = KY != null && KY.length > 0;
+	if ($Y) {
+		if (eX) {
+			let _ = [P, "  Tables { * }"];
+			return emitNotesBlock(_, KY), _.push("}"), _.join("\n");
+		}
+		return `${P}\n  *\n}`;
+	}
+	let tX = [P];
+	return XY.length > 0 && emitTablesBlock(tX, XY), ZY.length > 0 && emitTableGroupsBlock(tX, ZY), QY.length > 0 && emitSchemasBlock(tX, QY), eX && emitNotesBlock(tX, KY), tX.push("}"), tX.join("\n");
 }
 function syncDiagramView$1(_, HY, P) {
 	let UY = P ?? findDiagramViewBlocks$1(_), WY = [];
@@ -16203,19 +16244,19 @@ var POSTGRES_BUILTIN_TYPES = /* @__PURE__ */ "SMALLINT.INTEGER.INT.BIGINT.DECIMA
 		];
 		return concat_default(KY.schemas, KY.enums, KY.tables, KY.indexes, KY.comments, KY.refs, JY).join("\n");
 	}
+}, DbState = class {
+	constructor() {
+		this.dbId = 1, this.schemaId = 1, this.enumId = 1, this.tableGroupId = 1, this.refId = 1, this.tableId = 1, this.noteId = 1, this.enumValueId = 1, this.endpointId = 1, this.indexId = 1, this.checkId = 1, this.fieldId = 1, this.indexColumnId = 1, this.recordId = 1, this.tablePartialId = 1;
+	}
+	generateId(_) {
+		let HY = this[_];
+		return this[_] += 1, HY;
+	}
 }, ElementError = class extends Error {
-	constructor(_, HY = {
-		start: {
-			line: 1,
-			column: 1,
-			offset: 0
-		},
-		end: {
-			line: 1,
-			column: 1,
-			offset: 0
-		}
-	}) {
+	constructor(_, HY = { start: {
+		line: 1,
+		column: 1
+	} }) {
 		super(_), this.location = HY, this.error = "error";
 	}
 }, element_default = class {
@@ -16228,8 +16269,207 @@ var POSTGRES_BUILTIN_TYPES = /* @__PURE__ */ "SMALLINT.INTEGER.INT.BIGINT.DECIMA
 	error(_) {
 		throw new ElementError(_, this.token);
 	}
+};
+init_lodash();
+var enumValue_default = class extends element_default {
+	constructor({ name: _, token: HY, note: P, _enum: UY, noteToken: WY = null } = {}) {
+		super(HY), _ || this.error("Enum value must have a name"), this.name = _, this.note = P ? get_default(P, "value", P) : null, this.noteToken = P ? get_default(P, "token", WY) : null, this._enum = UY, this.dbState = this._enum.dbState, this.generateId();
+	}
+	generateId() {
+		this.id = this.dbState.generateId("enumValueId");
+	}
+	export() {
+		return { ...this.shallowExport() };
+	}
+	exportParentIds() {
+		return { enumId: this._enum.id };
+	}
+	shallowExport() {
+		return {
+			name: this.name,
+			note: this.note
+		};
+	}
+	normalize(_) {
+		_.enumValues[this.id] = {
+			id: this.id,
+			...this.shallowExport(),
+			...this.exportParentIds()
+		};
+	}
+};
+init_lodash();
+var enum_default = class extends element_default {
+	constructor({ name: _, token: HY, values: P, note: UY, schema: WY, noteToken: GY = null } = {}) {
+		super(HY), _ || this.error("Enum must have a name"), this.name = _, this.note = UY ? get_default(UY, "value", UY) : null, this.noteToken = UY ? get_default(UY, "token", GY) : null, this.values = [], this.fields = [], this.schema = WY, this.dbState = this.schema.dbState, this.generateId(), this.processValues(P);
+	}
+	generateId() {
+		this.id = this.dbState.generateId("enumId");
+	}
+	processValues(_) {
+		_.forEach((_) => {
+			this.pushValue(new enumValue_default({
+				..._,
+				_enum: this
+			}));
+		});
+	}
+	pushValue(_) {
+		this.checkValue(_), this.values.push(_);
+	}
+	checkValue(_) {
+		this.values.some((HY) => HY.name === _.name) && _.error(`Enum value "${_.name}" existed in enum ${shouldPrintSchema$1(this.schema) ? `"${this.schema.name}".` : ""}"${this.name}"`);
+	}
+	pushField(_) {
+		this.checkField(_), this.fields.push(_);
+	}
+	checkField(_) {
+		this.fields.some((HY) => HY.id === _.id) && this.error(`Field ${shouldPrintSchema$1(_.table.schema) ? `"${_.table.schema.name}".` : ""}"${_.table.name}"."${_.name}" already associated with enum ${shouldPrintSchema$1(this.schema) ? `"${this.schema.name}".` : ""}${this.name}"`);
+	}
+	export() {
+		return {
+			...this.shallowExport(),
+			...this.exportChild()
+		};
+	}
+	exportChild() {
+		return { values: this.values.map((_) => _.export()) };
+	}
+	exportChildIds() {
+		return {
+			valueIds: this.values.map((_) => _.id),
+			fieldIds: this.fields.map((_) => _.id)
+		};
+	}
+	exportParentIds() {
+		return { schemaId: this.schema.id };
+	}
+	shallowExport() {
+		return {
+			name: this.name,
+			note: this.note
+		};
+	}
+	normalize(_) {
+		_.enums[this.id] = {
+			id: this.id,
+			...this.shallowExport(),
+			...this.exportChildIds(),
+			...this.exportParentIds()
+		}, this.values.forEach((HY) => HY.normalize(_));
+	}
+}, endpoint_default = class extends element_default {
+	constructor({ tableName: _, schemaName: HY, fieldNames: P, relation: UY, token: WY, ref: GY }) {
+		super(WY), this.relation = UY, this.schemaName = HY, this.tableName = _, this.fieldNames = P, this.fields = [], this.ref = GY, this.dbState = this.ref.dbState, this.generateId();
+		let KY = GY.schema.database.findOrCreateSchema(HY || "public").database.findTable(HY, _);
+		KY || this.error(`Can't find table ${shouldPrintSchemaName(HY) ? `"${HY}".` : ""}"${_}"`), this.setFields(P, KY);
+	}
+	generateId() {
+		this.id = this.dbState.generateId("endpointId");
+	}
+	equals(_) {
+		return this.fields.length === _.fields.length ? this.compareFields(_) : !1;
+	}
+	compareFields(_) {
+		let HY = this.fields.map((_) => _.id).sort(), P = _.fields.map((_) => _.id).sort();
+		for (let _ = 0; _ < HY.length; _ += 1) if (HY[_] !== P[_]) return !1;
+		return !0;
+	}
+	export() {
+		return { ...this.shallowExport() };
+	}
+	exportParentIds() {
+		return {
+			refId: this.ref.id,
+			fieldIds: this.fields.map((_) => _.id)
+		};
+	}
+	shallowExport() {
+		return {
+			schemaName: this.schemaName,
+			tableName: this.tableName,
+			fieldNames: this.fieldNames,
+			relation: this.relation
+		};
+	}
+	setFields(_, HY) {
+		let P = _ && _.length ? [..._] : [];
+		if (!P.length) {
+			let _ = HY.fields.find((_) => _.pk);
+			if (_) P.push(_.name);
+			else {
+				let _ = HY.indexes.find((_) => _.pk);
+				_ ? P = _.columns.map((_) => _.value) : this.error(`Can't find primary or composite key in table ${shouldPrintSchema$1(HY.schema) ? `"${HY.schema.name}".` : ""}"${HY.name}"`);
+			}
+		}
+		P.forEach((_) => {
+			let P = HY.findField(_);
+			P || this.error(`Can't find field ${shouldPrintSchema$1(HY.schema) ? `"${HY.schema.name}".` : ""}"${_}" in table "${HY.name}"`), this.fields.push(P), P.pushEndpoint(this);
+		});
+	}
+	normalize(_) {
+		_.endpoints[this.id] = {
+			id: this.id,
+			...this.shallowExport(),
+			...this.exportParentIds()
+		};
+	}
+};
+function isEqualPair(_, HY) {
+	return _[0].equals(HY[0]) && _[1].equals(HY[1]);
+}
+var ref_default = class extends element_default {
+	constructor({ name: _, color: HY, endpoints: P, onDelete: UY, onUpdate: WY, token: GY, schema: KY = {}, injectedPartial: qY = null } = {}) {
+		super(GY), this.name = _, this.color = HY, this.onDelete = UY, this.onUpdate = WY, this.endpoints = [], this.schema = KY, this.injectedPartial = qY, this.dbState = this.schema.dbState, this.generateId(), this.processEndpoints(P);
+	}
+	generateId() {
+		this.id = this.dbState.generateId("refId");
+	}
+	processEndpoints(_) {
+		_.forEach((_) => {
+			this.endpoints.push(new endpoint_default({
+				..._,
+				ref: this
+			})), _.schemaName;
+		}), this.endpoints[0].equals(this.endpoints[1]) && this.error("Two endpoints are the same"), this.endpoints[0].fields.length !== this.endpoints[1].fields.length && this.error("Two endpoints have unequal number of fields");
+	}
+	equals(_) {
+		return isEqualPair(this.endpoints, _.endpoints) || isEqualPair(this.endpoints, _.endpoints.slice().reverse());
+	}
+	export() {
+		return {
+			...this.shallowExport(),
+			...this.exportChild()
+		};
+	}
+	shallowExport() {
+		return {
+			name: this.name,
+			color: this.color,
+			onDelete: this.onDelete,
+			onUpdate: this.onUpdate,
+			injectedPartialId: this.injectedPartial?.id
+		};
+	}
+	exportChild() {
+		return { endpoints: this.endpoints.map((_) => _.export()) };
+	}
+	exportChildIds() {
+		return { endpointIds: this.endpoints.map((_) => _.id) };
+	}
+	exportParentIds() {
+		return { schemaId: this.schema.id };
+	}
+	normalize(_) {
+		_.refs[this.id] = {
+			id: this.id,
+			...this.shallowExport(),
+			...this.exportChildIds(),
+			...this.exportParentIds()
+		}, this.endpoints.forEach((HY) => HY.normalize(_));
+	}
 }, check_default = class extends element_default {
-	constructor({ token: _, name: HY, expression: P, table: UY, column: WY = null, injectedPartial: GY = null }) {
+	constructor({ token: _, name: HY, expression: P, table: UY, column: WY = null, injectedPartial: GY = null } = {}) {
 		super(_), this.name = HY, this.expression = P, this.table = UY, this.column = WY, this.injectedPartial = GY, this.dbState = this.table.dbState, this.generateId();
 	}
 	generateId() {
@@ -16241,8 +16481,8 @@ var POSTGRES_BUILTIN_TYPES = /* @__PURE__ */ "SMALLINT.INTEGER.INT.BIGINT.DECIMA
 	exportParentIds() {
 		return {
 			tableId: this.table.id,
-			columnId: this.column?.id ?? null,
-			injectedPartialId: this.injectedPartial?.id ?? null
+			columnId: this.column?.id,
+			injectedPartialId: this.injectedPartial?.id
 		};
 	}
 	shallowExport() {
@@ -16252,9 +16492,8 @@ var POSTGRES_BUILTIN_TYPES = /* @__PURE__ */ "SMALLINT.INTEGER.INT.BIGINT.DECIMA
 		};
 	}
 	normalize(_) {
-		let HY = this.id;
-		_.checks[HY] = {
-			id: HY,
+		_.checks[this.id] = {
+			id: this.id,
 			...this.shallowExport(),
 			...this.exportParentIds()
 		};
@@ -16262,7 +16501,7 @@ var POSTGRES_BUILTIN_TYPES = /* @__PURE__ */ "SMALLINT.INTEGER.INT.BIGINT.DECIMA
 };
 init_lodash();
 var field_default = class extends element_default {
-	constructor({ name: _, type: HY, unique: P, pk: UY, token: WY, not_null: GY, note: KY, dbdefault: qY, increment: JY, checks: YY = [], table: XY = {}, noteToken: ZY = null, injectedPartial: QY = null, injectedToken: $Y = null }) {
+	constructor({ name: _, type: HY, unique: P, pk: UY, token: WY, not_null: GY, note: KY, dbdefault: qY, increment: JY, checks: YY = [], table: XY = {}, noteToken: ZY = null, injectedPartial: QY = null, injectedToken: $Y = null } = {}) {
 		super(WY), _ || this.error("Field must have a name"), HY || this.error("Field must have a type"), this.name = _, this.type = HY, this.unique = P, this.pk = UY, this.not_null = GY, this.note = KY ? get_default(KY, "value", KY) : null, this.noteToken = KY ? get_default(KY, "token", ZY) : null, this.dbdefault = qY, this.increment = JY, this.checks = [], this.endpoints = [], this.table = XY, this.injectedPartial = QY, this.injectedToken = $Y, this.dbState = this.table.dbState, this.generateId(), this.bindType(), this.processChecks(YY);
 	}
 	generateId() {
@@ -16331,7 +16570,7 @@ var field_default = class extends element_default {
 	}
 }, indexColumn_default = class extends element_default {
 	constructor({ type: _, value: HY, index: P, token: UY }) {
-		super(UY), this.type = _, this.value = HY, this.index = P, this.token = UY, this.dbState = this.index.dbState, this.generateId();
+		super(), this.type = _, this.value = HY, this.index = P, this.token = UY, this.dbState = this.index.dbState, this.generateId();
 	}
 	generateId() {
 		this.id = this.dbState.generateId("indexColumnId");
@@ -16356,7 +16595,7 @@ var field_default = class extends element_default {
 		};
 	}
 }, indexes_default = class extends element_default {
-	constructor({ columns: _, type: HY, unique: P, pk: UY, token: WY, name: GY, note: KY, table: qY = {}, injectedPartial: JY = null }) {
+	constructor({ columns: _, type: HY, unique: P, pk: UY, token: WY, name: GY, note: KY, table: qY = {}, injectedPartial: JY = null } = {}) {
 		super(WY), this.name = GY, this.type = HY, this.unique = P, this.note = KY ? KY.value : null, this.noteToken = KY ? KY.token : null, this.pk = UY, this.columns = [], this.table = qY, this.injectedPartial = JY, this.dbState = this.table.dbState, this.generateId(), this.processIndexColumns(_);
 	}
 	generateId() {
@@ -16412,7 +16651,7 @@ var field_default = class extends element_default {
 };
 init_lodash();
 var table_default = class extends element_default {
-	constructor({ name: _, alias: HY, note: P, fields: UY = [], indexes: WY = [], checks: GY = [], schema: KY = {}, token: qY, headerColor: JY, noteToken: YY = null, partials: XY = [] }) {
+	constructor({ name: _, alias: HY, note: P, fields: UY = [], indexes: WY = [], checks: GY = [], schema: KY = {}, token: qY, headerColor: JY, noteToken: YY = null, partials: XY = [] } = {}) {
 		super(qY), this.name = _, this.alias = HY, this.note = P ? get_default(P, "value", P) : null, this.noteToken = P ? get_default(P, "token", YY) : null, this.headerColor = JY, this.fields = [], this.indexes = [], this.checks = [], this.schema = KY, this.partials = XY, this.records = [], this.dbState = this.schema.dbState, this.generateId(), this.processFields(UY), this.processPartials(), this.checkFieldCount(), this.processIndexes(WY), this.processChecks(GY);
 	}
 	generateId() {
@@ -16466,18 +16705,18 @@ var table_default = class extends element_default {
 		return this.fields.find((HY) => HY.name === _);
 	}
 	checkSameId(_) {
-		return this.schema.checkSameId(_.schemaName || "public") && (this.name === _.name || this.alias === _.name || this.name === _.alias || !!(this.alias && this.alias === _.alias));
+		return this.schema.checkSameId(_.schemaName || "public") && (this.name === _.name || this.alias === _.name || this.name === _.alias || this.alias && this.alias === _.alias);
 	}
 	processPartials() {
 		if (!this.partials?.length) return;
 		let _ = new Set(this.fields.map((_) => _.name)), HY = /* @__PURE__ */ new Set();
 		isNil_default(this.note) || HY.add("note"), isNil_default(this.headerColor) || HY.add("headerColor");
 		let P = this.partials.sort((_, HY) => HY.order - _.order);
-		[...P].reverse().forEach((_) => {
+		P.toReversed().forEach((_) => {
 			this.fields.splice(_.order, 0, "dummy");
 		}), P.forEach((P) => {
 			let UY = this.schema.database.findTablePartial(P.name);
-			if (UY || this.error(`Table partial ${P.name} not found`), P.id = UY.id, UY.fields) {
+			if (UY || this.error(`Table partial ${P.name} not found`, P.token), P.id = UY.id, UY.fields) {
 				let HY = UY.fields.filter((HY) => !_.has(HY.name)).map((HY) => (_.add(HY.name), HY.inline_refs && HY.inline_refs.forEach((_) => {
 					let P = {
 						token: HY.token,
@@ -16567,95 +16806,6 @@ var table_default = class extends element_default {
 	}
 };
 init_lodash();
-var enumValue_default = class extends element_default {
-	constructor({ name: _, token: HY, note: P, _enum: UY, noteToken: WY = null }) {
-		super(HY), _ || this.error("Enum value must have a name"), this.name = _, this.note = P ? get_default(P, "value", P) : null, this.noteToken = P ? get_default(P, "token", WY) : null, this._enum = UY, this.dbState = this._enum.dbState, this.generateId();
-	}
-	generateId() {
-		this.id = this.dbState.generateId("enumValueId");
-	}
-	export() {
-		return { ...this.shallowExport() };
-	}
-	exportParentIds() {
-		return { enumId: this._enum.id };
-	}
-	shallowExport() {
-		return {
-			name: this.name,
-			note: this.note
-		};
-	}
-	normalize(_) {
-		_.enumValues[this.id] = {
-			id: this.id,
-			...this.shallowExport(),
-			...this.exportParentIds()
-		};
-	}
-};
-init_lodash();
-var enum_default = class extends element_default {
-	constructor({ name: _, token: HY, values: P, note: UY, schema: WY, noteToken: GY = null }) {
-		super(HY), _ || this.error("Enum must have a name"), this.name = _, this.note = UY ? get_default(UY, "value", UY) : null, this.noteToken = UY ? get_default(UY, "token", GY) : null, this.values = [], this.fields = [], this.schema = WY, this.dbState = this.schema.dbState, this.generateId(), this.processValues(P);
-	}
-	generateId() {
-		this.id = this.dbState.generateId("enumId");
-	}
-	processValues(_) {
-		_.forEach((_) => {
-			this.pushValue(new enumValue_default({
-				..._,
-				_enum: this
-			}));
-		});
-	}
-	pushValue(_) {
-		this.checkValue(_), this.values.push(_);
-	}
-	checkValue(_) {
-		this.values.some((HY) => HY.name === _.name) && _.error(`Enum value "${_.name}" existed in enum ${shouldPrintSchema$1(this.schema) ? `"${this.schema.name}".` : ""}"${this.name}"`);
-	}
-	pushField(_) {
-		this.checkField(_), this.fields.push(_);
-	}
-	checkField(_) {
-		this.fields.some((HY) => HY.id === _.id) && this.error(`Field ${shouldPrintSchema$1(_.table.schema) ? `"${_.table.schema.name}".` : ""}"${_.table.name}"."${_.name}" already associated with enum ${shouldPrintSchema$1(this.schema) ? `"${this.schema.name}".` : ""}${this.name}"`);
-	}
-	export() {
-		return {
-			...this.shallowExport(),
-			...this.exportChild()
-		};
-	}
-	exportChild() {
-		return { values: this.values.map((_) => _.export()) };
-	}
-	exportChildIds() {
-		return {
-			valueIds: this.values.map((_) => _.id),
-			fieldIds: this.fields.map((_) => _.id)
-		};
-	}
-	exportParentIds() {
-		return { schemaId: this.schema.id };
-	}
-	shallowExport() {
-		return {
-			name: this.name,
-			note: this.note
-		};
-	}
-	normalize(_) {
-		_.enums[this.id] = {
-			id: this.id,
-			...this.shallowExport(),
-			...this.exportChildIds(),
-			...this.exportParentIds()
-		}, this.values.forEach((HY) => HY.normalize(_));
-	}
-};
-init_lodash();
 var tableGroup_default = class extends element_default {
 	constructor({ name: _, token: HY, tables: P = [], schema: UY = {}, note: WY, color: GY, noteToken: KY = null }) {
 		super(HY), this.name = _, this.tables = [], this.schema = UY, this.dbState = this.schema.dbState, this.note = WY ? get_default(WY, "value", WY) : null, this.noteToken = WY ? get_default(WY, "token", KY) : null, this.color = GY, this.generateId(), this.processTables(P);
@@ -16708,120 +16858,10 @@ var tableGroup_default = class extends element_default {
 			...this.exportParentIds()
 		};
 	}
-}, endpoint_default = class extends element_default {
-	constructor({ tableName: _, schemaName: HY, fieldNames: P, relation: UY, token: WY, ref: GY }) {
-		super(WY), this.relation = UY, this.schemaName = HY, this.tableName = _, this.fieldNames = P, this.fields = [], this.ref = GY, this.dbState = this.ref.dbState, this.generateId();
-		let KY = GY.schema.database.findOrCreateSchema(HY || "public").database.findTable(HY, _);
-		KY || this.error(`Can't find table ${shouldPrintSchemaName(HY) ? `"${HY}".` : ""}"${_}"`), this.setFields(P, KY);
-	}
-	generateId() {
-		this.id = this.dbState.generateId("endpointId");
-	}
-	equals(_) {
-		return this.fields.length === _.fields.length ? this.compareFields(_) : !1;
-	}
-	compareFields(_) {
-		let HY = this.fields.map((_) => _.id).sort(), P = _.fields.map((_) => _.id).sort();
-		for (let _ = 0; _ < HY.length; _ += 1) if (HY[_] !== P[_]) return !1;
-		return !0;
-	}
-	export() {
-		return { ...this.shallowExport() };
-	}
-	exportParentIds() {
-		return {
-			refId: this.ref.id,
-			fieldIds: this.fields.map((_) => _.id)
-		};
-	}
-	shallowExport() {
-		return {
-			schemaName: this.schemaName,
-			tableName: this.tableName,
-			fieldNames: this.fieldNames,
-			relation: this.relation
-		};
-	}
-	setFields(_, HY) {
-		let P = _ && _.length ? [..._] : [];
-		if (!P.length) {
-			let _ = HY.fields.find((_) => _.pk);
-			if (_) P.push(_.name);
-			else {
-				let _ = HY.indexes.find((_) => _.pk);
-				_ ? P = _.columns.map((_) => _.value) : this.error(`Can't find primary or composite key in table ${shouldPrintSchema$1(HY.schema) ? `"${HY.schema.name}".` : ""}"${HY.name}"`);
-			}
-		}
-		P.forEach((_) => {
-			let P = HY.findField(_);
-			P || this.error(`Can't find field ${shouldPrintSchema$1(HY.schema) ? `"${HY.schema.name}".` : ""}"${_}" in table "${HY.name}"`), this.fields.push(P), P.pushEndpoint(this);
-		});
-	}
-	normalize(_) {
-		_.endpoints[this.id] = {
-			id: this.id,
-			...this.shallowExport(),
-			...this.exportParentIds()
-		};
-	}
-};
-function isEqualPair(_, HY) {
-	return _[0].equals(HY[0]) && _[1].equals(HY[1]);
-}
-var ref_default = class extends element_default {
-	constructor({ name: _, color: HY, endpoints: P, onDelete: UY, onUpdate: WY, token: GY, schema: KY = {}, injectedPartial: qY = void 0 }) {
-		super(GY), this.name = _, this.color = HY, this.onDelete = UY, this.onUpdate = WY, this.endpoints = [], this.schema = KY, this.injectedPartial = qY, this.dbState = this.schema.dbState, this.generateId(), this.processEndpoints(P);
-	}
-	generateId() {
-		this.id = this.dbState.generateId("refId");
-	}
-	processEndpoints(_) {
-		_.forEach((_) => {
-			this.endpoints.push(new endpoint_default({
-				..._,
-				ref: this
-			})), _.schemaName;
-		}), this.endpoints[0].equals(this.endpoints[1]) && this.error("Two endpoints are the same"), this.endpoints[0].fields.length !== this.endpoints[1].fields.length && this.error("Two endpoints have unequal number of fields");
-	}
-	equals(_) {
-		return isEqualPair(this.endpoints, _.endpoints) || isEqualPair(this.endpoints, _.endpoints.slice().reverse());
-	}
-	export() {
-		return {
-			...this.shallowExport(),
-			...this.exportChild()
-		};
-	}
-	shallowExport() {
-		return {
-			name: this.name,
-			color: this.color,
-			onDelete: this.onDelete,
-			onUpdate: this.onUpdate,
-			injectedPartialId: this.injectedPartial?.id
-		};
-	}
-	exportChild() {
-		return { endpoints: this.endpoints.map((_) => _.export()) };
-	}
-	exportChildIds() {
-		return { endpointIds: this.endpoints.map((_) => _.id) };
-	}
-	exportParentIds() {
-		return { schemaId: this.schema.id };
-	}
-	normalize(_) {
-		_.refs[this.id] = {
-			id: this.id,
-			...this.shallowExport(),
-			...this.exportChildIds(),
-			...this.exportParentIds()
-		}, this.endpoints.forEach((HY) => HY.normalize(_));
-	}
 };
 init_lodash();
 var schema_default = class extends element_default {
-	constructor({ name: _, alias: HY, note: P, tables: UY = [], refs: WY = [], enums: GY = [], tableGroups: KY = [], token: qY, database: JY = {}, noteToken: YY = null }) {
+	constructor({ name: _, alias: HY, note: P, tables: UY = [], refs: WY = [], enums: GY = [], tableGroups: KY = [], token: qY, database: JY = {}, noteToken: YY = null } = {}) {
 		super(qY), this.tables = [], this.enums = [], this.tableGroups = [], this.refs = [], this.name = _, this.note = P ? get_default(P, "value", P) : null, this.noteToken = P ? get_default(P, "token", YY) : null, this.alias = HY, this.database = JY, this.dbState = this.database.dbState, this.generateId(), this.processEnums(GY), this.processTables(UY), this.processRefs(WY), this.processTableGroups(KY);
 	}
 	generateId() {
@@ -16871,7 +16911,7 @@ var schema_default = class extends element_default {
 	}
 	checkRef(_) {
 		if (this.refs.some((HY) => HY.equals(_))) {
-			let HY = _.endpoints[0], P = HY.fieldNames.map((_) => JSON.stringify(_)).join(", "), UY = _.endpoints[1], WY = UY.fieldNames.map((_) => JSON.stringify(_)).join(", "), GY = `"${HY.schemaName ? `${HY.schemaName}"."` : ""}${HY.tableName}"(${P})`, KY = `"${UY.schemaName ? `${UY.schemaName}"."` : ""}${UY.tableName}"(${WY})`;
+			let HY = _.endpoints[0], P = HY.fieldNames.map(JSON.stringify).join(", "), UY = _.endpoints[1], WY = UY.fieldNames.map(JSON.stringify).join(", "), GY = `"${HY.schemaName ? `${HY.schemaName}"."` : ""}${HY.tableName}"(${P})`, KY = `"${UY.schemaName ? `${UY.schemaName}"."` : ""}${UY.tableName}"(${WY})`;
 			_.error(`Reference with the same endpoints already exists: ${GY} references ${KY}`);
 		}
 	}
@@ -16890,7 +16930,7 @@ var schema_default = class extends element_default {
 		this.tableGroups.some((HY) => HY.name === _.name) && _.error(`Table Group ${shouldPrintSchema$1(this) ? `"${this.name}".` : ""}"${_.name}" existed`);
 	}
 	checkSameId(_) {
-		return this.name === _.name || this.alias === _.name || this.name === _.alias || !!(this.alias && this.alias === _.alias);
+		return this.name === _.name || this.alias === _.name || this.name === _.alias || this.alias && this.alias === _.alias;
 	}
 	export() {
 		return {
@@ -16933,7 +16973,7 @@ var schema_default = class extends element_default {
 		}, this.tables.forEach((HY) => HY.normalize(_)), this.enums.forEach((HY) => HY.normalize(_)), this.tableGroups.forEach((HY) => HY.normalize(_)), this.refs.forEach((HY) => HY.normalize(_));
 	}
 }, stickyNote_default = class extends element_default {
-	constructor({ name: _, content: HY, headerColor: P, token: UY, database: WY = {} }) {
+	constructor({ name: _, content: HY, headerColor: P, token: UY, database: WY = {} } = {}) {
 		super(UY), this.name = _, this.content = HY, this.headerColor = P, this.database = WY, this.dbState = this.database.dbState, this.generateId();
 	}
 	generateId() {
@@ -16952,18 +16992,10 @@ var schema_default = class extends element_default {
 			...this.export()
 		};
 	}
-}, DbState = class {
-	constructor() {
-		this.dbId = 1, this.schemaId = 1, this.enumId = 1, this.tableGroupId = 1, this.refId = 1, this.tableId = 1, this.noteId = 1, this.enumValueId = 1, this.endpointId = 1, this.indexId = 1, this.checkId = 1, this.fieldId = 1, this.indexColumnId = 1, this.recordId = 1, this.tablePartialId = 1;
-	}
-	generateId(_) {
-		let HY = this[_];
-		return this[_] += 1, HY;
-	}
 };
 init_lodash();
 var tablePartial_default = class extends element_default {
-	constructor({ name: _, note: HY, fields: P = [], indexes: UY = [], checks: WY = [], token: GY, headerColor: KY, noteToken: qY = null, dbState: JY }) {
+	constructor({ name: _, note: HY, fields: P = [], indexes: UY = [], checks: WY = [], token: GY, headerColor: KY, noteToken: qY = null, dbState: JY } = {}) {
 		super(GY), this.name = _, this.note = HY ? get_default(HY, "value", HY) : null, this.noteToken = HY ? get_default(HY, "token", qY) : null, this.headerColor = KY, this.fields = P, this.indexes = UY, this.checks = WY, this.dbState = JY, this.generateId();
 	}
 	generateId() {
@@ -16991,7 +17023,7 @@ var tablePartial_default = class extends element_default {
 init_lodash();
 var database_default = class extends element_default {
 	constructor({ schemas: _ = [], tables: HY = [], notes: P = [], enums: UY = [], refs: WY = [], tableGroups: GY = [], project: KY = {}, aliases: qY = [], records: JY = [], tablePartials: YY = [] }) {
-		super(void 0), this.dbState = new DbState(), this.generateId(), this.hasDefaultSchema = !1, this.schemas = [], this.notes = [], this.note = KY.note ? get_default(KY, "note.value", KY.note) : null, this.noteToken = KY.note ? get_default(KY, "note.token", KY.noteToken) : null, this.databaseType = KY.database_type, this.name = KY.name, this.token = KY.token, this.aliases = qY, this.records = [], this.tablePartials = [], this.injectedRawRefs = [], this.processNotes(P), this.processRecords(JY), this.processTablePartials(YY), this.processSchemas(_), this.processSchemaElements(UY, ENUM), this.processSchemaElements(HY, TABLE), this.linkRecordsToTables(), this.processSchemaElements(P, "note"), this.processSchemaElements(WY, "ref"), this.processSchemaElements(GY, TABLE_GROUP), this.injectedRawRefs.forEach((_) => {
+		super(), this.dbState = new DbState(), this.generateId(), this.hasDefaultSchema = !1, this.schemas = [], this.notes = [], this.note = KY.note ? get_default(KY, "note.value", KY.note) : null, this.noteToken = KY.note ? get_default(KY, "note.token", KY.noteToken) : null, this.databaseType = KY.database_type, this.name = KY.name, this.token = KY.token, this.aliases = qY, this.records = [], this.tablePartials = [], this.injectedRawRefs = [], this.processNotes(P), this.processRecords(JY), this.processTablePartials(YY), this.processSchemas(_), this.processSchemaElements(UY, ENUM), this.processSchemaElements(HY, TABLE), this.linkRecordsToTables(), this.processSchemaElements(P, "note"), this.processSchemaElements(WY, "ref"), this.processSchemaElements(GY, TABLE_GROUP), this.injectedRawRefs.forEach((_) => {
 			let HY = this.findOrCreateSchema(DEFAULT_SCHEMA_NAME), P = new ref_default({
 				..._,
 				schema: HY
@@ -17097,30 +17129,27 @@ var database_default = class extends element_default {
 		let HY = this.schemas.find((HY) => HY.name === _ || HY.alias === _);
 		return HY || (HY = new schema_default({
 			name: _,
-			note: {
-				value: _ === "public" ? `Default ${capitalize_default(DEFAULT_SCHEMA_NAME)} Schema` : null,
-				token: void 0
-			},
+			note: { value: _ === "public" ? `Default ${capitalize_default(DEFAULT_SCHEMA_NAME)} Schema` : null },
 			database: this
 		}), this.pushSchema(HY)), HY;
 	}
 	findTableAlias(_) {
 		let HY = this.aliases.find((HY) => HY.name === _);
-		if (!HY || HY.kind !== "table") return;
+		if (!HY || HY.kind !== "table") return null;
 		let P = HY.value.schemaName || "public", UY = this.schemas.find((_) => _.name === P);
-		if (!UY) return;
+		if (!UY) return null;
 		let { tableName: WY } = HY.value;
 		return UY.tables.find((_) => _.name === WY);
 	}
 	findTable(_, HY) {
-		let P;
+		let P = null;
 		if (!_ && (P = this.findTableAlias(HY), P)) return P;
 		let UY = this.findOrCreateSchema(_ || "public");
 		return UY || this.error(`Schema ${_ || "public"} don't exist`), UY.findTable(HY);
 	}
 	findEnum(_, HY) {
 		let P = this.schemas.find((HY) => HY.name === _ || HY.alias === _);
-		if (P) return P.enums.find((_) => _.name === HY);
+		return P ? P.enums.find((_) => _.name === HY) : null;
 	}
 	findTablePartial(_) {
 		return this.tablePartials.find((HY) => HY.name === _);
@@ -1822011,5 +1822040,5 @@ function findDiagramViewBlocks(_) {
 	let HY = new Compiler();
 	return HY.setSource(_), HY.findDiagramViewBlocks();
 }
-const VERSION = "7.1.0-alpha.0";
+const VERSION = "7.1.1";
 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 };