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

package/lib/index.mjs

@@ -2229,6 +2229,10 @@ function baseUniq(_, VY, P) {
 	return KY;
 }
 var _baseUniq_default = baseUniq;
+function uniq(_) {
+	return _ && _.length ? _baseUniq_default(_) : [];
+}
+var uniq_default = uniq;
 function uniqBy(_, VY) {
 	return _ && _.length ? _baseUniq_default(_, _baseIteratee_default(VY, 2)) : [];
 }
@@ -2475,13 +2479,13 @@ var isAbsolute = function(_) {
 function resolveImportFilepath(_, VY) {
 	if (!Filepath.isRelative(VY)) return;
 	let P = Filepath.resolve(_.dirname, VY);
-	return P.absolute.endsWith(".dbml") ? P : Filepath.from(P.absolute + DBML_EXT);
+	return P.absolute.endsWith(".dbml") ? P : Filepath.from(P.absolute + ".dbml");
 }
 var KEYWORDS_OF_DEFAULT_SETTING = [
 	"null",
 	"true",
 	"false"
-], DBML_EXT = ".dbml", NUMERIC_LITERAL_PREFIX = ["-", "+"], DEFAULT_SCHEMA_NAME$1 = "public", DEFAULT_ENTRY = Filepath.from("/main.dbml"), CompileErrorCode = /* @__PURE__ */ function(_) {
+], NUMERIC_LITERAL_PREFIX = ["-", "+"], DEFAULT_SCHEMA_NAME$1 = "public", DEFAULT_ENTRY = Filepath.from("/main.dbml"), CompileErrorCode = /* @__PURE__ */ function(_) {
 	return _[_.UNKNOWN_SYMBOL = 1e3] = "UNKNOWN_SYMBOL", _[_.UNEXPECTED_SYMBOL = 1001] = "UNEXPECTED_SYMBOL", _[_.UNEXPECTED_EOF = 1002] = "UNEXPECTED_EOF", _[_.UNEXPECTED_NEWLINE = 1003] = "UNEXPECTED_NEWLINE", _[_.UNKNOWN_TOKEN = 1004] = "UNKNOWN_TOKEN", _[_.UNEXPECTED_TOKEN = 1005] = "UNEXPECTED_TOKEN", _[_.UNEXPECTED_ELEMENT_DECLARATION = 1006] = "UNEXPECTED_ELEMENT_DECLARATION", _[_.MISSING_SPACES = 1007] = "MISSING_SPACES", _[_.UNKNOWN_PREFIX_OP = 1008] = "UNKNOWN_PREFIX_OP", _[_.INVALID_OPERAND = 1009] = "INVALID_OPERAND", _[_.EMPTY_ATTRIBUTE_NAME = 1010] = "EMPTY_ATTRIBUTE_NAME", _[_.INVALID_ESCAPE_SEQUENCE = 1011] = "INVALID_ESCAPE_SEQUENCE", _[_.INVALID_NAME = 3e3] = "INVALID_NAME", _[_.UNEXPECTED_NAME = 3001] = "UNEXPECTED_NAME", _[_.NAME_NOT_FOUND = 3002] = "NAME_NOT_FOUND", _[_.DUPLICATE_NAME = 3003] = "DUPLICATE_NAME", _[_.INVALID_ALIAS = 3004] = "INVALID_ALIAS", _[_.UNEXPECTED_ALIAS = 3005] = "UNEXPECTED_ALIAS", _[_.UNEXPECTED_SETTINGS = 3006] = "UNEXPECTED_SETTINGS", _[_.INVALID_SETTINGS = 3007] = "INVALID_SETTINGS", _[_.UNEXPECTED_SIMPLE_BODY = 3008] = "UNEXPECTED_SIMPLE_BODY", _[_.UNEXPECTED_COMPLEX_BODY = 3009] = "UNEXPECTED_COMPLEX_BODY", _[_.INVALID_TABLE_CONTEXT = 3010] = "INVALID_TABLE_CONTEXT", _[_.UNKNOWN_TABLE_SETTING = 3011] = "UNKNOWN_TABLE_SETTING", _[_.DUPLICATE_TABLE_SETTING = 3012] = "DUPLICATE_TABLE_SETTING", _[_.INVALID_TABLEGROUP_CONTEXT = 3013] = "INVALID_TABLEGROUP_CONTEXT", _[_.INVALID_TABLEGROUP_ELEMENT_NAME = 3014] = "INVALID_TABLEGROUP_ELEMENT_NAME", _[_.DUPLICATE_TABLEGROUP_ELEMENT_NAME = 3015] = "DUPLICATE_TABLEGROUP_ELEMENT_NAME", _[_.DUPLICATE_TABLEGROUP_FIELD_NAME = 3016] = "DUPLICATE_TABLEGROUP_FIELD_NAME", _[_.INVALID_TABLEGROUP_FIELD = 3017] = "INVALID_TABLEGROUP_FIELD", _[_.EMPTY_TABLE = 3018] = "EMPTY_TABLE", _[_.INVALID_COLUMN = 3019] = "INVALID_COLUMN", _[_.INVALID_COLUMN_NAME = 3020] = "INVALID_COLUMN_NAME", _[_.UNKNOWN_COLUMN_SETTING = 3021] = "UNKNOWN_COLUMN_SETTING", _[_.INVALID_COLUMN_TYPE = 3022] = "INVALID_COLUMN_TYPE", _[_.DUPLICATE_COLUMN_NAME = 3023] = "DUPLICATE_COLUMN_NAME", _[_.DUPLICATE_COLUMN_SETTING = 3024] = "DUPLICATE_COLUMN_SETTING", _[_.INVALID_COLUMN_SETTING_VALUE = 3025] = "INVALID_COLUMN_SETTING_VALUE", _[_.INVALID_ENUM_CONTEXT = 3026] = "INVALID_ENUM_CONTEXT", _[_.INVALID_ENUM_ELEMENT_NAME = 3027] = "INVALID_ENUM_ELEMENT_NAME", _[_.INVALID_ENUM_ELEMENT = 3028] = "INVALID_ENUM_ELEMENT", _[_.DUPLICATE_ENUM_ELEMENT_NAME = 3029] = "DUPLICATE_ENUM_ELEMENT_NAME", _[_.UNKNOWN_ENUM_ELEMENT_SETTING = 3030] = "UNKNOWN_ENUM_ELEMENT_SETTING", _[_.DUPLICATE_ENUM_ELEMENT_SETTING = 3031] = "DUPLICATE_ENUM_ELEMENT_SETTING", _[_.INVALID_ENUM_ELEMENT_SETTING = 3032] = "INVALID_ENUM_ELEMENT_SETTING", _[_.EMPTY_ENUM = 3033] = "EMPTY_ENUM", _[_.INVALID_REF_CONTEXT = 3034] = "INVALID_REF_CONTEXT", _[_.UNKNOWN_REF_SETTING = 3035] = "UNKNOWN_REF_SETTING", _[_.DUPLICATE_REF_SETTING = 3036] = "DUPLICATE_REF_SETTING", _[_.INVALID_REF_SETTING_VALUE = 3037] = "INVALID_REF_SETTING_VALUE", _[_.INVALID_REF_RELATIONSHIP = 3038] = "INVALID_REF_RELATIONSHIP", _[_.INVALID_REF_FIELD = 3039] = "INVALID_REF_FIELD", _[_.EMPTY_REF = 3040] = "EMPTY_REF", _[_.REF_REDEFINED = 3041] = "REF_REDEFINED", _[_.INVALID_NOTE_CONTEXT = 3042] = "INVALID_NOTE_CONTEXT", _[_.INVALID_NOTE = 3043] = "INVALID_NOTE", _[_.NOTE_REDEFINED = 3044] = "NOTE_REDEFINED", _[_.NOTE_CONTENT_REDEFINED = 3045] = "NOTE_CONTENT_REDEFINED", _[_.EMPTY_NOTE = 3046] = "EMPTY_NOTE", _[_.INVALID_INDEXES_CONTEXT = 3047] = "INVALID_INDEXES_CONTEXT", _[_.INVALID_INDEXES_FIELD = 3048] = "INVALID_INDEXES_FIELD", _[_.INVALID_INDEX = 3049] = "INVALID_INDEX", _[_.UNKNOWN_INDEX_SETTING = 3050] = "UNKNOWN_INDEX_SETTING", _[_.DUPLICATE_INDEX_SETTING = 3051] = "DUPLICATE_INDEX_SETTING", _[_.UNEXPECTED_INDEX_SETTING_VALUE = 3052] = "UNEXPECTED_INDEX_SETTING_VALUE", _[_.INVALID_INDEX_SETTING_VALUE = 3053] = "INVALID_INDEX_SETTING_VALUE", _[_.INVALID_PROJECT_CONTEXT = 3054] = "INVALID_PROJECT_CONTEXT", _[_.PROJECT_REDEFINED = 3055] = "PROJECT_REDEFINED", _[_.INVALID_PROJECT_FIELD = 3056] = "INVALID_PROJECT_FIELD", _[_.INVALID_CUSTOM_CONTEXT = 3057] = "INVALID_CUSTOM_CONTEXT", _[_.INVALID_CUSTOM_ELEMENT_VALUE = 3058] = "INVALID_CUSTOM_ELEMENT_VALUE", _[_.INVALID_ELEMENT_IN_SIMPLE_BODY = 3059] = "INVALID_ELEMENT_IN_SIMPLE_BODY", _[_.INVALID_TABLE_PARTIAL_CONTEXT = 3060] = "INVALID_TABLE_PARTIAL_CONTEXT", _[_.INVALID_TABLE_PARTIAL_ELEMENT_NAME = 3061] = "INVALID_TABLE_PARTIAL_ELEMENT_NAME", _[_.INVALID_TABLE_PARTIAL_SETTING_VALUE = 3062] = "INVALID_TABLE_PARTIAL_SETTING_VALUE", _[_.DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME = 3063] = "DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME", _[_.DUPLICATE_TABLE_PARTIAL_SETTING = 3064] = "DUPLICATE_TABLE_PARTIAL_SETTING", _[_.INVALID_TABLE_PARTIAL_INJECTION = 3065] = "INVALID_TABLE_PARTIAL_INJECTION", _[_.INVALID_TABLE_PARTIAL_INJECTION_OP = 3066] = "INVALID_TABLE_PARTIAL_INJECTION_OP", _[_.INVALID_TABLE_PARTIAL_INJECTION_NAME = 3067] = "INVALID_TABLE_PARTIAL_INJECTION_NAME", _[_.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME = 3068] = "DUPLICATE_TABLE_PARTIAL_INJECTION_NAME", _[_.UNKNOWN_TABLE_PARTIAL_SETTING = 3069] = "UNKNOWN_TABLE_PARTIAL_SETTING", _[_.INVALID_TABLE_SETTING_VALUE = 3070] = "INVALID_TABLE_SETTING_VALUE", _[_.INVALID_CHECKS_CONTEXT = 3071] = "INVALID_CHECKS_CONTEXT", _[_.INVALID_CHECKS_FIELD = 3072] = "INVALID_CHECKS_FIELD", _[_.INVALID_CHECK = 3073] = "INVALID_CHECK", _[_.UNKNOWN_CHECK_SETTING = 3074] = "UNKNOWN_CHECK_SETTING", _[_.DUPLICATE_CHECK_SETTING = 3075] = "DUPLICATE_CHECK_SETTING", _[_.INVALID_CHECK_SETTING_VALUE = 3076] = "INVALID_CHECK_SETTING_VALUE", _[_.INVALID_RECORDS_CONTEXT = 3077] = "INVALID_RECORDS_CONTEXT", _[_.INVALID_RECORDS_NAME = 3078] = "INVALID_RECORDS_NAME", _[_.INVALID_RECORDS_FIELD = 3079] = "INVALID_RECORDS_FIELD", _[_.DUPLICATE_COLUMN_REFERENCES_IN_RECORDS = 3080] = "DUPLICATE_COLUMN_REFERENCES_IN_RECORDS", _[_.DUPLICATE_RECORDS_FOR_TABLE = 3081] = "DUPLICATE_RECORDS_FOR_TABLE", _[_.INVALID_USE_CONTEXT = 3082] = "INVALID_USE_CONTEXT", _[_.INVALID_USE_SPECIFIER_KIND = 3083] = "INVALID_USE_SPECIFIER_KIND", _[_.INVALID_USE_SPECIFIER_NAME = 3084] = "INVALID_USE_SPECIFIER_NAME", _[_.INVALID_DIAGRAMVIEW_CONTEXT = 3085] = "INVALID_DIAGRAMVIEW_CONTEXT", _[_.DUPLICATE_DIAGRAMVIEW_NAME = 3086] = "DUPLICATE_DIAGRAMVIEW_NAME", _[_.INVALID_DIAGRAMVIEW_FIELD = 3087] = "INVALID_DIAGRAMVIEW_FIELD", _[_.DUPLICATE_DIAGRAMVIEW_FIELD = 3088] = "DUPLICATE_DIAGRAMVIEW_FIELD", _[_.BINDING_ERROR = 4e3] = "BINDING_ERROR", _[_.NONEXISTENT_MODULE = 4001] = "NONEXISTENT_MODULE", _[_.UNSUPPORTED = 5e3] = "UNSUPPORTED", _[_.CIRCULAR_REF = 5001] = "CIRCULAR_REF", _[_.SAME_ENDPOINT = 5002] = "SAME_ENDPOINT", _[_.UNEQUAL_FIELDS_BINARY_REF = 5003] = "UNEQUAL_FIELDS_BINARY_REF", _[_.CONFLICTING_SETTING = 5004] = "CONFLICTING_SETTING", _[_.TABLE_REAPPEAR_IN_TABLEGROUP = 5005] = "TABLE_REAPPEAR_IN_TABLEGROUP", _;
 }({}), CompileError = class _ extends Error {
 	constructor(VY, P, HY) {
@@ -2526,6 +2530,9 @@ function isValidAlias(_) {
 function isSimpleName(_) {
 	return _ instanceof PrimaryExpressionNode && _.expression instanceof VariableNode;
 }
+function hasSimpleBody(_) {
+	return !!_.bodyColon;
+}
 function isValidPartialInjection(_) {
 	return _ instanceof PrefixExpressionNode && _.op?.value === "~" && isExpressionAVariableNode(_.expression);
 }
@@ -2720,7 +2727,7 @@ function destructureIndexNode(_) {
 	};
 }
 function extractQuotedStringToken(_) {
-	if (isExpressionAQuotedString(_)) return _?.expression instanceof VariableNode ? _?.expression?.variable?.value : _.expression.literal.value;
+	if (isExpressionAQuotedString(_)) return _.expression instanceof VariableNode ? _?.expression?.variable?.value : _.expression.literal.value;
 }
 function extractNumericLiteral(_) {
 	return _ instanceof PrimaryExpressionNode && _.expression instanceof LiteralNode && _.expression.literal?.kind === SyntaxTokenKind.NUMERIC_LITERAL ? Number(_.expression.literal.value) : null;
@@ -4007,7 +4014,9 @@ var DiagramViewBinder = class {
 		let [VY] = partition_default(_.body, (_) => _ instanceof FunctionApplicationNode);
 		return VY.flatMap((_) => !_.callee || isWildcardExpression(_.callee) ? [] : [_.callee, ..._.args].flatMap(scanNonListNodeForBinding).flatMap((_) => {
 			let VY = _.variables.pop();
-			return VY ? this.compiler.nodeReferee(VY).getErrors() : [];
+			if (!VY) return [];
+			let P = _.variables.pop();
+			return [...P ? this.compiler.nodeReferee(P).getErrors() : [], ...this.compiler.nodeReferee(VY).getErrors()];
 		}));
 	}
 	bindNoteReferences(_) {
@@ -4452,7 +4461,7 @@ var EnumBinder = class {
 		let WY = isExpressionAVariableNode(VY) ? VY.expression.variable?.value ?? "" : "", GY = _.lookupMembers(UY, SymbolKind.Column, WY);
 		if (GY) return Report.create(GY);
 		let KY = isElementNode(HY, ElementKind.TablePartial) ? "TablePartial" : "Table";
-		return new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${WY}' does not exist in ${KY} 'public.${UY.name}'`, VY)]);
+		return new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${WY}' does not exist in ${KY} 'public.${UY.name}'`, VY)]);
 	},
 	bindNode(_, VY) {
 		return isElementNode(VY, ElementKind.Indexes) ? Report.create(void 0, new IndexesBinder(_, VY).bind()) : Report.create(PASS_THROUGH);
@@ -8553,11 +8562,18 @@ var ProgramInterpreter = class {
 			let HY = P.getValue();
 			HY && this.pushElement(VY, HY);
 		}
-		let _ = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
-		for (let VY of _) {
-			if (!(VY instanceof SchemaSymbol)) continue;
-			let _ = this.compiler.symbolMembers(VY).getFiltered(UNHANDLED) ?? [];
-			for (let VY of _) VY instanceof UseSymbol && this.interpretUseSymbol(VY);
+		let _ = /* @__PURE__ */ new Set(), VY = (this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? []).filter((_) => _ instanceof SchemaSymbol);
+		for (; VY.length > 0;) {
+			let P = VY.shift(), HY = this.compiler.symbolMembers(P).getFiltered(UNHANDLED) ?? [];
+			for (let P of HY) {
+				if (P instanceof SchemaSymbol) {
+					VY.push(P);
+					continue;
+				}
+				if (!(P instanceof UseSymbol)) continue;
+				let HY = P.originalSymbol.intern();
+				_.has(HY) || (_.add(HY), this.interpretUseSymbol(P));
+			}
 		}
 	}
 	interpretUseSymbol(_) {
@@ -8760,24 +8776,16 @@ var ProgramInterpreter = class {
 	},
 	symbolMembers(_, VY) {
 		if (!VY.isKind(SymbolKind.Program)) return Report.create(PASS_THROUGH);
-		let P = VY.declaration;
-		if (!(P instanceof ProgramNode)) return Report.create([]);
-		let HY = new Map([[DEFAULT_SCHEMA_NAME$1, _.symbolFactory.create(SchemaSymbol, { name: DEFAULT_SCHEMA_NAME$1 }, VY.filepath)]]);
-		for (let UY of P.declarations) {
-			let P = _.nodeFullname(UY).getFiltered(UNHANDLED) || [], WY = P.length <= 1 ? DEFAULT_SCHEMA_NAME$1 : P[0];
-			HY.has(WY) || HY.set(WY, _.symbolFactory.create(SchemaSymbol, { name: WY }, VY.filepath));
-		}
-		for (let P of _.reachableFiles(VY.filepath)) {
-			let { schemaMembers: UY } = _.usableMembers(P).getValue();
-			for (let P of UY) {
-				let { name: UY } = P;
-				HY.has(UY) || HY.set(UY, _.symbolFactory.create(SchemaSymbol, { name: UY }, VY.filepath));
-			}
-		}
-		let UY = HY.get(DEFAULT_SCHEMA_NAME$1);
-		if (!UY) return Report.create([...HY.values()]);
-		let WY = _.symbolMembers(UY).getFiltered(UNHANDLED)?.filter((_) => !_.isKind(SymbolKind.Schema));
-		return WY ? Report.create([...HY.values(), ...WY]) : Report.create([...HY.values()]);
+		if (!(VY.declaration instanceof ProgramNode)) return Report.create([]);
+		let P = /* @__PURE__ */ new Map();
+		for (let HY of _.reachableFiles(VY.filepath)) {
+			let { schemaMembers: VY } = _.usableMembers(HY).getValue();
+			for (let _ of VY) P.has(_.name) || P.set(_.name, _);
+		}
+		let HY = P.get(DEFAULT_SCHEMA_NAME$1);
+		if (!HY) return Report.create([...P.values()]);
+		let UY = _.symbolMembers(HY).getFiltered(UNHANDLED)?.filter((_) => !_.isKind(SymbolKind.Schema));
+		return UY ? Report.create([...P.values(), ...UY]) : Report.create([...P.values()]);
 	},
 	bindNode(_, VY) {
 		return isProgramNode(VY) ? new Binder(VY, _).resolve() : Report.create(PASS_THROUGH);
@@ -9194,23 +9202,23 @@ function nodeRefereeOfRecordsName(_, VY, P) {
 	let HY = extractVarNameFromPrimaryVariable(P) ?? "";
 	if (!isAccessExpression(P.parentNode)) {
 		let UY = _.lookupMembers(VY, [SymbolKind.Table, SymbolKind.Schema], HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table '${HY}' does not exist in Schema 'public'`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table '${HY}' does not exist in Schema 'public'`, P)]);
 	}
 	let UY = nodeRefereeOfLeftExpression(_, P);
 	if (!UY) {
 		let UY = _.lookupMembers(VY, [SymbolKind.Table, SymbolKind.Schema], HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table or schema '${HY}' does not exist`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table or schema '${HY}' does not exist`, P)]);
 	}
 	if (UY.isKind(SymbolKind.Schema)) {
 		let VY = _.lookupMembers(UY, [SymbolKind.Table, SymbolKind.Schema], HY);
-		return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table or schema '${HY}' does not exist`, P)]);
+		return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table or schema '${HY}' does not exist`, P)]);
 	}
 	return new Report(void 0);
 }
 function nodeRefereeOfRecordsColumn(_, VY, P) {
 	if (!isExpressionAVariableNode(P)) return new Report(void 0);
 	let HY = extractVarNameFromPrimaryVariable(P) ?? "", UY = _.lookupMembers(VY, SymbolKind.Column, HY);
-	return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${HY}' does not exist in Table 'public.${VY.name}'`, P)]);
+	return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${HY}' does not exist in Table 'public.${VY.name}'`, P)]);
 }
 function nodeRefereeOfEnumValue(_, VY, P) {
 	if (!isExpressionAVariableNode(P)) return new Report(void 0);
@@ -9220,7 +9228,7 @@ function nodeRefereeOfEnumValue(_, VY, P) {
 	if (UY) {
 		if (UY.isKind(SymbolKind.Schema)) {
 			let VY = _.lookupMembers(UY, [SymbolKind.Enum, SymbolKind.Schema], HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${HY}' does not exist`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${HY}' does not exist`, P)]);
 		}
 		if (UY.isKind(SymbolKind.Enum)) {
 			let VY = _.lookupMembers(UY, SymbolKind.EnumField, HY);
@@ -9232,7 +9240,7 @@ function nodeRefereeOfEnumValue(_, VY, P) {
 	if (WY.leftExpression === P) {
 		if (isAccessExpression(WY.parentNode) && WY.parentNode.leftExpression === WY) {
 			let UY = _.lookupMembers(VY, SymbolKind.Schema, HY);
-			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 		}
 		let UY = _.lookupMembers(VY, SymbolKind.Enum, HY);
 		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum '${HY}' does not exist in Schema 'public'`, P)]);
@@ -9403,7 +9411,7 @@ function nodeRefereeOfRefEndpoint(_, VY, P) {
 }
 var useUtils = { visibleName(_, VY) {
 	let P = VY instanceof SyntaxNode ? VY : VY.useSpecifierDeclaration instanceof UseSpecifierNode ? VY.useSpecifierDeclaration : VY.declaration;
-	if (P) return _.nodeAlias(P).mapFiltered((_) => [_], UNHANDLED, void 0).getFiltered(UNHANDLED) || _.nodeFullname(P).getFiltered(UNHANDLED);
+	if (P instanceof UseSpecifierNode && VY instanceof NodeSymbol && P.getSymbolKind() !== VY.kind && (P = VY.declaration), P) return _.nodeAlias(P).mapFiltered((_) => [_], UNHANDLED, void 0).getFiltered(UNHANDLED) || _.nodeFullname(P).getFiltered(UNHANDLED);
 } }, useModule$1 = {
 	nodeSymbol(_, VY) {
 		if (!isUseSpecifier(VY) || !VY.name) return Report.create(PASS_THROUGH);
@@ -9416,7 +9424,7 @@ var useUtils = { visibleName(_, VY) {
 			usedSymbol: HY,
 			kind: P,
 			name: useUtils.visibleName(_, VY)?.at(-1)
-		}, VY.filepath), HY === void 0 ? [new CompileError(CompileErrorCode.BINDING_ERROR, `Failed to resolve the import of ${P} '${(_.nodeFullname(VY).getFiltered(UNHANDLED) || []).map(addDoubleQuoteIfNeeded).join(".")}'`, VY)] : []);
+		}, VY.filepath), HY === void 0 ? [new CompileError(CompileErrorCode.BINDING_ERROR, `Failed to resolve the import of ${P} '${(destructureComplexVariable(VY.name) || []).map(addDoubleQuoteIfNeeded).join(".")}'`, VY)] : []);
 	},
 	symbolMembers(_, VY) {
 		if (!(VY instanceof UseSymbol)) return Report.create(PASS_THROUGH);
@@ -9434,14 +9442,14 @@ var useUtils = { visibleName(_, VY) {
 		let GY = VY.parentOfKind(UseDeclarationNode);
 		if (GY?.importPath?.value === void 0) return Report.create(void 0);
 		let KY = resolveImportFilepath(VY.filepath, GY.importPath.value);
-		if (!KY) return Report.create(void 0);
+		if (!KY) return Report.create(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Import path must be relative, got '${GY.importPath.value}'`, VY)]);
 		if (!_.layout.exists(KY)) return Report.create(void 0, [new CompileError(CompileErrorCode.NONEXISTENT_MODULE, `${HY} '${UY?.join(".") ?? WY}' does not exist in file ${KY.toString()}. Does the file exist?`, VY)]);
 		let qY = VY.parentOfKind(InfixExpressionNode)?.leftExpression;
 		if (qY && qY !== VY) {
 			let P = _.nodeReferee(qY).getFiltered(UNHANDLED);
 			if (!P) return Report.create(void 0);
 			let UY = _.lookupMembers(P, HY, WY);
-			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Could not find ${HY} '${WY}'`, VY)]);
+			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Could not find ${HY} '${WY}'`, VY)]);
 		}
 		let JY = lookupMemberInFilepath(_, KY, WY, HY);
 		return JY ? Report.create(JY) : Report.create(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `${HY} '${WY}' does not exist in file ${KY.toString()}`, VY)]);
@@ -9451,7 +9459,7 @@ var useUtils = { visibleName(_, VY) {
 			let P = [];
 			if (VY.importPath?.value) {
 				let HY = resolveImportFilepath(VY.filepath, VY.importPath.value);
-				HY && !_.layout.exists(HY) && P.push(new CompileError(CompileErrorCode.NONEXISTENT_MODULE, `Failed to resolve the non-existent file '${VY.importPath.value}'`, VY.importPath));
+				HY ? _.layout.exists(HY) || P.push(new CompileError(CompileErrorCode.NONEXISTENT_MODULE, `Failed to resolve the non-existent file '${VY.importPath.value}'`, VY.importPath)) : P.push(new CompileError(CompileErrorCode.BINDING_ERROR, `Import path must be relative, got '${VY.importPath.value}'`, VY.importPath));
 			}
 			if (VY.specifiers) {
 				let HY = _.bindNode(VY.specifiers);
@@ -9497,74 +9505,151 @@ function lookupMemberInFilepath(_, VY, P, HY, UY = /* @__PURE__ */ new Set()) {
 	}
 }
 function usableMembers(_) {
-	let VY = [], P = /* @__PURE__ */ new Map(), HY = [], UY = [], WY = [], GY = [], KY = _ instanceof Filepath ? _ : _.filepath, qY = this.parseFile(KY), { ast: JY } = qY.getValue();
-	for (let _ of JY.body) {
-		if (!(_ instanceof UseDeclarationNode) || !_.specifiers || !_.importPath) continue;
-		let VY = resolveImportFilepath(KY, _.importPath.value);
-		VY && (_.isReuse ? _.specifiers instanceof WildcardNode ? HY.push({
-			importPath: VY,
-			node: _.specifiers
-		}) : UY.push(..._.specifiers.specifiers) : _.specifiers instanceof WildcardNode ? WY.push({
-			importPath: VY,
-			node: _.specifiers
-		}) : GY.push(..._.specifiers.specifiers));
-	}
-	let YY = [];
 	if (_ instanceof Filepath) {
-		let P = new Map([[DEFAULT_SCHEMA_NAME$1, this.symbolFactory.create(SchemaSymbol, { name: DEFAULT_SCHEMA_NAME$1 }, _)]]);
-		for (let VY of JY.declarations) {
-			let HY = this.nodeFullname(VY).getFiltered(UNHANDLED) || [], UY = HY.length <= 1 ? DEFAULT_SCHEMA_NAME$1 : HY[0];
-			P.has(UY) || P.set(UY, this.symbolFactory.create(SchemaSymbol, { name: UY }, _));
-		}
-		YY.push(...P.values());
-		let HY = YY.find((_) => _.isPublicSchema());
-		if (HY) {
-			let _ = this.usableMembers(HY).getFiltered(UNHANDLED);
-			_ && VY.push(..._.nonSchemaMembers);
-		}
-	} else {
-		let HY = _;
-		for (let _ of JY.body) {
-			if (!(_ instanceof ElementDeclarationNode)) continue;
-			let UY = schemaMembership(this, HY, _), WY = this.nodeAlias(_).getFiltered(UNHANDLED), GY = this.nodeSymbol(_).getFiltered(UNHANDLED);
-			if (WY !== void 0 && HY.isPublicSchema() && GY && VY.push(this.symbolFactory.create(AliasSymbol, {
-				kind: GY.kind,
-				declaration: _,
-				aliasedSymbol: GY,
-				name: WY
-			}, HY.filepath)), UY.kind !== "none") if (UY.kind === "direct") {
-				let P = this.nodeSymbol(_).getFiltered(UNHANDLED);
-				if (!P) continue;
-				VY.push(P);
-			} else P.has(UY.schemaName) || P.set(UY.schemaName, this.symbolFactory.create(SchemaSymbol, {
-				name: UY.schemaName,
-				parent: HY
-			}, HY.filepath));
-		}
-		YY.push(...P.values());
+		let { ast: VY } = this.parseFile(_).getValue(), P = this.nodeSymbol(VY).getFiltered(UNHANDLED);
+		return this.usableMembers(P);
 	}
+	let VY = _.filepath, P = collectImports(this, VY), { nonSchemaMembers: HY, schemaMembers: UY } = _ instanceof ProgramSymbol ? usableMembersForProgram(this, _, P) : usableMembersForSchema(this, _, P);
 	return new Report({
-		nonSchemaMembers: VY,
-		schemaMembers: YY,
+		nonSchemaMembers: HY,
+		schemaMembers: UY,
 		reuses: {
-			selective: UY,
-			wildcard: HY
+			selective: P.selectiveReuses,
+			wildcard: P.wildcardReuses
 		},
 		uses: {
-			selective: GY,
-			wildcard: WY
+			selective: P.selectiveUses,
+			wildcard: P.wildcardUses
 		}
-	}, qY.getErrors(), qY.getWarnings());
+	}, P.parseResult.getErrors(), P.parseResult.getWarnings());
 }
 function schemaMembership(_, VY, P) {
 	let HY = VY.qualifiedName, UY;
 	if (UY = P instanceof UseSpecifierNode ? useUtils.visibleName(_, P) : _.nodeFullname(P).getFiltered(UNHANDLED), !UY) return { kind: "none" };
-	let WY = UY.length <= 1 ? [DEFAULT_SCHEMA_NAME$1] : UY.slice(0, -1);
+	let WY = P instanceof UseSpecifierNode && P.getSymbolKind() === SymbolKind.Schema ? UY : UY.length <= 1 ? [DEFAULT_SCHEMA_NAME$1] : UY.slice(0, -1);
 	return WY.length < HY.length || !HY.every((_, VY) => _ === WY[VY]) ? { kind: "none" } : WY.length === HY.length ? { kind: "direct" } : {
 		kind: "child",
 		schemaName: WY[HY.length]
 	};
 }
+function collectImports(_, VY) {
+	let P = _.parseFile(VY), { ast: HY } = P.getValue(), UY = [], WY = [], GY = [], KY = [];
+	for (let _ of HY.body) {
+		if (!(_ instanceof UseDeclarationNode) || !_.specifiers || !_.importPath) continue;
+		let P = resolveImportFilepath(VY, _.importPath.value);
+		P && (_.isReuse ? _.specifiers instanceof WildcardNode ? UY.push({
+			importPath: P,
+			node: _.specifiers
+		}) : WY.push(..._.specifiers.specifiers) : _.specifiers instanceof WildcardNode ? GY.push({
+			importPath: P,
+			node: _.specifiers
+		}) : KY.push(..._.specifiers.specifiers));
+	}
+	return {
+		ast: HY,
+		parseResult: P,
+		selectiveReuses: WY,
+		wildcardReuses: UY,
+		selectiveUses: KY,
+		wildcardUses: GY
+	};
+}
+function usableMembersForProgram(_, VY, P) {
+	let { ast: HY, selectiveUses: UY, selectiveReuses: WY } = P, GY = VY.filepath, KY = new Map([[DEFAULT_SCHEMA_NAME$1, _.symbolFactory.create(SchemaSymbol, { name: DEFAULT_SCHEMA_NAME$1 }, GY)]]);
+	for (let VY of HY.declarations) {
+		let P = _.nodeFullname(VY).getFiltered(UNHANDLED) || [], HY = P.length <= 1 ? DEFAULT_SCHEMA_NAME$1 : P[0];
+		KY.has(HY) || KY.set(HY, _.symbolFactory.create(SchemaSymbol, { name: HY }, GY));
+	}
+	registerProgramSchemas(_, [...UY, ...WY], KY, GY);
+	for (let VY of _.reachableFiles(GY)) for (let P of collectTopLevelSchemaNames(_, VY)) KY.has(P) || KY.set(P, _.symbolFactory.create(SchemaSymbol, { name: P }, GY));
+	let qY = [...KY.values()], JY = [], YY = qY.find((_) => _.isPublicSchema());
+	if (YY) {
+		let VY = _.usableMembers(YY).getFiltered(UNHANDLED);
+		VY && JY.push(...VY.nonSchemaMembers);
+	}
+	return {
+		nonSchemaMembers: JY,
+		schemaMembers: qY
+	};
+}
+function usableMembersForSchema(_, VY, P) {
+	let { ast: HY, selectiveUses: UY, selectiveReuses: WY } = P, GY = [], KY = /* @__PURE__ */ new Map();
+	for (let P of HY.body) {
+		if (!(P instanceof ElementDeclarationNode)) continue;
+		let HY = schemaMembership(_, VY, P), UY = _.nodeAlias(P).getFiltered(UNHANDLED), WY = _.nodeSymbol(P).getFiltered(UNHANDLED);
+		if (UY !== void 0 && VY.isPublicSchema() && WY && GY.push(_.symbolFactory.create(AliasSymbol, {
+			kind: WY.kind,
+			declaration: P,
+			aliasedSymbol: WY,
+			name: UY
+		}, VY.filepath)), HY.kind !== "none") if (HY.kind === "direct") {
+			let VY = _.nodeSymbol(P).getFiltered(UNHANDLED);
+			if (!VY) continue;
+			GY.push(VY);
+		} else KY.has(HY.schemaName) || KY.set(HY.schemaName, _.symbolFactory.create(SchemaSymbol, {
+			name: HY.schemaName,
+			parent: VY
+		}, VY.filepath));
+	}
+	registerSchemaChildren(_, [...UY, ...WY], VY, KY);
+	let qY = VY.qualifiedName;
+	for (let P of _.reachableFiles(VY.filepath)) for (let HY of collectChildSchemaNames(_, P, qY)) KY.has(HY) || KY.set(HY, _.symbolFactory.create(SchemaSymbol, {
+		name: HY,
+		parent: VY
+	}, VY.filepath));
+	return {
+		nonSchemaMembers: GY,
+		schemaMembers: [...KY.values()]
+	};
+}
+function registerProgramSchemas(_, VY, P, HY) {
+	for (let UY of VY) {
+		if (UY.getSymbolKind() !== SymbolKind.Schema) continue;
+		let VY = useUtils.visibleName(_, UY)?.at(0);
+		VY !== void 0 && !P.has(VY) && P.set(VY, _.symbolFactory.create(SchemaSymbol, { name: VY }, HY));
+	}
+}
+function registerSchemaChildren(_, VY, P, HY) {
+	let UY = P.qualifiedName;
+	for (let WY of VY) {
+		if (WY.getSymbolKind() !== SymbolKind.Schema) continue;
+		let VY = useUtils.visibleName(_, WY);
+		if (!VY || VY.length <= UY.length || !UY.every((_, P) => _ === VY[P])) continue;
+		let GY = VY[UY.length];
+		GY && !HY.has(GY) && HY.set(GY, _.symbolFactory.create(SchemaSymbol, {
+			name: GY,
+			parent: P
+		}, P.filepath));
+	}
+}
+function collectTopLevelSchemaNames(_, VY) {
+	let { ast: P } = _.parseFile(VY).getValue(), HY = [];
+	for (let VY of P.declarations) {
+		let P = _.nodeFullname(VY).getFiltered(UNHANDLED) || [], UY = P.length <= 1 ? DEFAULT_SCHEMA_NAME$1 : P[0];
+		HY.push(UY);
+	}
+	let UY = collectImports(_, VY);
+	for (let VY of [...UY.selectiveUses, ...UY.selectiveReuses]) {
+		if (VY.getSymbolKind() !== SymbolKind.Schema) continue;
+		let P = useUtils.visibleName(_, VY)?.at(0);
+		P !== void 0 && HY.push(P);
+	}
+	return HY;
+}
+function collectChildSchemaNames(_, VY, P) {
+	let { ast: HY } = _.parseFile(VY).getValue(), UY = [];
+	for (let VY of HY.declarations) {
+		let HY = _.nodeFullname(VY).getFiltered(UNHANDLED) || [], WY = HY.length <= 1 ? [DEFAULT_SCHEMA_NAME$1] : HY.slice(0, -1);
+		WY.length > P.length && P.every((_, VY) => _ === WY[VY]) && UY.push(WY[P.length]);
+	}
+	let WY = collectImports(_, VY);
+	for (let VY of [...WY.selectiveUses, ...WY.selectiveReuses]) {
+		if (VY.getSymbolKind() !== SymbolKind.Schema) continue;
+		let HY = useUtils.visibleName(_, VY);
+		!HY || HY.length <= P.length || P.every((_, VY) => _ === HY[VY]) && UY.push(HY[P.length]);
+	}
+	return UY;
+}
 var TableBinder = class {
 	constructor(_, VY) {
 		this.compiler = _, this.declarationNode = VY;
@@ -9883,7 +9968,7 @@ function nodeRefereeOfPartialInjection(_, VY, P) {
 		}
 	}
 	let WY = _.lookupMembers(VY, SymbolKind.TablePartial, HY);
-	return WY ? Report.create(WY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `TablePartial '${HY}' does not exist in Schema 'public'`, P)]);
+	return WY ? Report.create(WY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `TablePartial '${HY}' does not exist in Schema 'public'`, P)]);
 }
 function nodeRefereeOfEnumType$1(_, VY, P) {
 	if (!isExpressionAVariableNode(P)) return new Report(void 0);
@@ -9893,13 +9978,13 @@ function nodeRefereeOfEnumType$1(_, VY, P) {
 	if (UY) {
 		if (UY.isKind(SymbolKind.Schema)) {
 			let VY = isTerminalAccessFragment(P), WY = _.lookupMembers(UY, VY ? SymbolKind.Enum : SymbolKind.Schema, HY);
-			return WY ? Report.create(WY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, VY ? `Enum '${HY}' does not exist in Schema 'public'` : `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+			return WY ? Report.create(WY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, VY ? `Enum '${HY}' does not exist in Schema 'public'` : `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 		}
 		return new Report(void 0);
 	}
 	if (P.parentNode.leftExpression === P) {
 		let UY = _.lookupMembers(VY, SymbolKind.Schema, HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 	}
 	return new Report(void 0);
 }
@@ -9946,11 +10031,11 @@ function nodeRefereeOfEnumDefault$1(_, VY, P) {
 	if (UY) {
 		if (UY.isKind(SymbolKind.Schema)) {
 			let VY = _.lookupMembers(UY, [SymbolKind.Enum, SymbolKind.Schema], HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${HY}' does not exist`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${HY}' does not exist`, P)]);
 		}
 		if (UY.isKind(SymbolKind.Enum)) {
 			let VY = _.lookupMembers(UY, SymbolKind.EnumField, HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum field '${HY}' does not exist in Enum 'public.${UY.name}'`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum field '${HY}' does not exist in Enum 'public.${UY.name}'`, P)]);
 		}
 		return new Report(void 0);
 	}
@@ -9958,10 +10043,10 @@ function nodeRefereeOfEnumDefault$1(_, VY, P) {
 	if (WY.leftExpression === P) {
 		if (isAccessExpression(WY.parentNode) && WY.parentNode.leftExpression === WY) {
 			let UY = _.lookupMembers(VY, SymbolKind.Schema, HY);
-			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 		}
 		let UY = _.lookupMembers(VY, SymbolKind.Enum, HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum '${HY}' does not exist in Schema 'public'`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum '${HY}' does not exist in Schema 'public'`, P)]);
 	}
 	return new Report(void 0);
 }
@@ -10225,16 +10310,11 @@ function nodeRefereeOfTableGroupField(_, VY, P) {
 	let HY = extractVarNameFromPrimaryVariable(P) ?? "";
 	if (!isAccessExpression(P.parentNode)) {
 		let UY = _.symbolMembers(VY).getFiltered(UNHANDLED);
-		if (UY) for (let VY of UY) {
-			if (!(VY instanceof SchemaSymbol)) continue;
-			let P = _.lookupMembers(VY, SymbolKind.Table, HY);
-			if (P) return Report.create(P);
-			if (!VY.isPublicSchema()) {
-				let P = _.symbolMembers(VY).getFiltered(UNHANDLED);
-				if (P) {
-					let VY = P.find((VY) => !VY.isKind(SymbolKind.Table) || !VY.declaration ? !1 : _.nodeAlias(VY.declaration).getFiltered(UNHANDLED) === HY);
-					if (VY) return new Report(VY);
-				}
+		if (UY) {
+			let VY = UY.find((_) => _ instanceof SchemaSymbol && _.isPublicSchema());
+			if (VY) {
+				let P = _.lookupMembers(VY, SymbolKind.Table, HY);
+				if (P) return Report.create(P);
 			}
 		}
 		let WY = _.lookupMembers(VY, SymbolKind.Table, HY);
@@ -10343,7 +10423,7 @@ var TablePartialBinder = class {
 		this.tablePartial.headerColor = P ? extractColor(P.value) : void 0;
 		let [HY] = VY[SettingName.Note] || [];
 		return this.tablePartial.note = HY && {
-			value: extractQuotedStringToken(HY?.value) ? normalizeNote(extractQuotedStringToken(HY?.value)) : "",
+			value: normalizeNote(extractQuotedStringToken(HY?.value)),
 			token: getTokenPosition(HY)
 		}, [];
 	}
@@ -10470,13 +10550,13 @@ function nodeRefereeOfEnumType(_, VY, P) {
 	if (UY) {
 		if (UY.isKind(SymbolKind.Schema)) {
 			let VY = _.lookupMembers(UY, [SymbolKind.Enum, SymbolKind.Schema], HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${HY}' does not exist`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${HY}' does not exist`, P)]);
 		}
 		return new Report(void 0);
 	}
 	if (P.parentNode.leftExpression === P) {
 		let UY = _.lookupMembers(VY, SymbolKind.Schema, HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 	}
 	return new Report(void 0);
 }
@@ -10489,21 +10569,21 @@ function nodeRefereeOfInlineRef(_, VY, P) {
 			let VY = _.nodeSymbol(UY).getFiltered(UNHANDLED);
 			if (VY) {
 				let UY = _.lookupMembers(VY, SymbolKind.Column, HY);
-				return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${HY}' does not exist in TablePartial '${VY.name}'`, P)]);
+				return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${HY}' does not exist in TablePartial '${VY.name}'`, P)]);
 			}
 		}
 		let WY = _.lookupMembers(VY, SymbolKind.Column, HY);
-		return WY ? Report.create(WY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${HY}' does not exist`, P)]);
+		return WY ? Report.create(WY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${HY}' does not exist`, P)]);
 	}
 	let UY = nodeRefereeOfLeftExpression(_, P);
 	if (UY) {
 		if (UY.isKind(SymbolKind.Schema)) {
 			let VY = _.lookupMembers(UY, [SymbolKind.Table, SymbolKind.Schema], HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table or schema '${HY}' does not exist`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table or schema '${HY}' does not exist`, P)]);
 		}
 		if (UY.isKind(SymbolKind.Table)) {
 			let VY = _.lookupMembers(UY, SymbolKind.Column, HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Column '${HY}' does not exist in Table 'public.${UY.name}'`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Column '${HY}' does not exist in Table 'public.${UY.name}'`, P)]);
 		}
 		return new Report(void 0);
 	}
@@ -10511,10 +10591,10 @@ function nodeRefereeOfInlineRef(_, VY, P) {
 	if (WY.leftExpression === P) {
 		if (isAccessExpression(WY.parentNode) && WY.parentNode.leftExpression === WY) {
 			let UY = _.lookupMembers(VY, SymbolKind.Schema, HY);
-			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 		}
 		let UY = _.lookupMembers(VY, SymbolKind.Table, HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Table '${HY}' does not exist in Schema 'public'`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Table '${HY}' does not exist in Schema 'public'`, P)]);
 	}
 	return new Report(void 0);
 }
@@ -10526,11 +10606,11 @@ function nodeRefereeOfEnumDefault(_, VY, P) {
 	if (UY) {
 		if (UY.isKind(SymbolKind.Schema)) {
 			let VY = _.lookupMembers(UY, [SymbolKind.Enum, SymbolKind.Schema], HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum or schema '${HY}' does not exist`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum or schema '${HY}' does not exist`, P)]);
 		}
 		if (UY.isKind(SymbolKind.Enum)) {
 			let VY = _.lookupMembers(UY, SymbolKind.EnumField, HY);
-			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum field '${HY}' does not exist in Enum 'public.${UY.name}'`, P)]);
+			return VY ? Report.create(VY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum field '${HY}' does not exist in Enum 'public.${UY.name}'`, P)]);
 		}
 		return new Report(void 0);
 	}
@@ -10538,10 +10618,10 @@ function nodeRefereeOfEnumDefault(_, VY, P) {
 	if (WY.leftExpression === P) {
 		if (isAccessExpression(WY.parentNode) && WY.parentNode.leftExpression === WY) {
 			let UY = _.lookupMembers(VY, SymbolKind.Schema, HY);
-			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
+			return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Schema '${HY}' does not exist in Schema 'public'`, P)]);
 		}
 		let UY = _.lookupMembers(VY, SymbolKind.Enum, HY);
-		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.NAME_NOT_FOUND, `Enum '${HY}' does not exist in Schema 'public'`, P)]);
+		return UY ? Report.create(UY) : new Report(void 0, [new CompileError(CompileErrorCode.BINDING_ERROR, `Enum '${HY}' does not exist in Schema 'public'`, P)]);
 	}
 	return new Report(void 0);
 }
@@ -10554,26 +10634,38 @@ var schemaModule = { symbolMembers(_, VY) {
 		let HY = handleMemberSelectiveUses(_, VY, P, WY);
 		GY.push(...HY.getErrors());
 		let KY = HY.getFiltered(UNHANDLED);
-		KY && UY.push(KY);
+		KY && UY.push(KY), UY.push(...mergeImportedSchema(_, VY, P));
 	}
 	for (let { importPath: P, node: GY } of HY.reuses.wildcard) UY.push(...handleMemberWildcardUses(_, VY, P, GY, WY));
 	for (let P of HY.uses.selective) {
 		let HY = handleMemberSelectiveUses(_, VY, P, WY);
 		GY.push(...HY.getErrors());
 		let KY = HY.getFiltered(UNHANDLED);
-		KY && UY.push(KY);
+		KY && UY.push(KY), UY.push(...mergeImportedSchema(_, VY, P));
 	}
 	for (let { importPath: P, node: GY } of HY.uses.wildcard) UY.push(...handleMemberWildcardUses(_, VY, P, GY, WY));
 	UY.push(...WY.values());
 	let KY = [...UY];
-	for (let VY of UY) VY.isKind(SymbolKind.TableGroup) && KY.push(...expandTableGroup(_, VY));
+	{
+		let P = UY.filter((_) => _.isKind(SymbolKind.TableGroup));
+		if (!VY.isPublicSchema()) {
+			let HY = _.usableMembers(VY.filepath).getFiltered(UNHANDLED)?.schemaMembers.find((_) => _.isPublicSchema());
+			if (HY) {
+				let VY = _.symbolMembers(HY).getFiltered(UNHANDLED);
+				VY && P.push(...VY.filter((_) => _.isKind(SymbolKind.TableGroup)));
+			}
+		}
+		for (let HY of P) KY.push(...expandTableGroup(_, VY, HY));
+	}
 	let qY = /* @__PURE__ */ new Set(), JY = KY.filter((_) => {
+		if (_ instanceof UseSymbol && _.isKind(SymbolKind.Schema)) return !1;
 		let VY = `${_.originalSymbol.intern()}:${_.name ?? ""}`;
 		return qY.has(VY) ? !1 : (qY.add(VY), !0);
 	}), YY = /* @__PURE__ */ new Map();
 	for (let _ of JY) {
 		let VY = `${_.kind}:${_.name}`;
 		if (YY.get(VY)) {
+			if (_.isKind(SymbolKind.Schema)) continue;
 			let VY = _ instanceof UseSymbol ? _.useSpecifierDeclaration ?? _.declaration : _.declaration instanceof ElementDeclarationNode && _.declaration.name ? _.declaration.name : _.declaration;
 			VY && _.name !== void 0 && GY.push(getDuplicateSchemaMemberError(_.kind, _.name, P.join("."), VY));
 		} else YY.set(VY, _);
@@ -10602,6 +10694,43 @@ function handleMemberSelectiveUses(_, VY, P, HY) {
 		parent: VY
 	}, VY.filepath)), Report.create(void 0);
 }
+function mergeImportedSchema(_, VY, P, HY = /* @__PURE__ */ new Set()) {
+	if (P.getSymbolKind() !== SymbolKind.Schema || !P.name) return [];
+	let UY = _.nodeReferee(P.name).getFiltered(UNHANDLED);
+	if (!UY || !UY.isKind(SymbolKind.Schema)) return [];
+	let WY = useUtils.visibleName(_, P), GY = VY.qualifiedName;
+	return !WY || WY.length !== GY.length || !WY.every((_, VY) => _ === GY[VY]) ? [] : mergeSchemaMembers(_, VY, P, UY, HY);
+}
+function mergeSchemaMembers(_, VY, P, HY, UY) {
+	let WY = HY.intern();
+	if (UY.has(WY)) return [];
+	UY.add(WY);
+	let GY = _.usableMembers(HY).getFiltered(UNHANDLED);
+	if (!GY) return [];
+	let KY = GY.nonSchemaMembers.filter((_) => _.canBeImported).map((HY) => _.symbolFactory.create(UseSymbol, {
+		kind: HY.kind,
+		declaration: HY.originalSymbol.declaration,
+		usedSymbol: HY.originalSymbol,
+		useSpecifierDeclaration: P,
+		name: HY.name
+	}, VY.filepath));
+	for (let P of [...KY]) P.isKind(SymbolKind.TableGroup) && KY.push(...expandTableGroup(_, VY, P));
+	for (let HY of GY.reuses.selective) if (KY.push(...mergeImportedSchema(_, VY, HY, UY)), schemaMembership(_, VY, HY).kind === "direct") {
+		let UY = _.nodeSymbol(HY).getFiltered(UNHANDLED);
+		UY && UY.canBeImported && KY.push(_.symbolFactory.create(UseSymbol, {
+			kind: UY.kind,
+			declaration: UY.originalSymbol.declaration,
+			usedSymbol: UY.originalSymbol,
+			useSpecifierDeclaration: P,
+			name: UY.name
+		}, VY.filepath));
+	}
+	for (let { importPath: HY } of GY.reuses.wildcard) {
+		let WY = findSchemaSymbolInFilepath(_, HY, VY.qualifiedName);
+		WY && KY.push(...mergeSchemaMembers(_, VY, P, WY, UY));
+	}
+	return KY;
+}
 function handleMemberWildcardUses(_, VY, P, HY, UY, WY = /* @__PURE__ */ new Set()) {
 	if (WY.has(P)) return [];
 	WY.add(P);
@@ -10620,7 +10749,7 @@ function handleMemberWildcardUses(_, VY, P, HY, UY, WY = /* @__PURE__ */ new Set
 	let { reuses: { selective: JY, wildcard: YY } } = KY;
 	for (let P of JY) {
 		let HY = handleMemberSelectiveUses(_, VY, P, UY).getFiltered(UNHANDLED);
-		HY && qY.push(HY);
+		HY && qY.push(HY), qY.push(...mergeImportedSchema(_, VY, P));
 	}
 	for (let { importPath: P } of YY) qY.push(...handleMemberWildcardUses(_, VY, P, HY, UY, WY));
 	return qY;
@@ -10638,34 +10767,36 @@ function findSchemaSymbolInFilepath(_, VY, P) {
 	}
 	return WY;
 }
-function expandTableGroup(_, VY) {
-	if (!VY.isKind(SymbolKind.TableGroup)) return [];
-	let P = VY.originalSymbol, HY = _.symbolMembers(P).getFiltered(UNHANDLED);
-	if (!HY) return [];
-	let UY = [];
-	for (let P of HY) {
-		if (!P.isKind(SymbolKind.TableGroupField) || !P.declaration) continue;
-		let HY = P.declaration.callee;
+function expandTableGroup(_, VY, P) {
+	if (!P.isKind(SymbolKind.TableGroup) || !(P instanceof UseSymbol)) return [];
+	let HY = P.originalSymbol, UY = _.symbolMembers(HY).getFiltered(UNHANDLED);
+	if (!UY) return [];
+	let WY = VY.qualifiedName, GY = [];
+	for (let VY of UY) {
+		if (!VY.isKind(SymbolKind.TableGroupField) || !VY.declaration) continue;
+		let HY = VY.declaration.callee;
 		if (!HY) continue;
-		let WY = destructureComplexVariable(HY);
-		if (!WY || WY.length === 0) continue;
-		let GY = P.declaration.filepath, KY = lookupTableInFile(_, GY, WY);
-		KY && VY instanceof UseSymbol && UY.push(_.symbolFactory.create(UseSymbol, {
+		let UY = destructureComplexVariable(HY);
+		if (!UY || UY.length === 0) continue;
+		let KY = UY.length <= 1 ? [DEFAULT_SCHEMA_NAME$1] : UY.slice(0, -1);
+		if (KY.length !== WY.length || !WY.every((_, VY) => _ === KY[VY])) continue;
+		let qY = VY.declaration.filepath, JY = lookupTableInFile(_, qY, UY);
+		JY && GY.push(_.symbolFactory.create(UseSymbol, {
 			kind: SymbolKind.Table,
-			declaration: KY.declaration,
-			usedSymbol: KY,
+			declaration: JY.declaration,
+			usedSymbol: JY,
 			useSpecifierDeclaration: void 0,
-			name: KY.name
-		}, VY.filepath));
+			name: JY.name
+		}, P.filepath));
 	}
-	return UY;
+	return GY;
 }
 function lookupTableInFile(_, VY, P) {
 	if (P.length === 1) {
 		let HY = _.usableMembers(VY).getFiltered(UNHANDLED);
 		return HY ? HY.nonSchemaMembers.find((_) => _.isKind(SymbolKind.Table) && _.name === P[0]) : void 0;
 	}
-	let [HY, UY] = [P[0], P[P.length - 1]], WY = _.usableMembers(VY).getFiltered(UNHANDLED);
+	let HY = P[0], UY = P[P.length - 1], WY = _.usableMembers(VY).getFiltered(UNHANDLED);
 	if (!WY) return;
 	let GY = WY.schemaMembers.find((_) => _.name === HY);
 	if (!GY) return;
@@ -10981,6 +11112,10 @@ var customModule = {
 	}
 	validateSubBlock(_) {
 		let VY = [], P = [];
+		if (hasSimpleBody(_)) return VY.push(new CompileError(CompileErrorCode.UNEXPECTED_SIMPLE_BODY, `${_.type?.value} body must be a block`, _.bodyColon)), {
+			errors: VY,
+			warnings: P
+		};
 		if (!_.body || !(_.body instanceof BlockExpressionNode)) return {
 			errors: VY,
 			warnings: P
@@ -12196,7 +12331,7 @@ var tablePartialModule = {
 		nodeFullname(_, VY) {
 			if (!isUseSpecifier(VY)) return Report.create(PASS_THROUGH);
 			let P = destructureComplexVariable(VY.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)", VY)]) : VY.isKind(ImportKind.TableGroup) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TableGroup name must be a simple name", VY)]) : VY.isKind(ImportKind.TablePartial) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TablePartial name must be a simple name", VY)]) : VY.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", VY)]) : (P.length === 1 && P.unshift(DEFAULT_SCHEMA_NAME$1), 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)", VY)]) : VY.isKind(ImportKind.TableGroup) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TableGroup name must be a simple name", VY)]) : VY.isKind(ImportKind.TablePartial) && P.length > 1 ? Report.create(P, [new CompileError(CompileErrorCode.INVALID_USE_SPECIFIER_NAME, "A TablePartial name must be a simple name", VY)]) : VY.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", VY)]) : (P.length === 1 && !VY.isKind(ImportKind.Schema) && P.unshift(DEFAULT_SCHEMA_NAME$1), new Report(P));
 		},
 		nodeAlias(_, VY) {
 			return isUseSpecifier(VY) ? VY.alias ? isValidAlias(VY.alias) ? new Report(extractVariableFromExpression(VY.alias)) : new Report(void 0, [new CompileError(CompileErrorCode.INVALID_ALIAS, "Use aliases can only contain alphanumeric and underscore unless surrounded by double quotes", VY.alias)]) : new Report(void 0) : Report.create(PASS_THROUGH);
@@ -13070,77 +13205,47 @@ function isOffsetWithinElementHeader(_, VY) {
 	let P = VY.bodyColon?.start ?? VY.body?.start;
 	return P === void 0 ? _ >= VY.start && _ <= VY.end : _ >= VY.start && _ < P;
 }
-function scanExistingUses(_, VY, P) {
-	let HY = [], UY = _.parseFile(VY).getValue()?.ast;
-	if (!UY) return HY;
-	for (let _ of UY.uses) {
-		let VY = _.importPath?.value ?? "";
-		if (!VY) {
-			let HY = _.useKeyword?.start ?? _.fullStart, UY = P.lastIndexOf("\n", HY - 1) + 1, WY = P.indexOf("\n", HY), GY = P.slice(UY, WY === -1 ? void 0 : WY).match(/from\s*(['"])(.*?)\1/);
-			GY && (VY = GY[2]);
-		}
-		let UY = [];
-		if (_.specifiers instanceof UseSpecifierListNode) {
-			let VY = new Set([
-				"table",
-				"enum",
-				"tablepartial",
-				"tablegroup",
-				"note",
-				"schema",
-				"from"
-			]);
-			for (let HY of _.specifiers.specifiers) {
-				let _, WY;
-				if (HY.name) _ = HY.importKind?.value, WY = extractVariableFromExpression(HY.name), !WY && HY.name.start !== void 0 && HY.name.end !== void 0 && (WY = P.slice(HY.name.start, HY.name.end).trim());
-				else if (HY.importKind) {
-					let _ = HY.importKind.value ?? void 0;
-					_ && !VY.has(_.toLowerCase()) && (WY = _);
-				}
-				WY && WY.toLowerCase() !== "from" && UY.push({
+function scanExistingUses(_, VY) {
+	let P = [], HY = _.parseFile(VY).getValue()?.ast;
+	if (!HY) return P;
+	for (let _ of HY.uses) {
+		let VY = _.importPath?.value ?? "", HY = [];
+		if (_.specifiers instanceof UseSpecifierListNode) for (let VY of _.specifiers.specifiers) {
+			let _, P;
+			if (VY.name ? (_ = VY.importKind?.value, P = extractVariableFromExpression(VY.name)) : VY.importKind && (P = VY.importKind.value ?? void 0), P) {
+				let UY = VY.alias ? extractVariableFromExpression(VY.alias) : void 0;
+				HY.push({
 					kind: _,
-					name: WY
+					name: P,
+					alias: UY
 				});
 			}
-		} else _.specifiers instanceof WildcardNode && UY.push({ name: "*" });
-		if (UY.length === 0 && !(_.specifiers instanceof WildcardNode)) continue;
-		let WY = _.fullEnd;
-		if (!_.importPath) {
-			let VY = _.useKeyword?.start ?? _.fullStart, HY = P.indexOf("\n", VY);
-			WY = HY === -1 ? P.length : HY;
 		}
-		HY.push({
+		else _.specifiers instanceof WildcardNode && HY.push({ name: "*" });
+		HY.length === 0 && !(_.specifiers instanceof WildcardNode) || P.push({
 			startOffset: _.fullStart,
-			endOffset: WY,
+			endOffset: _.fullEnd,
 			sourceFile: VY,
-			specifiers: UY,
+			specifiers: HY,
 			node: _
 		});
 	}
-	return HY;
+	return P;
 }
 function mergeSymbolIntoUses(_, VY, P, HY, UY, WY) {
-	let GY = scanExistingUses(_, UY, WY), KY = normalizeSourcePath(HY, UY), qY = GY.findIndex((_) => _.sourceFile === KY), JY = `${P} ${VY}`, YY = detectLineEnding(WY);
+	let GY = scanExistingUses(_, UY), KY = HY.relativeTo(UY.dirname).replace(/\.dbml$/, ""), qY = GY.findIndex((_) => _.sourceFile === KY), JY = `${P} ${VY}`;
 	if (qY !== -1) {
 		let _ = GY[qY];
 		return _.specifiers.some((_) => _.name === VY) ? { topInsert: "" } : {
-			topInsert: buildUseStatement(uniqueInOrder([..._.specifiers.filter((_) => _.name !== "*").map((_) => `${_.kind ?? P} ${_.name}`), JY]), KY, YY),
+			topInsert: buildUseStatement(uniq_default([..._.specifiers.filter((_) => _.name !== "*").map((_) => `${_.kind ?? P} ${_.name}${_.alias ? ` as ${_.alias}` : ""}`), JY]), KY, "\n"),
 			removeRange: expandToFullLines(WY, _.startOffset, _.endOffset)
 		};
 	}
-	return { topInsert: buildUseStatement([JY], KY, YY) };
+	return { topInsert: buildUseStatement([JY], KY, "\n") };
 }
 function buildUseStatement(_, VY, P) {
 	return `use {${P}${_.map((_) => `  ${_}`).join(P)}${P}} from '${VY}'${P}${P}`;
 }
-function uniqueInOrder(_) {
-	let VY = /* @__PURE__ */ new Set(), P = [];
-	for (let HY of _) {
-		let _ = HY.trim();
-		VY.has(_) || (VY.add(_), P.push(HY));
-	}
-	return P;
-}
 function expandToFullLines(_, VY, P) {
 	let HY = _.lastIndexOf("\n", VY - 1) + 1, UY = P;
 	for (; UY < _.length && (_[UY] === " " || _[UY] === "	");) UY++;
@@ -13149,12 +13254,6 @@ function expandToFullLines(_, VY, P) {
 		endOffset: UY
 	};
 }
-function detectLineEnding(_) {
-	return _.includes("\r\n") ? "\r\n" : "\n";
-}
-function normalizeSourcePath(_, VY) {
-	return _.relativeTo(VY.dirname).replace(/\.dbml$/, "");
-}
 function pickCompletionItemKind(_) {
 	switch (_) {
 		case SymbolKind.Schema: return CompletionItemKind.Module;
@@ -13214,7 +13313,7 @@ function addSuggestAllSuggestion(_, VY = ", ") {
 }
 function collectCrossFileSuggestions(_, VY, P) {
 	let HY = [], UY = /* @__PURE__ */ new Set(), WY = _.layout.getSource(P) ?? "";
-	for (let GY of _.layout.getEntryPoints()) {
+	for (let GY of _.layout.getEntrypoints()) {
 		if (GY.equals(P)) continue;
 		let KY = _.usableMembers(GY).getFiltered(UNHANDLED);
 		if (KY) for (let qY of [...KY.nonSchemaMembers, ...KY.schemaMembers]) {
@@ -13334,6 +13433,7 @@ function suggestUseCompletion(_, VY, P, HY, UY) {
 }
 function suggestInUseDeclaration(_, VY, P, HY, UY, WY) {
 	if (HY.importPath && isOffsetWithinSpan(P, HY.importPath)) return suggestUseFilepath(_, VY, HY.importPath, UY, HY);
+	if (HY.importPath && P >= HY.importPath.end) return noSuggestions();
 	if (HY.fromKeyword && P > HY.fromKeyword.end) return suggestUseFilepath(_, VY, void 0, UY, HY);
 	if (HY.specifiers instanceof UseSpecifierListNode) {
 		if (!HY.specifiers.openBrace) {
@@ -13403,14 +13503,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
@@ -13427,7 +13527,7 @@ function suggestUseFilepath(_, VY, P, HY, UY) {
 			endColumn: _.endColumn - 1
 		};
 	}
-	let JY = /* @__PURE__ */ new Map(), YY = /* @__PURE__ */ new Map(), XY = uniqBy_default(_.layout.getEntryPoints().flatMap((VY) => [..._.reachableFiles(VY)]), (_) => _.intern());
+	let JY = /* @__PURE__ */ new Map(), YY = /* @__PURE__ */ new Map(), XY = uniqBy_default(_.layout.getEntrypoints().flatMap((VY) => [..._.reachableFiles(VY)]), (_) => _.intern());
 	for (let P of XY) {
 		if (P.equals(VY)) continue;
 		let HY = P.relativeTo(WY);
@@ -14216,7 +14316,7 @@ var dbmlMonarchTokensProvider = {
 		}
 		return [...HY].sort().map(Filepath.from);
 	}
-	getEntryPoints() {
+	getEntrypoints() {
 		return [...this.files.keys()].map(Filepath.from).sort((_, VY) => _.absolute.localeCompare(VY.absolute));
 	}
 	clone() {
@@ -14236,7 +14336,7 @@ function containerStack(_, VY) {
 	for (; qY.length > 0;) {
 		let P = !1, HY = last_default$1(qY);
 		if (HY instanceof FunctionApplicationNode) {
-			let UY = this.layout.getSource(_) || "";
+			let UY = this.getSource(_) || "";
 			for (let _ = HY.end; _ < VY; _ += 1) UY[_] === "\n" && (qY.pop(), P = !0);
 		} else HY instanceof PrefixExpressionNode || HY instanceof InfixExpressionNode ? this.container.token(_, VY).token !== HY.op && (qY.pop(), P = !0) : HY instanceof ListExpressionNode ? HY.listCloseBracket && HY.end <= VY && (qY.pop(), P = !0) : HY instanceof TupleExpressionNode ? HY.tupleCloseParen && HY.end <= VY && (qY.pop(), P = !0) : HY instanceof CommaExpressionNode ? HY.end <= VY && (qY.pop(), P = !0) : HY instanceof BlockExpressionNode ? HY.blockCloseBrace && HY.end <= VY && (qY.pop(), P = !0) : HY instanceof IdentifierStreamNode || HY.end < VY && (qY.pop(), P = !0);
 		if (P) {
@@ -14293,32 +14393,40 @@ function containerScopeKind(_, VY) {
 }
 function canonicalName(_, VY) {
 	let P = VY.originalSymbol;
-	if (P.filepath.intern() === _.intern()) return Report.create(fullnameToCanonical(this, P));
-	let HY = this.parseFile(_).getValue().ast, UY = this.nodeSymbol(HY).getFiltered(UNHANDLED);
-	if (!UY) return Report.create(fullnameToCanonical(this, P));
-	let WY = this.symbolMembers(UY).getFiltered(UNHANDLED) ?? [], GY = [...WY];
-	for (let _ of WY) if (_ instanceof SchemaSymbol && _.isKind(SymbolKind.Schema)) {
-		let VY = this.symbolMembers(_).getFiltered(UNHANDLED);
-		VY && GY.push(...VY);
-	}
-	for (let VY of GY) if (VY.filepath.intern() === _.intern() && VY.originalSymbol === P && (VY instanceof UseSymbol || VY instanceof AliasSymbol)) {
-		let _ = VY.name;
-		if (!_) continue;
-		if (_ !== P.name) return Report.create({
+	if (P.filepath.equals(_)) return Report.create(fullnameToCanonical(this, P));
+	let HY = [...this.symbolUses(P).getValue(), ...this.symbolAliases(P).getValue()].filter((VY) => VY.filepath.equals(_));
+	for (let _ of HY) {
+		let VY = _.name;
+		if (!VY) continue;
+		if (VY !== P.name) return Report.create({
 			schema: "",
-			name: _
+			name: VY
+		});
+		let HY = getSchemaChain(this, _);
+		if (HY.length > 0) return Report.create({
+			schema: HY.join("."),
+			name: VY
 		});
-		let HY = fullnameToCanonical(this, P);
-		return HY ? Report.create({
-			...HY,
-			name: _
+		let UY = fullnameToCanonical(this, P);
+		return UY ? Report.create({
+			...UY,
+			name: VY
 		}) : Report.create({
 			schema: DEFAULT_SCHEMA_NAME$1,
-			name: _
+			name: VY
 		});
 	}
 	return Report.create(fullnameToCanonical(this, P));
 }
+function getSchemaChain(_, VY) {
+	let P = [], HY = VY;
+	for (; HY;) {
+		let VY = _.symbolParent(HY).find((_) => _ instanceof SchemaSymbol && _.isKind(SymbolKind.Schema));
+		if (!VY || VY.isPublicSchema()) break;
+		P.unshift(VY.name ?? ""), HY = VY;
+	}
+	return P;
+}
 function fullnameToCanonical(_, VY) {
 	if (!VY.declaration) return VY.name ? {
 		schema: DEFAULT_SCHEMA_NAME$1,
@@ -14344,16 +14452,19 @@ function fileDependencies(_) {
 	}
 	return P;
 }
-function reachableFiles(_) {
-	let VY = /* @__PURE__ */ new Set(), P = [], HY = _ ? [_] : this.layout.getEntryPoints(), UY = 0;
-	for (; UY < HY.length;) {
-		let _ = HY[UY++], WY = _.intern();
-		if (!VY.has(WY)) {
-			VY.add(WY), P.push(_);
-			for (let VY of this.fileDependencies(_)) HY.push(VY);
+function walkDependencies(_, VY) {
+	let P = /* @__PURE__ */ new Set(), HY = [], UY = [...VY], WY = 0;
+	for (; WY < UY.length;) {
+		let VY = UY[WY++], GY = VY.intern();
+		if (!P.has(GY)) {
+			P.add(GY), HY.push(VY);
+			for (let P of _.fileDependencies(VY)) UY.push(P);
 		}
 	}
-	return P;
+	return HY;
+}
+function reachableFiles(_) {
+	return walkDependencies(this, _ ? [_] : this.layout.getEntrypoints());
 }
 function ast(_) {
 	return this.bindFile(_), this.parseFile(_).getValue().ast;
@@ -14404,7 +14515,7 @@ function bindFile(_) {
 	return new Report(void 0, [...VY.getErrors(), ...HY.getErrors()], [...VY.getWarnings(), ...HY.getWarnings()]);
 }
 function bindProject() {
-	let _ = collectTransitiveDependencies(this, this.layout.getEntryPoints()), VY = /* @__PURE__ */ new Map();
+	let _ = collectTransitiveDependencies(this, this.layout.getEntrypoints()), VY = /* @__PURE__ */ new Map();
 	for (let P of _) {
 		let _ = this.bindFile(P);
 		VY.set(P.absolute, _);
@@ -14419,7 +14530,7 @@ function interpretFile(_) {
 }
 function interpretProject() {
 	let _ = [], VY = [], P = /* @__PURE__ */ new Set(), HY = [];
-	for (let _ of this.layout.getEntryPoints()) for (let VY of this.reachableFiles(_)) {
+	for (let _ of this.layout.getEntrypoints()) for (let VY of this.reachableFiles(_)) {
 		let _ = VY.intern();
 		P.has(_) || (P.add(_), HY.push(VY));
 	}
@@ -14427,8 +14538,10 @@ function interpretProject() {
 	for (let P of HY) {
 		let HY = this.parseFile(P);
 		_.push(...HY.getErrors()), VY.push(...HY.getWarnings());
-		let WY = HY.getValue().ast, GY = this.nodeSymbol(WY).getFiltered(UNHANDLED), KY = GY ? this.interpretSymbol(GY, P) : Report.create(UNHANDLED), qY = KY.getFiltered(UNHANDLED);
-		qY && UY.set(P.absolute, qY), _.push(...KY.getErrors()), VY.push(...KY.getWarnings());
+		let WY = this.bindFile(P);
+		_.push(...WY.getErrors()), VY.push(...WY.getWarnings());
+		let GY = HY.getValue().ast, KY = this.nodeSymbol(GY).getFiltered(UNHANDLED), qY = KY ? this.interpretSymbol(KY, P) : Report.create(UNHANDLED), JY = qY.getFiltered(UNHANDLED);
+		JY && UY.set(P.absolute, JY), _.push(...qY.getErrors()), VY.push(...qY.getWarnings());
 	}
 	let WY = {};
 	for (let [_, VY] of UY) WY[_] = VY;
@@ -14780,7 +14893,47 @@ var Lexer = class {
 	}
 }, Parser$1 = class {
 	constructor(_, VY, P, HY) {
-		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 _ = { specifiers: [] }, VY = () => this.nodeFactory.create(UseSpecifierListNode, _);
+			try {
+				this.consume("Expect an opening brace '{'", SyntaxTokenKind.LBRACE), _.openBrace = this.previous();
+			} catch (_) {
+				if (!(_ instanceof PartialParsingError)) throw _;
+				if (!this.canHandle(_)) throw new PartialParsingError(_.token, VY(), _.handlerContext);
+				this.synchronizeUseSpecifierList();
+			}
+			for (; !this.isAtEnd() && !this.check(SyntaxTokenKind.RBRACE);) {
+				try {
+					_.specifiers.push(this.useSpecifier());
+				} catch (P) {
+					if (!(P instanceof PartialParsingError)) throw P;
+					if (P.partialNode instanceof UseSpecifierNode && _.specifiers.push(P.partialNode), !this.canHandle(P)) throw new PartialParsingError(P.token, VY(), P.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), _.closeBrace = this.previous();
+			} catch (_) {
+				if (!(_ instanceof PartialParsingError)) throw _;
+				if (!this.canHandle(_)) throw new PartialParsingError(_.token, VY(), _.handlerContext);
+				this.synchronizeUseSpecifierList();
+			}
+			return VY();
+		}), this.synchronizeUseSpecifierList = () => {
+			if (!this.check(SyntaxTokenKind.RBRACE)) for (markInvalid(this.advance()); !this.isAtEnd();) {
+				let _ = this.peek();
+				if (this.check(SyntaxTokenKind.RBRACE) || this.check(SyntaxTokenKind.STRING_LITERAL) || this.check(SyntaxTokenKind.IDENTIFIER) && isFromKeyword(_) || isAtStartOfLine(this.previous(), _)) break;
+				markInvalid(_), this.advance();
+			}
+		}, this.synchronizeUseSpecifier = () => {
+			for (; !this.isAtEnd();) {
+				let _ = this.peek();
+				if (this.check(SyntaxTokenKind.RBRACE) || isAtStartOfLine(this.previous(), _)) break;
+				markInvalid(_), this.advance();
+			}
+		}, this.synchronizeProgram = () => {
 			let _ = this.peek();
 			_.kind === SyntaxTokenKind.EOF ? this.logError(_, CompileErrorCode.UNEXPECTED_EOF, "Unexpected EOF") : markInvalid(this.advance());
 		}, this.synchronizeElementDeclarationName = () => {
@@ -15002,59 +15155,39 @@ var Lexer = class {
 		if (this.advance(), _.useKeyword = this.previous(), this.peek().kind === SyntaxTokenKind.WILDCARD) this.advance(), _.specifiers = this.nodeFactory.create(WildcardNode, { token: this.previous() });
 		else try {
 			_.specifiers = this.useSpecifierList();
-		} catch (P) {
-			throw P instanceof PartialParsingError ? (_.specifiers = P.partialNode, new PartialParsingError(P.token, VY(), P.handlerContext)) : P;
+		} catch (VY) {
+			if (!(VY instanceof PartialParsingError)) throw VY;
+			VY.partialNode instanceof UseSpecifierListNode && (_.specifiers = VY.partialNode);
 		}
 		let P = _.specifiers instanceof WildcardNode ? "'*'" : "specifier list";
-		if (isFromKeyword(this.peek())) _.fromKeyword = this.advance();
-		else throw this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, `Expect 'from' after ${P}`), new PartialParsingError(this.peek(), VY(), this.contextStack.findHandlerContext(this.tokens, this.current));
-		if (this.match(SyntaxTokenKind.STRING_LITERAL)) _.importPath = this.previous();
-		else throw this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect a string literal path"), new PartialParsingError(this.peek(), VY(), this.contextStack.findHandlerContext(this.tokens, this.current));
-		return VY();
-	}
-	useSpecifierList() {
-		let _ = { specifiers: [] }, VY = () => this.nodeFactory.create(UseSpecifierListNode, _);
-		try {
-			this.consume("Expect an opening brace '{'", SyntaxTokenKind.LBRACE), _.openBrace = this.previous();
-		} catch (_) {
-			throw _ instanceof PartialParsingError ? new PartialParsingError(_.token, VY(), _.handlerContext) : _;
-		}
-		for (; !this.isAtEnd() && !this.check(SyntaxTokenKind.RBRACE);) {
-			try {
-				_.specifiers.push(this.useSpecifier());
-			} catch (P) {
-				throw P instanceof PartialParsingError ? (P.partialNode instanceof UseSpecifierNode && _.specifiers.push(P.partialNode), new PartialParsingError(P.token, VY(), P.handlerContext)) : P;
-			}
-			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), _.closeBrace = this.previous();
-		} catch (_) {
-			throw _ instanceof PartialParsingError ? new PartialParsingError(_.token, VY(), _.handlerContext) : _;
-		}
-		return VY();
+		return isFromKeyword(this.peek()) ? _.fromKeyword = this.advance() : this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, `Expect 'from' after ${P}`), this.match(SyntaxTokenKind.STRING_LITERAL) ? _.importPath = this.previous() : this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect a string literal path"), VY();
 	}
 	useSpecifier() {
 		let _ = {}, VY = () => this.nodeFactory.create(UseSpecifierNode, _);
 		try {
 			this.consume("Expect an import kind specifier (e.g. table, enum)", SyntaxTokenKind.IDENTIFIER), _.importKind = this.previous();
 		} catch (_) {
-			throw _ instanceof PartialParsingError ? new PartialParsingError(_.token, VY(), _.handlerContext) : _;
+			if (!(_ instanceof PartialParsingError)) throw _;
+			if (!this.canHandle(_)) throw new PartialParsingError(_.token, VY(), _.handlerContext);
+			this.synchronizeUseSpecifier();
 		}
 		if (this.check(SyntaxTokenKind.IDENTIFIER, SyntaxTokenKind.QUOTED_STRING)) try {
 			_.name = this.normalExpression();
-		} catch (_) {
-			throw _ instanceof PartialParsingError ? new PartialParsingError(_.token, VY(), _.handlerContext) : _;
+		} catch (P) {
+			if (!(P instanceof PartialParsingError)) throw P;
+			if (P.partialNode instanceof SyntaxNode && (_.name = P.partialNode), !this.canHandle(P)) throw new PartialParsingError(P.token, VY(), P.handlerContext);
+			this.synchronizeUseSpecifier();
 		}
-		else this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect an element name");
+		else _.importKind && this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect an element name");
 		if (isAsKeyword(this.peek())) {
 			_.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(), VY(), this.contextStack.findHandlerContext(this.tokens, this.current));
 				_.alias = this.normalExpression();
 			} catch (_) {
-				throw _ instanceof PartialParsingError ? new PartialParsingError(_.token, VY(), _.handlerContext) : _;
+				if (!(_ instanceof PartialParsingError)) throw _;
+				if (!this.canHandle(_)) throw new PartialParsingError(_.token, VY(), _.handlerContext);
+				this.synchronizeUseSpecifier();
 			}
 		}
 		return VY();
@@ -15434,7 +15567,7 @@ function postfixBindingPower(_) {
 	};
 }
 function parseFile(_) {
-	let VY = this.layout.getSource(_);
+	let VY = this.getSource(_);
 	return new Lexer(VY ?? "", _).lex().chain((P) => new Parser$1(VY ?? "", P, this.nodeIdGenerator, _).parse()).map(({ ast: VY, tokens: P }) => ({
 		ast: VY,
 		tokens: P,
@@ -15442,7 +15575,7 @@ function parseFile(_) {
 	}));
 }
 function parseProject() {
-	let _ = collectTransitiveDependencies(this, this.layout.getEntryPoints()), VY = /* @__PURE__ */ new Map();
+	let _ = collectTransitiveDependencies(this, this.layout.getEntrypoints()), VY = /* @__PURE__ */ new Map();
 	for (let P of _) {
 		let _ = this.parseFile(P);
 		VY.set(P.absolute, _);
@@ -15513,11 +15646,30 @@ function resolutionIndex() {
 		};
 		P(VY);
 	}
+	let GY = /* @__PURE__ */ new Map(), KY = /* @__PURE__ */ new Set();
+	function qY(_, VY) {
+		let P = VY.intern();
+		if (KY.has(P)) return;
+		KY.add(P);
+		let HY = _.symbolMembers(VY).getFiltered(UNHANDLED);
+		if (HY) for (let P of HY) {
+			let HY = P.intern(), UY = GY.get(HY);
+			UY || (UY = [], GY.set(HY, UY)), UY.push(VY), P instanceof SchemaSymbol && P.isKind(SymbolKind.Schema) && qY(_, P);
+		}
+	}
+	for (let _ of P.values()) {
+		let VY = _.getValue().ast, P = this.nodeSymbol(VY).getFiltered(UNHANDLED);
+		P && qY(this, P);
+	}
 	return {
 		references: _,
-		metadata: VY
+		metadata: VY,
+		parents: GY
 	};
 }
+function symbolParent(_) {
+	return this.resolutionIndex().parents.get(_.intern()) ?? [];
+}
 function symbolReferences(_) {
 	return this.resolutionIndex().references.get(_.intern()) ?? [];
 }
@@ -15626,59 +15778,60 @@ function findReplacements(_, VY, P, HY, UY) {
 	return WY;
 }
 function renameTable$1(_, VY, P) {
-	let HY = this.layout.clone(), UY = normalizeTableName(VY), WY = normalizeTableName(P), GY = UY.schema, KY = UY.table, qY = WY.schema, JY = WY.table, YY = lookupTableSymbol(this, _, GY, KY);
-	if (!YY || YY instanceof AliasSymbol || checkForNameCollision(this, _, GY, KY, qY, JY)) return HY;
-	if (YY instanceof UseSymbol && YY.useSpecifierDeclaration instanceof UseSpecifierNode && YY.useSpecifierDeclaration.alias) {
-		let VY = YY.useSpecifierDeclaration;
-		if (this.nodeAlias(VY).getFiltered(UNHANDLED) === KY) return renameAlias(this, HY, _, VY, YY, qY, JY);
+	let HY = normalizeTableName(VY), UY = normalizeTableName(P), WY = HY.schema, GY = HY.table, KY = UY.schema, qY = UY.table, JY = lookupTableSymbol(this, _, WY, GY);
+	if (!JY || JY instanceof AliasSymbol || checkForNameCollision(this, _, WY, GY, KY, qY)) return /* @__PURE__ */ new Map();
+	if (JY instanceof UseSymbol && JY.useSpecifierDeclaration instanceof UseSpecifierNode && JY.useSpecifierDeclaration.alias) {
+		let VY = JY.useSpecifierDeclaration;
+		if (this.nodeAlias(VY).getFiltered(UNHANDLED) === GY) return renameAlias(this, _, VY, JY, KY, qY);
 	}
-	return renameRealDeclaration(this, HY, YY, GY, KY, qY, JY);
+	return renameRealDeclaration(this, JY, WY, GY, KY, qY);
 }
-function renameAlias(_, VY, P, HY, UY, WY, GY) {
-	let KY = _.layout.getSource(P) ?? "";
-	if (!HY.alias) return VY;
-	let qY = formatTableName(WY, GY, KY.substring(HY.alias.start, HY.alias.end).includes("\"")), JY = [];
-	JY.push({
-		start: HY.alias.start,
-		end: HY.alias.end,
-		newText: qY.formattedTable
+function renameAlias(_, VY, P, HY, UY, WY) {
+	let GY = _.getSource(VY) ?? "";
+	if (!P.alias) return /* @__PURE__ */ new Map();
+	let KY = formatTableName(UY, WY, GY.substring(P.alias.start, P.alias.end).includes("\"")), qY = [];
+	qY.push({
+		start: P.alias.start,
+		end: P.alias.end,
+		newText: KY.formattedTable
 	});
-	let YY = _.symbolReferences(UY);
-	for (let _ of YY) _.filepath.absolute === P.absolute && _ !== HY.alias && JY.push({
+	let JY = _.symbolReferences(HY);
+	for (let _ of JY) _.filepath.absolute === VY.absolute && _ !== P.alias && qY.push({
 		start: _.start,
 		end: _.end,
-		newText: qY.formattedTable
+		newText: KY.formattedTable
 	});
-	return VY.setSource(P, applyTextEdits(KY, JY)), VY;
+	return new Map([[VY.absolute, applyTextEdits(GY, qY)]]);
 }
-function renameRealDeclaration(_, VY, P, HY, UY, WY, GY) {
-	let KY = P.originalSymbol, qY = KY.declaration;
-	if (!qY || !(qY instanceof ElementDeclarationNode)) return VY;
-	let JY = qY.filepath;
-	if (!JY) return VY;
-	let YY = formatTableName(WY, GY, checkIfDeclarationUsesQuotes(qY, _.layout.getSource(JY) ?? "")), XY = /* @__PURE__ */ new Map(), ZY = (_, VY) => {
-		let P = _.absolute, HY = XY.get(P);
+function renameRealDeclaration(_, VY, P, HY, UY, WY) {
+	let GY = VY.originalSymbol, KY = GY.declaration;
+	if (!KY || !(KY instanceof ElementDeclarationNode)) return /* @__PURE__ */ new Map();
+	let qY = KY.filepath;
+	if (!qY) return /* @__PURE__ */ new Map();
+	let JY = formatTableName(UY, WY, checkIfDeclarationUsesQuotes(KY, _.getSource(qY) ?? "")), YY = /* @__PURE__ */ new Map(), XY = (_, VY) => {
+		let P = _.absolute, HY = YY.get(P);
 		HY || (HY = {
 			fp: _,
 			edits: []
-		}, XY.set(P, HY)), HY.edits.push(VY);
-	}, QY = qY.name;
-	QY && ZY(JY, {
-		start: QY.start,
-		end: QY.end,
-		newText: buildReplacementText(YY)
+		}, YY.set(P, HY)), HY.edits.push(VY);
+	}, ZY = KY.name;
+	ZY && XY(qY, {
+		start: ZY.start,
+		end: ZY.end,
+		newText: buildReplacementText(JY)
 	});
-	let $Y = _.symbolReferences(KY);
-	for (let VY of $Y) {
-		if (VY === QY) continue;
-		let P = VY.filepath, WY = _.layout.getSource(P) ?? "";
-		for (let _ of findReplacements([VY], HY, UY, YY, WY)) ZY(P, _);
-	}
-	for (let { fp: P, edits: HY } of XY.values()) {
-		let UY = _.layout.getSource(P) ?? "";
-		VY.setSource(P, applyTextEdits(UY, HY));
-	}
-	return VY;
+	let QY = _.symbolReferences(GY);
+	for (let VY of QY) {
+		if (VY === ZY) continue;
+		let UY = VY.filepath, WY = _.getSource(UY) ?? "";
+		for (let _ of findReplacements([VY], P, HY, JY, WY)) XY(UY, _);
+	}
+	let $Y = /* @__PURE__ */ new Map();
+	for (let { fp: VY, edits: P } of YY.values()) {
+		let HY = _.getSource(VY) ?? "";
+		$Y.set(VY.absolute, applyTextEdits(HY, P));
+	}
+	return $Y;
 }
 function findDiagramViewBlocks$1(_) {
 	let VY = [], P = new Lexer(_, DEFAULT_ENTRY).lex();
@@ -15741,7 +15894,7 @@ function generateDiagramViewBlock(_, VY) {
 	return YY.length > 0 && emitTablesBlock(eX, YY), XY.length > 0 && emitTableGroupsBlock(eX, XY), ZY.length > 0 && emitSchemasBlock(eX, ZY), $Y && emitNotesBlock(eX, GY), eX.push("}"), eX.join("\n");
 }
 function syncDiagramView$1(_, VY, P) {
-	let HY = this.layout.getSource(_) ?? "", UY = P ?? findDiagramViewBlocks$1(HY), WY = [];
+	let HY = this.getSource(_) ?? "", UY = P ?? findDiagramViewBlocks$1(HY), WY = [];
 	for (let _ of VY) {
 		let VY = applyOperation(HY, _, UY);
 		WY.push(...VY);
@@ -15801,12 +15954,12 @@ function computeDeleteEdit(_, VY, P) {
 	}];
 }
 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$1.bind(this), this.syncDiagramView = syncDiagramView$1.bind(this), this.token = {
+	constructor(_ = 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$1.bind(this), this.syncDiagramView = syncDiagramView$1.bind(this), this.token = {
 			invalidStream: this.localQuery(invalidStream),
 			flatStream: this.localQuery(flatStream)
 		}, this.parse = {
-			source: (_) => this.layout.getSource(_) || "",
+			source: (_) => this.getSource(_) || "",
 			ast: (_ = DEFAULT_ENTRY) => ast.call(this, _),
 			errors: (_ = DEFAULT_ENTRY) => errors.call(this, _),
 			warnings: (_ = DEFAULT_ENTRY) => warnings.call(this, _),
@@ -15819,21 +15972,25 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 			element: this.localQuery(containerElement),
 			scope: this.localQuery(containerScope),
 			scopeKind: this.localQuery(containerScopeKind)
-		};
+		}, this.layout = _;
 	}
-	setSource(_, VY) {
-		this.layout.setSource(_, VY), this.localCache.delete(_.intern()), this.globalCache.clear();
+	getSource(_) {
+		return this.layout.getSource(_);
 	}
-	clearSource() {
-		this.layout = new MemoryProjectLayout(), this.localCache.clear(), this.globalCache.clear();
+	cleanStaleLocalCache(_) {
+		let VY = this.layout.getSource(_), P = _.absolute;
+		this.sourceSnapshot.has(P) && this.sourceSnapshot.get(P) !== VY && (this.localCache.delete(_.intern()), this.globalCache.clear()), this.sourceSnapshot.set(P, VY);
 	}
-	deleteSource(_) {
-		this.layout.deleteSource(_), this.localCache.delete(_.intern()), this.globalCache.clear();
+	cleanStaleGlobalCache() {
+		let _ = this.layout.getEntrypoints(), VY = !1;
+		this.entrypointsSnapshot !== void 0 && (this.entrypointsSnapshot.length !== _.length || this.entrypointsSnapshot.some((VY, P) => VY.absolute !== _[P].absolute)) && (VY = !0), this.entrypointsSnapshot = _;
+		for (let VY of walkDependencies(this, _)) this.cleanStaleLocalCache(VY);
+		VY && this.globalCache.clear();
 	}
 	globalQuery(_) {
 		let VY = Symbol();
 		return ((...P) => {
-			this.globalCache.has(VY) || this.globalCache.set(VY, /* @__PURE__ */ new Map());
+			this.cleanStaleGlobalCache(), this.globalCache.has(VY) || this.globalCache.set(VY, /* @__PURE__ */ new Map());
 			let HY = P.map((_) => intern(_)).join("\0"), UY = this.globalCache.get(VY);
 			if (UY.has(HY)) {
 				let VY = UY.get(HY);
@@ -15852,25 +16009,27 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 	localQuery(_) {
 		let VY = Symbol();
 		return ((...P) => {
-			let [HY] = P, UY = (HY instanceof SyntaxNode ? HY.filepath : HY).intern(), WY = P.map((_) => intern(_)).join("\0"), GY = this.localCache.get(UY);
-			GY || (GY = /* @__PURE__ */ new Map(), this.localCache.set(UY, GY));
-			let KY = GY.get(VY);
-			if (KY || (KY = /* @__PURE__ */ new Map(), GY.set(VY, KY)), KY.has(WY)) {
-				let VY = KY.get(WY);
-				if (VY === COMPUTING) throw Error(`Cycle detected in query: ${_.name}(${UY}, ${WY})`);
+			let [HY] = P, UY = HY instanceof SyntaxNode ? HY.filepath : HY;
+			this.cleanStaleLocalCache(UY);
+			let WY = UY.intern(), GY = P.map((_) => intern(_)).join("\0"), KY = this.localCache.get(WY);
+			KY || (KY = /* @__PURE__ */ new Map(), this.localCache.set(WY, KY));
+			let qY = KY.get(VY);
+			if (qY || (qY = /* @__PURE__ */ new Map(), KY.set(VY, qY)), qY.has(GY)) {
+				let VY = qY.get(GY);
+				if (VY === COMPUTING) throw Error(`Cycle detected in query: ${_.name}(${WY}, ${GY})`);
 				return VY;
 			}
-			KY.set(WY, COMPUTING);
+			qY.set(GY, COMPUTING);
 			try {
 				let VY = _.apply(this, P);
-				return KY.set(WY, VY), VY;
+				return qY.set(GY, VY), VY;
 			} catch (_) {
-				throw KY.delete(WY), _;
+				throw qY.delete(GY), _;
 			}
 		});
 	}
 	findDiagramViewBlocks(_) {
-		return findDiagramViewBlocks$1(this.layout.getSource(_) ?? "");
+		return findDiagramViewBlocks$1(this.getSource(_) ?? "");
 	}
 	initMonacoServices(_) {
 		let VY = _?.autocompletion?.triggerCharacters ?? [
@@ -1825423,9 +1825582,9 @@ var init_actions = __esmMin((() => {
 		return import_postgresParser.default.parse(_);
 	}
 	static parseDBMLToJSONv2(_, VY) {
-		let P = VY || new Compiler();
-		P.setSource(DEFAULT_ENTRY, _);
-		let HY = P.parse.errors(DEFAULT_ENTRY).map((_) => ({
+		let P = VY || new Compiler(), HY = new MemoryProjectLayout();
+		HY.setSource(DEFAULT_ENTRY, _), P.layout = HY;
+		let UY = P.parse.errors(DEFAULT_ENTRY).map((_) => ({
 			message: _.diagnostic,
 			location: {
 				start: {
@@ -1825439,7 +1825598,7 @@ var init_actions = __esmMin((() => {
 			},
 			code: _.code
 		}));
-		if (HY.length > 0) throw CompilerError.create(HY);
+		if (UY.length > 0) throw CompilerError.create(UY);
 		return P.parse.rawDb(DEFAULT_ENTRY);
 	}
 	static parseDBMLToJSON(_) {
@@ -1825635,16 +1825794,22 @@ var import_default = {
 	generateDbml
 };
 function renameTable(_, VY, P) {
-	let HY = new Compiler();
-	return HY.setSource(DEFAULT_ENTRY, P), HY.renameTable(DEFAULT_ENTRY, _, VY).getSource(DEFAULT_ENTRY) ?? P;
+	let HY = new MemoryProjectLayout();
+	HY.setSource(DEFAULT_ENTRY, P);
+	let UY = new Compiler();
+	return UY.layout = HY, UY.renameTable(DEFAULT_ENTRY, _, VY).get(DEFAULT_ENTRY.absolute) ?? P;
 }
 function syncDiagramView(_, VY, P) {
-	let HY = new Compiler();
-	return HY.setSource(DEFAULT_ENTRY, _), HY.syncDiagramView(DEFAULT_ENTRY, VY, P);
+	let HY = new MemoryProjectLayout();
+	HY.setSource(DEFAULT_ENTRY, _);
+	let UY = new Compiler();
+	return UY.layout = HY, UY.syncDiagramView(DEFAULT_ENTRY, VY, P);
 }
 function findDiagramViewBlocks(_) {
-	let VY = new Compiler();
-	return VY.setSource(DEFAULT_ENTRY, _), VY.findDiagramViewBlocks(DEFAULT_ENTRY);
+	let VY = new MemoryProjectLayout();
+	VY.setSource(DEFAULT_ENTRY, _);
+	let P = new Compiler();
+	return P.layout = VY, P.findDiagramViewBlocks(DEFAULT_ENTRY);
 }
-const VERSION = "8.0.0-alpha.0";
+const VERSION = "8.0.0-alpha.11";
 export { CompilerError, ModelExporter_default as ModelExporter, Parser_default as Parser, VERSION, addDoubleQuoteIfNeeded, dbmlMonarchTokensProvider, export_default as exporter, findDiagramViewBlocks, formatRecordValue, import_default as importer, isBinaryType, isBooleanType, isDateTimeType, isFloatType, isIntegerType, isNumericType, isSerialType, isStringType, renameTable, syncDiagramView, tryExtractBoolean, tryExtractDateTime, tryExtractEnum, tryExtractInteger, tryExtractNumeric, tryExtractString };