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

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);
@@ -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;

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.5",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "17d4675433b702912a20dcc65a63c03c73c56db5"
+  "gitHead": "2e6795b120c2ca4f16bb542295b2152f091d6ed9"
 }