@dbml/parse 8.0.0-alpha.0 → 8.0.0-alpha.11

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)) : [];
 }
@@ -1257,13 +1261,13 @@ var isAbsolute = function(r) {
 function resolveImportFilepath(r, j) {
 	if (!Filepath.isRelative(j)) return;
 	let M = Filepath.resolve(r.dirname, j);
-	return M.absolute.endsWith(".dbml") ? M : Filepath.from(M.absolute + DBML_EXT);
+	return M.absolute.endsWith(".dbml") ? M : Filepath.from(M.absolute + ".dbml");
 }
 const KEYWORDS_OF_DEFAULT_SETTING = [
 	"null",
 	"true",
 	"false"
-], DBML_EXT = ".dbml", NUMERIC_LITERAL_PREFIX = ["-", "+"], DEFAULT_SCHEMA_NAME = "public", DEFAULT_ENTRY = Filepath.from("/main.dbml");
+], NUMERIC_LITERAL_PREFIX = ["-", "+"], DEFAULT_SCHEMA_NAME = "public", DEFAULT_ENTRY = Filepath.from("/main.dbml");
 let CompileErrorCode = /* @__PURE__ */ function(r) {
 	return r[r.UNKNOWN_SYMBOL = 1e3] = "UNKNOWN_SYMBOL", r[r.UNEXPECTED_SYMBOL = 1001] = "UNEXPECTED_SYMBOL", r[r.UNEXPECTED_EOF = 1002] = "UNEXPECTED_EOF", r[r.UNEXPECTED_NEWLINE = 1003] = "UNEXPECTED_NEWLINE", r[r.UNKNOWN_TOKEN = 1004] = "UNKNOWN_TOKEN", r[r.UNEXPECTED_TOKEN = 1005] = "UNEXPECTED_TOKEN", r[r.UNEXPECTED_ELEMENT_DECLARATION = 1006] = "UNEXPECTED_ELEMENT_DECLARATION", r[r.MISSING_SPACES = 1007] = "MISSING_SPACES", r[r.UNKNOWN_PREFIX_OP = 1008] = "UNKNOWN_PREFIX_OP", r[r.INVALID_OPERAND = 1009] = "INVALID_OPERAND", r[r.EMPTY_ATTRIBUTE_NAME = 1010] = "EMPTY_ATTRIBUTE_NAME", r[r.INVALID_ESCAPE_SEQUENCE = 1011] = "INVALID_ESCAPE_SEQUENCE", r[r.INVALID_NAME = 3e3] = "INVALID_NAME", r[r.UNEXPECTED_NAME = 3001] = "UNEXPECTED_NAME", r[r.NAME_NOT_FOUND = 3002] = "NAME_NOT_FOUND", r[r.DUPLICATE_NAME = 3003] = "DUPLICATE_NAME", r[r.INVALID_ALIAS = 3004] = "INVALID_ALIAS", r[r.UNEXPECTED_ALIAS = 3005] = "UNEXPECTED_ALIAS", r[r.UNEXPECTED_SETTINGS = 3006] = "UNEXPECTED_SETTINGS", r[r.INVALID_SETTINGS = 3007] = "INVALID_SETTINGS", r[r.UNEXPECTED_SIMPLE_BODY = 3008] = "UNEXPECTED_SIMPLE_BODY", r[r.UNEXPECTED_COMPLEX_BODY = 3009] = "UNEXPECTED_COMPLEX_BODY", r[r.INVALID_TABLE_CONTEXT = 3010] = "INVALID_TABLE_CONTEXT", r[r.UNKNOWN_TABLE_SETTING = 3011] = "UNKNOWN_TABLE_SETTING", r[r.DUPLICATE_TABLE_SETTING = 3012] = "DUPLICATE_TABLE_SETTING", r[r.INVALID_TABLEGROUP_CONTEXT = 3013] = "INVALID_TABLEGROUP_CONTEXT", r[r.INVALID_TABLEGROUP_ELEMENT_NAME = 3014] = "INVALID_TABLEGROUP_ELEMENT_NAME", r[r.DUPLICATE_TABLEGROUP_ELEMENT_NAME = 3015] = "DUPLICATE_TABLEGROUP_ELEMENT_NAME", r[r.DUPLICATE_TABLEGROUP_FIELD_NAME = 3016] = "DUPLICATE_TABLEGROUP_FIELD_NAME", r[r.INVALID_TABLEGROUP_FIELD = 3017] = "INVALID_TABLEGROUP_FIELD", r[r.EMPTY_TABLE = 3018] = "EMPTY_TABLE", r[r.INVALID_COLUMN = 3019] = "INVALID_COLUMN", r[r.INVALID_COLUMN_NAME = 3020] = "INVALID_COLUMN_NAME", r[r.UNKNOWN_COLUMN_SETTING = 3021] = "UNKNOWN_COLUMN_SETTING", r[r.INVALID_COLUMN_TYPE = 3022] = "INVALID_COLUMN_TYPE", r[r.DUPLICATE_COLUMN_NAME = 3023] = "DUPLICATE_COLUMN_NAME", r[r.DUPLICATE_COLUMN_SETTING = 3024] = "DUPLICATE_COLUMN_SETTING", r[r.INVALID_COLUMN_SETTING_VALUE = 3025] = "INVALID_COLUMN_SETTING_VALUE", r[r.INVALID_ENUM_CONTEXT = 3026] = "INVALID_ENUM_CONTEXT", r[r.INVALID_ENUM_ELEMENT_NAME = 3027] = "INVALID_ENUM_ELEMENT_NAME", r[r.INVALID_ENUM_ELEMENT = 3028] = "INVALID_ENUM_ELEMENT", r[r.DUPLICATE_ENUM_ELEMENT_NAME = 3029] = "DUPLICATE_ENUM_ELEMENT_NAME", r[r.UNKNOWN_ENUM_ELEMENT_SETTING = 3030] = "UNKNOWN_ENUM_ELEMENT_SETTING", r[r.DUPLICATE_ENUM_ELEMENT_SETTING = 3031] = "DUPLICATE_ENUM_ELEMENT_SETTING", r[r.INVALID_ENUM_ELEMENT_SETTING = 3032] = "INVALID_ENUM_ELEMENT_SETTING", r[r.EMPTY_ENUM = 3033] = "EMPTY_ENUM", r[r.INVALID_REF_CONTEXT = 3034] = "INVALID_REF_CONTEXT", r[r.UNKNOWN_REF_SETTING = 3035] = "UNKNOWN_REF_SETTING", r[r.DUPLICATE_REF_SETTING = 3036] = "DUPLICATE_REF_SETTING", r[r.INVALID_REF_SETTING_VALUE = 3037] = "INVALID_REF_SETTING_VALUE", r[r.INVALID_REF_RELATIONSHIP = 3038] = "INVALID_REF_RELATIONSHIP", r[r.INVALID_REF_FIELD = 3039] = "INVALID_REF_FIELD", r[r.EMPTY_REF = 3040] = "EMPTY_REF", r[r.REF_REDEFINED = 3041] = "REF_REDEFINED", r[r.INVALID_NOTE_CONTEXT = 3042] = "INVALID_NOTE_CONTEXT", r[r.INVALID_NOTE = 3043] = "INVALID_NOTE", r[r.NOTE_REDEFINED = 3044] = "NOTE_REDEFINED", r[r.NOTE_CONTENT_REDEFINED = 3045] = "NOTE_CONTENT_REDEFINED", r[r.EMPTY_NOTE = 3046] = "EMPTY_NOTE", r[r.INVALID_INDEXES_CONTEXT = 3047] = "INVALID_INDEXES_CONTEXT", r[r.INVALID_INDEXES_FIELD = 3048] = "INVALID_INDEXES_FIELD", r[r.INVALID_INDEX = 3049] = "INVALID_INDEX", r[r.UNKNOWN_INDEX_SETTING = 3050] = "UNKNOWN_INDEX_SETTING", r[r.DUPLICATE_INDEX_SETTING = 3051] = "DUPLICATE_INDEX_SETTING", r[r.UNEXPECTED_INDEX_SETTING_VALUE = 3052] = "UNEXPECTED_INDEX_SETTING_VALUE", r[r.INVALID_INDEX_SETTING_VALUE = 3053] = "INVALID_INDEX_SETTING_VALUE", r[r.INVALID_PROJECT_CONTEXT = 3054] = "INVALID_PROJECT_CONTEXT", r[r.PROJECT_REDEFINED = 3055] = "PROJECT_REDEFINED", r[r.INVALID_PROJECT_FIELD = 3056] = "INVALID_PROJECT_FIELD", r[r.INVALID_CUSTOM_CONTEXT = 3057] = "INVALID_CUSTOM_CONTEXT", r[r.INVALID_CUSTOM_ELEMENT_VALUE = 3058] = "INVALID_CUSTOM_ELEMENT_VALUE", r[r.INVALID_ELEMENT_IN_SIMPLE_BODY = 3059] = "INVALID_ELEMENT_IN_SIMPLE_BODY", r[r.INVALID_TABLE_PARTIAL_CONTEXT = 3060] = "INVALID_TABLE_PARTIAL_CONTEXT", r[r.INVALID_TABLE_PARTIAL_ELEMENT_NAME = 3061] = "INVALID_TABLE_PARTIAL_ELEMENT_NAME", r[r.INVALID_TABLE_PARTIAL_SETTING_VALUE = 3062] = "INVALID_TABLE_PARTIAL_SETTING_VALUE", r[r.DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME = 3063] = "DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME", r[r.DUPLICATE_TABLE_PARTIAL_SETTING = 3064] = "DUPLICATE_TABLE_PARTIAL_SETTING", r[r.INVALID_TABLE_PARTIAL_INJECTION = 3065] = "INVALID_TABLE_PARTIAL_INJECTION", r[r.INVALID_TABLE_PARTIAL_INJECTION_OP = 3066] = "INVALID_TABLE_PARTIAL_INJECTION_OP", r[r.INVALID_TABLE_PARTIAL_INJECTION_NAME = 3067] = "INVALID_TABLE_PARTIAL_INJECTION_NAME", r[r.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME = 3068] = "DUPLICATE_TABLE_PARTIAL_INJECTION_NAME", r[r.UNKNOWN_TABLE_PARTIAL_SETTING = 3069] = "UNKNOWN_TABLE_PARTIAL_SETTING", r[r.INVALID_TABLE_SETTING_VALUE = 3070] = "INVALID_TABLE_SETTING_VALUE", r[r.INVALID_CHECKS_CONTEXT = 3071] = "INVALID_CHECKS_CONTEXT", r[r.INVALID_CHECKS_FIELD = 3072] = "INVALID_CHECKS_FIELD", r[r.INVALID_CHECK = 3073] = "INVALID_CHECK", r[r.UNKNOWN_CHECK_SETTING = 3074] = "UNKNOWN_CHECK_SETTING", r[r.DUPLICATE_CHECK_SETTING = 3075] = "DUPLICATE_CHECK_SETTING", r[r.INVALID_CHECK_SETTING_VALUE = 3076] = "INVALID_CHECK_SETTING_VALUE", r[r.INVALID_RECORDS_CONTEXT = 3077] = "INVALID_RECORDS_CONTEXT", r[r.INVALID_RECORDS_NAME = 3078] = "INVALID_RECORDS_NAME", r[r.INVALID_RECORDS_FIELD = 3079] = "INVALID_RECORDS_FIELD", r[r.DUPLICATE_COLUMN_REFERENCES_IN_RECORDS = 3080] = "DUPLICATE_COLUMN_REFERENCES_IN_RECORDS", r[r.DUPLICATE_RECORDS_FOR_TABLE = 3081] = "DUPLICATE_RECORDS_FOR_TABLE", r[r.INVALID_USE_CONTEXT = 3082] = "INVALID_USE_CONTEXT", r[r.INVALID_USE_SPECIFIER_KIND = 3083] = "INVALID_USE_SPECIFIER_KIND", r[r.INVALID_USE_SPECIFIER_NAME = 3084] = "INVALID_USE_SPECIFIER_NAME", r[r.INVALID_DIAGRAMVIEW_CONTEXT = 3085] = "INVALID_DIAGRAMVIEW_CONTEXT", r[r.DUPLICATE_DIAGRAMVIEW_NAME = 3086] = "DUPLICATE_DIAGRAMVIEW_NAME", r[r.INVALID_DIAGRAMVIEW_FIELD = 3087] = "INVALID_DIAGRAMVIEW_FIELD", r[r.DUPLICATE_DIAGRAMVIEW_FIELD = 3088] = "DUPLICATE_DIAGRAMVIEW_FIELD", r[r.BINDING_ERROR = 4e3] = "BINDING_ERROR", r[r.NONEXISTENT_MODULE = 4001] = "NONEXISTENT_MODULE", r[r.UNSUPPORTED = 5e3] = "UNSUPPORTED", r[r.CIRCULAR_REF = 5001] = "CIRCULAR_REF", r[r.SAME_ENDPOINT = 5002] = "SAME_ENDPOINT", r[r.UNEQUAL_FIELDS_BINARY_REF = 5003] = "UNEQUAL_FIELDS_BINARY_REF", r[r.CONFLICTING_SETTING = 5004] = "CONFLICTING_SETTING", r[r.TABLE_REAPPEAR_IN_TABLEGROUP = 5005] = "TABLE_REAPPEAR_IN_TABLEGROUP", r;
 }({});
@@ -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);
 }
@@ -1504,7 +1511,7 @@ function destructureIndexNode(r) {
 	};
 }
 function extractQuotedStringToken(r) {
-	if (isExpressionAQuotedString(r)) return r?.expression instanceof VariableNode ? r?.expression?.variable?.value : r.expression.literal.value;
+	if (isExpressionAQuotedString(r)) return r.expression instanceof VariableNode ? r?.expression?.variable?.value : r.expression.literal.value;
 }
 function extractNumericLiteral(r) {
 	return r instanceof PrimaryExpressionNode && r.expression instanceof LiteralNode && r.expression.literal?.kind === SyntaxTokenKind.NUMERIC_LITERAL ? Number(r.expression.literal.value) : null;
@@ -2797,7 +2804,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) {
@@ -3246,7 +3255,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,11 +7359,18 @@ var ProgramInterpreter = class {
 			let P = N.getValue();
 			P && this.pushElement(M, P);
 		}
-		let r = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
-		for (let M of r) {
-			if (!(M instanceof SchemaSymbol)) continue;
-			let r = this.compiler.symbolMembers(M).getFiltered(UNHANDLED) ?? [];
-			for (let j of r) j instanceof UseSymbol && this.interpretUseSymbol(j);
+		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 N = j.originalSymbol.intern();
+				r.has(N) || (r.add(N), this.interpretUseSymbol(j));
+			}
 		}
 	}
 	interpretUseSymbol(r) {
@@ -7558,24 +7574,16 @@ const programModule$1 = {
 	},
 	symbolMembers(N, P) {
 		if (!P.isKind(SymbolKind.Program)) return Report.create(PASS_THROUGH);
-		let F = P.declaration;
-		if (!(F instanceof ProgramNode)) return Report.create([]);
-		let I = new Map([[DEFAULT_SCHEMA_NAME, N.symbolFactory.create(SchemaSymbol, { name: DEFAULT_SCHEMA_NAME }, P.filepath)]]);
-		for (let r of F.declarations) {
-			let M = N.nodeFullname(r).getFiltered(UNHANDLED) || [], F = M.length <= 1 ? DEFAULT_SCHEMA_NAME : M[0];
-			I.has(F) || I.set(F, N.symbolFactory.create(SchemaSymbol, { name: F }, P.filepath));
-		}
+		if (!(P.declaration instanceof ProgramNode)) return Report.create([]);
+		let F = /* @__PURE__ */ new Map();
 		for (let r of N.reachableFiles(P.filepath)) {
 			let { schemaMembers: j } = N.usableMembers(r).getValue();
-			for (let r of j) {
-				let { name: j } = r;
-				I.has(j) || I.set(j, N.symbolFactory.create(SchemaSymbol, { name: j }, P.filepath));
-			}
+			for (let r of j) F.has(r.name) || F.set(r.name, r);
 		}
-		let L = I.get(DEFAULT_SCHEMA_NAME);
-		if (!L) return Report.create([...I.values()]);
-		let R = N.symbolMembers(L).getFiltered(UNHANDLED)?.filter((r) => !r.isKind(SymbolKind.Schema));
-		return R ? Report.create([...I.values(), ...R]) : Report.create([...I.values()]);
+		let I = F.get(DEFAULT_SCHEMA_NAME);
+		if (!I) return Report.create([...F.values()]);
+		let L = N.symbolMembers(I).getFiltered(UNHANDLED)?.filter((r) => !r.isKind(SymbolKind.Schema));
+		return L ? Report.create([...F.values(), ...L]) : Report.create([...F.values()]);
 	},
 	bindNode(j, N) {
 		return isProgramNode(N) ? new Binder(N, j).resolve() : Report.create(PASS_THROUGH);
@@ -7995,23 +8003,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);
@@ -8021,7 +8029,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);
@@ -8033,7 +8041,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)]);
@@ -8204,7 +8212,7 @@ function nodeRefereeOfRefEndpoint(r, N, P) {
 }
 const useUtils = { visibleName(r, M) {
 	let N = M instanceof SyntaxNode ? M : M.useSpecifierDeclaration instanceof UseSpecifierNode ? M.useSpecifierDeclaration : M.declaration;
-	if (N) return r.nodeAlias(N).mapFiltered((r) => [r], UNHANDLED, void 0).getFiltered(UNHANDLED) || r.nodeFullname(N).getFiltered(UNHANDLED);
+	if (N instanceof UseSpecifierNode && M instanceof NodeSymbol && N.getSymbolKind() !== M.kind && (N = M.declaration), N) return r.nodeAlias(N).mapFiltered((r) => [r], UNHANDLED, void 0).getFiltered(UNHANDLED) || r.nodeFullname(N).getFiltered(UNHANDLED);
 } }, useModule$1 = {
 	nodeSymbol(N, P) {
 		if (!isUseSpecifier(P) || !P.name) return Report.create(PASS_THROUGH);
@@ -8217,7 +8225,7 @@ const useUtils = { visibleName(r, M) {
 			usedSymbol: I,
 			kind: F,
 			name: useUtils.visibleName(N, P)?.at(-1)
-		}, P.filepath), I === void 0 ? [new CompileError(CompileErrorCode.BINDING_ERROR, `Failed to resolve the import of ${F} '${(N.nodeFullname(P).getFiltered(UNHANDLED) || []).map(addDoubleQuoteIfNeeded).join(".")}'`, P)] : []);
+		}, P.filepath), I === void 0 ? [new CompileError(CompileErrorCode.BINDING_ERROR, `Failed to resolve the import of ${F} '${(destructureComplexVariable(P.name) || []).map(addDoubleQuoteIfNeeded).join(".")}'`, P)] : []);
 	},
 	symbolMembers(N, P) {
 		if (!(P instanceof UseSymbol)) return Report.create(PASS_THROUGH);
@@ -8235,14 +8243,14 @@ const useUtils = { visibleName(r, M) {
 		let z = P.parentOfKind(UseDeclarationNode);
 		if (z?.importPath?.value === void 0) return Report.create(void 0);
 		let B = resolveImportFilepath(P.filepath, z.importPath.value);
-		if (!B) return Report.create(void 0);
+		if (!B) return Report.create(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Import path must be relative, got '${z.importPath.value}'`, P)]);
 		if (!N.layout.exists(B)) return Report.create(void 0, [new CompileError(CompileErrorCode.NONEXISTENT_MODULE, `${I} '${L?.join(".") ?? R}' does not exist in file ${B.toString()}. Does the file exist?`, P)]);
 		let V = P.parentOfKind(InfixExpressionNode)?.leftExpression;
 		if (V && V !== P) {
 			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)]);
@@ -8252,7 +8260,7 @@ const useUtils = { visibleName(r, M) {
 			let r = [];
 			if (N.importPath?.value) {
 				let M = resolveImportFilepath(N.filepath, N.importPath.value);
-				M && !j.layout.exists(M) && r.push(new CompileError(CompileErrorCode.NONEXISTENT_MODULE, `Failed to resolve the non-existent file '${N.importPath.value}'`, N.importPath));
+				M ? j.layout.exists(M) || r.push(new CompileError(CompileErrorCode.NONEXISTENT_MODULE, `Failed to resolve the non-existent file '${N.importPath.value}'`, N.importPath)) : r.push(new CompileError(CompileErrorCode.BINDING_ERROR, `Import path must be relative, got '${N.importPath.value}'`, N.importPath));
 			}
 			if (N.specifiers) {
 				let M = j.bindNode(N.specifiers);
@@ -8298,74 +8306,151 @@ function lookupMemberInFilepath(r, M, N, P, F = /* @__PURE__ */ new Set()) {
 	}
 }
 function usableMembers(r) {
-	let N = [], P = /* @__PURE__ */ new Map(), F = [], I = [], L = [], R = [], z = r instanceof Filepath ? r : r.filepath, B = this.parseFile(z), { ast: V } = B.getValue();
-	for (let r of V.body) {
-		if (!(r instanceof UseDeclarationNode) || !r.specifiers || !r.importPath) continue;
-		let j = resolveImportFilepath(z, r.importPath.value);
-		j && (r.isReuse ? r.specifiers instanceof WildcardNode ? F.push({
-			importPath: j,
-			node: r.specifiers
-		}) : I.push(...r.specifiers.specifiers) : r.specifiers instanceof WildcardNode ? L.push({
-			importPath: j,
-			node: r.specifiers
-		}) : R.push(...r.specifiers.specifiers));
-	}
-	let H = [];
 	if (r instanceof Filepath) {
-		let M = new Map([[DEFAULT_SCHEMA_NAME, this.symbolFactory.create(SchemaSymbol, { name: DEFAULT_SCHEMA_NAME }, r)]]);
-		for (let N of V.declarations) {
-			let P = this.nodeFullname(N).getFiltered(UNHANDLED) || [], F = P.length <= 1 ? DEFAULT_SCHEMA_NAME : P[0];
-			M.has(F) || M.set(F, this.symbolFactory.create(SchemaSymbol, { name: F }, r));
-		}
-		H.push(...M.values());
-		let P = H.find((r) => r.isPublicSchema());
-		if (P) {
-			let r = this.usableMembers(P).getFiltered(UNHANDLED);
-			r && N.push(...r.nonSchemaMembers);
-		}
-	} else {
-		let M = r;
-		for (let r of V.body) {
-			if (!(r instanceof ElementDeclarationNode)) continue;
-			let F = schemaMembership(this, M, r), I = this.nodeAlias(r).getFiltered(UNHANDLED), L = this.nodeSymbol(r).getFiltered(UNHANDLED);
-			if (I !== void 0 && M.isPublicSchema() && L && N.push(this.symbolFactory.create(AliasSymbol, {
-				kind: L.kind,
-				declaration: r,
-				aliasedSymbol: L,
-				name: I
-			}, M.filepath)), F.kind !== "none") if (F.kind === "direct") {
-				let M = this.nodeSymbol(r).getFiltered(UNHANDLED);
-				if (!M) continue;
-				N.push(M);
-			} else P.has(F.schemaName) || P.set(F.schemaName, this.symbolFactory.create(SchemaSymbol, {
-				name: F.schemaName,
-				parent: M
-			}, M.filepath));
-		}
-		H.push(...P.values());
+		let { ast: M } = this.parseFile(r).getValue(), N = this.nodeSymbol(M).getFiltered(UNHANDLED);
+		return this.usableMembers(N);
 	}
+	let N = r.filepath, P = collectImports(this, N), { nonSchemaMembers: F, schemaMembers: I } = r instanceof ProgramSymbol ? usableMembersForProgram(this, r, P) : usableMembersForSchema(this, r, P);
 	return new Report({
-		nonSchemaMembers: N,
-		schemaMembers: H,
+		nonSchemaMembers: F,
+		schemaMembers: I,
 		reuses: {
-			selective: I,
-			wildcard: F
+			selective: P.selectiveReuses,
+			wildcard: P.wildcardReuses
 		},
 		uses: {
-			selective: R,
-			wildcard: L
+			selective: P.selectiveUses,
+			wildcard: P.wildcardUses
 		}
-	}, B.getErrors(), B.getWarnings());
+	}, P.parseResult.getErrors(), P.parseResult.getWarnings());
 }
 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]
 	};
 }
+function collectImports(r, j) {
+	let M = r.parseFile(j), { ast: N } = M.getValue(), P = [], F = [], I = [], L = [];
+	for (let r of N.body) {
+		if (!(r instanceof UseDeclarationNode) || !r.specifiers || !r.importPath) continue;
+		let M = resolveImportFilepath(j, r.importPath.value);
+		M && (r.isReuse ? r.specifiers instanceof WildcardNode ? P.push({
+			importPath: M,
+			node: r.specifiers
+		}) : F.push(...r.specifiers.specifiers) : r.specifiers instanceof WildcardNode ? I.push({
+			importPath: M,
+			node: r.specifiers
+		}) : L.push(...r.specifiers.specifiers));
+	}
+	return {
+		ast: N,
+		parseResult: M,
+		selectiveReuses: F,
+		wildcardReuses: P,
+		selectiveUses: L,
+		wildcardUses: I
+	};
+}
+function usableMembersForProgram(r, M, N) {
+	let { ast: P, selectiveUses: F, selectiveReuses: I } = N, L = M.filepath, R = new Map([[DEFAULT_SCHEMA_NAME, r.symbolFactory.create(SchemaSymbol, { name: DEFAULT_SCHEMA_NAME }, L)]]);
+	for (let M of P.declarations) {
+		let N = r.nodeFullname(M).getFiltered(UNHANDLED) || [], P = N.length <= 1 ? DEFAULT_SCHEMA_NAME : N[0];
+		R.has(P) || R.set(P, r.symbolFactory.create(SchemaSymbol, { name: P }, L));
+	}
+	registerProgramSchemas(r, [...F, ...I], R, L);
+	for (let j of r.reachableFiles(L)) for (let M of collectTopLevelSchemaNames(r, j)) R.has(M) || R.set(M, r.symbolFactory.create(SchemaSymbol, { name: M }, L));
+	let z = [...R.values()], B = [], V = z.find((r) => r.isPublicSchema());
+	if (V) {
+		let M = r.usableMembers(V).getFiltered(UNHANDLED);
+		M && B.push(...M.nonSchemaMembers);
+	}
+	return {
+		nonSchemaMembers: B,
+		schemaMembers: z
+	};
+}
+function usableMembersForSchema(r, M, N) {
+	let { ast: P, selectiveUses: F, selectiveReuses: I } = N, L = [], R = /* @__PURE__ */ new Map();
+	for (let N of P.body) {
+		if (!(N instanceof ElementDeclarationNode)) continue;
+		let P = schemaMembership(r, M, N), F = r.nodeAlias(N).getFiltered(UNHANDLED), I = r.nodeSymbol(N).getFiltered(UNHANDLED);
+		if (F !== void 0 && M.isPublicSchema() && I && L.push(r.symbolFactory.create(AliasSymbol, {
+			kind: I.kind,
+			declaration: N,
+			aliasedSymbol: I,
+			name: F
+		}, M.filepath)), P.kind !== "none") if (P.kind === "direct") {
+			let M = r.nodeSymbol(N).getFiltered(UNHANDLED);
+			if (!M) continue;
+			L.push(M);
+		} else R.has(P.schemaName) || R.set(P.schemaName, r.symbolFactory.create(SchemaSymbol, {
+			name: P.schemaName,
+			parent: M
+		}, M.filepath));
+	}
+	registerSchemaChildren(r, [...F, ...I], M, R);
+	let z = M.qualifiedName;
+	for (let j of r.reachableFiles(M.filepath)) for (let N of collectChildSchemaNames(r, j, z)) R.has(N) || R.set(N, r.symbolFactory.create(SchemaSymbol, {
+		name: N,
+		parent: M
+	}, M.filepath));
+	return {
+		nonSchemaMembers: L,
+		schemaMembers: [...R.values()]
+	};
+}
+function registerProgramSchemas(r, j, M, N) {
+	for (let P of j) {
+		if (P.getSymbolKind() !== SymbolKind.Schema) continue;
+		let j = useUtils.visibleName(r, P)?.at(0);
+		j !== void 0 && !M.has(j) && M.set(j, r.symbolFactory.create(SchemaSymbol, { name: j }, N));
+	}
+}
+function registerSchemaChildren(r, j, M, N) {
+	let P = M.qualifiedName;
+	for (let F of j) {
+		if (F.getSymbolKind() !== SymbolKind.Schema) continue;
+		let j = useUtils.visibleName(r, F);
+		if (!j || j.length <= P.length || !P.every((r, M) => r === j[M])) continue;
+		let I = j[P.length];
+		I && !N.has(I) && N.set(I, r.symbolFactory.create(SchemaSymbol, {
+			name: I,
+			parent: M
+		}, M.filepath));
+	}
+}
+function collectTopLevelSchemaNames(r, M) {
+	let { ast: N } = r.parseFile(M).getValue(), P = [];
+	for (let M of N.declarations) {
+		let N = r.nodeFullname(M).getFiltered(UNHANDLED) || [], F = N.length <= 1 ? DEFAULT_SCHEMA_NAME : N[0];
+		P.push(F);
+	}
+	let F = collectImports(r, M);
+	for (let j of [...F.selectiveUses, ...F.selectiveReuses]) {
+		if (j.getSymbolKind() !== SymbolKind.Schema) continue;
+		let M = useUtils.visibleName(r, j)?.at(0);
+		M !== void 0 && P.push(M);
+	}
+	return P;
+}
+function collectChildSchemaNames(r, M, N) {
+	let { ast: P } = r.parseFile(M).getValue(), F = [];
+	for (let M of P.declarations) {
+		let P = r.nodeFullname(M).getFiltered(UNHANDLED) || [], I = P.length <= 1 ? [DEFAULT_SCHEMA_NAME] : P.slice(0, -1);
+		I.length > N.length && N.every((r, j) => r === I[j]) && F.push(I[N.length]);
+	}
+	let I = collectImports(r, M);
+	for (let j of [...I.selectiveUses, ...I.selectiveReuses]) {
+		if (j.getSymbolKind() !== SymbolKind.Schema) continue;
+		let M = useUtils.visibleName(r, j);
+		!M || M.length <= N.length || N.every((r, j) => r === M[j]) && F.push(M[N.length]);
+	}
+	return F;
+}
 var TableBinder = class {
 	constructor(r, j) {
 		this.compiler = r, this.declarationNode = j;
@@ -8685,7 +8770,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);
@@ -8695,13 +8780,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);
 }
@@ -8748,11 +8833,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);
 	}
@@ -8760,10 +8845,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);
 }
@@ -9028,16 +9113,11 @@ function nodeRefereeOfTableGroupField(r, N, P) {
 	let F = extractVarNameFromPrimaryVariable(P) ?? "";
 	if (!isAccessExpression(P.parentNode)) {
 		let I = r.symbolMembers(N).getFiltered(UNHANDLED);
-		if (I) for (let N of I) {
-			if (!(N instanceof SchemaSymbol)) continue;
-			let P = r.lookupMembers(N, SymbolKind.Table, F);
-			if (P) return Report.create(P);
-			if (!N.isPublicSchema()) {
-				let P = r.symbolMembers(N).getFiltered(UNHANDLED);
-				if (P) {
-					let N = P.find((M) => !M.isKind(SymbolKind.Table) || !M.declaration ? !1 : r.nodeAlias(M.declaration).getFiltered(UNHANDLED) === F);
-					if (N) return new Report(N);
-				}
+		if (I) {
+			let j = I.find((r) => r instanceof SchemaSymbol && r.isPublicSchema());
+			if (j) {
+				let N = r.lookupMembers(j, SymbolKind.Table, F);
+				if (N) return Report.create(N);
 			}
 		}
 		let L = r.lookupMembers(N, SymbolKind.Table, F);
@@ -9146,7 +9226,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)
 		}, [];
 	}
@@ -9274,13 +9354,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);
 }
@@ -9293,21 +9373,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);
 	}
@@ -9315,10 +9395,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);
 }
@@ -9330,11 +9410,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);
 	}
@@ -9342,10 +9422,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);
 }
@@ -9358,26 +9438,38 @@ const schemaModule = { symbolMembers(N, P) {
 		let M = handleMemberSelectiveUses(N, P, r, R);
 		z.push(...M.getErrors());
 		let F = M.getFiltered(UNHANDLED);
-		F && L.push(F);
+		F && L.push(F), L.push(...mergeImportedSchema(N, P, r));
 	}
 	for (let { importPath: r, node: j } of I.reuses.wildcard) L.push(...handleMemberWildcardUses(N, P, r, j, R));
 	for (let r of I.uses.selective) {
 		let M = handleMemberSelectiveUses(N, P, r, R);
 		z.push(...M.getErrors());
 		let F = M.getFiltered(UNHANDLED);
-		F && L.push(F);
+		F && L.push(F), L.push(...mergeImportedSchema(N, P, r));
 	}
 	for (let { importPath: r, node: j } of I.uses.wildcard) L.push(...handleMemberWildcardUses(N, P, r, j, R));
 	L.push(...R.values());
 	let B = [...L];
-	for (let r of L) r.isKind(SymbolKind.TableGroup) && B.push(...expandTableGroup(N, r));
+	{
+		let r = L.filter((r) => r.isKind(SymbolKind.TableGroup));
+		if (!P.isPublicSchema()) {
+			let M = N.usableMembers(P.filepath).getFiltered(UNHANDLED)?.schemaMembers.find((r) => r.isPublicSchema());
+			if (M) {
+				let P = N.symbolMembers(M).getFiltered(UNHANDLED);
+				P && r.push(...P.filter((r) => r.isKind(SymbolKind.TableGroup)));
+			}
+		}
+		for (let j of r) B.push(...expandTableGroup(N, P, j));
+	}
 	let V = /* @__PURE__ */ new Set(), H = B.filter((r) => {
+		if (r instanceof UseSymbol && r.isKind(SymbolKind.Schema)) return !1;
 		let j = `${r.originalSymbol.intern()}:${r.name ?? ""}`;
 		return V.has(j) ? !1 : (V.add(j), !0);
 	}), U = /* @__PURE__ */ new Map();
 	for (let r of H) {
 		let j = `${r.kind}:${r.name}`;
 		if (U.get(j)) {
+			if (r.isKind(SymbolKind.Schema)) continue;
 			let j = r instanceof UseSymbol ? r.useSpecifierDeclaration ?? r.declaration : r.declaration instanceof ElementDeclarationNode && r.declaration.name ? r.declaration.name : r.declaration;
 			j && r.name !== void 0 && z.push(getDuplicateSchemaMemberError(r.kind, r.name, F.join("."), j));
 		} else U.set(j, r);
@@ -9406,6 +9498,43 @@ function handleMemberSelectiveUses(r, N, P, F) {
 		parent: N
 	}, N.filepath)), Report.create(void 0);
 }
+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)) 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,
+		declaration: j.originalSymbol.declaration,
+		usedSymbol: j.originalSymbol,
+		useSpecifierDeclaration: N,
+		name: j.name
+	}, M.filepath));
+	for (let j of [...R]) j.isKind(SymbolKind.TableGroup) && R.push(...expandTableGroup(r, M, j));
+	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()) {
 	if (I.has(N)) return [];
 	I.add(N);
@@ -9424,7 +9553,7 @@ function handleMemberWildcardUses(r, M, N, P, F, I = /* @__PURE__ */ new Set())
 	let { reuses: { selective: B, wildcard: V } } = R;
 	for (let N of B) {
 		let P = handleMemberSelectiveUses(r, M, N, F).getFiltered(UNHANDLED);
-		P && z.push(P);
+		P && z.push(P), z.push(...mergeImportedSchema(r, M, N));
 	}
 	for (let { importPath: j } of V) z.push(...handleMemberWildcardUses(r, M, j, P, F, I));
 	return z;
@@ -9442,34 +9571,36 @@ function findSchemaSymbolInFilepath(r, M, N) {
 	}
 	return I;
 }
-function expandTableGroup(r, M) {
-	if (!M.isKind(SymbolKind.TableGroup)) return [];
-	let N = M.originalSymbol, P = r.symbolMembers(N).getFiltered(UNHANDLED);
-	if (!P) return [];
-	let F = [];
-	for (let j of P) {
+function expandTableGroup(r, M, N) {
+	if (!N.isKind(SymbolKind.TableGroup) || !(N instanceof UseSymbol)) return [];
+	let P = N.originalSymbol, F = r.symbolMembers(P).getFiltered(UNHANDLED);
+	if (!F) return [];
+	let I = M.qualifiedName, L = [];
+	for (let j of F) {
 		if (!j.isKind(SymbolKind.TableGroupField) || !j.declaration) continue;
-		let N = j.declaration.callee;
-		if (!N) continue;
-		let P = destructureComplexVariable(N);
+		let M = j.declaration.callee;
+		if (!M) continue;
+		let P = destructureComplexVariable(M);
 		if (!P || P.length === 0) continue;
-		let I = j.declaration.filepath, L = lookupTableInFile(r, I, P);
-		L && M instanceof UseSymbol && F.push(r.symbolFactory.create(UseSymbol, {
+		let F = P.length <= 1 ? [DEFAULT_SCHEMA_NAME] : P.slice(0, -1);
+		if (F.length !== I.length || !I.every((r, j) => r === F[j])) continue;
+		let R = j.declaration.filepath, z = lookupTableInFile(r, R, P);
+		z && L.push(r.symbolFactory.create(UseSymbol, {
 			kind: SymbolKind.Table,
-			declaration: L.declaration,
-			usedSymbol: L,
+			declaration: z.declaration,
+			usedSymbol: z,
 			useSpecifierDeclaration: void 0,
-			name: L.name
-		}, M.filepath));
+			name: z.name
+		}, N.filepath));
 	}
-	return F;
+	return L;
 }
 function lookupTableInFile(r, M, N) {
 	if (N.length === 1) {
 		let P = r.usableMembers(M).getFiltered(UNHANDLED);
 		return P ? P.nonSchemaMembers.find((r) => r.isKind(SymbolKind.Table) && r.name === N[0]) : void 0;
 	}
-	let [P, F] = [N[0], N[N.length - 1]], I = r.usableMembers(M).getFiltered(UNHANDLED);
+	let P = N[0], F = N[N.length - 1], I = r.usableMembers(M).getFiltered(UNHANDLED);
 	if (!I) return;
 	let L = I.schemaMembers.find((r) => r.name === P);
 	if (!L) return;
@@ -9789,6 +9920,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
@@ -11023,7 +11158,7 @@ const modules = [
 		nodeFullname(j, N) {
 			if (!isUseSpecifier(N)) return Report.create(PASS_THROUGH);
 			let P = destructureComplexVariable(N.name);
-			return !P || P.length === 0 ? Report.create(void 0, [new CompileError(CompileErrorCode.INVALID_NAME, "Use specifiers must have a valid name (simple name or schema-qualified name)", N)]) : N.isKind(ImportKind.TableGroup) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TableGroup name must be a simple name", N)]) : N.isKind(ImportKind.TablePartial) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TablePartial name must be a simple name", N)]) : N.isKind(ImportKind.Note) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A Sticky note name must be a simple name", N)]) : (P.length === 1 && P.unshift(DEFAULT_SCHEMA_NAME), new Report(P));
+			return !P || P.length === 0 ? Report.create(void 0, [new CompileError(CompileErrorCode.INVALID_NAME, "Use specifiers must have a valid name (simple name or schema-qualified name)", N)]) : N.isKind(ImportKind.TableGroup) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TableGroup name must be a simple name", N)]) : N.isKind(ImportKind.TablePartial) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TablePartial name must be a simple name", N)]) : N.isKind(ImportKind.Note) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A Sticky note name must be a simple name", N)]) : (P.length === 1 && !N.isKind(ImportKind.Schema) && P.unshift(DEFAULT_SCHEMA_NAME), new Report(P));
 		},
 		nodeAlias(j, N) {
 			return isUseSpecifier(N) ? N.alias ? isValidAlias(N.alias) ? new Report(extractVariableFromExpression(N.alias)) : new Report(void 0, [new CompileError(CompileErrorCode.INVALID_ALIAS, "Use aliases can only contain alphanumeric and underscore unless surrounded by double quotes", N.alias)]) : new Report(void 0) : Report.create(PASS_THROUGH);
@@ -11902,77 +12037,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);
-				}
-				F && F.toLowerCase() !== "from" && P.push({
+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: F
+					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}`), 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++;
@@ -11981,12 +12086,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;
@@ -12046,7 +12145,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]) {
@@ -12166,6 +12265,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) {
@@ -12235,14 +12335,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
@@ -12259,7 +12359,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);
@@ -13115,7 +13215,7 @@ var dbmlMonarchTokensProvider = {
 		}
 		return [...N].sort().map(Filepath.from);
 	}
-	getEntryPoints() {
+	getEntrypoints() {
 		return [...this.files.keys()].map(Filepath.from).sort((r, j) => r.absolute.localeCompare(j.absolute));
 	}
 	clone() {
@@ -13135,7 +13235,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) {
@@ -13190,33 +13290,41 @@ function containerScopeKind(r, j) {
 		default: return ScopeKind.CUSTOM;
 	}
 }
-function canonicalName(r, N) {
-	let P = N.originalSymbol;
-	if (P.filepath.intern() === r.intern()) return Report.create(fullnameToCanonical(this, P));
-	let F = this.parseFile(r).getValue().ast, I = this.nodeSymbol(F).getFiltered(UNHANDLED);
-	if (!I) return Report.create(fullnameToCanonical(this, P));
-	let L = this.symbolMembers(I).getFiltered(UNHANDLED) ?? [], R = [...L];
-	for (let r of L) if (r instanceof SchemaSymbol && r.isKind(SymbolKind.Schema)) {
-		let M = this.symbolMembers(r).getFiltered(UNHANDLED);
-		M && R.push(...M);
-	}
-	for (let j of R) if (j.filepath.intern() === r.intern() && j.originalSymbol === P && (j instanceof UseSymbol || j instanceof AliasSymbol)) {
-		let r = j.name;
-		if (!r) continue;
-		if (r !== P.name) return Report.create({
+function canonicalName(r, j) {
+	let N = j.originalSymbol;
+	if (N.filepath.equals(r)) return Report.create(fullnameToCanonical(this, N));
+	let P = [...this.symbolUses(N).getValue(), ...this.symbolAliases(N).getValue()].filter((j) => j.filepath.equals(r));
+	for (let r of P) {
+		let j = r.name;
+		if (!j) continue;
+		if (j !== N.name) return Report.create({
 			schema: "",
-			name: r
+			name: j
+		});
+		let P = getSchemaChain(this, r);
+		if (P.length > 0) return Report.create({
+			schema: P.join("."),
+			name: j
 		});
-		let N = fullnameToCanonical(this, P);
-		return N ? Report.create({
-			...N,
-			name: r
+		let F = fullnameToCanonical(this, N);
+		return F ? Report.create({
+			...F,
+			name: j
 		}) : Report.create({
 			schema: DEFAULT_SCHEMA_NAME,
-			name: r
+			name: j
 		});
 	}
-	return Report.create(fullnameToCanonical(this, P));
+	return Report.create(fullnameToCanonical(this, N));
+}
+function getSchemaChain(r, j) {
+	let M = [], N = j;
+	for (; N;) {
+		let j = r.symbolParent(N).find((r) => r instanceof SchemaSymbol && r.isKind(SymbolKind.Schema));
+		if (!j || j.isPublicSchema()) break;
+		M.unshift(j.name ?? ""), N = j;
+	}
+	return M;
 }
 function fullnameToCanonical(r, M) {
 	if (!M.declaration) return M.name ? {
@@ -13243,16 +13351,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;
@@ -13303,7 +13414,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);
@@ -13318,7 +13429,7 @@ function interpretFile(r) {
 }
 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));
 	}
@@ -13326,8 +13437,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 R = F.getValue().ast, 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;
@@ -13681,7 +13794,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 = () => {
@@ -13903,59 +14056,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();
@@ -14335,7 +14468,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,
@@ -14343,7 +14476,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);
@@ -14414,11 +14547,30 @@ function resolutionIndex() {
 		};
 		N(M);
 	}
+	let L = /* @__PURE__ */ new Map(), R = /* @__PURE__ */ new Set();
+	function z(r, M) {
+		let N = M.intern();
+		if (R.has(N)) return;
+		R.add(N);
+		let P = r.symbolMembers(M).getFiltered(UNHANDLED);
+		if (P) for (let j of P) {
+			let N = j.intern(), P = L.get(N);
+			P || (P = [], L.set(N, P)), P.push(M), j instanceof SchemaSymbol && j.isKind(SymbolKind.Schema) && z(r, j);
+		}
+	}
+	for (let r of N.values()) {
+		let M = r.getValue().ast, N = this.nodeSymbol(M).getFiltered(UNHANDLED);
+		N && z(this, N);
+	}
 	return {
 		references: r,
-		metadata: M
+		metadata: M,
+		parents: L
 	};
 }
+function symbolParent(r) {
+	return this.resolutionIndex().parents.get(r.intern()) ?? [];
+}
 function symbolReferences(r) {
 	return this.resolutionIndex().references.get(r.intern()) ?? [];
 }
@@ -14527,59 +14679,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();
@@ -14642,7 +14795,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);
@@ -14702,12 +14855,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.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 = new MemoryProjectLayout()) {
+		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),
@@ -14720,21 +14873,25 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 			element: this.localQuery(containerElement),
 			scope: this.localQuery(containerScope),
 			scopeKind: this.localQuery(containerScopeKind)
-		};
+		}, this.layout = r;
 	}
-	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);
@@ -14753,25 +14910,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 ?? [
@@ -14797,4 +14956,4 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 		};
 	}
 };
-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 };
+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 };