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

package/dist/dbml-parse.mjs

@@ -7350,11 +7350,15 @@ var ProgramInterpreter = class {
 			let P = N.getValue();
 			P && this.pushElement(M, P);
 		}
-		let r = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
-		for (let M of r) {
-			if (!(M instanceof SchemaSymbol)) continue;
-			let r = this.compiler.symbolMembers(M).getFiltered(UNHANDLED) ?? [];
-			for (let j of r) j instanceof UseSymbol && this.interpretUseSymbol(j);
+		let r = /* @__PURE__ */ new Set(), M = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
+		for (let N of M) {
+			if (!(N instanceof SchemaSymbol)) continue;
+			let M = this.compiler.symbolMembers(N).getFiltered(UNHANDLED) ?? [];
+			for (let j of M) {
+				if (!(j instanceof UseSymbol)) continue;
+				let M = j.originalSymbol.intern();
+				r.has(M) || (r.add(M), this.interpretUseSymbol(j));
+			}
 		}
 	}
 	interpretUseSymbol(r) {
@@ -8201,9 +8205,9 @@ const useUtils = { visibleName(r, M) {
 	nodeSymbol(N, P) {
 		if (!isUseSpecifier(P) || !P.name) return Report.create(PASS_THROUGH);
 		let F = P.getSymbolKind();
-		if (F === void 0) return Report.create(PASS_THROUGH);
+		if (F === void 0 || F === SymbolKind.Schema) return Report.create(PASS_THROUGH);
 		let I = N.nodeReferee(P.name).getFiltered(UNHANDLED);
-		return I && !I.canBeImported && F !== SymbolKind.Schema ? Report.create(PASS_THROUGH) : Report.create(N.symbolFactory.create(UseSymbol, {
+		return I && !I.canBeImported ? Report.create(PASS_THROUGH) : Report.create(N.symbolFactory.create(UseSymbol, {
 			useSpecifierDeclaration: P,
 			declaration: I?.declaration,
 			usedSymbol: I,
@@ -9446,12 +9450,14 @@ const schemaModule = { symbolMembers(N, P) {
 		for (let j of r) B.push(...expandTableGroup(N, P, j));
 	}
 	let V = /* @__PURE__ */ new Set(), H = B.filter((r) => {
+		if (r instanceof UseSymbol && r.isKind(SymbolKind.Schema)) return !1;
 		let j = `${r.originalSymbol.intern()}:${r.name ?? ""}`;
 		return V.has(j) ? !1 : (V.add(j), !0);
 	}), U = /* @__PURE__ */ new Map();
 	for (let r of H) {
 		let j = `${r.kind}:${r.name}`;
 		if (U.get(j)) {
+			if (r.isKind(SymbolKind.Schema)) continue;
 			let j = r instanceof UseSymbol ? r.useSpecifierDeclaration ?? r.declaration : r.declaration instanceof ElementDeclarationNode && r.declaration.name ? r.declaration.name : r.declaration;
 			j && r.name !== void 0 && z.push(getDuplicateSchemaMemberError(r.kind, r.name, F.join("."), j));
 		} else U.set(j, r);
@@ -13292,7 +13298,7 @@ function containerScopeKind(r, j) {
 }
 function canonicalName(r, j) {
 	let N = j.originalSymbol;
-	if (N.filepath.intern() === r.intern()) return Report.create(fullnameToCanonical(this, N));
+	if (N.filepath.equals(r)) return Report.create(fullnameToCanonical(this, N));
 	let P = [...this.symbolUses(N).getValue(), ...this.symbolAliases(N).getValue()].filter((j) => j.filepath.equals(r));
 	for (let r of P) {
 		let j = r.name;

package/package.json

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