@dbml/parse 10.3.0-alpha.0 → 10.3.1

package/dist/dbml-parse.mjs

@@ -1425,6 +1425,7 @@ var ho = function(e) {
 	return t && r.endsWith(t) ? r.slice(0, -t.length) : r;
 }, bo = /^[a-zA-Z]:\//, xo = class e {
 	constructor(e, t = {}) {
+		e = e.split("/").map(So).join("/");
 		let n = lo(e);
 		if (!ho(n)) throw Error(`FilePath requires an absolute path, got: "${e}"`);
 		this.path = n, this.protocol = t.protocol;
@@ -1449,14 +1450,17 @@ var ho = function(e) {
 	get absolute() {
 		return this.path;
 	}
+	get fsPath() {
+		return this.path.split("/").map(decodeURIComponent).join("/");
+	}
 	get dirname() {
-		return vo(this.path);
+		return vo(this.fsPath);
 	}
 	get basename() {
-		return yo(this.path);
+		return yo(this.fsPath);
 	}
 	get extname() {
-		return go(this.path);
+		return go(this.fsPath);
 	}
 	resolve(t) {
 		return new e(po(this.dirname, t));
@@ -1465,14 +1469,14 @@ var ho = function(e) {
 		return new e(uo(this.path, ...t));
 	}
 	relativeTo(e) {
-		let t = _o(e, this.path);
+		let t = _o(e, this.fsPath);
 		return !t.startsWith("./") && !t.startsWith("../") && ![".", ".."].includes(t) ? `./${t}` : t;
 	}
-	toString() {
+	toKey() {
 		return this.path;
 	}
 	equals(e) {
-		return this.path === e.path;
+		return this.toKey() === e.toKey();
 	}
 	isParentOf(e) {
 		if (this.path === e.path) return !1;
@@ -1489,10 +1493,12 @@ var ho = function(e) {
 		return !ho(lo(e));
 	}
 };
-function So(e, t) {
-	if (!xo.isRelative(t)) return;
-	let n = xo.resolve(e.dirname, t);
-	return n.absolute.endsWith(".dbml") ? n : xo.from(n.absolute + ".dbml");
+function So(e) {
+	try {
+		return encodeURIComponent(decodeURIComponent(e));
+	} catch {
+		return encodeURIComponent(e);
+	}
 }
 //#endregion
 //#region src/constants.ts
@@ -9593,9 +9599,9 @@ var o_ = { visibleName(e, n) {
 		if (c === void 0) return n.create(void 0);
 		let l = i.parentOfKind(fm);
 		if (l?.importPath?.value === void 0) return n.create(void 0);
-		let u = So(i.filepath, l.importPath.value);
+		let u = r.layout.resolveFileSpecifier(i.filepath, l.importPath.value);
 		if (!u) return n.create(void 0, [new T(w.BINDING_ERROR, `Import path must be relative, got '${l.importPath.value}'`, i)]);
-		if (!r.layout.exists(u)) return n.create(void 0, [new T(w.NONEXISTENT_MODULE, `${o} '${s?.join(".") ?? c}' does not exist in file ${u.toString()}. Does the file exist?`, i)]);
+		if (!r.layout.exists(u)) return n.create(void 0, [new T(w.NONEXISTENT_MODULE, `${o} '${s?.join(".") ?? c}' does not exist in file ${u.toKey()}. Does the file exist?`, i)]);
 		let d = i.parentOfKind(gm)?.leftExpression;
 		if (d && d !== i) {
 			let e = r.nodeReferee(d).getFiltered(t);
@@ -9604,14 +9610,14 @@ var o_ = { visibleName(e, n) {
 			return a ? n.create(a) : new n(void 0, [new T(w.BINDING_ERROR, `Could not find ${o} '${c}'`, i)]);
 		}
 		let f = c_(r, u, c, o);
-		return f ? n.create(f) : n.create(void 0, [new T(w.BINDING_ERROR, `${o} '${c}' does not exist in file ${u.toString()}`, i)]);
+		return f ? n.create(f) : n.create(void 0, [new T(w.BINDING_ERROR, `${o} '${c}' does not exist in file ${u.toKey()}`, i)]);
 	},
 	bindNode(t, r) {
 		if (Kf(r)) {
 			let e = [];
 			if (r.importPath?.value) {
-				let n = So(r.filepath, r.importPath.value);
-				n ? t.layout.exists(n) || e.push(new T(w.NONEXISTENT_MODULE, `Failed to resolve the non-existent file '${r.importPath.value}'`, r.importPath)) : e.push(new T(w.BINDING_ERROR, `Import path must be relative, got '${r.importPath.value}'`, r.importPath));
+				let n = t.layout.resolveFileSpecifier(r.filepath, r.importPath.value);
+				(!n || !t.layout.exists(n)) && e.push(new T(w.NONEXISTENT_MODULE, `Failed to resolve the non-existent file '${r.importPath.value}'`, r.importPath));
 			}
 			if (r.specifiers) {
 				let n = t.bindNode(r.specifiers);
@@ -9647,7 +9653,7 @@ function c_(e, n, r, i, a = /* @__PURE__ */ new Set()) {
 	for (let t of o.reuses.selective) if (M(t.alias ?? t.name)?.at(-1) === r) {
 		let o = t.parentOfKind(fm);
 		if (o?.importPath?.value) {
-			let s = c_(e, So(n, o.importPath.value), M(t.name)?.at(-1) ?? r, i, a);
+			let s = c_(e, e.layout.resolveFileSpecifier(n, o.importPath.value), M(t.name)?.at(-1) ?? r, i, a);
 			if (s) return s;
 		}
 	}
@@ -9688,16 +9694,16 @@ function u_(e, n, r) {
 }
 function d_(e, t) {
 	let n = e.parseFile(t), { ast: r } = n.getValue(), i = [], a = [], o = [], s = [];
-	for (let e of r.body) {
-		if (!(e instanceof fm) || !e.specifiers || !e.importPath) continue;
-		let n = So(t, e.importPath.value);
-		n && (e.isReuse ? e.specifiers instanceof wm ? i.push({
-			importPath: n,
-			node: e.specifiers
-		}) : a.push(...e.specifiers.specifiers) : e.specifiers instanceof wm ? o.push({
-			importPath: n,
-			node: e.specifiers
-		}) : s.push(...e.specifiers.specifiers));
+	for (let n of r.body) {
+		if (!(n instanceof fm) || !n.specifiers || !n.importPath) continue;
+		let r = e.layout.resolveFileSpecifier(t, n.importPath.value);
+		r && (n.isReuse ? n.specifiers instanceof wm ? i.push({
+			importPath: r,
+			node: n.specifiers
+		}) : a.push(...n.specifiers.specifiers) : n.specifiers instanceof wm ? o.push({
+			importPath: r,
+			node: n.specifiers
+		}) : s.push(...n.specifiers.specifiers));
 	}
 	return {
 		ast: r,
@@ -12873,7 +12879,7 @@ var gy = {
 	}
 	validateBody() {
 		let e = [];
-		if (this.declarationNode.importPath && !xo.isRelative(this.declarationNode.importPath.value) && e.push(new T(w.INVALID_USE_SPECIFIER_NAME, "Import path must be a relative path (starting with './' or '../')", this.declarationNode.importPath)), this.declarationNode.specifiers instanceof wm) return [];
+		if (this.declarationNode.specifiers instanceof wm) return [];
 		for (let t of this.declarationNode.specifiers?.specifiers || []) e.push(...this.validateSpecifier(t));
 		return e;
 	}
@@ -14128,7 +14134,7 @@ function ex() {
 }
 function tx(e, n, r, i) {
 	if (!r) return X();
-	let a = So(n, r.value);
+	let a = e.layout.resolveFileSpecifier(n, r.value);
 	if (!a) return X();
 	let o = e.usableMembers(a).getFiltered(t);
 	if (!o) return X();
@@ -15243,7 +15249,7 @@ function vS(e) {
 	let { ast: t } = this.parseFile(e).getValue(), n = [], r = /* @__PURE__ */ new Set();
 	for (let i of t.body) {
 		if (!(i instanceof fm) || !i.importPath) continue;
-		let t = So(e, i.importPath.value);
+		let t = this.layout.resolveFileSpecifier(e, i.importPath.value);
 		!t || r.has(t.absolute) || (r.add(t.absolute), n.push(t));
 	}
 	return n;
@@ -17143,6 +17149,11 @@ var nw = Symbol("COMPUTING"), rw = class {
 	constructor(e = {}) {
 		this.files = e instanceof Map ? new Map(e) : new Map(Object.entries(e));
 	}
+	resolveFileSpecifier(e, t) {
+		if (!xo.isRelative(t)) return;
+		let n = xo.resolve(e.dirname, t);
+		return n.absolute.endsWith(".dbml") ? n : xo.from(n.absolute + ".dbml");
+	}
 	setSource(e, t) {
 		this.files.set(e.absolute, t);
 	}

package/dist/src/compiler/projectLayout/layout.d.ts

@@ -1,5 +1,6 @@
 import { Filepath } from '../../core/types/filepath';
 export interface DbmlProjectLayout {
+    resolveFileSpecifier(currentFilepath: Filepath, specifier: string): Filepath | undefined;
     getSource(filePath: Filepath): string | undefined;
     exists(filePath: Filepath): boolean;
     isFile(filePath: Filepath): boolean;
@@ -10,6 +11,7 @@ export interface DbmlProjectLayout {
 export declare class MemoryProjectLayout implements DbmlProjectLayout {
     private readonly files;
     constructor(files?: Map<string, string> | Record<string, string>);
+    resolveFileSpecifier(currentFilepath: Filepath, relativePath: string): Filepath | undefined;
     setSource(filePath: Filepath, content: string): void;
     getSource(filePath: Filepath): string | undefined;
     deleteSource(filePath: Filepath): void;

package/dist/src/core/types/filepath.d.ts

@@ -14,13 +14,14 @@ export declare class Filepath implements Internable<FilepathId> {
     static resolve(fromDir: string, relativePath: string): Filepath;
     static fromUri(uri: string): Filepath;
     get absolute(): string;
+    get fsPath(): string;
     get dirname(): string;
     get basename(): string;
     get extname(): string;
     resolve(relativePath: string): Filepath;
     join(...segments: string[]): Filepath;
     relativeTo(baseDir: string): string;
-    toString(): string;
+    toKey(): string;
     equals(other: Filepath): boolean;
     isParentOf(other: Filepath): boolean;
     toUri(options?: {
@@ -28,5 +29,4 @@ export declare class Filepath implements Internable<FilepathId> {
     }): string;
     static isRelative(p: string): boolean;
 }
-export declare function resolveImportFilepath(currentFilepath: Filepath, relativePath: string): Filepath | undefined;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "10.3.0-alpha.0",
+  "version": "10.3.1",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "e21f51bfa07c3406e56dd3d81a27ef27caa72453"
+  "gitHead": "34108bb9346df5f22d5224549c106ff47ca931c8"
 }