@dbml/cli 10.3.0-alpha.2 → 10.3.0

package/lib/index.js

@@ -39,7 +39,7 @@ let node_fs = require("node:fs");
 var package_default = {
 	$schema: "https://json.schemastore.org/package",
 	name: "@dbml/cli",
-	version: "10.3.0-alpha.2",
+	version: "10.3.0",
 	description: "",
 	main: "lib/index.js",
 	license: "Apache-2.0",
@@ -66,9 +66,9 @@ var package_default = {
 	keywords: ["dbml", "dbml-cli"],
 	dependencies: {
 		"@babel/cli": "^7.21.0",
-		"@dbml/connector": "^10.3.0-alpha.0",
-		"@dbml/core": "^10.3.0-alpha.2",
-		"@dbml/parse": "^10.3.0-alpha.0",
+		"@dbml/connector": "^10.3.0",
+		"@dbml/core": "^10.3.0",
+		"@dbml/parse": "^10.3.0",
 		"bluebird": "^3.5.5",
 		"chalk": "^2.4.2",
 		"commander": "^2.20.0",
@@ -79,7 +79,7 @@ var package_default = {
 		"strip-ansi": "^5.2.0",
 		"winston": "^3.2.1"
 	},
-	gitHead: "8843ed7b7c8b09b81cb3040bfd98232724073c9d",
+	gitHead: "7b26e1a4849d627ecb64e5a614e50373ee60c208",
 	engines: { "node": ">=18" }
 };
 //#endregion
@@ -2651,20 +2651,25 @@ var NodeProjectLayout = class {
 	constructor(entryPoints) {
 		this.entryPoints = [...entryPoints];
 	}
+	resolveFileSpecifier(currentFilepath, relativePath) {
+		if (!_dbml_parse.Filepath.isRelative(relativePath)) return void 0;
+		const resolved = _dbml_parse.Filepath.resolve(currentFilepath.dirname, relativePath);
+		return resolved.absolute.endsWith(".dbml") ? resolved : _dbml_parse.Filepath.from(resolved.absolute + ".dbml");
+	}
 	getSource(filePath) {
-		return safeReadFileSync(filePath.absolute, "utf-8");
+		return safeReadFileSync(filePath.fsPath, "utf-8");
 	}
 	exists(filePath) {
 		return this.isFile(filePath) || this.isDirectory(filePath);
 	}
 	isFile(filePath) {
-		return safeStatSync(filePath.absolute, { throwIfNoEntry: false })?.isFile() ?? false;
+		return safeStatSync(filePath.fsPath, { throwIfNoEntry: false })?.isFile() ?? false;
 	}
 	isDirectory(filePath) {
-		return safeStatSync(filePath.absolute, { throwIfNoEntry: false })?.isDirectory() ?? false;
+		return safeStatSync(filePath.fsPath, { throwIfNoEntry: false })?.isDirectory() ?? false;
 	}
 	listDirectory(dirPath) {
-		const basePath = dirPath?.absolute ?? "/";
+		const basePath = dirPath ? dirPath.fsPath : "/";
 		return safeReaddirSync(basePath)?.map((entry) => basePath + entry).sort().map(_dbml_parse.Filepath.from) ?? [];
 	}
 	getEntrypoints() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/cli",
-  "version": "10.3.0-alpha.2",
+  "version": "10.3.0",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -33,9 +33,9 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/connector": "^10.3.0-alpha.0",
-    "@dbml/core": "^10.3.0-alpha.2",
-    "@dbml/parse": "^10.3.0-alpha.0",
+    "@dbml/connector": "^10.3.0",
+    "@dbml/core": "^10.3.0",
+    "@dbml/parse": "^10.3.0",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -46,7 +46,7 @@
     "strip-ansi": "^5.2.0",
     "winston": "^3.2.1"
   },
-  "gitHead": "8843ed7b7c8b09b81cb3040bfd98232724073c9d",
+  "gitHead": "7b26e1a4849d627ecb64e5a614e50373ee60c208",
   "engines": {
     "node": ">=18"
   }

package/src/NodeProjectLayout.ts

@@ -18,8 +18,16 @@ export class NodeProjectLayout implements DbmlProjectLayout {
     this.entryPoints = [...entryPoints];
   }
 
+  // From the currentFilepath, resolve the relativePath to an absolute path
+  // Append `.dbml` if relativePath does not ends with `.dbml`
+  resolveFileSpecifier (currentFilepath: Filepath, relativePath: string): Filepath | undefined {
+    if (!Filepath.isRelative(relativePath)) return undefined;
+    const resolved = Filepath.resolve(currentFilepath.dirname, relativePath);
+    return resolved.absolute.endsWith('.dbml') ? resolved : Filepath.from(resolved.absolute + '.dbml');
+  }
+
   getSource (filePath: Filepath): string | undefined {
-    return safeReadFileSync(filePath.absolute, 'utf-8');
+    return safeReadFileSync(filePath.fsPath, 'utf-8');
   }
 
   exists (filePath: Filepath): boolean {
@@ -27,19 +35,19 @@ export class NodeProjectLayout implements DbmlProjectLayout {
   }
 
   isFile (filePath: Filepath): boolean {
-    return safeStatSync(filePath.absolute, {
+    return safeStatSync(filePath.fsPath, {
       throwIfNoEntry: false,
     })?.isFile() ?? false;
   }
 
   isDirectory (filePath: Filepath): boolean {
-    return safeStatSync(filePath.absolute, {
+    return safeStatSync(filePath.fsPath, {
       throwIfNoEntry: false,
     })?.isDirectory() ?? false;
   }
 
   listDirectory (dirPath?: Filepath): Filepath[] {
-    const basePath = dirPath?.absolute ?? '/';
+    const basePath = dirPath ? dirPath.fsPath : '/';
     return safeReaddirSync(basePath)?.map((entry) => basePath + entry).sort().map(Filepath.from) ?? [];
   }