@dbml/cli 7.1.1 → 8.0.0-alpha.0

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

@@ -0,0 +1,99 @@
+2026-04-11T10:16:02.804Z
+undefined
+
+2026-04-11T10:19:47.074Z
+undefined
+
+2026-04-11T10:53:31.236Z
+undefined
+
+2026-04-11T10:55:59.352Z
+undefined
+
+2026-04-11T11:14:08.082Z
+undefined
+
+2026-04-11T15:33:24.319Z
+undefined
+
+2026-04-17T08:28:12.644Z
+undefined
+
+2026-04-17T08:30:04.522Z
+undefined
+
+2026-04-21T10:03:46.911Z
+undefined
+
+2026-04-25T14:23:24.290Z
+undefined
+
+2026-04-25T14:24:44.457Z
+undefined
+
+2026-04-25T14:26:03.853Z
+undefined
+
+2026-04-25T14:27:23.238Z
+undefined
+
+2026-04-25T14:28:44.260Z
+undefined
+
+2026-04-25T14:39:04.973Z
+undefined
+
+2026-04-25T14:42:09.694Z
+undefined
+
+2026-04-25T14:46:18.763Z
+undefined
+
+2026-04-25T14:49:45.147Z
+undefined
+
+2026-04-25T14:52:17.585Z
+undefined
+
+2026-04-25T14:54:06.309Z
+undefined
+
+2026-04-25T14:55:33.033Z
+undefined
+
+2026-04-25T14:57:29.835Z
+undefined
+
+2026-04-25T14:59:18.940Z
+undefined
+
+2026-04-25T15:18:52.479Z
+undefined
+
+2026-04-25T15:45:10.950Z
+undefined
+
+2026-04-30T02:24:16.181Z
+undefined
+
+2026-04-30T02:27:03.580Z
+undefined
+
+2026-05-03T12:50:13.032Z
+undefined
+
+2026-05-03T12:55:31.060Z
+undefined
+
+2026-05-03T13:24:02.658Z
+undefined
+
+2026-05-04T15:14:09.165Z
+undefined
+
+2026-05-04T17:05:56.541Z
+undefined
+
+2026-05-04T17:07:08.426Z
+undefined
+

package/dbml-error.log

@@ -0,0 +1,3 @@
+2026-04-11T10:16:28.713Z
+undefined
+

package/lib/index.js

@@ -32,9 +32,11 @@ figures = __toESM(figures);
 let winston = require("winston");
 let fs = require("fs");
 fs = __toESM(fs);
+let __dbml_parse = require("@dbml/parse");
+let node_fs = require("node:fs");
 const $schema = "https://json.schemastore.org/package";
 const name = "@dbml/cli";
-const version = "7.1.1";
+const version = "8.0.0-alpha.0";
 const description = "";
 const main = "lib/index.js";
 const license = "Apache-2.0";
@@ -60,9 +62,9 @@ const repository = "https://github.com/holistics/dbml/tree/master/packages/dbml-
 const keywords = ["dbml", "dbml-cli"];
 const dependencies = {
 	"@babel/cli": "^7.21.0",
-	"@dbml/connector": "^7.1.1",
-	"@dbml/core": "^7.1.1",
-	"@dbml/parse": "^7.1.1",
+	"@dbml/connector": "^8.0.0-alpha.0",
+	"@dbml/core": "^8.0.0-alpha.0",
+	"@dbml/parse": "^8.0.0-alpha.0",
 	"bluebird": "^3.5.5",
 	"chalk": "^2.4.2",
 	"commander": "^2.20.0",
@@ -73,7 +75,7 @@ const dependencies = {
 	"strip-ansi": "^5.2.0",
 	"winston": "^3.2.1"
 };
-const gitHead = "db3691bdada0e754afb76ed4c24c519a80fcddf9";
+const gitHead = "4b99e7eab601b7d53e268d5d80048ee035614a79";
 const engines = { "node": ">=18" };
 var package_default = {
 	$schema,
@@ -510,8 +512,8 @@ ListCache.prototype.get = _listCacheGet_default;
 ListCache.prototype.has = _listCacheHas_default;
 ListCache.prototype.set = _listCacheSet_default;
 var _ListCache_default = ListCache;
-var Map = _getNative_default(_root_default, "Map");
-var _Map_default = Map;
+var Map$1 = _getNative_default(_root_default, "Map");
+var _Map_default = Map$1;
 function mapCacheClear() {
 	this.size = 0;
 	this.__data__ = {
@@ -724,8 +726,8 @@ var DataView = _getNative_default(_root_default, "DataView");
 var _DataView_default = DataView;
 var Promise$1 = _getNative_default(_root_default, "Promise");
 var _Promise_default = Promise$1;
-var Set = _getNative_default(_root_default, "Set");
-var _Set_default = Set;
+var Set$1 = _getNative_default(_root_default, "Set");
+var _Set_default = Set$1;
 var mapTag$2 = "[object Map]", objectTag$1 = "[object Object]", promiseTag = "[object Promise]", setTag$2 = "[object Set]", weakMapTag = "[object WeakMap]";
 var dataViewTag$1 = "[object DataView]";
 var dataViewCtorString = _toSource_default(_DataView_default), mapCtorString = _toSource_default(_Map_default), promiseCtorString = _toSource_default(_Promise_default), setCtorString = _toSource_default(_Set_default), weakMapCtorString = _toSource_default(_WeakMap_default);
@@ -1176,25 +1178,76 @@ async function connectionHandler(program$1) {
 		logger_default.error(error);
 	}
 }
-var DomainError = class extends Error {
-	constructor(message, rootError = {}) {
-		super(message);
-		this.name = this.constructor.name;
-		this.rootError = rootError;
-		Error.captureStackTrace(this, this.constructor);
+var NodeProjectLayout = class NodeProjectLayout {
+	constructor(entryPoints) {
+		this.overlay = /* @__PURE__ */ new Map();
+		this.entryPoints = [...entryPoints];
 	}
-};
-var domainError_default = DomainError;
-var SyntaxError = class extends domainError_default {
-	constructor(fileName, rootError = {}) {
-		let message = `You have a syntax error at "${fileName}"`;
-		if (rootError.location) message += ` line ${rootError.location.start.line} column ${rootError.location.start.column}`;
-		message += ".";
-		if (!isEmpty_default(rootError)) message += ` ${rootError.message}`;
-		super(message, rootError);
+	setSource(filePath, content) {
+		this.overlay.set(filePath.absolute, content);
+	}
+	getSource(filePath) {
+		const absolutePath = filePath.absolute;
+		if (this.overlay.has(absolutePath)) return this.overlay.get(absolutePath) ?? void 0;
+		try {
+			return (0, node_fs.readFileSync)(absolutePath, "utf-8");
+		} catch {
+			return;
+		}
+	}
+	deleteSource(filePath) {
+		this.overlay.set(filePath.absolute, null);
+	}
+	clearSource() {
+		this.overlay.clear();
+		this.entryPoints = [];
+	}
+	exists(filePath) {
+		return this.isFile(filePath) || this.isDirectory(filePath);
+	}
+	isFile(filePath) {
+		const absolutePath = filePath.absolute;
+		if (this.overlay.has(absolutePath)) return this.overlay.get(absolutePath) !== null;
+		try {
+			return (0, node_fs.statSync)(absolutePath).isFile();
+		} catch {
+			return false;
+		}
+	}
+	isDirectory(filePath) {
+		const absolutePath = filePath.absolute;
+		try {
+			if ((0, node_fs.statSync)(absolutePath).isDirectory()) return true;
+		} catch {}
+		for (const [overlayPath, content] of this.overlay) {
+			if (content === null) continue;
+			if (overlayPath.startsWith(absolutePath)) return true;
+		}
+		return false;
+	}
+	listDirectory(dirPath) {
+		const basePath = dirPath?.absolute ?? "/";
+		const results = /* @__PURE__ */ new Set();
+		try {
+			for (const entry of (0, node_fs.readdirSync)(basePath)) results.add(basePath + entry);
+		} catch {}
+		for (const [abs, content] of this.overlay) {
+			if (content === null) continue;
+			if (!abs.startsWith(basePath)) continue;
+			if (!abs.slice(basePath.length).includes("/")) results.add(abs);
+		}
+		for (const [overlayPath, content] of this.overlay) if (content === null) results.delete(overlayPath);
+		return [...results].sort().map(__dbml_parse.Filepath.from);
+	}
+	getEntryPoints() {
+		return this.entryPoints.filter((fp) => this.exists(fp));
+	}
+	clone() {
+		const copy = new NodeProjectLayout([...this.entryPoints]);
+		for (const [overlayPath, content] of this.overlay) copy.overlay.set(overlayPath, content);
+		return copy;
 	}
 };
-var syntaxError_default = SyntaxError;
 var config = {
 	mysql: { name: "MySQL" },
 	mysqlLegacy: { name: "MySQL" },
@@ -1209,26 +1262,60 @@ function validateFilePlugin(_path) {
 	if (fs.default.statSync(_path).isDirectory()) throw new Error("Expect input to be files");
 }
 async function exportHandler(program$1) {
-	try {
-		const inputPaths = resolvePaths(program$1.args);
-		validateInputFilePaths(inputPaths, validateFilePlugin);
-		const opts = program$1.opts();
-		const format$1 = getFormatOpt(opts);
-		if (!opts.outFile && !opts.outDir) generate(inputPaths, (dbml) => __dbml_core.exporter.export(dbml, format$1), outputConsolePlugin_default);
-		else if (opts.outFile) {
-			const header = [
-				"-- SQL dump generated using DBML (dbml.dbdiagram.io)\n",
-				`-- Database: ${config_default[format$1].name}\n`,
-				`-- Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}\n\n`
-			].join("");
-			generate(inputPaths, (dbml) => __dbml_core.exporter.export(dbml, format$1), new outputFilePlugin_default(resolvePaths(opts.outFile), header));
-			console.log(`  ${chalk.default.green(figures.default.main.tick)} Generated SQL dump file (${config_default[format$1].name}): ${path.default.basename(opts.outFile)}`);
+	const inputPaths = resolvePaths(program$1.args);
+	validateInputFilePaths(inputPaths, validateFilePlugin);
+	const opts = program$1.opts();
+	const format$1 = getFormatOpt(opts);
+	const entryPoints = inputPaths.map((p) => new __dbml_parse.Filepath(p));
+	const compiler = new __dbml_parse.Compiler();
+	compiler.layout = new NodeProjectLayout(entryPoints);
+	const outputPlugin = opts.outFile ? new outputFilePlugin_default(resolvePaths(opts.outFile), [
+		"-- SQL dump generated using DBML (dbml.dbdiagram.io)\n",
+		`-- Database: ${config_default[format$1].name}\n`,
+		`-- Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}\n\n`
+	].join("")) : outputConsolePlugin_default;
+	let hasErrors = false;
+	for (const filepath of entryPoints) {
+		const result = compiler.interpretFile(filepath);
+		const errors = result.getErrors();
+		if (errors.length > 0) {
+			hasErrors = true;
+			const isMultifile = compiler.reachableFiles(filepath).length > 1;
+			logger_default.error(`\n    ${errors.map((e) => {
+				const pos = e.nodeOrToken.startPos;
+				const line = pos.line + 1;
+				const col = pos.column + 1;
+				if (isMultifile) return `${e.filepath.basename}(${line},${col}): ${e.message}`;
+				return `You have a syntax error at "${e.filepath.basename}" line ${line} column ${col}. ${e.message}`;
+			}).join("\n    ")}`);
+			continue;
 		}
-	} catch (error) {
-		const e = error;
-		logger_default.error(`\n    ${e.diags.map((diag) => new syntaxError_default(diag.filepath ?? "", diag)).map(({ message }) => message).join("\n    ")}`);
+		const db = result.getValue();
+		if (!db) continue;
+		const sql = __dbml_core.ModelExporter.export(__dbml_core.Parser.parseJSONToDatabase(db), format$1);
+		outputPlugin.write(sql);
 	}
+	if (!hasErrors && opts.outFile) console.log(`  ${chalk.default.green(figures.default.main.tick)} Generated SQL dump file (${config_default[format$1].name}): ${path.default.basename(opts.outFile)}`);
 }
+var DomainError = class extends Error {
+	constructor(message, rootError = {}) {
+		super(message);
+		this.name = this.constructor.name;
+		this.rootError = rootError;
+		Error.captureStackTrace(this, this.constructor);
+	}
+};
+var domainError_default = DomainError;
+var SyntaxError = class extends domainError_default {
+	constructor(fileName, rootError = {}) {
+		let message = `You have a syntax error at "${fileName}"`;
+		if (rootError.location) message += ` line ${rootError.location.start.line} column ${rootError.location.start.column}`;
+		message += ".";
+		if (!isEmpty_default(rootError)) message += ` ${rootError.message}`;
+		super(message, rootError);
+	}
+};
+var syntaxError_default = SyntaxError;
 async function importHandler(program$1) {
 	try {
 		const inputPaths = resolvePaths(program$1.args);

package/package.json

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

package/src/NodeProjectLayout.ts

@@ -0,0 +1,125 @@
+import {
+  existsSync, readFileSync, readdirSync, statSync,
+} from 'node:fs';
+import {
+  type DbmlProjectLayout, Filepath,
+} from '@dbml/parse';
+
+/**
+ * A DbmlProjectLayout backed by the Node.js filesystem.
+ * Reads source files on demand from disk; setSource/deleteSource maintain an
+ * in-memory overlay (e.g. for unsaved edits) without touching the real FS.
+ */
+export class NodeProjectLayout implements DbmlProjectLayout {
+  // Overlay is an overriding map of file absolute paths to file content
+  // `null`: The file is deleted
+  private overlay = new Map<string, string | null>();
+  private entryPoints: Filepath[];
+
+  constructor (entryPoints: Filepath[]) {
+    this.entryPoints = [...entryPoints];
+  }
+
+  setSource (filePath: Filepath, content: string): void {
+    this.overlay.set(filePath.absolute, content);
+  }
+
+  getSource (filePath: Filepath): string | undefined {
+    const absolutePath = filePath.absolute;
+
+    // If overlay already has the file,
+    // return its content
+    if (this.overlay.has(absolutePath)) {
+      const value = this.overlay.get(absolutePath);
+      return value ?? undefined; // null (deleted) -> undefined
+    }
+    try {
+      return readFileSync(absolutePath, 'utf-8');
+    } catch {
+      return undefined;
+    }
+  }
+
+  deleteSource (filePath: Filepath): void {
+    this.overlay.set(filePath.absolute, null);
+  }
+
+  clearSource (): void {
+    this.overlay.clear();
+    this.entryPoints = [];
+  }
+
+  exists (filePath: Filepath): boolean {
+    return this.isFile(filePath) || this.isDirectory(filePath);
+  }
+
+  isFile (filePath: Filepath): boolean {
+    const absolutePath = filePath.absolute;
+
+    if (this.overlay.has(absolutePath)) return this.overlay.get(absolutePath) !== null;
+
+    try {
+      // `statSync` (not lstatSync) so symlinks resolve to their target, matching
+      // how node reads the file on disk.
+      return statSync(absolutePath).isFile();
+    } catch {
+      return false;
+    }
+  }
+
+  isDirectory (filePath: Filepath): boolean {
+    const absolutePath = filePath.absolute;
+
+    try {
+      // Exist in filesystem
+      if (statSync(absolutePath).isDirectory()) return true;
+    } catch {
+      // fall through: the path may exist only in the overlay
+    }
+    for (const [overlayPath, content] of this.overlay) {
+      if (content === null) continue;
+      if (overlayPath.startsWith(absolutePath)) return true;
+    }
+    return false;
+  }
+
+  listDirectory (dirPath?: Filepath): Filepath[] {
+    const basePath = dirPath?.absolute ?? '/';
+    const results = new Set<string>();
+
+    try {
+      // Filesystem entries
+      for (const entry of readdirSync(basePath)) {
+        results.add(basePath + entry);
+      }
+    } catch {
+      // Not a readable directory - ignore
+    }
+
+    // Overlay additions: non-deleted files directly under base
+    for (const [abs, content] of this.overlay) {
+      if (content === null) continue;
+      if (!abs.startsWith(basePath)) continue;
+      if (!abs.slice(basePath.length).includes('/')) results.add(abs);
+    }
+
+    // Remove overlay-deleted paths
+    for (const [overlayPath, content] of this.overlay) {
+      if (content === null) results.delete(overlayPath);
+    }
+
+    return [...results].sort().map(Filepath.from);
+  }
+
+  getEntryPoints (): Filepath[] {
+    return this.entryPoints.filter((fp) => this.exists(fp));
+  }
+
+  clone (): NodeProjectLayout {
+    const copy = new NodeProjectLayout([...this.entryPoints]);
+    for (const [overlayPath, content] of this.overlay) {
+      copy.overlay.set(overlayPath, content);
+    }
+    return copy;
+  }
+}

package/src/cli/export.ts

@@ -1,24 +1,23 @@
 import path from 'path';
 import {
-  CompilerError, exporter,
-} from '@dbml/core';
-import type {
-  ExportFormat,
+  ModelExporter, Parser,
 } from '@dbml/core';
+import {
+  Compiler, Filepath,
+} from '@dbml/parse';
 import chalk from 'chalk';
 import type {
   Command,
 } from 'commander';
 import figures from 'figures';
 import {
-  SyntaxError,
-} from '../errors';
+  NodeProjectLayout,
+} from '../NodeProjectLayout';
 import logger from '../helpers/logger';
 import config from './config';
 import OutputConsolePlugin from './outputPlugins/outputConsolePlugin';
 import OutputFilePlugin from './outputPlugins/outputFilePlugin';
 import {
-  generate,
   getFormatOpt,
   resolvePaths,
   validateInputFilePaths,
@@ -27,35 +26,60 @@ import {
   validateFilePlugin,
 } from './validatePlugins/validatePlugins';
 
-export default async function exportHandler (program: Command) {
-  try {
-    const inputPaths = resolvePaths(program.args);
-    validateInputFilePaths(inputPaths, validateFilePlugin);
-    const opts = program.opts();
-
-    const format = getFormatOpt(opts) as ExportFormat;
-
-    if (!opts.outFile && !opts.outDir) {
-      generate(inputPaths, (dbml) => exporter.export(dbml, format), OutputConsolePlugin);
-    } else if (opts.outFile) {
-      const header = [
-        '-- SQL dump generated using DBML (dbml.dbdiagram.io)\n',
-        `-- Database: ${config[format].name}\n`,
-        `-- Generated at: ${new Date().toISOString()}\n\n`,
-      ].join('');
-
-      generate(
-        inputPaths,
-        (dbml) => exporter.export(dbml, format),
-        new OutputFilePlugin(resolvePaths(opts.outFile), header),
-      );
+export default async function exportHandler (program: Command): Promise<void> {
+  const inputPaths = resolvePaths(program.args);
+  validateInputFilePaths(inputPaths, validateFilePlugin);
+  const opts = program.opts();
+  const format = getFormatOpt(opts);
+
+  const entryPoints = inputPaths.map((p: string) => new Filepath(p));
+  const compiler = new Compiler();
+  compiler.layout = new NodeProjectLayout(entryPoints);
+
+  const outputPlugin = opts.outFile
+    ? new OutputFilePlugin(
+        resolvePaths(opts.outFile as string),
+        [
+          '-- SQL dump generated using DBML (dbml.dbdiagram.io)\n',
+          `-- Database: ${(config as any)[format].name}\n`,
+          `-- Generated at: ${new Date().toISOString()}\n\n`,
+        ].join(''),
+      )
+    : OutputConsolePlugin;
+
+  let hasErrors = false;
 
-      console.log(`  ${chalk.green(figures.main.tick)} Generated SQL dump file (${config[format].name}): ${path.basename(opts.outFile)}`);
+  for (const filepath of entryPoints) {
+    const result = compiler.interpretFile(filepath);
+    const errors = result.getErrors();
+
+    if (errors.length > 0) {
+      hasErrors = true;
+      const isMultifile = compiler.reachableFiles(filepath).length > 1;
+      logger.error(
+        `\n    ${errors
+          .map((e) => {
+            const pos = e.nodeOrToken.startPos;
+            const line = pos.line + 1;
+            const col = pos.column + 1;
+            if (isMultifile) {
+              return `${e.filepath.basename}(${line},${col}): ${e.message}`;
+            }
+            return `You have a syntax error at "${e.filepath.basename}" line ${line} column ${col}. ${e.message}`;
+          })
+          .join('\n    ')}`,
+      );
+      continue;
     }
-  } catch (error) {
-    const e = error as CompilerError;
-    logger.error(`\n    ${e.diags.map((diag) => new SyntaxError(diag.filepath ?? '', diag)).map(({
-      message,
-    }) => message).join('\n    ')}`);
+
+    const db = result.getValue();
+    if (!db) continue;
+
+    const sql = ModelExporter.export(Parser.parseJSONToDatabase(db as any), format);
+    outputPlugin.write(sql);
+  }
+
+  if (!hasErrors && opts.outFile) {
+    console.log(`  ${chalk.green(figures.main.tick)} Generated SQL dump file (${(config as any)[format].name}): ${path.basename(opts.outFile)}`);
   }
 }

package/vite.config.ts

@@ -25,6 +25,7 @@ export default defineConfig({
       external: [
         '@dbml/connector',
         '@dbml/core',
+        '@dbml/parse',
         'bluebird',
         'chalk',
         'commander',