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

package/dist/dbml-parse.mjs

@@ -8196,7 +8196,7 @@ function nodeRefereeOfRefEndpoint(r, N, P) {
 }
 const useUtils = { visibleName(r, M) {
 	let N = M instanceof SyntaxNode ? M : M.useSpecifierDeclaration instanceof UseSpecifierNode ? M.useSpecifierDeclaration : M.declaration;
-	if (N) return r.nodeAlias(N).mapFiltered((r) => [r], UNHANDLED, void 0).getFiltered(UNHANDLED) || r.nodeFullname(N).getFiltered(UNHANDLED);
+	if (N instanceof UseSpecifierNode && M instanceof NodeSymbol && N.getSymbolKind() !== M.kind && (N = M.declaration), N) return r.nodeAlias(N).mapFiltered((r) => [r], UNHANDLED, void 0).getFiltered(UNHANDLED) || r.nodeFullname(N).getFiltered(UNHANDLED);
 } }, useModule$1 = {
 	nodeSymbol(N, P) {
 		if (!isUseSpecifier(P) || !P.name) return Report.create(PASS_THROUGH);
@@ -9097,16 +9097,11 @@ function nodeRefereeOfTableGroupField(r, N, P) {
 	let F = extractVarNameFromPrimaryVariable(P) ?? "";
 	if (!isAccessExpression(P.parentNode)) {
 		let I = r.symbolMembers(N).getFiltered(UNHANDLED);
-		if (I) for (let N of I) {
-			if (!(N instanceof SchemaSymbol)) continue;
-			let P = r.lookupMembers(N, SymbolKind.Table, F);
-			if (P) return Report.create(P);
-			if (!N.isPublicSchema()) {
-				let P = r.symbolMembers(N).getFiltered(UNHANDLED);
-				if (P) {
-					let N = P.find((M) => !M.isKind(SymbolKind.Table) || !M.declaration ? !1 : r.nodeAlias(M.declaration).getFiltered(UNHANDLED) === F);
-					if (N) return new Report(N);
-				}
+		if (I) {
+			let j = I.find((r) => r instanceof SchemaSymbol && r.isPublicSchema());
+			if (j) {
+				let N = r.lookupMembers(j, SymbolKind.Table, F);
+				if (N) return Report.create(N);
 			}
 		}
 		let L = r.lookupMembers(N, SymbolKind.Table, F);
@@ -9439,7 +9434,17 @@ const schemaModule = { symbolMembers(N, P) {
 	for (let { importPath: r, node: j } of I.uses.wildcard) L.push(...handleMemberWildcardUses(N, P, r, j, R));
 	L.push(...R.values());
 	let B = [...L];
-	for (let r of L) r.isKind(SymbolKind.TableGroup) && B.push(...expandTableGroup(N, r));
+	{
+		let r = L.filter((r) => r.isKind(SymbolKind.TableGroup));
+		if (!P.isPublicSchema()) {
+			let M = N.usableMembers(P.filepath).getFiltered(UNHANDLED)?.schemaMembers.find((r) => r.isPublicSchema());
+			if (M) {
+				let P = N.symbolMembers(M).getFiltered(UNHANDLED);
+				P && r.push(...P.filter((r) => r.isKind(SymbolKind.TableGroup)));
+			}
+		}
+		for (let j of r) B.push(...expandTableGroup(N, P, j));
+	}
 	let V = /* @__PURE__ */ new Set(), H = B.filter((r) => {
 		let j = `${r.originalSymbol.intern()}:${r.name ?? ""}`;
 		return V.has(j) ? !1 : (V.add(j), !0);
@@ -9478,7 +9483,7 @@ function handleMemberSelectiveUses(r, N, P, F) {
 function mergeImportedSchema(r, M, N, P = /* @__PURE__ */ new Set()) {
 	if (N.getSymbolKind() !== SymbolKind.Schema || !N.name) return [];
 	let F = r.nodeReferee(N.name).getFiltered(UNHANDLED);
-	if (!F || !F.isKind(SymbolKind.Schema) || F.name !== M.name) return [];
+	if (!F || !F.isKind(SymbolKind.Schema) || (r.nodeAlias(N).getFiltered(UNHANDLED) ?? r.nodeFullname(N).getFiltered(UNHANDLED)?.at(0)) !== M.name) return [];
 	let I = F.intern();
 	if (P.has(I)) return [];
 	P.add(I);
@@ -9488,9 +9493,10 @@ function mergeImportedSchema(r, M, N, P = /* @__PURE__ */ new Set()) {
 		kind: j.kind,
 		declaration: j.originalSymbol.declaration,
 		usedSymbol: j.originalSymbol,
-		useSpecifierDeclaration: void 0,
+		useSpecifierDeclaration: N,
 		name: j.name
 	}, M.filepath));
+	for (let j of [...R]) j.isKind(SymbolKind.TableGroup) && R.push(...expandTableGroup(r, M, j));
 	for (let j of L.reuses.selective) R.push(...mergeImportedSchema(r, M, j, P));
 	return R;
 }
@@ -9512,7 +9518,7 @@ function handleMemberWildcardUses(r, M, N, P, F, I = /* @__PURE__ */ new Set())
 	let { reuses: { selective: B, wildcard: V } } = R;
 	for (let N of B) {
 		let P = handleMemberSelectiveUses(r, M, N, F).getFiltered(UNHANDLED);
-		P && z.push(P);
+		P && z.push(P), z.push(...mergeImportedSchema(r, M, N));
 	}
 	for (let { importPath: j } of V) z.push(...handleMemberWildcardUses(r, M, j, P, F, I));
 	return z;
@@ -9530,34 +9536,36 @@ function findSchemaSymbolInFilepath(r, M, N) {
 	}
 	return I;
 }
-function expandTableGroup(r, M) {
-	if (!M.isKind(SymbolKind.TableGroup)) return [];
-	let N = M.originalSymbol, P = r.symbolMembers(N).getFiltered(UNHANDLED);
-	if (!P) return [];
-	let F = [];
-	for (let j of P) {
+function expandTableGroup(r, M, N) {
+	if (!N.isKind(SymbolKind.TableGroup) || !(N instanceof UseSymbol)) return [];
+	let P = N.originalSymbol, F = r.symbolMembers(P).getFiltered(UNHANDLED);
+	if (!F) return [];
+	let I = M.qualifiedName, L = [];
+	for (let j of F) {
 		if (!j.isKind(SymbolKind.TableGroupField) || !j.declaration) continue;
-		let N = j.declaration.callee;
-		if (!N) continue;
-		let P = destructureComplexVariable(N);
+		let M = j.declaration.callee;
+		if (!M) continue;
+		let P = destructureComplexVariable(M);
 		if (!P || P.length === 0) continue;
-		let I = j.declaration.filepath, L = lookupTableInFile(r, I, P);
-		L && M instanceof UseSymbol && F.push(r.symbolFactory.create(UseSymbol, {
+		let F = P.length <= 1 ? [DEFAULT_SCHEMA_NAME] : P.slice(0, -1);
+		if (F.length !== I.length || !I.every((r, j) => r === F[j])) continue;
+		let R = j.declaration.filepath, z = lookupTableInFile(r, R, P);
+		z && L.push(r.symbolFactory.create(UseSymbol, {
 			kind: SymbolKind.Table,
-			declaration: L.declaration,
-			usedSymbol: L,
+			declaration: z.declaration,
+			usedSymbol: z,
 			useSpecifierDeclaration: void 0,
-			name: L.name
-		}, M.filepath));
+			name: z.name
+		}, N.filepath));
 	}
-	return F;
+	return L;
 }
 function lookupTableInFile(r, M, N) {
 	if (N.length === 1) {
 		let P = r.usableMembers(M).getFiltered(UNHANDLED);
 		return P ? P.nonSchemaMembers.find((r) => r.isKind(SymbolKind.Table) && r.name === N[0]) : void 0;
 	}
-	let [P, F] = [N[0], N[N.length - 1]], I = r.usableMembers(M).getFiltered(UNHANDLED);
+	let P = N[0], F = N[N.length - 1], I = r.usableMembers(M).getFiltered(UNHANDLED);
 	if (!I) return;
 	let L = I.schemaMembers.find((r) => r.name === P);
 	if (!L) return;
@@ -12017,10 +12025,14 @@ function scanExistingUses(r, j, M) {
 					let r = N.importKind.value ?? void 0;
 					r && !j.has(r.toLowerCase()) && (F = r);
 				}
-				F && F.toLowerCase() !== "from" && P.push({
-					kind: r,
-					name: F
-				});
+				if (F && F.toLowerCase() !== "from") {
+					let j = N.alias ? extractVariableFromExpression(N.alias) : void 0;
+					P.push({
+						kind: r,
+						name: F,
+						alias: j
+					});
+				}
 			}
 		} else r.specifiers instanceof WildcardNode && P.push({ name: "*" });
 		if (P.length === 0 && !(r.specifiers instanceof WildcardNode)) continue;
@@ -12044,7 +12056,7 @@ function mergeSymbolIntoUses(r, j, M, N, P, F) {
 	if (R !== -1) {
 		let r = I[R];
 		return r.specifiers.some((r) => r.name === j) ? { topInsert: "" } : {
-			topInsert: buildUseStatement(uniqueInOrder([...r.specifiers.filter((r) => r.name !== "*").map((r) => `${r.kind ?? M} ${r.name}`), z]), L, B),
+			topInsert: buildUseStatement(uniqueInOrder([...r.specifiers.filter((r) => r.name !== "*").map((r) => `${r.kind ?? M} ${r.name}${r.alias ? ` as ${r.alias}` : ""}`), z]), L, B),
 			removeRange: expandToFullLines(F, r.startOffset, r.endOffset)
 		};
 	}
@@ -13278,33 +13290,41 @@ function containerScopeKind(r, j) {
 		default: return ScopeKind.CUSTOM;
 	}
 }
-function canonicalName(r, N) {
-	let P = N.originalSymbol;
-	if (P.filepath.intern() === r.intern()) return Report.create(fullnameToCanonical(this, P));
-	let F = this.parseFile(r).getValue().ast, I = this.nodeSymbol(F).getFiltered(UNHANDLED);
-	if (!I) return Report.create(fullnameToCanonical(this, P));
-	let L = this.symbolMembers(I).getFiltered(UNHANDLED) ?? [], R = [...L];
-	for (let r of L) if (r instanceof SchemaSymbol && r.isKind(SymbolKind.Schema)) {
-		let M = this.symbolMembers(r).getFiltered(UNHANDLED);
-		M && R.push(...M);
-	}
-	for (let j of R) if (j.filepath.intern() === r.intern() && j.originalSymbol === P && (j instanceof UseSymbol || j instanceof AliasSymbol)) {
-		let r = j.name;
-		if (!r) continue;
-		if (r !== P.name) return Report.create({
+function canonicalName(r, j) {
+	let N = j.originalSymbol;
+	if (N.filepath.intern() === r.intern()) return Report.create(fullnameToCanonical(this, N));
+	let P = [...this.symbolUses(N).getValue(), ...this.symbolAliases(N).getValue()].filter((j) => j.filepath.equals(r));
+	for (let r of P) {
+		let j = r.name;
+		if (!j) continue;
+		if (j !== N.name) return Report.create({
 			schema: "",
-			name: r
+			name: j
+		});
+		let P = getSchemaChain(this, r);
+		if (P.length > 0) return Report.create({
+			schema: P.join("."),
+			name: j
 		});
-		let N = fullnameToCanonical(this, P);
-		return N ? Report.create({
-			...N,
-			name: r
+		let F = fullnameToCanonical(this, N);
+		return F ? Report.create({
+			...F,
+			name: j
 		}) : Report.create({
 			schema: DEFAULT_SCHEMA_NAME,
-			name: r
+			name: j
 		});
 	}
-	return Report.create(fullnameToCanonical(this, P));
+	return Report.create(fullnameToCanonical(this, N));
+}
+function getSchemaChain(r, j) {
+	let M = [], N = j;
+	for (; N;) {
+		let j = r.symbolParent(N).find((r) => r instanceof SchemaSymbol && r.isKind(SymbolKind.Schema));
+		if (!j || j.isPublicSchema()) break;
+		M.unshift(j.name ?? ""), N = j;
+	}
+	return M;
 }
 function fullnameToCanonical(r, M) {
 	if (!M.declaration) return M.name ? {
@@ -14502,11 +14522,30 @@ function resolutionIndex() {
 		};
 		N(M);
 	}
+	let L = /* @__PURE__ */ new Map(), R = /* @__PURE__ */ new Set();
+	function z(r, M) {
+		let N = M.intern();
+		if (R.has(N)) return;
+		R.add(N);
+		let P = r.symbolMembers(M).getFiltered(UNHANDLED);
+		if (P) for (let j of P) {
+			let N = j.intern(), P = L.get(N);
+			P || (P = [], L.set(N, P)), P.push(M), j instanceof SchemaSymbol && j.isKind(SymbolKind.Schema) && z(r, j);
+		}
+	}
+	for (let r of N.values()) {
+		let M = r.getValue().ast, N = this.nodeSymbol(M).getFiltered(UNHANDLED);
+		N && z(this, N);
+	}
 	return {
 		references: r,
-		metadata: M
+		metadata: M,
+		parents: L
 	};
 }
+function symbolParent(r) {
+	return this.resolutionIndex().parents.get(r.intern()) ?? [];
+}
 function symbolReferences(r) {
 	return this.resolutionIndex().references.get(r.intern()) ?? [];
 }
@@ -14791,7 +14830,7 @@ function computeDeleteEdit(r, j, M) {
 }
 var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 	constructor() {
-		this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.layout = new MemoryProjectLayout(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable.bind(this), this.syncDiagramView = syncDiagramView.bind(this), this.token = {
+		this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.layout = new MemoryProjectLayout(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolParent = this.globalQuery(symbolParent), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable.bind(this), this.syncDiagramView = syncDiagramView.bind(this), this.token = {
 			invalidStream: this.localQuery(invalidStream),
 			flatStream: this.localQuery(flatStream)
 		}, this.parse = {

package/dist/src/compiler/index.d.ts

@@ -42,6 +42,7 @@ export default class Compiler {
     nodeReferee: (node: SyntaxNode) => import('../core/types/report').default<typeof import('..').UNHANDLED> | import('../core/types/report').default<import('../core/types/symbol').NodeSymbol | undefined>;
     resolutionIndex: () => import('./queries/resolutionIndex').ResolutionIndex;
     symbolReferences: (symbol: import('../core/types/symbol').NodeSymbol) => SyntaxNode[];
+    symbolParent: (symbol: import('../core/types/symbol').NodeSymbol) => import('../core/types/symbol').NodeSymbol[];
     symbolMetadata: (symbol: import('../core/types/symbol').NodeSymbol) => import('../core/types/symbol').NodeMetadata[];
     symbolAliases: (symbol: import('../core/types/symbol').NodeSymbol) => import('../core/types/report').default<import('../core/types/symbol').AliasSymbol[]>;
     symbolUses: (symbol: import('../core/types/symbol').NodeSymbol) => import('../core/types/report').default<import('../core/types/symbol').UseSymbol[]>;

package/dist/src/compiler/queries/resolutionIndex.d.ts

@@ -5,7 +5,9 @@ import { default as Compiler } from '../index';
 export interface ResolutionIndex {
     references: Map<InternedNodeSymbol, SyntaxNode[]>;
     metadata: Map<InternedNodeSymbol, NodeMetadata[]>;
+    parents: Map<InternedNodeSymbol, NodeSymbol[]>;
 }
 export declare function resolutionIndex(this: Compiler): ResolutionIndex;
+export declare function symbolParent(this: Compiler, symbol: NodeSymbol): NodeSymbol[];
 export declare function symbolReferences(this: Compiler, symbol: NodeSymbol): SyntaxNode[];
 export declare function symbolMetadata(this: Compiler, symbol: NodeSymbol): NodeMetadata[];

package/dist/src/services/suggestions/utils/useMerger.d.ts

@@ -5,6 +5,7 @@ import { UseDeclarationNode } from '../../../core/types/nodes';
 export interface ParsedUseSpecifier {
     kind?: string;
     name: string;
+    alias?: string;
 }
 export interface ParsedUseStatement {
     startOffset: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "8.0.0-alpha.4",
+  "version": "8.0.0-alpha.6",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "17d4675433b702912a20dcc65a63c03c73c56db5"
+  "gitHead": "52721b96504df2eeb4ff7fc13292896221a837ef"
 }