@dbml/core 8.0.0-alpha.4 → 8.0.0-alpha.6

package/lib/index.mjs

@@ -9395,7 +9395,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);
@@ -10294,16 +10294,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);
@@ -10635,7 +10630,17 @@ var schemaModule = { symbolMembers(_, VY) {
 	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((_) => {
 		let VY = `${_.originalSymbol.intern()}:${_.name ?? ""}`;
 		return qY.has(VY) ? !1 : (qY.add(VY), !0);
@@ -10674,19 +10679,20 @@ function handleMemberSelectiveUses(_, VY, P, HY) {
 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) || UY.name !== VY.name) return [];
+	if (!UY || !UY.isKind(SymbolKind.Schema) || (_.nodeAlias(P).getFiltered(UNHANDLED) ?? _.nodeFullname(P).getFiltered(UNHANDLED)?.at(0)) !== VY.name) return [];
 	let WY = UY.intern();
 	if (HY.has(WY)) return [];
 	HY.add(WY);
 	let GY = _.usableMembers(UY).getFiltered(UNHANDLED);
 	if (!GY) return [];
-	let KY = GY.nonSchemaMembers.filter((_) => _.canBeImported).map((P) => _.symbolFactory.create(UseSymbol, {
-		kind: P.kind,
-		declaration: P.originalSymbol.declaration,
-		usedSymbol: P.originalSymbol,
-		useSpecifierDeclaration: void 0,
-		name: P.name
+	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 P of GY.reuses.selective) KY.push(...mergeImportedSchema(_, VY, P, HY));
 	return KY;
 }
@@ -10708,7 +10714,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;
@@ -10726,34 +10732,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;
@@ -13185,10 +13193,14 @@ function scanExistingUses(_, VY, P) {
 					let _ = HY.importKind.value ?? void 0;
 					_ && !VY.has(_.toLowerCase()) && (WY = _);
 				}
-				WY && WY.toLowerCase() !== "from" && UY.push({
-					kind: _,
-					name: WY
-				});
+				if (WY && WY.toLowerCase() !== "from") {
+					let VY = HY.alias ? extractVariableFromExpression(HY.alias) : void 0;
+					UY.push({
+						kind: _,
+						name: WY,
+						alias: VY
+					});
+				}
 			}
 		} else _.specifiers instanceof WildcardNode && UY.push({ name: "*" });
 		if (UY.length === 0 && !(_.specifiers instanceof WildcardNode)) continue;
@@ -13212,7 +13224,7 @@ function mergeSymbolIntoUses(_, VY, P, HY, UY, WY) {
 	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(uniqueInOrder([..._.specifiers.filter((_) => _.name !== "*").map((_) => `${_.kind ?? P} ${_.name}${_.alias ? ` as ${_.alias}` : ""}`), JY]), KY, YY),
 			removeRange: expandToFullLines(WY, _.startOffset, _.endOffset)
 		};
 	}
@@ -14382,31 +14394,39 @@ 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({
+	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 = fullnameToCanonical(this, P);
-		return HY ? Report.create({
-			...HY,
-			name: _
+		let HY = getSchemaChain(this, _);
+		if (HY.length > 0) return Report.create({
+			schema: HY.join("."),
+			name: VY
+		});
+		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,
@@ -15601,11 +15621,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()) ?? [];
 }
@@ -15890,7 +15929,7 @@ 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 = {
+		this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.layout = new MemoryProjectLayout(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolParent = this.globalQuery(symbolParent), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable$1.bind(this), this.syncDiagramView = syncDiagramView$1.bind(this), this.token = {
 			invalidStream: this.localQuery(invalidStream),
 			flatStream: this.localQuery(flatStream)
 		}, this.parse = {
@@ -1825734,5 +1825773,5 @@ function findDiagramViewBlocks(_) {
 	let VY = new Compiler();
 	return VY.setSource(DEFAULT_ENTRY, _), VY.findDiagramViewBlocks(DEFAULT_ENTRY);
 }
-const VERSION = "8.0.0-alpha.4";
+const VERSION = "8.0.0-alpha.6";
 export { CompilerError, ModelExporter_default as ModelExporter, Parser_default as Parser, VERSION, addDoubleQuoteIfNeeded, dbmlMonarchTokensProvider, export_default as exporter, findDiagramViewBlocks, formatRecordValue, import_default as importer, isBinaryType, isBooleanType, isDateTimeType, isFloatType, isIntegerType, isNumericType, isSerialType, isStringType, renameTable, syncDiagramView, tryExtractBoolean, tryExtractDateTime, tryExtractEnum, tryExtractInteger, tryExtractNumeric, tryExtractString };

package/package.json

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