@dbml/parse 8.0.0-alpha.9 → 8.0.0-prerelease.1

package/dist/dbml-parse.mjs

@@ -1010,6 +1010,10 @@ function baseUniq(r, j, M) {
 	return L;
 }
 var _baseUniq_default = baseUniq;
+function uniq(r) {
+	return r && r.length ? _baseUniq_default(r) : [];
+}
+var uniq_default = uniq;
 function uniqBy(r, j) {
 	return r && r.length ? _baseUniq_default(r, _baseIteratee_default(j, 2)) : [];
 }
@@ -1231,7 +1235,7 @@ var isAbsolute = function(r) {
 	}
 	relativeTo(r) {
 		let j = relative$1(r, this.path);
-		return j.startsWith(".") ? j : `./${j}`;
+		return !j.startsWith("./") && !j.startsWith("../") && ![".", ".."].includes(j) ? `./${j}` : j;
 	}
 	toString() {
 		return this.path;
@@ -1310,6 +1314,9 @@ function isValidAlias(r) {
 function isSimpleName(r) {
 	return r instanceof PrimaryExpressionNode && r.expression instanceof VariableNode;
 }
+function hasSimpleBody(r) {
+	return !!r.bodyColon;
+}
 function isValidPartialInjection(r) {
 	return r instanceof PrefixExpressionNode && r.op?.value === "~" && isExpressionAVariableNode(r.expression);
 }
@@ -2704,7 +2711,7 @@ function markInvalidNode(r) {
 	else if (r instanceof ProgramNode) r.body.forEach(markInvalid), markInvalid(r.eof);
 	else if (!(r instanceof EmptyNode)) if (r instanceof UseDeclarationNode) markInvalid(r.useKeyword), markInvalid(r.specifiers), markInvalid(r.fromKeyword), markInvalid(r.importPath);
 	else if (r instanceof UseSpecifierListNode) markInvalid(r.openBrace), r.specifiers.forEach(markInvalid), markInvalid(r.closeBrace);
-	else if (r instanceof UseSpecifierNode) markInvalid(r.importKind), markInvalid(r.name);
+	else if (r instanceof UseSpecifierNode) markInvalid(r.importKind), markInvalid(r.name), markInvalid(r.asKeyword), markInvalid(r.alias);
 	else if (r instanceof WildcardNode) markInvalid(r.token);
 	else throw Error("Unreachable case in markInvalidNode");
 }
@@ -2733,7 +2740,7 @@ function getMemberChain(r) {
 	if (r instanceof EmptyNode) return [];
 	if (r instanceof UseDeclarationNode) return filterUndefined(r.useKeyword, r.specifiers, r.fromKeyword, r.importPath);
 	if (r instanceof UseSpecifierListNode) return filterUndefined(r.openBrace, ...r.specifiers, r.closeBrace);
-	if (r instanceof UseSpecifierNode) return filterUndefined(r.importKind, r.name);
+	if (r instanceof UseSpecifierNode) return filterUndefined(r.importKind, r.name, r.asKeyword, r.alias);
 	if (r instanceof WildcardNode) return filterUndefined(r.token);
 	throw r instanceof GroupExpressionNode ? Error("This case is already handled by TupleExpressionNode") : Error("Unreachable - no other possible cases");
 }
@@ -2743,8 +2750,7 @@ function alternateLists(r, j) {
 	return M.push(...r.slice(N), ...j.slice(N)), M;
 }
 function shouldInterpretNode(r, j) {
-	let M = [...r.parseProject().values()].some((r) => r.getErrors().length > 0), N = r.validateNode(j).getErrors().length > 0, P = r.bindNode(j).getErrors().length > 0;
-	return !M && !N && !P;
+	return r.reachableFiles(j.filepath).every((j) => r.bindFile(j).getErrors().length === 0);
 }
 function scanNonListNodeForBinding(r) {
 	if (!r) return [];
@@ -2797,7 +2803,9 @@ var DiagramViewBinder = class {
 		let [j] = partition_default(r.body, (r) => r instanceof FunctionApplicationNode);
 		return j.flatMap((r) => !r.callee || isWildcardExpression(r.callee) ? [] : [r.callee, ...r.args].flatMap(scanNonListNodeForBinding).flatMap((r) => {
 			let j = r.variables.pop();
-			return j ? this.compiler.nodeReferee(j).getErrors() : [];
+			if (!j) return [];
+			let M = r.variables.pop();
+			return [...M ? this.compiler.nodeReferee(M).getErrors() : [], ...this.compiler.nodeReferee(j).getErrors()];
 		}));
 	}
 	bindNoteReferences(r) {
@@ -2858,31 +2866,31 @@ var DiagramViewBinder = class {
 			let j = r.type?.value.toLowerCase();
 			j && M.add(j), r.body instanceof BlockExpressionNode && this.interpretSubBlock(r.body, j);
 		}
-		let N = this.diagramView.visibleEntities;
-		return (M.has("tables") && N.tables !== null || M.has("tablegroups") && N.tableGroups !== null || M.has("schemas") && N.schemas !== null) && (M.has("tables") || (N.tables = []), M.has("tablegroups") || (N.tableGroups = []), M.has("schemas") || (N.schemas = [])), M.has("tables") && this.diagramViewExplicitlySet.add("tables"), M.has("tablegroups") && this.diagramViewExplicitlySet.add("tableGroups"), M.has("schemas") && this.diagramViewExplicitlySet.add("schemas"), M.has("notes") && this.diagramViewExplicitlySet.add("stickyNotes"), [];
+		let P = this.diagramView.visibleEntities;
+		return (M.has("tables") && P.tables !== null || M.has("tablegroups") && P.tableGroups !== null || M.has("schemas") && P.schemas !== null) && (M.has("tables") || (P.tables = []), M.has("tablegroups") || (P.tableGroups = []), M.has("schemas") || (P.schemas = [])), M.has(ElementKind.DiagramViewTables) && this.diagramViewExplicitlySet.add("tables"), M.has(ElementKind.DiagramViewTableGroups) && this.diagramViewExplicitlySet.add("tableGroups"), M.has(ElementKind.DiagramViewSchemas) && this.diagramViewExplicitlySet.add("schemas"), M.has(ElementKind.DiagramViewNotes) && this.diagramViewExplicitlySet.add("stickyNotes"), [];
 	}
 	interpretSubBlock(r, M) {
 		if (!M) return;
 		if (r.body.some((r) => r instanceof FunctionApplicationNode && isWildcardExpression(r.callee))) {
 			let r = this.diagramViewWildcards;
 			switch (M) {
-				case "tables":
+				case ElementKind.DiagramViewTables:
 					this.diagramView.visibleEntities.tables = [], r.add("tables");
 					break;
-				case "notes":
+				case ElementKind.DiagramViewNotes:
 					this.diagramView.visibleEntities.stickyNotes = [], r.add("stickyNotes");
 					break;
-				case "tablegroups":
+				case ElementKind.DiagramViewTableGroups:
 					this.diagramView.visibleEntities.tableGroups = [], r.add("tableGroups");
 					break;
-				case "schemas":
+				case ElementKind.DiagramViewSchemas:
 					this.diagramView.visibleEntities.schemas = [], r.add("schemas");
 					break;
 			}
 			return;
 		}
 		if (r.body.length === 0) return;
-		let N = [];
+		let P = [];
 		for (let M of r.body) {
 			if (!(M instanceof FunctionApplicationNode)) continue;
 			let r = M.callee && this.compiler.nodeReferee(M.callee).getFiltered(UNHANDLED);
@@ -2890,33 +2898,33 @@ var DiagramViewBinder = class {
 				let j = destructureComplexVariable(r.declaration.name) ?? [];
 				if (j.length > 0) {
 					let r = j[j.length - 1], M = j.length > 1 ? j.slice(0, -1).join(".") : DEFAULT_SCHEMA_NAME;
-					N.push({
+					P.push({
 						name: r,
 						schemaName: M
 					});
 					continue;
 				}
 			}
-			let P = destructureComplexVariable(M.callee) ?? [];
-			if (P.length === 0) continue;
-			let F = P[P.length - 1], I = P.length > 1 ? P[0] : DEFAULT_SCHEMA_NAME;
-			N.push({
+			let N = destructureComplexVariable(M.callee) ?? [];
+			if (N.length === 0) continue;
+			let F = N[N.length - 1], I = N.length > 1 ? N[0] : DEFAULT_SCHEMA_NAME;
+			P.push({
 				name: F,
 				schemaName: I
 			});
 		}
 		switch (M) {
-			case "tables":
-				this.diagramView.visibleEntities.tables = N.length > 0 ? N : null;
+			case ElementKind.DiagramViewTables:
+				this.diagramView.visibleEntities.tables = P.length > 0 ? P : null;
 				break;
-			case "notes":
-				this.diagramView.visibleEntities.stickyNotes = N.length > 0 ? N.map((r) => ({ name: r.name })) : null;
+			case ElementKind.DiagramViewNotes:
+				this.diagramView.visibleEntities.stickyNotes = P.length > 0 ? P.map((r) => ({ name: r.name })) : null;
 				break;
-			case "tablegroups":
-				this.diagramView.visibleEntities.tableGroups = N.length > 0 ? N.map((r) => ({ name: r.name })) : null;
+			case ElementKind.DiagramViewTableGroups:
+				this.diagramView.visibleEntities.tableGroups = P.length > 0 ? P.map((r) => ({ name: r.name })) : null;
 				break;
-			case "schemas":
-				this.diagramView.visibleEntities.schemas = N.length > 0 ? N.map((r) => ({ name: r.name })) : null;
+			case ElementKind.DiagramViewSchemas:
+				this.diagramView.visibleEntities.schemas = P.length > 0 ? P.map((r) => ({ name: r.name })) : null;
 				break;
 		}
 	}
@@ -3246,7 +3254,7 @@ const indexesModule$1 = {
 		let z = isExpressionAVariableNode(F) ? F.expression.variable?.value ?? "" : "", B = P.lookupMembers(R, SymbolKind.Column, z);
 		if (B) return Report.create(B);
 		let V = isElementNode(L, ElementKind.TablePartial) ? "TablePartial" : "Table";
-		return new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${z}' does not exist in ${V} 'public.${R.name}'`, F)]);
+		return new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${z}' does not exist in ${V} 'public.${R.name}'`, F)]);
 	},
 	bindNode(j, P) {
 		return isElementNode(P, ElementKind.Indexes) ? Report.create(void 0, new IndexesBinder(j, P).bind()) : Report.create(PASS_THROUGH);
@@ -7350,14 +7358,17 @@ var ProgramInterpreter = class {
 			let P = N.getValue();
 			P && this.pushElement(M, P);
 		}
-		let r = /* @__PURE__ */ new Set(), M = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
-		for (let N of M) {
-			if (!(N instanceof SchemaSymbol)) continue;
-			let M = this.compiler.symbolMembers(N).getFiltered(UNHANDLED) ?? [];
-			for (let j of M) {
+		let r = /* @__PURE__ */ new Set(), M = (this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? []).filter((r) => r instanceof SchemaSymbol);
+		for (; M.length > 0;) {
+			let N = M.shift(), P = this.compiler.symbolMembers(N).getFiltered(UNHANDLED) ?? [];
+			for (let j of P) {
+				if (j instanceof SchemaSymbol) {
+					M.push(j);
+					continue;
+				}
 				if (!(j instanceof UseSymbol)) continue;
-				let M = j.originalSymbol.intern();
-				r.has(M) || (r.add(M), this.interpretUseSymbol(j));
+				let N = j.originalSymbol.intern();
+				r.has(N) || (r.add(N), this.interpretUseSymbol(j));
 			}
 		}
 	}
@@ -7577,7 +7588,13 @@ const programModule$1 = {
 		return isProgramNode(N) ? new Binder(N, j).resolve() : Report.create(PASS_THROUGH);
 	},
 	interpretSymbol(j, N, P) {
-		return N instanceof ProgramSymbol ? N.declaration instanceof ProgramNode ? shouldInterpretNode(j, N.declaration) ? new ProgramInterpreter(j, N, P).interpret() : Report.create(void 0, [...j.validateNode(N.declaration).getErrors(), ...j.bindNode(N.declaration).getErrors()]) : Report.create(void 0) : Report.create(PASS_THROUGH);
+		if (!(N instanceof ProgramSymbol)) return Report.create(PASS_THROUGH);
+		if (!(N.declaration instanceof ProgramNode)) return Report.create(void 0);
+		if (!shouldInterpretNode(j, N.declaration)) {
+			let r = j.reachableFiles(P).flatMap((r) => j.bindFile(r).getErrors());
+			return Report.create(void 0, r);
+		}
+		return new ProgramInterpreter(j, N, P).interpret();
 	}
 };
 var ProjectBinder = class {
@@ -7626,7 +7643,7 @@ var ProjectBinder = class {
 	interpretBody(r) {
 		return r.body.flatMap((r) => {
 			let j = r;
-			switch (j.type?.value.toLowerCase()) {
+			switch (j.getElementKind()) {
 				case ElementKind.Table: {
 					let r = this.interpretSubElement(j);
 					return r.getValue() && this.project.tables?.push(r.getValue()), r.getErrors();
@@ -7991,23 +8008,23 @@ function nodeRefereeOfRecordsName(r, j, N) {
 	let P = extractVarNameFromPrimaryVariable(N) ?? "";
 	if (!isAccessExpression(N.parentNode)) {
 		let F = r.lookupMembers(j, [SymbolKind.Table, SymbolKind.Schema], P);
-		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table '${P}' does not exist in Schema 'public'`, N)]);
+		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table '${P}' does not exist in Schema 'public'`, N)]);
 	}
 	let F = nodeRefereeOfLeftExpression(r, N);
 	if (!F) {
 		let F = r.lookupMembers(j, [SymbolKind.Table, SymbolKind.Schema], P);
-		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table or schema '${P}' does not exist`, N)]);
+		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table or schema '${P}' does not exist`, N)]);
 	}
 	if (F.isKind(SymbolKind.Schema)) {
 		let j = r.lookupMembers(F, [SymbolKind.Table, SymbolKind.Schema], P);
-		return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table or schema '${P}' does not exist`, N)]);
+		return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table or schema '${P}' does not exist`, N)]);
 	}
 	return new Report(void 0);
 }
 function nodeRefereeOfRecordsColumn(r, j, N) {
 	if (!isExpressionAVariableNode(N)) return new Report(void 0);
 	let P = extractVarNameFromPrimaryVariable(N) ?? "", F = r.lookupMembers(j, SymbolKind.Column, P);
-	return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${P}' does not exist in Table 'public.${j.name}'`, N)]);
+	return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${P}' does not exist in Table 'public.${j.name}'`, N)]);
 }
 function nodeRefereeOfEnumValue(r, j, N) {
 	if (!isExpressionAVariableNode(N)) return new Report(void 0);
@@ -8017,7 +8034,7 @@ function nodeRefereeOfEnumValue(r, j, N) {
 	if (F) {
 		if (F.isKind(SymbolKind.Schema)) {
 			let j = r.lookupMembers(F, [SymbolKind.Enum, SymbolKind.Schema], P);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${P}' does not exist`, N)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${P}' does not exist`, N)]);
 		}
 		if (F.isKind(SymbolKind.Enum)) {
 			let j = r.lookupMembers(F, SymbolKind.EnumField, P);
@@ -8029,7 +8046,7 @@ function nodeRefereeOfEnumValue(r, j, N) {
 	if (I.leftExpression === N) {
 		if (isAccessExpression(I.parentNode) && I.parentNode.leftExpression === I) {
 			let F = r.lookupMembers(j, SymbolKind.Schema, P);
-			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${P}' does not exist in Schema 'public'`, N)]);
+			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${P}' does not exist in Schema 'public'`, N)]);
 		}
 		let F = r.lookupMembers(j, SymbolKind.Enum, P);
 		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum '${P}' does not exist in Schema 'public'`, N)]);
@@ -8238,7 +8255,7 @@ const useUtils = { visibleName(r, M) {
 			let r = N.nodeReferee(V).getFiltered(UNHANDLED);
 			if (!r) return Report.create(void 0);
 			let F = N.lookupMembers(r, I, R);
-			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Could not find ${I} '${R}'`, P)]);
+			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Could not find ${I} '${R}'`, P)]);
 		}
 		let H = lookupMemberInFilepath(N, B, R, I);
 		return H ? Report.create(H) : Report.create(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `${I} '${R}' does not exist in file ${B.toString()}`, P)]);
@@ -8277,8 +8294,8 @@ function lookupMemberInFilepath(r, M, N, P, F = /* @__PURE__ */ new Set()) {
 	F.add(M.intern());
 	let I = r.usableMembers(M).getFiltered(UNHANDLED);
 	if (!I) return;
-	let L = I.nonSchemaMembers.find((r) => r.name === N);
-	if (L?.isKind(P)) return L;
+	let L = I.nonSchemaMembers.find((r) => r.name === N && r.isKind(P));
+	if (L) return L;
 	let R = I.schemaMembers.find((r) => r.name === N);
 	if (R?.isKind(SymbolKind.Schema)) return R;
 	for (let j of I.reuses.selective) if (destructureComplexVariable(j.alias ?? j.name)?.at(-1) === N) {
@@ -8315,7 +8332,7 @@ function usableMembers(r) {
 function schemaMembership(r, M, N) {
 	let P = M.qualifiedName, F;
 	if (F = N instanceof UseSpecifierNode ? useUtils.visibleName(r, N) : r.nodeFullname(N).getFiltered(UNHANDLED), !F) return { kind: "none" };
-	let I = F.length <= 1 ? [DEFAULT_SCHEMA_NAME] : F.slice(0, -1);
+	let I = N instanceof UseSpecifierNode && N.getSymbolKind() === SymbolKind.Schema ? F : F.length <= 1 ? [DEFAULT_SCHEMA_NAME] : F.slice(0, -1);
 	return I.length < P.length || !P.every((r, j) => r === I[j]) ? { kind: "none" } : I.length === P.length ? { kind: "direct" } : {
 		kind: "child",
 		schemaName: I[P.length]
@@ -8579,7 +8596,7 @@ var TableBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
+			switch (r.getElementKind()) {
 				case ElementKind.Note: return this.table.note = {
 					value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 					token: getTokenPosition(r)
@@ -8599,8 +8616,8 @@ var TableBinder = class {
 		P.name = extractVariableFromExpression(r.expression) || "";
 		let F = r.expression ? this.compiler.nodeReferee(r.expression).getFiltered(UNHANDLED) : void 0, I = this.compiler.parseFile(this.filepath).getValue().ast, L = this.compiler.nodeSymbol(I).getFiltered(UNHANDLED);
 		if (F && !L.inNestedSchema(this.compiler, F)) {
-			let M = this.compiler.nodeSymbol(this.declarationNode).getFiltered(UNHANDLED), P = M ? (this.compiler.symbolUses(M).getFiltered(UNHANDLED) ?? []).find((r) => r.filepath.equals(this.filepath)) : void 0;
-			N.push(new CompileError(CompileErrorCode.UNSUPPORTED, `Import TablePartial from '${F.filepath}' first. Currently, importing a table that uses a table partial requires that table partial to also be in scope.`, P?.useSpecifierDeclaration ?? r));
+			let M = this.compiler.nodeSymbol(this.declarationNode).getFiltered(UNHANDLED), I = M ? (this.compiler.symbolUses(M).getFiltered(UNHANDLED) ?? []).find((r) => r.filepath.equals(this.filepath)) : void 0;
+			N.push(new CompileError(CompileErrorCode.UNSUPPORTED, `TablePartial ${P.name} from '${F.filepath}' should be imported. Currently, importing a table that uses a table partial requires that table partial to also be in scope.`, I?.useSpecifierDeclaration ?? r));
 		}
 		return this.table.partials.push(P), N;
 	}
@@ -8758,7 +8775,7 @@ function nodeRefereeOfPartialInjection(r, N, P) {
 		}
 	}
 	let L = r.lookupMembers(N, SymbolKind.TablePartial, F);
-	return L ? Report.create(L) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `TablePartial '${F}' does not exist in Schema 'public'`, P)]);
+	return L ? Report.create(L) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `TablePartial '${F}' does not exist in Schema 'public'`, P)]);
 }
 function nodeRefereeOfEnumType$1(r, j, N) {
 	if (!isExpressionAVariableNode(N)) return new Report(void 0);
@@ -8768,13 +8785,13 @@ function nodeRefereeOfEnumType$1(r, j, N) {
 	if (F) {
 		if (F.isKind(SymbolKind.Schema)) {
 			let j = isTerminalAccessFragment(N), I = r.lookupMembers(F, j ? SymbolKind.Enum : SymbolKind.Schema, P);
-			return I ? Report.create(I) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, j ? `Enum '${P}' does not exist in Schema 'public'` : `Schema '${P}' does not exist in Schema 'public'`, N)]);
+			return I ? Report.create(I) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, j ? `Enum '${P}' does not exist in Schema 'public'` : `Schema '${P}' does not exist in Schema 'public'`, N)]);
 		}
 		return new Report(void 0);
 	}
 	if (N.parentNode.leftExpression === N) {
 		let F = r.lookupMembers(j, SymbolKind.Schema, P);
-		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${P}' does not exist in Schema 'public'`, N)]);
+		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${P}' does not exist in Schema 'public'`, N)]);
 	}
 	return new Report(void 0);
 }
@@ -8821,11 +8838,11 @@ function nodeRefereeOfEnumDefault$1(r, j, N) {
 	if (F) {
 		if (F.isKind(SymbolKind.Schema)) {
 			let j = r.lookupMembers(F, [SymbolKind.Enum, SymbolKind.Schema], P);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${P}' does not exist`, N)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${P}' does not exist`, N)]);
 		}
 		if (F.isKind(SymbolKind.Enum)) {
 			let j = r.lookupMembers(F, SymbolKind.EnumField, P);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum field '${P}' does not exist in Enum 'public.${F.name}'`, N)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum field '${P}' does not exist in Enum 'public.${F.name}'`, N)]);
 		}
 		return new Report(void 0);
 	}
@@ -8833,10 +8850,10 @@ function nodeRefereeOfEnumDefault$1(r, j, N) {
 	if (I.leftExpression === N) {
 		if (isAccessExpression(I.parentNode) && I.parentNode.leftExpression === I) {
 			let F = r.lookupMembers(j, SymbolKind.Schema, P);
-			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${P}' does not exist in Schema 'public'`, N)]);
+			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${P}' does not exist in Schema 'public'`, N)]);
 		}
 		let F = r.lookupMembers(j, SymbolKind.Enum, P);
-		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum '${P}' does not exist in Schema 'public'`, N)]);
+		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum '${P}' does not exist in Schema 'public'`, N)]);
 	}
 	return new Report(void 0);
 }
@@ -9002,8 +9019,8 @@ var TableGroupBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
-				case "note":
+			switch (r.getElementKind()) {
+				case ElementKind.Note:
 					this.tableGroup.note = {
 						value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 						token: getTokenPosition(r)
@@ -9214,7 +9231,7 @@ var TablePartialBinder = class {
 		this.tablePartial.headerColor = M ? extractColor(M.value) : void 0;
 		let [N] = j[SettingName.Note] || [];
 		return this.tablePartial.note = N && {
-			value: extractQuotedStringToken(N?.value) ? normalizeNote(extractQuotedStringToken(N?.value)) : "",
+			value: normalizeNote(extractQuotedStringToken(N?.value)),
 			token: getTokenPosition(N)
 		}, [];
 	}
@@ -9224,7 +9241,7 @@ var TablePartialBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
+			switch (r.getElementKind()) {
 				case ElementKind.Note: return this.tablePartial.note = {
 					value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 					token: getTokenPosition(r)
@@ -9342,13 +9359,13 @@ function nodeRefereeOfEnumType(r, j, N) {
 	if (F) {
 		if (F.isKind(SymbolKind.Schema)) {
 			let j = r.lookupMembers(F, [SymbolKind.Enum, SymbolKind.Schema], P);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${P}' does not exist`, N)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${P}' does not exist`, N)]);
 		}
 		return new Report(void 0);
 	}
 	if (N.parentNode.leftExpression === N) {
 		let F = r.lookupMembers(j, SymbolKind.Schema, P);
-		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${P}' does not exist in Schema 'public'`, N)]);
+		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${P}' does not exist in Schema 'public'`, N)]);
 	}
 	return new Report(void 0);
 }
@@ -9361,21 +9378,21 @@ function nodeRefereeOfInlineRef(r, P, F) {
 			let N = r.nodeSymbol(L).getFiltered(UNHANDLED);
 			if (N) {
 				let j = r.lookupMembers(N, SymbolKind.Column, I);
-				return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${I}' does not exist in TablePartial '${N.name}'`, F)]);
+				return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${I}' does not exist in TablePartial '${N.name}'`, F)]);
 			}
 		}
 		let R = r.lookupMembers(P, SymbolKind.Column, I);
-		return R ? Report.create(R) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${I}' does not exist`, F)]);
+		return R ? Report.create(R) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${I}' does not exist`, F)]);
 	}
 	let L = nodeRefereeOfLeftExpression(r, F);
 	if (L) {
 		if (L.isKind(SymbolKind.Schema)) {
 			let j = r.lookupMembers(L, [SymbolKind.Table, SymbolKind.Schema], I);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table or schema '${I}' does not exist`, F)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table or schema '${I}' does not exist`, F)]);
 		}
 		if (L.isKind(SymbolKind.Table)) {
 			let j = r.lookupMembers(L, SymbolKind.Column, I);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${I}' does not exist in Table 'public.${L.name}'`, F)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${I}' does not exist in Table 'public.${L.name}'`, F)]);
 		}
 		return new Report(void 0);
 	}
@@ -9383,10 +9400,10 @@ function nodeRefereeOfInlineRef(r, P, F) {
 	if (R.leftExpression === F) {
 		if (isAccessExpression(R.parentNode) && R.parentNode.leftExpression === R) {
 			let j = r.lookupMembers(P, SymbolKind.Schema, I);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${I}' does not exist in Schema 'public'`, F)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${I}' does not exist in Schema 'public'`, F)]);
 		}
 		let j = r.lookupMembers(P, SymbolKind.Table, I);
-		return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table '${I}' does not exist in Schema 'public'`, F)]);
+		return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table '${I}' does not exist in Schema 'public'`, F)]);
 	}
 	return new Report(void 0);
 }
@@ -9398,11 +9415,11 @@ function nodeRefereeOfEnumDefault(r, j, N) {
 	if (F) {
 		if (F.isKind(SymbolKind.Schema)) {
 			let j = r.lookupMembers(F, [SymbolKind.Enum, SymbolKind.Schema], P);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${P}' does not exist`, N)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${P}' does not exist`, N)]);
 		}
 		if (F.isKind(SymbolKind.Enum)) {
 			let j = r.lookupMembers(F, SymbolKind.EnumField, P);
-			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum field '${P}' does not exist in Enum 'public.${F.name}'`, N)]);
+			return j ? Report.create(j) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum field '${P}' does not exist in Enum 'public.${F.name}'`, N)]);
 		}
 		return new Report(void 0);
 	}
@@ -9410,10 +9427,10 @@ function nodeRefereeOfEnumDefault(r, j, N) {
 	if (I.leftExpression === N) {
 		if (isAccessExpression(I.parentNode) && I.parentNode.leftExpression === I) {
 			let F = r.lookupMembers(j, SymbolKind.Schema, P);
-			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${P}' does not exist in Schema 'public'`, N)]);
+			return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${P}' does not exist in Schema 'public'`, N)]);
 		}
 		let F = r.lookupMembers(j, SymbolKind.Enum, P);
-		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum '${P}' does not exist in Schema 'public'`, N)]);
+		return F ? Report.create(F) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum '${P}' does not exist in Schema 'public'`, N)]);
 	}
 	return new Report(void 0);
 }
@@ -9489,11 +9506,15 @@ function handleMemberSelectiveUses(r, N, P, F) {
 function mergeImportedSchema(r, M, N, P = /* @__PURE__ */ new Set()) {
 	if (N.getSymbolKind() !== SymbolKind.Schema || !N.name) return [];
 	let F = r.nodeReferee(N.name).getFiltered(UNHANDLED);
-	if (!F || !F.isKind(SymbolKind.Schema) || (r.nodeAlias(N).getFiltered(UNHANDLED) ?? r.nodeFullname(N).getFiltered(UNHANDLED)?.at(0)) !== M.name) return [];
-	let I = F.intern();
-	if (P.has(I)) return [];
-	P.add(I);
-	let L = r.usableMembers(F).getFiltered(UNHANDLED);
+	if (!F || !F.isKind(SymbolKind.Schema)) return [];
+	let I = useUtils.visibleName(r, N), L = M.qualifiedName;
+	return !I || I.length !== L.length || !I.every((r, j) => r === L[j]) ? [] : mergeSchemaMembers(r, M, N, F, P);
+}
+function mergeSchemaMembers(r, M, N, P, F) {
+	let I = P.intern();
+	if (F.has(I)) return [];
+	F.add(I);
+	let L = r.usableMembers(P).getFiltered(UNHANDLED);
 	if (!L) return [];
 	let R = L.nonSchemaMembers.filter((r) => r.canBeImported).map((j) => r.symbolFactory.create(UseSymbol, {
 		kind: j.kind,
@@ -9503,7 +9524,20 @@ function mergeImportedSchema(r, M, N, P = /* @__PURE__ */ new Set()) {
 		name: j.name
 	}, M.filepath));
 	for (let j of [...R]) j.isKind(SymbolKind.TableGroup) && R.push(...expandTableGroup(r, M, j));
-	for (let j of L.reuses.selective) R.push(...mergeImportedSchema(r, M, j, P));
+	for (let P of L.reuses.selective) if (R.push(...mergeImportedSchema(r, M, P, F)), schemaMembership(r, M, P).kind === "direct") {
+		let F = r.nodeSymbol(P).getFiltered(UNHANDLED);
+		F && F.canBeImported && R.push(r.symbolFactory.create(UseSymbol, {
+			kind: F.kind,
+			declaration: F.originalSymbol.declaration,
+			usedSymbol: F.originalSymbol,
+			useSpecifierDeclaration: N,
+			name: F.name
+		}, M.filepath));
+	}
+	for (let { importPath: j } of L.reuses.wildcard) {
+		let P = findSchemaSymbolInFilepath(r, j, M.qualifiedName);
+		P && R.push(...mergeSchemaMembers(r, M, N, P, F));
+	}
 	return R;
 }
 function handleMemberWildcardUses(r, M, N, P, F, I = /* @__PURE__ */ new Set()) {
@@ -9891,6 +9925,10 @@ var DiagramViewValidator = class {
 	}
 	validateSubBlock(r) {
 		let j = [], M = [];
+		if (hasSimpleBody(r)) return j.push(new CompileError(CompileErrorCode.UNEXPECTED_SIMPLE_BODY, `${r.type?.value} body must be a block`, r.bodyColon)), {
+			errors: j,
+			warnings: M
+		};
 		if (!r.body || !(r.body instanceof BlockExpressionNode)) return {
 			errors: j,
 			warnings: M
@@ -11904,14 +11942,12 @@ var DBMLDefinitionProvider = class {
 		for (; I.length !== 0;) {
 			let r = I.pop();
 			if (!r) continue;
-			let M = this.compiler.nodeReferee(r);
-			if (M.hasValue(UNHANDLED)) continue;
-			let P = M.getValue();
-			if (!P) continue;
-			let F;
-			if (P.declaration && [SyntaxNodeKind.PRIMARY_EXPRESSION, SyntaxNodeKind.VARIABLE].includes(r.kind) && ({declaration: F} = P), F) {
-				let { startPos: r, endPos: j } = F, M = N;
-				return N && F.filepath && (M = URI.parse(F.filepath.toUri())), [{
+			let M = this.compiler.nodeReferee(r).getFiltered(UNHANDLED);
+			if (!M) continue;
+			let P;
+			if (M.declaration && [SyntaxNodeKind.PRIMARY_EXPRESSION, SyntaxNodeKind.VARIABLE].includes(r.kind) && ({declaration: P} = M), P) {
+				let { startPos: r, endPos: j } = P, M = N;
+				return N && P.filepath && (M = URI.parse(P.filepath.toUri())), [{
 					range: {
 						startColumn: r.column + 1,
 						startLineNumber: r.line + 1,
@@ -12004,81 +12040,47 @@ function isOffsetWithinElementHeader(r, j) {
 	let M = j.bodyColon?.start ?? j.body?.start;
 	return M === void 0 ? r >= j.start && r <= j.end : r >= j.start && r < M;
 }
-function scanExistingUses(r, j, M) {
-	let N = [], P = r.parseFile(j).getValue()?.ast;
-	if (!P) return N;
-	for (let r of P.uses) {
-		let j = r.importPath?.value ?? "";
-		if (!j) {
-			let N = r.useKeyword?.start ?? r.fullStart, P = M.lastIndexOf("\n", N - 1) + 1, F = M.indexOf("\n", N), I = M.slice(P, F === -1 ? void 0 : F).match(/from\s*(['"])(.*?)\1/);
-			I && (j = I[2]);
-		}
-		let P = [];
-		if (r.specifiers instanceof UseSpecifierListNode) {
-			let j = new Set([
-				"table",
-				"enum",
-				"tablepartial",
-				"tablegroup",
-				"note",
-				"schema",
-				"from"
-			]);
-			for (let N of r.specifiers.specifiers) {
-				let r, F;
-				if (N.name) r = N.importKind?.value, F = extractVariableFromExpression(N.name), !F && N.name.start !== void 0 && N.name.end !== void 0 && (F = M.slice(N.name.start, N.name.end).trim());
-				else if (N.importKind) {
-					let r = N.importKind.value ?? void 0;
-					r && !j.has(r.toLowerCase()) && (F = r);
-				}
-				if (F && F.toLowerCase() !== "from") {
-					let j = N.alias ? extractVariableFromExpression(N.alias) : void 0;
-					P.push({
-						kind: r,
-						name: F,
-						alias: j
-					});
-				}
+function scanExistingUses(r, j) {
+	let M = [], N = r.parseFile(j).getValue()?.ast;
+	if (!N) return M;
+	for (let r of N.uses) {
+		let j = r.importPath?.value ?? "", N = [];
+		if (r.specifiers instanceof UseSpecifierListNode) for (let j of r.specifiers.specifiers) {
+			let r, M;
+			if (j.name ? (r = j.importKind?.value, M = extractVariableFromExpression(j.name)) : j.importKind && (M = j.importKind.value ?? void 0), M) {
+				let P = j.alias ? extractVariableFromExpression(j.alias) : void 0;
+				N.push({
+					kind: r,
+					name: M,
+					alias: P
+				});
 			}
-		} else r.specifiers instanceof WildcardNode && P.push({ name: "*" });
-		if (P.length === 0 && !(r.specifiers instanceof WildcardNode)) continue;
-		let F = r.fullEnd;
-		if (!r.importPath) {
-			let j = r.useKeyword?.start ?? r.fullStart, N = M.indexOf("\n", j);
-			F = N === -1 ? M.length : N;
 		}
-		N.push({
+		else r.specifiers instanceof WildcardNode && N.push({ name: "*" });
+		N.length === 0 && !(r.specifiers instanceof WildcardNode) || M.push({
 			startOffset: r.fullStart,
-			endOffset: F,
+			endOffset: r.fullEnd,
 			sourceFile: j,
-			specifiers: P,
+			specifiers: N,
 			node: r
 		});
 	}
-	return N;
+	return M;
 }
 function mergeSymbolIntoUses(r, j, M, N, P, F) {
-	let I = scanExistingUses(r, P, F), L = normalizeSourcePath(N, P), R = I.findIndex((r) => r.sourceFile === L), z = `${M} ${j}`, B = detectLineEnding(F);
+	let I = scanExistingUses(r, P), L = N.relativeTo(P.dirname).replace(/\.dbml$/, ""), R = I.findIndex((r) => r.sourceFile === L), z = `${M} ${j}`;
 	if (R !== -1) {
 		let r = I[R];
 		return r.specifiers.some((r) => r.name === j) ? { topInsert: "" } : {
-			topInsert: buildUseStatement(uniqueInOrder([...r.specifiers.filter((r) => r.name !== "*").map((r) => `${r.kind ?? M} ${r.name}${r.alias ? ` as ${r.alias}` : ""}`), z]), L, B),
+			topInsert: buildUseStatement(uniq_default([...r.specifiers.filter((r) => r.name !== "*").map((r) => `${r.kind ?? M} ${r.name}${r.alias ? ` as ${r.alias}` : ""}`), z]), L, "\n"),
 			removeRange: expandToFullLines(F, r.startOffset, r.endOffset)
 		};
 	}
-	return { topInsert: buildUseStatement([z], L, B) };
+	return { topInsert: buildUseStatement([z], L, "\n") };
 }
 function buildUseStatement(r, j, M) {
 	return `use {${M}${r.map((r) => `  ${r}`).join(M)}${M}} from '${j}'${M}${M}`;
 }
-function uniqueInOrder(r) {
-	let j = /* @__PURE__ */ new Set(), M = [];
-	for (let N of r) {
-		let r = N.trim();
-		j.has(r) || (j.add(r), M.push(N));
-	}
-	return M;
-}
 function expandToFullLines(r, j, M) {
 	let N = r.lastIndexOf("\n", j - 1) + 1, P = M;
 	for (; P < r.length && (r[P] === " " || r[P] === "	");) P++;
@@ -12087,12 +12089,6 @@ function expandToFullLines(r, j, M) {
 		endOffset: P
 	};
 }
-function detectLineEnding(r) {
-	return r.includes("\r\n") ? "\r\n" : "\n";
-}
-function normalizeSourcePath(r, j) {
-	return r.relativeTo(j.dirname).replace(/\.dbml$/, "");
-}
 function pickCompletionItemKind(r) {
 	switch (r) {
 		case SymbolKind.Schema: return CompletionItemKind.Module;
@@ -12152,7 +12148,7 @@ function addSuggestAllSuggestion(r, j = ", ") {
 }
 function collectCrossFileSuggestions(r, M, N) {
 	let P = [], F = /* @__PURE__ */ new Set(), I = r.layout.getSource(N) ?? "";
-	for (let L of r.layout.getEntryPoints()) {
+	for (let L of r.layout.getEntrypoints()) {
 		if (L.equals(N)) continue;
 		let R = r.usableMembers(L).getFiltered(UNHANDLED);
 		if (R) for (let j of [...R.nonSchemaMembers, ...R.schemaMembers]) {
@@ -12272,6 +12268,7 @@ function suggestUseCompletion(r, j, M, N, P) {
 }
 function suggestInUseDeclaration(r, j, M, N, P, F) {
 	if (N.importPath && isOffsetWithinSpan(M, N.importPath)) return suggestUseFilepath(r, j, N.importPath, P, N);
+	if (N.importPath && M >= N.importPath.end) return noSuggestions();
 	if (N.fromKeyword && M > N.fromKeyword.end) return suggestUseFilepath(r, j, void 0, P, N);
 	if (N.specifiers instanceof UseSpecifierListNode) {
 		if (!N.specifiers.openBrace) {
@@ -12312,24 +12309,16 @@ function suggestUseElementNames(r, M, N, P) {
 	if (!F) return noSuggestions();
 	let I = r.usableMembers(F).getFiltered(UNHANDLED);
 	if (!I) return noSuggestions();
-	let L = [];
-	for (let r of I.nonSchemaMembers) {
-		if (r.kind !== P) continue;
-		let j = r.name;
-		j && L.push(j);
-	}
+	let L = /* @__PURE__ */ new Set();
 	for (let M of I.schemaMembers) {
-		if (M.isPublicSchema()) continue;
-		let N = M.name;
-		if (!N) continue;
-		let F = r.symbolMembers(M).getFiltered(UNHANDLED) ?? [];
-		for (let r of F) {
-			if (r.kind !== P) continue;
+		let N = r.symbolMembers(M).getFiltered(UNHANDLED) ?? [];
+		for (let r of N) {
+			if (r.kind !== P || r instanceof UseSymbol && !r.canBeImported) continue;
 			let j = r.name;
-			j && L.push(`${N}.${j}`);
+			j && (M.isPublicSchema() ? L.add(j) : L.add(`${M.name}.${j}`));
 		}
 	}
-	return { suggestions: L.map((r) => ({
+	return { suggestions: [...L].map((r) => ({
 		label: r,
 		insertText: r,
 		insertTextRules: CompletionItemInsertTextRule.KeepWhitespace,
@@ -12341,14 +12330,14 @@ function suggestUseSpecifierStart() {
 	return { suggestions: [{
 		label: "* from",
 		detail: "import all",
-		insertText: "* from '${1:path}'",
+		insertText: "* from '${1:./path}'",
 		insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
 		kind: CompletionItemKind.Snippet,
 		range: void 0
 	}, {
 		label: "{ } from",
 		detail: "import named",
-		insertText: "{ ${1:table} ${2:name} } from '${3:path}'",
+		insertText: "{ ${1:kind} ${2:name} } from '${3:./path}'",
 		insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
 		kind: CompletionItemKind.Snippet,
 		range: void 0
@@ -12365,7 +12354,7 @@ function suggestUseFilepath(r, j, M, N, P) {
 			endColumn: r.endColumn - 1
 		};
 	}
-	let z = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map(), V = uniqBy_default(r.layout.getEntryPoints().flatMap((j) => [...r.reachableFiles(j)]), (r) => r.intern());
+	let z = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map(), V = uniqBy_default(r.layout.getEntrypoints().flatMap((j) => [...r.reachableFiles(j)]), (r) => r.intern());
 	for (let M of V) {
 		if (M.equals(j)) continue;
 		let N = M.relativeTo(F);
@@ -12902,11 +12891,11 @@ function suggestInDiagramViewBody() {
 		range: void 0
 	})), wildcardSuggestion] };
 }
-function suggestInDiagramViewSubBlock(r, j, M, N) {
-	switch (N.type?.value.toLowerCase()) {
-		case "tables": return { suggestions: [wildcardSuggestion, ...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.Table, SymbolKind.Schema]).suggestions] };
-		case "tablegroups": return { suggestions: [wildcardSuggestion, ...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.TableGroup]).suggestions] };
-		case "schemas": return { suggestions: [
+function suggestInDiagramViewSubBlock(r, j, M, P) {
+	switch (P.getElementKind()) {
+		case ElementKind.DiagramViewTables: return { suggestions: [wildcardSuggestion, ...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.Table, SymbolKind.Schema]).suggestions] };
+		case ElementKind.DiagramViewTableGroups: return { suggestions: [wildcardSuggestion, ...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.TableGroup]).suggestions] };
+		case ElementKind.DiagramViewSchemas: return { suggestions: [
 			wildcardSuggestion,
 			{
 				label: DEFAULT_SCHEMA_NAME,
@@ -12917,7 +12906,7 @@ function suggestInDiagramViewSubBlock(r, j, M, N) {
 			},
 			...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.Schema]).suggestions
 		] };
-		case "notes": return { suggestions: [wildcardSuggestion, ...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.StickyNote]).suggestions] };
+		case ElementKind.DiagramViewNotes: return { suggestions: [wildcardSuggestion, ...suggestNamesInScope(r, j, M, r.parse.ast(j), [SymbolKind.StickyNote]).suggestions] };
 		default: return noSuggestions();
 	}
 }
@@ -13185,48 +13174,6 @@ var dbmlMonarchTokensProvider = {
 			[/[/*]/, "comment"]
 		]
 	}
-}, MemoryProjectLayout = class r {
-	constructor(r = {}) {
-		this.files = r instanceof Map ? new Map(r) : new Map(Object.entries(r));
-	}
-	setSource(r, j) {
-		this.files.set(r.absolute, j);
-	}
-	getSource(r) {
-		return this.files.get(r.absolute) ?? void 0;
-	}
-	deleteSource(r) {
-		this.files.delete(r.absolute);
-	}
-	clearSource() {
-		this.files.clear();
-	}
-	exists(r) {
-		return this.isFile(r) || this.isDirectory(r);
-	}
-	isFile(r) {
-		return this.files.has(r.absolute);
-	}
-	isDirectory(r) {
-		let j = r.absolute.endsWith("/") ? r.absolute : `${r.absolute}/`;
-		for (let r of this.files.keys()) if (r.startsWith(j)) return !0;
-		return !1;
-	}
-	listDirectory(r) {
-		let j = r?.absolute ?? "/", M = j.endsWith("/") ? j : j + "/", N = /* @__PURE__ */ new Set();
-		for (let r of this.files.keys()) {
-			if (!r.startsWith(M)) continue;
-			let j = r.slice(M.length), P = j.indexOf("/");
-			N.add(M + (P === -1 ? j : j.slice(0, P)));
-		}
-		return [...N].sort().map(Filepath.from);
-	}
-	getEntryPoints() {
-		return [...this.files.keys()].map(Filepath.from).sort((r, j) => r.absolute.localeCompare(j.absolute));
-	}
-	clone() {
-		return new r(this.files);
-	}
 };
 function containerStack(r, j) {
 	let M = this.token.flatStream(r), { index: N, token: P } = this.container.token(r, j), F = N === void 0 ? -1 : findLastIndex_default(M, (r) => !r.isInvalid, N);
@@ -13241,7 +13188,7 @@ function containerStack(r, j) {
 	for (; R.length > 0;) {
 		let M = !1, N = last_default(R);
 		if (N instanceof FunctionApplicationNode) {
-			let P = this.layout.getSource(r) || "";
+			let P = this.getSource(r) || "";
 			for (let r = N.end; r < j; r += 1) P[r] === "\n" && (R.pop(), M = !0);
 		} else N instanceof PrefixExpressionNode || N instanceof InfixExpressionNode ? this.container.token(r, j).token !== N.op && (R.pop(), M = !0) : N instanceof ListExpressionNode ? N.listCloseBracket && N.end <= j && (R.pop(), M = !0) : N instanceof TupleExpressionNode ? N.tupleCloseParen && N.end <= j && (R.pop(), M = !0) : N instanceof CommaExpressionNode ? N.end <= j && (R.pop(), M = !0) : N instanceof BlockExpressionNode ? N.blockCloseBrace && N.end <= j && (R.pop(), M = !0) : N instanceof IdentifierStreamNode || N.end < j && (R.pop(), M = !0);
 		if (M) {
@@ -13357,16 +13304,19 @@ function fileDependencies(r) {
 	}
 	return M;
 }
-function reachableFiles(r) {
-	let j = /* @__PURE__ */ new Set(), M = [], N = r ? [r] : this.layout.getEntryPoints(), P = 0;
-	for (; P < N.length;) {
-		let r = N[P++], F = r.intern();
-		if (!j.has(F)) {
-			j.add(F), M.push(r);
-			for (let j of this.fileDependencies(r)) N.push(j);
+function walkDependencies(r, j) {
+	let M = /* @__PURE__ */ new Set(), N = [], P = [...j], F = 0;
+	for (; F < P.length;) {
+		let j = P[F++], I = j.intern();
+		if (!M.has(I)) {
+			M.add(I), N.push(j);
+			for (let M of r.fileDependencies(j)) P.push(M);
 		}
 	}
-	return M;
+	return N;
+}
+function reachableFiles(r) {
+	return walkDependencies(this, r ? [r] : this.layout.getEntrypoints());
 }
 function ast(r) {
 	return this.bindFile(r), this.parseFile(r).getValue().ast;
@@ -13385,13 +13335,8 @@ function rawDb(r) {
 	if (N) return this.interpretSymbol(N, r).getFiltered(UNHANDLED);
 }
 function publicSymbolTable(r) {
-	let M = this.parseFile(r).getValue().ast, N = this.nodeSymbol(M);
-	if (N.hasValue(UNHANDLED)) return;
-	let P = this.symbolMembers(N.getValue());
-	if (P.hasValue(UNHANDLED)) return;
-	let F = [];
-	for (let r of P.getValue()) F.push(r);
-	return F;
+	let M = this.parseFile(r).getValue().ast, N = this.nodeSymbol(M).getFiltered(UNHANDLED);
+	if (N) return this.symbolMembers(N).getFiltered(UNHANDLED);
 }
 function flatStream(r) {
 	return this.parseFile(r).getValue().tokens.flatMap((r) => [
@@ -13417,7 +13362,7 @@ function bindFile(r) {
 	return new Report(void 0, [...j.getErrors(), ...P.getErrors()], [...j.getWarnings(), ...P.getWarnings()]);
 }
 function bindProject() {
-	let r = collectTransitiveDependencies(this, this.layout.getEntryPoints()), j = /* @__PURE__ */ new Map();
+	let r = collectTransitiveDependencies(this, this.layout.getEntrypoints()), j = /* @__PURE__ */ new Map();
 	for (let M of r) {
 		let r = this.bindFile(M);
 		j.set(M.absolute, r);
@@ -13425,14 +13370,12 @@ function bindProject() {
 	return j;
 }
 function interpretFile(r) {
-	let N = this.bindFile(r);
-	if (N.getErrors().length > 0) return N.map(() => void 0);
-	let P = this.parseFile(r).getValue().ast, F = this.nodeSymbol(P).getFiltered(UNHANDLED);
-	return F ? this.interpretSymbol(F, r).map((r) => r === UNHANDLED || !r ? void 0 : r) : Report.create(void 0);
+	let { ast: N } = this.parseFile(r).getValue(), P = this.nodeSymbol(N).getFiltered(UNHANDLED);
+	return P ? this.interpretSymbol(P, r).map((r) => r === UNHANDLED || !r ? void 0 : r) : Report.create(void 0);
 }
 function interpretProject() {
 	let r = [], N = [], P = /* @__PURE__ */ new Set(), F = [];
-	for (let r of this.layout.getEntryPoints()) for (let j of this.reachableFiles(r)) {
+	for (let r of this.layout.getEntrypoints()) for (let j of this.reachableFiles(r)) {
 		let r = j.intern();
 		P.has(r) || (P.add(r), F.push(j));
 	}
@@ -13440,8 +13383,10 @@ function interpretProject() {
 	for (let P of F) {
 		let F = this.parseFile(P);
 		r.push(...F.getErrors()), N.push(...F.getWarnings());
-		let L = F.getValue().ast, R = this.nodeSymbol(L).getFiltered(UNHANDLED), z = R ? this.interpretSymbol(R, P) : Report.create(UNHANDLED), B = z.getFiltered(UNHANDLED);
-		B && I.set(P.absolute, B), r.push(...z.getErrors()), N.push(...z.getWarnings());
+		let L = this.bindFile(P);
+		r.push(...L.getErrors()), N.push(...L.getWarnings());
+		let { ast: R } = F.getValue(), z = this.nodeSymbol(R).getFiltered(UNHANDLED), B = z ? this.interpretSymbol(z, P) : Report.create(UNHANDLED), V = B.getFiltered(UNHANDLED);
+		V && I.set(P.absolute, V), r.push(...B.getErrors()), N.push(...B.getWarnings());
 	}
 	let L = {};
 	for (let [r, j] of I) L[r] = j;
@@ -13795,7 +13740,47 @@ var ParsingContextStack = class {
 	}
 }, Parser = class {
 	constructor(r, j, M, N) {
-		this.current = 0, this.errors = [], this.contextStack = new ParsingContextStack(), this.synchronizeProgram = () => {
+		this.current = 0, this.errors = [], this.contextStack = new ParsingContextStack(), this.useSpecifierList = this.contextStack.withContextDo(ParsingContext.BlockExpression, () => {
+			let r = { specifiers: [] }, j = () => this.nodeFactory.create(UseSpecifierListNode, r);
+			try {
+				this.consume("Expect an opening brace '{'", SyntaxTokenKind.LBRACE), r.openBrace = this.previous();
+			} catch (r) {
+				if (!(r instanceof PartialParsingError)) throw r;
+				if (!this.canHandle(r)) throw new PartialParsingError(r.token, j(), r.handlerContext);
+				this.synchronizeUseSpecifierList();
+			}
+			for (; !this.isAtEnd() && !this.check(SyntaxTokenKind.RBRACE);) {
+				try {
+					r.specifiers.push(this.useSpecifier());
+				} catch (M) {
+					if (!(M instanceof PartialParsingError)) throw M;
+					if (M.partialNode instanceof UseSpecifierNode && r.specifiers.push(M.partialNode), !this.canHandle(M)) throw new PartialParsingError(M.token, j(), M.handlerContext);
+					this.synchronizeUseSpecifierList();
+				}
+				if (this.check(SyntaxTokenKind.IDENTIFIER) && isFromKeyword(this.peek())) break;
+				!hasTrailingNewLines(this.previous()) && !this.check(SyntaxTokenKind.RBRACE) && this.logError(this.peek(), CompileErrorCode.MISSING_SPACES, "Expect a newline between use specifiers");
+			}
+			try {
+				this.consume("Expect a closing brace '}'", SyntaxTokenKind.RBRACE), r.closeBrace = this.previous();
+			} catch (r) {
+				if (!(r instanceof PartialParsingError)) throw r;
+				if (!this.canHandle(r)) throw new PartialParsingError(r.token, j(), r.handlerContext);
+				this.synchronizeUseSpecifierList();
+			}
+			return j();
+		}), this.synchronizeUseSpecifierList = () => {
+			if (!this.check(SyntaxTokenKind.RBRACE)) for (markInvalid(this.advance()); !this.isAtEnd();) {
+				let r = this.peek();
+				if (this.check(SyntaxTokenKind.RBRACE) || this.check(SyntaxTokenKind.STRING_LITERAL) || this.check(SyntaxTokenKind.IDENTIFIER) && isFromKeyword(r) || isAtStartOfLine(this.previous(), r)) break;
+				markInvalid(r), this.advance();
+			}
+		}, this.synchronizeUseSpecifier = () => {
+			for (; !this.isAtEnd();) {
+				let r = this.peek();
+				if (this.check(SyntaxTokenKind.RBRACE) || isAtStartOfLine(this.previous(), r)) break;
+				markInvalid(r), this.advance();
+			}
+		}, this.synchronizeProgram = () => {
 			let r = this.peek();
 			r.kind === SyntaxTokenKind.EOF ? this.logError(r, CompileErrorCode.UNEXPECTED_EOF, "Unexpected EOF") : markInvalid(this.advance());
 		}, this.synchronizeElementDeclarationName = () => {
@@ -14017,59 +14002,39 @@ var ParsingContextStack = class {
 		if (this.advance(), r.useKeyword = this.previous(), this.peek().kind === SyntaxTokenKind.WILDCARD) this.advance(), r.specifiers = this.nodeFactory.create(WildcardNode, { token: this.previous() });
 		else try {
 			r.specifiers = this.useSpecifierList();
-		} catch (M) {
-			throw M instanceof PartialParsingError ? (r.specifiers = M.partialNode, new PartialParsingError(M.token, j(), M.handlerContext)) : M;
+		} catch (j) {
+			if (!(j instanceof PartialParsingError)) throw j;
+			j.partialNode instanceof UseSpecifierListNode && (r.specifiers = j.partialNode);
 		}
 		let M = r.specifiers instanceof WildcardNode ? "'*'" : "specifier list";
-		if (isFromKeyword(this.peek())) r.fromKeyword = this.advance();
-		else throw this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, `Expect 'from' after ${M}`), new PartialParsingError(this.peek(), j(), this.contextStack.findHandlerContext(this.tokens, this.current));
-		if (this.match(SyntaxTokenKind.STRING_LITERAL)) r.importPath = this.previous();
-		else throw this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect a string literal path"), new PartialParsingError(this.peek(), j(), this.contextStack.findHandlerContext(this.tokens, this.current));
-		return j();
-	}
-	useSpecifierList() {
-		let r = { specifiers: [] }, j = () => this.nodeFactory.create(UseSpecifierListNode, r);
-		try {
-			this.consume("Expect an opening brace '{'", SyntaxTokenKind.LBRACE), r.openBrace = this.previous();
-		} catch (r) {
-			throw r instanceof PartialParsingError ? new PartialParsingError(r.token, j(), r.handlerContext) : r;
-		}
-		for (; !this.isAtEnd() && !this.check(SyntaxTokenKind.RBRACE);) {
-			try {
-				r.specifiers.push(this.useSpecifier());
-			} catch (M) {
-				throw M instanceof PartialParsingError ? (M.partialNode instanceof UseSpecifierNode && r.specifiers.push(M.partialNode), new PartialParsingError(M.token, j(), M.handlerContext)) : M;
-			}
-			if (this.check(SyntaxTokenKind.IDENTIFIER) && isFromKeyword(this.peek())) break;
-			!hasTrailingNewLines(this.previous()) && !this.check(SyntaxTokenKind.RBRACE) && this.logError(this.peek(), CompileErrorCode.MISSING_SPACES, "Expect a newline between use specifiers");
-		}
-		try {
-			this.consume("Expect a closing brace '}'", SyntaxTokenKind.RBRACE), r.closeBrace = this.previous();
-		} catch (r) {
-			throw r instanceof PartialParsingError ? new PartialParsingError(r.token, j(), r.handlerContext) : r;
-		}
-		return j();
+		return isFromKeyword(this.peek()) ? r.fromKeyword = this.advance() : this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, `Expect 'from' after ${M}`), this.match(SyntaxTokenKind.STRING_LITERAL) ? r.importPath = this.previous() : this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect a string literal path"), j();
 	}
 	useSpecifier() {
 		let r = {}, j = () => this.nodeFactory.create(UseSpecifierNode, r);
 		try {
 			this.consume("Expect an import kind specifier (e.g. table, enum)", SyntaxTokenKind.IDENTIFIER), r.importKind = this.previous();
 		} catch (r) {
-			throw r instanceof PartialParsingError ? new PartialParsingError(r.token, j(), r.handlerContext) : r;
+			if (!(r instanceof PartialParsingError)) throw r;
+			if (!this.canHandle(r)) throw new PartialParsingError(r.token, j(), r.handlerContext);
+			this.synchronizeUseSpecifier();
 		}
 		if (this.check(SyntaxTokenKind.IDENTIFIER, SyntaxTokenKind.QUOTED_STRING)) try {
 			r.name = this.normalExpression();
-		} catch (r) {
-			throw r instanceof PartialParsingError ? new PartialParsingError(r.token, j(), r.handlerContext) : r;
+		} catch (M) {
+			if (!(M instanceof PartialParsingError)) throw M;
+			if (M.partialNode instanceof SyntaxNode && (r.name = M.partialNode), !this.canHandle(M)) throw new PartialParsingError(M.token, j(), M.handlerContext);
+			this.synchronizeUseSpecifier();
 		}
-		else this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect an element name");
+		else r.importKind && this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect an element name");
 		if (isAsKeyword(this.peek())) {
 			r.asKeyword = this.advance();
 			try {
 				if (!this.check(SyntaxTokenKind.IDENTIFIER, SyntaxTokenKind.QUOTED_STRING)) throw this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect an alias name after 'as'"), new PartialParsingError(this.peek(), j(), this.contextStack.findHandlerContext(this.tokens, this.current));
 				r.alias = this.normalExpression();
 			} catch (r) {
-				throw r instanceof PartialParsingError ? new PartialParsingError(r.token, j(), r.handlerContext) : r;
+				if (!(r instanceof PartialParsingError)) throw r;
+				if (!this.canHandle(r)) throw new PartialParsingError(r.token, j(), r.handlerContext);
+				this.synchronizeUseSpecifier();
 			}
 		}
 		return j();
@@ -14449,7 +14414,7 @@ function postfixBindingPower(r) {
 	};
 }
 function parseFile(r) {
-	let j = this.layout.getSource(r);
+	let j = this.getSource(r);
 	return new Lexer(j ?? "", r).lex().chain((M) => new Parser(j ?? "", M, this.nodeIdGenerator, r).parse()).map(({ ast: j, tokens: M }) => ({
 		ast: j,
 		tokens: M,
@@ -14457,7 +14422,7 @@ function parseFile(r) {
 	}));
 }
 function parseProject() {
-	let r = collectTransitiveDependencies(this, this.layout.getEntryPoints()), j = /* @__PURE__ */ new Map();
+	let r = collectTransitiveDependencies(this, this.layout.getEntrypoints()), j = /* @__PURE__ */ new Map();
 	for (let M of r) {
 		let r = this.parseFile(M);
 		j.set(M.absolute, r);
@@ -14660,59 +14625,60 @@ function findReplacements(r, j, M, N, P) {
 	return F;
 }
 function renameTable(r, M, N) {
-	let P = this.layout.clone(), F = normalizeTableName(M), I = normalizeTableName(N), L = F.schema, R = F.table, z = I.schema, B = I.table, V = lookupTableSymbol(this, r, L, R);
-	if (!V || V instanceof AliasSymbol || checkForNameCollision(this, r, L, R, z, B)) return P;
-	if (V instanceof UseSymbol && V.useSpecifierDeclaration instanceof UseSpecifierNode && V.useSpecifierDeclaration.alias) {
-		let M = V.useSpecifierDeclaration;
-		if (this.nodeAlias(M).getFiltered(UNHANDLED) === R) return renameAlias(this, P, r, M, V, z, B);
-	}
-	return renameRealDeclaration(this, P, V, L, R, z, B);
-}
-function renameAlias(r, j, M, N, P, F, I) {
-	let L = r.layout.getSource(M) ?? "";
-	if (!N.alias) return j;
-	let R = formatTableName(F, I, L.substring(N.alias.start, N.alias.end).includes("\"")), z = [];
-	z.push({
-		start: N.alias.start,
-		end: N.alias.end,
-		newText: R.formattedTable
+	let P = normalizeTableName(M), F = normalizeTableName(N), I = P.schema, L = P.table, R = F.schema, z = F.table, B = lookupTableSymbol(this, r, I, L);
+	if (!B || B instanceof AliasSymbol || checkForNameCollision(this, r, I, L, R, z)) return /* @__PURE__ */ new Map();
+	if (B instanceof UseSymbol && B.useSpecifierDeclaration instanceof UseSpecifierNode && B.useSpecifierDeclaration.alias) {
+		let M = B.useSpecifierDeclaration;
+		if (this.nodeAlias(M).getFiltered(UNHANDLED) === L) return renameAlias(this, r, M, B, R, z);
+	}
+	return renameRealDeclaration(this, B, I, L, R, z);
+}
+function renameAlias(r, j, M, N, P, F) {
+	let I = r.getSource(j) ?? "";
+	if (!M.alias) return /* @__PURE__ */ new Map();
+	let L = formatTableName(P, F, I.substring(M.alias.start, M.alias.end).includes("\"")), R = [];
+	R.push({
+		start: M.alias.start,
+		end: M.alias.end,
+		newText: L.formattedTable
 	});
-	let B = r.symbolReferences(P);
-	for (let r of B) r.filepath.absolute === M.absolute && r !== N.alias && z.push({
+	let z = r.symbolReferences(N);
+	for (let r of z) r.filepath.absolute === j.absolute && r !== M.alias && R.push({
 		start: r.start,
 		end: r.end,
-		newText: R.formattedTable
+		newText: L.formattedTable
 	});
-	return j.setSource(M, applyTextEdits(L, z)), j;
-}
-function renameRealDeclaration(r, j, M, N, P, F, I) {
-	let L = M.originalSymbol, R = L.declaration;
-	if (!R || !(R instanceof ElementDeclarationNode)) return j;
-	let z = R.filepath;
-	if (!z) return j;
-	let B = formatTableName(F, I, checkIfDeclarationUsesQuotes(R, r.layout.getSource(z) ?? "")), V = /* @__PURE__ */ new Map(), H = (r, j) => {
-		let M = r.absolute, N = V.get(M);
+	return new Map([[j.absolute, applyTextEdits(I, R)]]);
+}
+function renameRealDeclaration(r, j, M, N, P, F) {
+	let I = j.originalSymbol, L = I.declaration;
+	if (!L || !(L instanceof ElementDeclarationNode)) return /* @__PURE__ */ new Map();
+	let R = L.filepath;
+	if (!R) return /* @__PURE__ */ new Map();
+	let z = formatTableName(P, F, checkIfDeclarationUsesQuotes(L, r.getSource(R) ?? "")), B = /* @__PURE__ */ new Map(), V = (r, j) => {
+		let M = r.absolute, N = B.get(M);
 		N || (N = {
 			fp: r,
 			edits: []
-		}, V.set(M, N)), N.edits.push(j);
-	}, U = R.name;
-	U && H(z, {
-		start: U.start,
-		end: U.end,
-		newText: buildReplacementText(B)
+		}, B.set(M, N)), N.edits.push(j);
+	}, H = L.name;
+	H && V(R, {
+		start: H.start,
+		end: H.end,
+		newText: buildReplacementText(z)
 	});
-	let W = r.symbolReferences(L);
-	for (let j of W) {
-		if (j === U) continue;
-		let M = j.filepath, F = r.layout.getSource(M) ?? "";
-		for (let r of findReplacements([j], N, P, B, F)) H(M, r);
+	let U = r.symbolReferences(I);
+	for (let j of U) {
+		if (j === H) continue;
+		let P = j.filepath, F = r.getSource(P) ?? "";
+		for (let r of findReplacements([j], M, N, z, F)) V(P, r);
 	}
-	for (let { fp: M, edits: N } of V.values()) {
-		let P = r.layout.getSource(M) ?? "";
-		j.setSource(M, applyTextEdits(P, N));
+	let W = /* @__PURE__ */ new Map();
+	for (let { fp: j, edits: M } of B.values()) {
+		let N = r.getSource(j) ?? "";
+		W.set(j.absolute, applyTextEdits(N, M));
 	}
-	return j;
+	return W;
 }
 function findDiagramViewBlocks(r) {
 	let j = [], M = new Lexer(r, DEFAULT_ENTRY).lex();
@@ -14775,7 +14741,7 @@ function generateDiagramViewBlock(r, j) {
 	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 = this.layout.getSource(r) ?? "", P = M ?? findDiagramViewBlocks(N), F = [];
+	let N = this.getSource(r) ?? "", P = M ?? findDiagramViewBlocks(N), F = [];
 	for (let r of j) {
 		let j = applyOperation(N, r, P);
 		F.push(...j);
@@ -14835,12 +14801,12 @@ function computeDeleteEdit(r, j, M) {
 	}];
 }
 var COMPUTING = Symbol("COMPUTING"), Compiler = class {
-	constructor() {
-		this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.layout = new MemoryProjectLayout(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolParent = this.globalQuery(symbolParent), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable.bind(this), this.syncDiagramView = syncDiagramView.bind(this), this.token = {
+	constructor(r) {
+		this.layout = r, this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.sourceSnapshot = /* @__PURE__ */ new Map(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolParent = this.globalQuery(symbolParent), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable.bind(this), this.syncDiagramView = syncDiagramView.bind(this), this.token = {
 			invalidStream: this.localQuery(invalidStream),
 			flatStream: this.localQuery(flatStream)
 		}, this.parse = {
-			source: (r) => this.layout.getSource(r) || "",
+			source: (r) => this.getSource(r) || "",
 			ast: (r = DEFAULT_ENTRY) => ast.call(this, r),
 			errors: (r = DEFAULT_ENTRY) => errors.call(this, r),
 			warnings: (r = DEFAULT_ENTRY) => warnings.call(this, r),
@@ -14855,19 +14821,23 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 			scopeKind: this.localQuery(containerScopeKind)
 		};
 	}
-	setSource(r, j) {
-		this.layout.setSource(r, j), this.localCache.delete(r.intern()), this.globalCache.clear();
+	getSource(r) {
+		return this.layout.getSource(r);
 	}
-	clearSource() {
-		this.layout = new MemoryProjectLayout(), this.localCache.clear(), this.globalCache.clear();
+	cleanStaleLocalCache(r) {
+		let j = this.layout.getSource(r), M = r.absolute;
+		this.sourceSnapshot.has(M) && this.sourceSnapshot.get(M) !== j && (this.localCache.delete(r.intern()), this.globalCache.clear()), this.sourceSnapshot.set(M, j);
 	}
-	deleteSource(r) {
-		this.layout.deleteSource(r), this.localCache.delete(r.intern()), this.globalCache.clear();
+	cleanStaleGlobalCache() {
+		let r = this.layout.getEntrypoints(), j = !1;
+		this.entrypointsSnapshot !== void 0 && (this.entrypointsSnapshot.length !== r.length || this.entrypointsSnapshot.some((j, M) => j.absolute !== r[M].absolute)) && (j = !0), this.entrypointsSnapshot = r;
+		for (let j of walkDependencies(this, r)) this.cleanStaleLocalCache(j);
+		j && this.globalCache.clear();
 	}
 	globalQuery(r) {
 		let j = Symbol();
 		return ((...M) => {
-			this.globalCache.has(j) || this.globalCache.set(j, /* @__PURE__ */ new Map());
+			this.cleanStaleGlobalCache(), this.globalCache.has(j) || this.globalCache.set(j, /* @__PURE__ */ new Map());
 			let N = M.map((r) => intern(r)).join("\0"), P = this.globalCache.get(j);
 			if (P.has(N)) {
 				let j = P.get(N);
@@ -14886,25 +14856,27 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 	localQuery(r) {
 		let j = Symbol();
 		return ((...M) => {
-			let [N] = M, P = (N instanceof SyntaxNode ? N.filepath : N).intern(), F = M.map((r) => intern(r)).join("\0"), I = this.localCache.get(P);
-			I || (I = /* @__PURE__ */ new Map(), this.localCache.set(P, I));
-			let L = I.get(j);
-			if (L || (L = /* @__PURE__ */ new Map(), I.set(j, L)), L.has(F)) {
-				let j = L.get(F);
-				if (j === COMPUTING) throw Error(`Cycle detected in query: ${r.name}(${P}, ${F})`);
+			let [N] = M, P = N instanceof SyntaxNode ? N.filepath : N;
+			this.cleanStaleLocalCache(P);
+			let F = P.intern(), I = M.map((r) => intern(r)).join("\0"), L = this.localCache.get(F);
+			L || (L = /* @__PURE__ */ new Map(), this.localCache.set(F, L));
+			let R = L.get(j);
+			if (R || (R = /* @__PURE__ */ new Map(), L.set(j, R)), R.has(I)) {
+				let j = R.get(I);
+				if (j === COMPUTING) throw Error(`Cycle detected in query: ${r.name}(${F}, ${I})`);
 				return j;
 			}
-			L.set(F, COMPUTING);
+			R.set(I, COMPUTING);
 			try {
 				let j = r.apply(this, M);
-				return L.set(F, j), j;
+				return R.set(I, j), j;
 			} catch (r) {
-				throw L.delete(F), r;
+				throw R.delete(I), r;
 			}
 		});
 	}
 	findDiagramViewBlocks(r) {
-		return findDiagramViewBlocks(this.layout.getSource(r) ?? "");
+		return findDiagramViewBlocks(this.getSource(r) ?? "");
 	}
 	initMonacoServices(r) {
 		let j = r?.autocompletion?.triggerCharacters ?? [
@@ -14929,5 +14901,47 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 			diagnosticsProvider: new DBMLDiagnosticsProvider(this)
 		};
 	}
+}, MemoryProjectLayout = class r {
+	constructor(r = {}) {
+		this.files = r instanceof Map ? new Map(r) : new Map(Object.entries(r));
+	}
+	setSource(r, j) {
+		this.files.set(r.absolute, j);
+	}
+	getSource(r) {
+		return this.files.get(r.absolute) ?? void 0;
+	}
+	deleteSource(r) {
+		this.files.delete(r.absolute);
+	}
+	clearSource() {
+		this.files.clear();
+	}
+	exists(r) {
+		return this.isFile(r) || this.isDirectory(r);
+	}
+	isFile(r) {
+		return this.files.has(r.absolute);
+	}
+	isDirectory(r) {
+		let j = r.absolute.endsWith("/") ? r.absolute : `${r.absolute}/`;
+		for (let r of this.files.keys()) if (r.startsWith(j)) return !0;
+		return !1;
+	}
+	listDirectory(r) {
+		let j = r?.absolute ?? "/", M = j.endsWith("/") ? j : j + "/", N = /* @__PURE__ */ new Set();
+		for (let r of this.files.keys()) {
+			if (!r.startsWith(M)) continue;
+			let j = r.slice(M.length), P = j.indexOf("/");
+			N.add(M + (P === -1 ? j : j.slice(0, P)));
+		}
+		return [...N].sort().map(Filepath.from);
+	}
+	getEntrypoints() {
+		return [...this.files.keys()].map(Filepath.from).sort((r, j) => r.absolute.localeCompare(j.absolute));
+	}
+	clone() {
+		return new r(this.files);
+	}
 };
 export { ArrayNode, AttributeNode, BlockExpressionNode, CallExpressionNode, CommaExpressionNode, CompileError, CompileErrorCode, Compiler, CompletionItemInsertTextRule, CompletionItemKind, DBMLCompletionItemProvider, DBMLDefinitionProvider, DBMLDiagnosticsProvider, DBMLReferencesProvider, DEFAULT_ENTRY, ElementDeclarationNode, ElementKind, EmptyNode, FALSY_VALUES, Filepath, FunctionApplicationNode, FunctionExpressionNode, GroupExpressionNode, IdentifierStreamNode, InfixExpressionNode, ListExpressionNode, LiteralNode, MarkerSeverity, MemoryProjectLayout, PostfixExpressionNode, PrefixExpressionNode, PrimaryExpressionNode, ProgramNode, ScopeKind, SymbolKind, SyntaxNode, SyntaxNodeIdGenerator, SyntaxNodeKind, SyntaxToken, SyntaxTokenKind, TRUTHY_VALUES, TupleExpressionNode, UNHANDLED, URI as Uri, UseDeclarationNode, UseSpecifierListNode, UseSpecifierNode, VariableNode, WildcardNode, addDoubleQuoteIfNeeded, dbmlLanguageConfig, dbmlMonarchTokensProvider, escapeString, extractNumericLiteral, extractSignedNumber, formatRecordValue, getRecordValueType, isBinaryType, isBooleanType, isDateTimeType, isEmptyStringLiteral, isFloatType, isFunctionExpression, isIntegerType, isNullish, isNumericType, isOp, isOpToken, isSerialType, isStringType, isTriviaToken, isValidIdentifier, normalizeTypeName, splitQualifiedIdentifier, tryExtractBoolean, tryExtractDateTime, tryExtractEnum, tryExtractInteger, tryExtractNumeric, tryExtractString, unescapeString, validateForeignKeys, validatePrimaryKey, validateUnique };