@dbml/cli 10.4.0-alpha.1 → 10.4.0-alpha.3

package/__tests__/sql2dbml/multiple_schema_mysql/out-files/multiple_schema.out.dbml

@@ -70,21 +70,21 @@ Table "orders4" {
   }
 }
 
-Ref "FK_1":"schemaA"."locations"."id" < "schemaA"."products"."lid" [delete: cascade]
+Ref "FK_1":"schemaA"."locations"."id" ?<? "schemaA"."products"."lid" [delete: cascade]
 
-Ref:"schemaA"."products"."id" < "orders"."pid"
+Ref:"schemaA"."products"."id" ?<? "orders"."pid"
 
-Ref:"schemaA"."products"."id" < "orders2"."pid"
+Ref:"schemaA"."products"."id" ?<? "orders2"."pid"
 
-Ref "CFK_1":"orders".("id1", "id2") < "orders2".("id1", "id2") [update: set null, delete: cascade]
+Ref "CFK_1":"orders".("id1", "id2") ?<? "orders2".("id1", "id2") [update: set null, delete: cascade]
 
-Ref:"users"."id" < "ecommerce"."users"."id"
+Ref:"users"."id" <? "ecommerce"."users"."id"
 
-Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
+Ref "name_optional":"users"."name" <? "ecommerce"."users"."id"
 
-Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
+Ref:"ecommerce"."users"."id" ?<? "schemaA"."products"."name"
 
-Ref:"users"."id" < "schemaA"."locations"."name"
+Ref:"users"."id" ?<? "schemaA"."locations"."name"
 
 Enum "ecommerce"."users_ejs_enum" {
   "created2"

package/__tests__/sql2dbml/multiple_schema_pg/out-files/multiple_schema.out.dbml

@@ -56,19 +56,19 @@ Table "br_flight" {
   }
 }
 
-Ref "fk_1":"schemaA"."locations"."id" < "schemaA"."products"."lid"
+Ref "fk_1":"schemaA"."locations"."id" ?<? "schemaA"."products"."lid"
 
-Ref:"users"."id" < "ecommerce"."users"."id"
+Ref:"users"."id" <? "ecommerce"."users"."id"
 
-Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
+Ref "name_optional":"users"."name" <? "ecommerce"."users"."id"
 
-Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
+Ref:"ecommerce"."users"."id" ?<? "schemaA"."products"."name"
 
-Ref:"users"."id" < "schemaA"."locations"."name"
+Ref:"users"."id" ?<? "schemaA"."locations"."name"
 
-Ref "fk_composite":"booking_reference".("reference_id", "cust_id") < "br_flight".("reference_id", "cust_id")
+Ref "fk_composite":"booking_reference".("reference_id", "cust_id") <? "br_flight".("reference_id", "cust_id")
 
-Ref "fk_country_code":"countries"."code" < "users"."country_code"
+Ref "fk_country_code":"countries"."code" ?<? "users"."country_code"
 
 Enum "schemaB"."gender" {
   "male"

package/__tests__/sql2dbml/syntax-error/dbml-error.log

@@ -18,3 +18,19 @@
 
     You have a syntax error at "business.sql" line 6 column 2. no viable alternative at input 'CREATE TABLE `staff` (\n  `id` int PRIMARY KEY,\n  `first_name` varchar(255),\n  `last_name` varchar(255),\n  `address_id` int\n  `picture`'
 
+2026-10-19T04:22:24.215Z
+
+    You have a syntax error at "business.sql" line 6 column 2. no viable alternative at input 'CREATE TABLE `staff` (\n  `id` int PRIMARY KEY,\n  `first_name` varchar(255),\n  `last_name` varchar(255),\n  `address_id` int\n  `picture`'
+
+2026-10-19T04:25:33.331Z
+
+    You have a syntax error at "business.sql" line 6 column 2. no viable alternative at input 'CREATE TABLE `staff` (\n  `id` int PRIMARY KEY,\n  `first_name` varchar(255),\n  `last_name` varchar(255),\n  `address_id` int\n  `picture`'
+
+2026-10-19T08:38:05.172Z
+
+    You have a syntax error at "business.sql" line 6 column 2. no viable alternative at input 'CREATE TABLE `staff` (\n  `id` int PRIMARY KEY,\n  `first_name` varchar(255),\n  `last_name` varchar(255),\n  `address_id` int\n  `picture`'
+
+2026-10-20T03:59:42.784Z
+
+    You have a syntax error at "business.sql" line 6 column 2. no viable alternative at input 'CREATE TABLE `staff` (\n  `id` int PRIMARY KEY,\n  `first_name` varchar(255),\n  `last_name` varchar(255),\n  `address_id` int\n  `picture`'
+

package/__tests__/sql2dbml/syntax-error-duplicate-endpoints --mssql/dbml-error.log

@@ -18,3 +18,19 @@
 
     You have a syntax error at "schema.sql" line 1 column 1. Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
 
+2026-10-19T04:22:24.950Z
+
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+
+2026-10-19T04:25:34.066Z
+
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+
+2026-10-19T08:38:05.917Z
+
+    You have a syntax error at "schema.sql" line 1 column 1. Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+
+2026-10-20T03:59:43.596Z
+
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+

package/__tests__/sql2dbml/syntax-error-duplicate-endpoints --mssql/stdout.txt

@@ -1,4 +1,4 @@
   ERROR: 
-    You have a syntax error at "schema.sql" line 1 column 1. Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
 
   A complete log can be found in:

package/__tests__/sql2dbml/syntax-error-duplicate-endpoints --mysql/dbml-error.log

@@ -18,3 +18,19 @@
 
     You have a syntax error at "schema.sql" line 1 column 1. Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
 
+2026-10-19T04:22:25.649Z
+
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+
+2026-10-19T04:25:34.792Z
+
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+
+2026-10-19T08:38:06.607Z
+
+    You have a syntax error at "schema.sql" line 1 column 1. Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+
+2026-10-20T03:59:44.342Z
+
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+

package/__tests__/sql2dbml/syntax-error-duplicate-endpoints --mysql/stdout.txt

@@ -1,4 +1,4 @@
   ERROR: 
-    You have a syntax error at "schema.sql" line 1 column 1. Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
+    You have a syntax error at "schema.sql". Reference with the same endpoints already exists: "student"("subject_id", "score_id") references "score_subject"("subject_id", "score_id")
 
   A complete log can be found in:

package/__tests__/windows/multifile-backslash/in-files/main.dbml

@@ -0,0 +1,2 @@
+use { table users } from './types'
+use { table orders } from './sub/orders'

package/__tests__/windows/multifile-backslash/in-files/sub/orders.dbml

@@ -0,0 +1,6 @@
+use { table users } from '../types'
+
+Table orders {
+  id int [pk]
+  user_id int [ref: > users.id]
+}

package/__tests__/windows/multifile-backslash/in-files/types.dbml

@@ -0,0 +1,4 @@
+Table users {
+  id int [pk]
+  name varchar
+}

package/__tests__/windows/multifile-backslash/options.json

@@ -0,0 +1,6 @@
+{
+  "args": [
+    ".\\in-files\\main.dbml",
+    "--postgres"
+  ]
+}

package/__tests__/windows/multifile-backslash/stdout.txt

@@ -0,0 +1,12 @@
+CREATE TABLE "users" (
+  "id" int PRIMARY KEY,
+  "name" varchar
+);
+
+CREATE TABLE "orders" (
+  "id" int PRIMARY KEY,
+  "user_id" int
+);
+
+ALTER TABLE "orders" ADD FOREIGN KEY ("user_id") REFERENCES "users" ("id") DEFERRABLE INITIALLY IMMEDIATE;
+

package/__tests__/windows/multifile-relative/in-files/main.dbml

@@ -0,0 +1,2 @@
+use { table users } from './types'
+use { table orders } from './sub/orders'

package/__tests__/windows/multifile-relative/in-files/sub/orders.dbml

@@ -0,0 +1,6 @@
+use { table users } from '../types'
+
+Table orders {
+  id int [pk]
+  user_id int [ref: > users.id]
+}

package/__tests__/windows/multifile-relative/in-files/types.dbml

@@ -0,0 +1,4 @@
+Table users {
+  id int [pk]
+  name varchar
+}

package/__tests__/windows/multifile-relative/options.json

@@ -0,0 +1,6 @@
+{
+  "args": [
+    "./in-files/main.dbml",
+    "--postgres"
+  ]
+}

package/__tests__/windows/multifile-relative/stdout.txt

@@ -0,0 +1,12 @@
+CREATE TABLE "users" (
+  "id" int PRIMARY KEY,
+  "name" varchar
+);
+
+CREATE TABLE "orders" (
+  "id" int PRIMARY KEY,
+  "user_id" int
+);
+
+ALTER TABLE "orders" ADD FOREIGN KEY ("user_id") REFERENCES "users" ("id") DEFERRABLE INITIALLY IMMEDIATE;
+

package/__tests__/windows.test.ts

@@ -0,0 +1,34 @@
+import childProcess from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import util from 'util';
+import stripAnsi from 'strip-ansi';
+import {
+  scanDirNames,
+} from './testHelpers';
+
+const exec = util.promisify(childProcess.exec);
+
+// Only run on Windows - skipped on other platforms
+const describeOnWindows = process.platform === 'win32' ? describe : describe.skip;
+
+describeOnWindows('@dbml/cli - Windows paths', () => {
+  const runTest = async (dirName: string) => {
+    process.chdir(dirName);
+    const binFile = path.join(__dirname, '../bin/dbml2sql.js');
+    const optsRaw = fs.readFileSync(path.join(dirName, './options.json'), 'utf-8');
+    const opts = JSON.parse(optsRaw);
+
+    const {
+      stdout,
+    } = await exec(`node "${binFile}" ${opts.args.join(' ')}`);
+    const expectStdout = fs.readFileSync(path.join(dirName, './stdout.txt'), 'utf-8').replaceAll('\r\n', '\n');
+    const actualStdout = stripAnsi(stdout).replaceAll('\r\n', '\n');
+
+    expect(actualStdout).toBe(expectStdout);
+  };
+
+  test.each(scanDirNames(__dirname, 'windows'))('windows/%s', async (dirName) => {
+    await runTest(path.join(__dirname, 'windows', dirName));
+  }, 100000);
+});

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.4.0-alpha.1",
+	version: "10.4.0-alpha.3",
 	description: "",
 	main: "lib/index.js",
 	license: "Apache-2.0",
@@ -47,7 +47,7 @@ var package_default = {
 		"test": "vitest run",
 		"test:watch": "vitest watch",
 		"coverage": "vitest --coverage",
-		"build": "rm -rf ./lib && tsc --noEmit && vite build",
+		"build": "rimraf ./lib && tsc --noEmit && vite build",
 		"dev": "vite build --watch",
 		"prepublish": "npm run build",
 		"lint": "eslint $(git diff --relative --name-only --diff-filter=ACMRTUXB master -- . | grep -E '\\.(js|ts)$')",
@@ -66,9 +66,9 @@ var package_default = {
 	keywords: ["dbml", "dbml-cli"],
 	dependencies: {
 		"@babel/cli": "^7.21.0",
-		"@dbml/connector": "^10.4.0-alpha.1",
-		"@dbml/core": "^10.4.0-alpha.1",
-		"@dbml/parse": "^10.4.0-alpha.1",
+		"@dbml/connector": "^10.4.0-alpha.3",
+		"@dbml/core": "^10.4.0-alpha.3",
+		"@dbml/parse": "^10.4.0-alpha.3",
 		"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: "2abacb40597047ca589b2c18117f57f8fe3978e6",
+	gitHead: "3c5f2624711c16e2b5011f118c62899f41abca7d",
 	engines: { "node": ">=18" }
 };
 //#endregion
@@ -2612,7 +2612,7 @@ function generate(inputPaths, transform, outputPlugin) {
 			const content = transform(source);
 			outputPlugin.write(content);
 		} catch (e) {
-			if (e instanceof _dbml_core.CompilerError) throw e.map((diag) => ({
+			if (e instanceof _dbml_core.CompilerDiagnostics) throw e.map((diag) => ({
 				...diag,
 				message: diag.message,
 				filepath: path.default.basename(_path),
@@ -2656,6 +2656,11 @@ var NodeProjectLayout = class {
 		const resolved = _dbml_parse.Filepath.resolve(currentFilepath.dirname, relativePath);
 		return resolved.absolute.endsWith(".dbml") ? resolved : _dbml_parse.Filepath.from(resolved.absolute + ".dbml");
 	}
+	getFileSpecifierInfo(currentFilepath, targetFilepath) {
+		let specifier = targetFilepath.relativeTo(currentFilepath.dirname);
+		if (specifier.endsWith(".dbml")) specifier = specifier.slice(0, -5);
+		return { specifier };
+	}
 	getSource(filePath) {
 		return safeReadFileSync(filePath.fsPath, "utf-8");
 	}
@@ -2778,8 +2783,8 @@ async function importHandler(program) {
 			console.log(`  ${chalk.default.green(figures.default.main.tick)} Generated DBML file from SQL file (${config[format].name}): ${path.default.basename(opts.outFile)}`);
 		}
 	} catch (error) {
-		if (error instanceof _dbml_core.CompilerError) {
-			const msg = `\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath ?? "", diag)).map(({ message }) => message).join("\n    ")}`;
+		if (error instanceof _dbml_core.CompilerDiagnostics) {
+			const msg = `\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath ?? "", diag)).map((e) => e.message).join("\n    ")}`;
 			consoleLogger.error(msg);
 			fileLogger.error(msg);
 			return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/cli",
-  "version": "10.4.0-alpha.1",
+  "version": "10.4.0-alpha.3",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
     "test": "vitest run",
     "test:watch": "vitest watch",
     "coverage": "vitest --coverage",
-    "build": "rm -rf ./lib && tsc --noEmit && vite build",
+    "build": "rimraf ./lib && tsc --noEmit && vite build",
     "dev": "vite build --watch",
     "prepublish": "npm run build",
     "lint": "eslint $(git diff --relative --name-only --diff-filter=ACMRTUXB master -- . | grep -E '\\.(js|ts)$')",
@@ -33,9 +33,9 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/connector": "^10.4.0-alpha.1",
-    "@dbml/core": "^10.4.0-alpha.1",
-    "@dbml/parse": "^10.4.0-alpha.1",
+    "@dbml/connector": "^10.4.0-alpha.3",
+    "@dbml/core": "^10.4.0-alpha.3",
+    "@dbml/parse": "^10.4.0-alpha.3",
     "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": "2abacb40597047ca589b2c18117f57f8fe3978e6",
+  "gitHead": "3c5f2624711c16e2b5011f118c62899f41abca7d",
   "engines": {
     "node": ">=18"
   }

package/src/NodeProjectLayout.ts

@@ -2,7 +2,7 @@ import {
   readFileSync, readdirSync, statSync,
 } from 'node:fs';
 import {
-  type DbmlProjectLayout, Filepath,
+  type DbmlProjectLayout, type FileSpecifierInfo, Filepath,
 } from '@dbml/parse';
 import {
   fileLogger,
@@ -26,6 +26,14 @@ export class NodeProjectLayout implements DbmlProjectLayout {
     return resolved.absolute.endsWith('.dbml') ? resolved : Filepath.from(resolved.absolute + '.dbml');
   }
 
+  getFileSpecifierInfo (currentFilepath: Filepath, targetFilepath: Filepath): FileSpecifierInfo | undefined {
+    let specifier = targetFilepath.relativeTo(currentFilepath.dirname);
+    if (specifier.endsWith('.dbml')) specifier = specifier.slice(0, -'.dbml'.length);
+    return {
+      specifier,
+    };
+  }
+
   getSource (filePath: Filepath): string | undefined {
     return safeReadFileSync(filePath.fsPath, 'utf-8');
   }

package/src/cli/import.ts

@@ -1,8 +1,9 @@
 import path from 'path';
 import {
-  CompilerError, importer,
+  CompilerDiagnostics, importer,
 } from '@dbml/core';
 import type {
+  CompilerDiagnostic,
   ImportFormat,
 } from '@dbml/core';
 import chalk from 'chalk';
@@ -45,10 +46,8 @@ export default async function importHandler (program: Command) {
       console.log(`  ${chalk.green(figures.main.tick)} Generated DBML file from SQL file (${config[format].name}): ${path.basename(opts.outFile)}`);
     }
   } catch (error) {
-    if (error instanceof CompilerError) {
-      const msg = `\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath ?? '', diag)).map(({
-        message,
-      }) => message).join('\n    ')}`;
+    if (error instanceof CompilerDiagnostics) {
+      const msg = `\n    ${error.diags.map((diag: CompilerDiagnostic) => new SyntaxError(diag.filepath ?? '', diag)).map((e: SyntaxError) => e.message).join('\n    ')}`;
       consoleLogger.error(msg);
       fileLogger.error(msg);
       return;

package/src/cli/utils.ts

@@ -1,7 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 import {
-  CompilerError,
+  CompilerDiagnostics,
+  type CompilerDiagnostic,
   type ExportFormat,
 } from '@dbml/core';
 import {
@@ -88,8 +89,8 @@ function generate (
       const content = transform(source);
       outputPlugin.write(content);
     } catch (e) {
-      if (e instanceof CompilerError) {
-        throw e.map((diag) => ({
+      if (e instanceof CompilerDiagnostics) {
+        throw e.map((diag: CompilerDiagnostic) => ({
           ...diag,
           message: diag.message,
           filepath: path.basename(_path),