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

package/lib/index.mjs

@@ -8562,14 +8562,17 @@ var ProgramInterpreter = class {
 			let HY = P.getValue();
 			HY && this.pushElement(VY, HY);
 		}
-		let _ = /* @__PURE__ */ new Set(), VY = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
-		for (let P of VY) {
-			if (!(P instanceof SchemaSymbol)) continue;
-			let VY = this.compiler.symbolMembers(P).getFiltered(UNHANDLED) ?? [];
-			for (let P of 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 VY = P.originalSymbol.intern();
-				_.has(VY) || (_.add(VY), this.interpretUseSymbol(P));
+				let HY = P.originalSymbol.intern();
+				_.has(HY) || (_.add(HY), this.interpretUseSymbol(P));
 			}
 		}
 	}
@@ -9523,7 +9526,7 @@ function usableMembers(_) {
 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]
@@ -10694,11 +10697,15 @@ 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) || (_.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 (!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,
@@ -10708,7 +10715,20 @@ function mergeImportedSchema(_, VY, P, HY = /* @__PURE__ */ new Set()) {
 		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));
+	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()) {
@@ -1825791,5 +1825811,5 @@ function findDiagramViewBlocks(_) {
 	let P = new Compiler();
 	return P.layout = VY, P.findDiagramViewBlocks(DEFAULT_ENTRY);
 }
-const VERSION = "8.0.0-alpha.10";
+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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "8.0.0-alpha.10",
+  "version": "8.0.0-alpha.11",
   "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.10",
+    "@dbml/parse": "^8.0.0-alpha.11",
     "antlr4": "^4.13.1",
     "lodash": "^4.18.1",
     "lodash-es": "^4.18.1",
@@ -57,7 +57,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "219525258181f597943175cf46783566dcddb441",
+  "gitHead": "976e0f27c85468fa8a0fbb2ded04862e86b05b89",
   "engines": {
     "node": ">=16"
   }