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

package/lib/index.mjs

@@ -8553,11 +8553,15 @@ var ProgramInterpreter = class {
 			let HY = P.getValue();
 			HY && this.pushElement(VY, HY);
 		}
-		let _ = this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? [];
-		for (let VY of _) {
-			if (!(VY instanceof SchemaSymbol)) continue;
-			let _ = this.compiler.symbolMembers(VY).getFiltered(UNHANDLED) ?? [];
-			for (let VY of _) VY instanceof UseSymbol && this.interpretUseSymbol(VY);
+		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) {
+				if (!(P instanceof UseSymbol)) continue;
+				let VY = P.originalSymbol.intern();
+				_.has(VY) || (_.add(VY), this.interpretUseSymbol(P));
+			}
 		}
 	}
 	interpretUseSymbol(_) {
@@ -9400,9 +9404,9 @@ var useUtils = { visibleName(_, VY) {
 	nodeSymbol(_, VY) {
 		if (!isUseSpecifier(VY) || !VY.name) return Report.create(PASS_THROUGH);
 		let P = VY.getSymbolKind();
-		if (P === void 0) return Report.create(PASS_THROUGH);
+		if (P === void 0 || P === SymbolKind.Schema) return Report.create(PASS_THROUGH);
 		let HY = _.nodeReferee(VY.name).getFiltered(UNHANDLED);
-		return HY && !HY.canBeImported && P !== SymbolKind.Schema ? Report.create(PASS_THROUGH) : Report.create(_.symbolFactory.create(UseSymbol, {
+		return HY && !HY.canBeImported ? Report.create(PASS_THROUGH) : Report.create(_.symbolFactory.create(UseSymbol, {
 			useSpecifierDeclaration: VY,
 			declaration: HY?.declaration,
 			usedSymbol: HY,
@@ -10642,12 +10646,14 @@ var schemaModule = { symbolMembers(_, VY) {
 		for (let HY of P) KY.push(...expandTableGroup(_, VY, HY));
 	}
 	let qY = /* @__PURE__ */ new Set(), JY = KY.filter((_) => {
+		if (_ instanceof UseSymbol && _.isKind(SymbolKind.Schema)) return !1;
 		let VY = `${_.originalSymbol.intern()}:${_.name ?? ""}`;
 		return qY.has(VY) ? !1 : (qY.add(VY), !0);
 	}), YY = /* @__PURE__ */ new Map();
 	for (let _ of JY) {
 		let VY = `${_.kind}:${_.name}`;
 		if (YY.get(VY)) {
+			if (_.isKind(SymbolKind.Schema)) continue;
 			let VY = _ instanceof UseSymbol ? _.useSpecifierDeclaration ?? _.declaration : _.declaration instanceof ElementDeclarationNode && _.declaration.name ? _.declaration.name : _.declaration;
 			VY && _.name !== void 0 && GY.push(getDuplicateSchemaMemberError(_.kind, _.name, P.join("."), VY));
 		} else YY.set(VY, _);
@@ -14393,7 +14399,7 @@ function containerScopeKind(_, VY) {
 }
 function canonicalName(_, VY) {
 	let P = VY.originalSymbol;
-	if (P.filepath.intern() === _.intern()) return Report.create(fullnameToCanonical(this, P));
+	if (P.filepath.equals(_)) return Report.create(fullnameToCanonical(this, P));
 	let HY = [...this.symbolUses(P).getValue(), ...this.symbolAliases(P).getValue()].filter((VY) => VY.filepath.equals(_));
 	for (let _ of HY) {
 		let VY = _.name;
@@ -1825773,5 +1825779,5 @@ function findDiagramViewBlocks(_) {
 	let VY = new Compiler();
 	return VY.setSource(DEFAULT_ENTRY, _), VY.findDiagramViewBlocks(DEFAULT_ENTRY);
 }
-const VERSION = "8.0.0-alpha.6";
+const VERSION = "8.0.0-alpha.8";
 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.6",
+  "version": "8.0.0-alpha.8",
   "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.6",
+    "@dbml/parse": "^8.0.0-alpha.8",
     "antlr4": "^4.13.1",
     "lodash": "^4.18.1",
     "lodash-es": "^4.18.1",
@@ -57,7 +57,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "52721b96504df2eeb4ff7fc13292896221a837ef",
+  "gitHead": "ddb14ef16808f03119bcdc7e28dc88e254a4e21f",
   "engines": {
     "node": ">=16"
   }