@dbml/parse 8.0.0-alpha.10 → 8.0.0-alpha.12

package/dist/dbml-parse.mjs

@@ -1235,7 +1235,7 @@ var isAbsolute = function(r) {
 	}
 	relativeTo(r) {
 		let j = relative$1(r, this.path);
-		return j.startsWith(".") ? j : `./${j}`;
+		return !j.startsWith("./") && !j.startsWith("../") && ![".", ".."].includes(j) ? `./${j}` : j;
 	}
 	toString() {
 		return this.path;
@@ -7359,14 +7359,17 @@ var ProgramInterpreter = class {
 			let P = N.getValue();
 			P && this.pushElement(M, P);
 		}
-		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) {
+		let r = /* @__PURE__ */ new Set(), M = (this.compiler.symbolMembers(this.programSymbol).getFiltered(UNHANDLED) ?? []).filter((r) => r instanceof SchemaSymbol);
+		for (; M.length > 0;) {
+			let N = M.shift(), P = this.compiler.symbolMembers(N).getFiltered(UNHANDLED) ?? [];
+			for (let j of P) {
+				if (j instanceof SchemaSymbol) {
+					M.push(j);
+					continue;
+				}
 				if (!(j instanceof UseSymbol)) continue;
-				let M = j.originalSymbol.intern();
-				r.has(M) || (r.add(M), this.interpretUseSymbol(j));
+				let N = j.originalSymbol.intern();
+				r.has(N) || (r.add(N), this.interpretUseSymbol(j));
 			}
 		}
 	}
@@ -7635,7 +7638,7 @@ var ProjectBinder = class {
 	interpretBody(r) {
 		return r.body.flatMap((r) => {
 			let j = r;
-			switch (j.type?.value.toLowerCase()) {
+			switch (j.getElementKind()) {
 				case ElementKind.Table: {
 					let r = this.interpretSubElement(j);
 					return r.getValue() && this.project.tables?.push(r.getValue()), r.getErrors();
@@ -8324,7 +8327,7 @@ function usableMembers(r) {
 function schemaMembership(r, M, N) {
 	let P = M.qualifiedName, F;
 	if (F = N instanceof UseSpecifierNode ? useUtils.visibleName(r, N) : r.nodeFullname(N).getFiltered(UNHANDLED), !F) return { kind: "none" };
-	let I = F.length <= 1 ? [DEFAULT_SCHEMA_NAME] : F.slice(0, -1);
+	let I = N instanceof UseSpecifierNode && N.getSymbolKind() === SymbolKind.Schema ? F : F.length <= 1 ? [DEFAULT_SCHEMA_NAME] : F.slice(0, -1);
 	return I.length < P.length || !P.every((r, j) => r === I[j]) ? { kind: "none" } : I.length === P.length ? { kind: "direct" } : {
 		kind: "child",
 		schemaName: I[P.length]
@@ -8588,7 +8591,7 @@ var TableBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
+			switch (r.getElementKind()) {
 				case ElementKind.Note: return this.table.note = {
 					value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 					token: getTokenPosition(r)
@@ -8608,8 +8611,8 @@ var TableBinder = class {
 		P.name = extractVariableFromExpression(r.expression) || "";
 		let F = r.expression ? this.compiler.nodeReferee(r.expression).getFiltered(UNHANDLED) : void 0, I = this.compiler.parseFile(this.filepath).getValue().ast, L = this.compiler.nodeSymbol(I).getFiltered(UNHANDLED);
 		if (F && !L.inNestedSchema(this.compiler, F)) {
-			let M = this.compiler.nodeSymbol(this.declarationNode).getFiltered(UNHANDLED), P = M ? (this.compiler.symbolUses(M).getFiltered(UNHANDLED) ?? []).find((r) => r.filepath.equals(this.filepath)) : void 0;
-			N.push(new CompileError(CompileErrorCode.UNSUPPORTED, `Import TablePartial from '${F.filepath}' first. Currently, importing a table that uses a table partial requires that table partial to also be in scope.`, P?.useSpecifierDeclaration ?? r));
+			let M = this.compiler.nodeSymbol(this.declarationNode).getFiltered(UNHANDLED), I = M ? (this.compiler.symbolUses(M).getFiltered(UNHANDLED) ?? []).find((r) => r.filepath.equals(this.filepath)) : void 0;
+			N.push(new CompileError(CompileErrorCode.UNSUPPORTED, `Import TablePartial ${P.name} from '${F.filepath}' first. Currently, importing a table that uses a table partial requires that table partial to also be in scope.`, I?.useSpecifierDeclaration ?? r));
 		}
 		return this.table.partials.push(P), N;
 	}
@@ -9011,8 +9014,8 @@ var TableGroupBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
-				case "note":
+			switch (r.getElementKind()) {
+				case ElementKind.Note:
 					this.tableGroup.note = {
 						value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 						token: getTokenPosition(r)
@@ -9233,7 +9236,7 @@ var TablePartialBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
+			switch (r.getElementKind()) {
 				case ElementKind.Note: return this.tablePartial.note = {
 					value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 					token: getTokenPosition(r)
@@ -9498,11 +9501,15 @@ 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) || (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);
-	let L = r.usableMembers(F).getFiltered(UNHANDLED);
+	if (!F || !F.isKind(SymbolKind.Schema)) return [];
+	let I = useUtils.visibleName(r, N), L = M.qualifiedName;
+	return !I || I.length !== L.length || !I.every((r, j) => r === L[j]) ? [] : mergeSchemaMembers(r, M, N, F, P);
+}
+function mergeSchemaMembers(r, M, N, P, F) {
+	let I = P.intern();
+	if (F.has(I)) return [];
+	F.add(I);
+	let L = r.usableMembers(P).getFiltered(UNHANDLED);
 	if (!L) return [];
 	let R = L.nonSchemaMembers.filter((r) => r.canBeImported).map((j) => r.symbolFactory.create(UseSymbol, {
 		kind: j.kind,
@@ -9512,7 +9519,20 @@ function mergeImportedSchema(r, M, N, P = /* @__PURE__ */ new Set()) {
 		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));
+	for (let P of L.reuses.selective) if (R.push(...mergeImportedSchema(r, M, P, F)), schemaMembership(r, M, P).kind === "direct") {
+		let F = r.nodeSymbol(P).getFiltered(UNHANDLED);
+		F && F.canBeImported && R.push(r.symbolFactory.create(UseSymbol, {
+			kind: F.kind,
+			declaration: F.originalSymbol.declaration,
+			usedSymbol: F.originalSymbol,
+			useSpecifierDeclaration: N,
+			name: F.name
+		}, M.filepath));
+	}
+	for (let { importPath: j } of L.reuses.wildcard) {
+		let P = findSchemaSymbolInFilepath(r, j, M.qualifiedName);
+		P && R.push(...mergeSchemaMembers(r, M, N, P, F));
+	}
 	return R;
 }
 function handleMemberWildcardUses(r, M, N, P, F, I = /* @__PURE__ */ new Set()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "8.0.0-alpha.10",
+  "version": "8.0.0-alpha.12",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "219525258181f597943175cf46783566dcddb441"
+  "gitHead": "53557d9ec226c4e7b8177229efce49594535502b"
 }