@dbml/cli 10.4.0-alpha.2 → 11.0.0-alpha.2

package/lib/index.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -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.2",
+	version: "11.0.0-alpha.2",
 	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": "rimraf ./lib && tsc --noEmit && vite build",
+		"build": "rm -rf ./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.2",
-		"@dbml/core": "^10.4.0-alpha.2",
-		"@dbml/parse": "^10.4.0-alpha.2",
+		"@dbml/connector": "^11.0.0-alpha.2",
+		"@dbml/core": "^11.0.0-alpha.2",
+		"@dbml/parse": "^11.0.0-alpha.2",
 		"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: "cdf36a18c335cfea80135fabab1b8f80c7466cfd",
+	gitHead: "75a0e5bf55149fef937ec7d02e48c170421229ff",
 	engines: { "node": ">=18" }
 };
 //#endregion
@@ -181,10 +181,8 @@ function getRawTag(value) {
 		var unmasked = true;
 	} catch (e) {}
 	var result = nativeObjectToString$1.call(value);
-	if (unmasked) {
-		if (isOwn) value[symToStringTag$1] = tag;
-		else delete value[symToStringTag$1];
-	}
+	if (unmasked) if (isOwn) value[symToStringTag$1] = tag;
+	else delete value[symToStringTag$1];
 	return result;
 }
 //#endregion
@@ -208,8 +206,7 @@ function objectToString(value) {
 //#endregion
 //#region ../../node_modules/lodash-es/_baseGetTag.js
 /** `Object#toString` result references. */
-var nullTag = "[object Null]";
-var undefinedTag = "[object Undefined]";
+var nullTag = "[object Null]", undefinedTag = "[object Undefined]";
 /** Built-in value references. */
 var symToStringTag = Symbol$1 ? Symbol$1.toStringTag : void 0;
 /**
@@ -321,10 +318,9 @@ var isArray = Array.isArray;
 //#endregion
 //#region ../../node_modules/lodash-es/_baseToString.js
 /** Used as references for various `Number` constants. */
-var INFINITY$1 = 1 / 0;
+var INFINITY$1 = Infinity;
 /** Used to convert symbols to primitives and strings. */
-var symbolProto$1 = Symbol$1 ? Symbol$1.prototype : void 0;
-var symbolToString = symbolProto$1 ? symbolProto$1.toString : void 0;
+var symbolProto$1 = Symbol$1 ? Symbol$1.prototype : void 0, symbolToString = symbolProto$1 ? symbolProto$1.toString : void 0;
 /**
 * The base implementation of `_.toString` which doesn't convert nullish
 * values to empty strings.
@@ -395,10 +391,7 @@ function identity(value) {
 //#endregion
 //#region ../../node_modules/lodash-es/isFunction.js
 /** `Object#toString` result references. */
-var asyncTag = "[object AsyncFunction]";
-var funcTag$1 = "[object Function]";
-var genTag = "[object GeneratorFunction]";
-var proxyTag = "[object Proxy]";
+var asyncTag = "[object AsyncFunction]", funcTag$1 = "[object Function]", genTag = "[object GeneratorFunction]", proxyTag = "[object Proxy]";
 /**
 * Checks if `value` is classified as a `Function` object.
 *
@@ -474,8 +467,7 @@ var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
 /** Used to detect host constructors (Safari). */
 var reIsHostCtor = /^\[object .+?Constructor\]$/;
 /** Used for built-in method references. */
-var funcProto = Function.prototype;
-var objectProto$2 = Object.prototype;
+var funcProto = Function.prototype, objectProto$2 = Object.prototype;
 /** Used to resolve the decompiled source of functions. */
 var funcToString = funcProto.toString;
 /** Used to check objects for own properties. */
@@ -766,30 +758,8 @@ var isBuffer = (Buffer$1 ? Buffer$1.isBuffer : void 0) || stubFalse;
 //#endregion
 //#region ../../node_modules/lodash-es/_baseIsTypedArray.js
 /** `Object#toString` result references. */
-var argsTag$1 = "[object Arguments]";
-var arrayTag$1 = "[object Array]";
-var boolTag$1 = "[object Boolean]";
-var dateTag$1 = "[object Date]";
-var errorTag$1 = "[object Error]";
-var funcTag = "[object Function]";
-var mapTag$3 = "[object Map]";
-var numberTag$1 = "[object Number]";
-var objectTag$2 = "[object Object]";
-var regexpTag$1 = "[object RegExp]";
-var setTag$3 = "[object Set]";
-var stringTag$1 = "[object String]";
-var weakMapTag$1 = "[object WeakMap]";
-var arrayBufferTag$1 = "[object ArrayBuffer]";
-var dataViewTag$2 = "[object DataView]";
-var float32Tag = "[object Float32Array]";
-var float64Tag = "[object Float64Array]";
-var int8Tag = "[object Int8Array]";
-var int16Tag = "[object Int16Array]";
-var int32Tag = "[object Int32Array]";
-var uint8Tag = "[object Uint8Array]";
-var uint8ClampedTag = "[object Uint8ClampedArray]";
-var uint16Tag = "[object Uint16Array]";
-var uint32Tag = "[object Uint32Array]";
+var argsTag$1 = "[object Arguments]", arrayTag$1 = "[object Array]", boolTag$1 = "[object Boolean]", dateTag$1 = "[object Date]", errorTag$1 = "[object Error]", funcTag = "[object Function]", mapTag$3 = "[object Map]", numberTag$1 = "[object Number]", objectTag$2 = "[object Object]", regexpTag$1 = "[object RegExp]", setTag$3 = "[object Set]", stringTag$1 = "[object String]", weakMapTag$1 = "[object WeakMap]";
+var arrayBufferTag$1 = "[object ArrayBuffer]", dataViewTag$2 = "[object DataView]", float32Tag = "[object Float32Array]", float64Tag = "[object Float64Array]", int8Tag = "[object Int8Array]", int16Tag = "[object Int16Array]", int32Tag = "[object Int32Array]", uint8Tag = "[object Uint8Array]", uint8ClampedTag = "[object Uint8ClampedArray]", uint16Tag = "[object Uint16Array]", uint32Tag = "[object Uint32Array]";
 /** Used to identify `toStringTag` values of typed arrays. */
 var typedArrayTags = {};
 typedArrayTags[float32Tag] = typedArrayTags[float64Tag] = typedArrayTags[int8Tag] = typedArrayTags[int16Tag] = typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] = typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] = typedArrayTags[uint32Tag] = true;
@@ -943,8 +913,7 @@ function keys(object) {
 //#endregion
 //#region ../../node_modules/lodash-es/_isKey.js
 /** Used to match property names within property paths. */
-var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/;
-var reIsPlainProp = /^\w*$/;
+var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, reIsPlainProp = /^\w*$/;
 /**
 * Checks if `value` is a property name and not a property path.
 *
@@ -1470,7 +1439,7 @@ function castPath(value, object) {
 //#endregion
 //#region ../../node_modules/lodash-es/_toKey.js
 /** Used as references for various `Number` constants. */
-var INFINITY = 1 / 0;
+var INFINITY = Infinity;
 /**
 * Converts `value` to a string key if it's not a string or symbol.
 *
@@ -1771,18 +1740,10 @@ var Set = getNative(root, "Set");
 //#endregion
 //#region ../../node_modules/lodash-es/_getTag.js
 /** `Object#toString` result references. */
-var mapTag$2 = "[object Map]";
-var objectTag$1 = "[object Object]";
-var promiseTag = "[object Promise]";
-var setTag$2 = "[object Set]";
-var weakMapTag = "[object WeakMap]";
+var mapTag$2 = "[object Map]", objectTag$1 = "[object Object]", promiseTag = "[object Promise]", setTag$2 = "[object Set]", weakMapTag = "[object WeakMap]";
 var dataViewTag$1 = "[object DataView]";
 /** Used to detect maps, sets, and weakmaps. */
-var dataViewCtorString = toSource(DataView);
-var mapCtorString = toSource(Map);
-var promiseCtorString = toSource(Promise$1);
-var setCtorString = toSource(Set);
-var weakMapCtorString = toSource(WeakMap);
+var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map), promiseCtorString = toSource(Promise$1), setCtorString = toSource(Set), weakMapCtorString = toSource(WeakMap);
 /**
 * Gets the `toStringTag` of `value`.
 *
@@ -1889,8 +1850,7 @@ function cacheHas(cache, key) {
 //#endregion
 //#region ../../node_modules/lodash-es/_equalArrays.js
 /** Used to compose bitmasks for value comparisons. */
-var COMPARE_PARTIAL_FLAG$5 = 1;
-var COMPARE_UNORDERED_FLAG$3 = 2;
+var COMPARE_PARTIAL_FLAG$5 = 1, COMPARE_UNORDERED_FLAG$3 = 2;
 /**
 * A specialized version of `baseIsEqualDeep` for arrays with support for
 * partial deep comparisons.
@@ -1972,23 +1932,12 @@ function setToArray(set) {
 //#endregion
 //#region ../../node_modules/lodash-es/_equalByTag.js
 /** Used to compose bitmasks for value comparisons. */
-var COMPARE_PARTIAL_FLAG$4 = 1;
-var COMPARE_UNORDERED_FLAG$2 = 2;
+var COMPARE_PARTIAL_FLAG$4 = 1, COMPARE_UNORDERED_FLAG$2 = 2;
 /** `Object#toString` result references. */
-var boolTag = "[object Boolean]";
-var dateTag = "[object Date]";
-var errorTag = "[object Error]";
-var mapTag$1 = "[object Map]";
-var numberTag = "[object Number]";
-var regexpTag = "[object RegExp]";
-var setTag$1 = "[object Set]";
-var stringTag = "[object String]";
-var symbolTag = "[object Symbol]";
-var arrayBufferTag = "[object ArrayBuffer]";
-var dataViewTag = "[object DataView]";
+var boolTag = "[object Boolean]", dateTag = "[object Date]", errorTag = "[object Error]", mapTag$1 = "[object Map]", numberTag = "[object Number]", regexpTag = "[object RegExp]", setTag$1 = "[object Set]", stringTag = "[object String]", symbolTag = "[object Symbol]";
+var arrayBufferTag = "[object ArrayBuffer]", dataViewTag = "[object DataView]";
 /** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol$1 ? Symbol$1.prototype : void 0;
-var symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
+var symbolProto = Symbol$1 ? Symbol$1.prototype : void 0, symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
 /**
 * A specialized version of `baseIsEqualDeep` for comparing objects of
 * the same `toStringTag`.
@@ -2094,9 +2043,7 @@ function equalObjects(object, other, bitmask, customizer, equalFunc, stack) {
 /** Used to compose bitmasks for value comparisons. */
 var COMPARE_PARTIAL_FLAG$2 = 1;
 /** `Object#toString` result references. */
-var argsTag = "[object Arguments]";
-var arrayTag = "[object Array]";
-var objectTag = "[object Object]";
+var argsTag = "[object Arguments]", arrayTag = "[object Array]", objectTag = "[object Object]";
 /** Used to check objects for own properties. */
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 /**
@@ -2163,8 +2110,7 @@ function baseIsEqual(value, other, bitmask, customizer, stack) {
 //#endregion
 //#region ../../node_modules/lodash-es/_baseIsMatch.js
 /** Used to compose bitmasks for value comparisons. */
-var COMPARE_PARTIAL_FLAG$1 = 1;
-var COMPARE_UNORDERED_FLAG$1 = 2;
+var COMPARE_PARTIAL_FLAG$1 = 1, COMPARE_UNORDERED_FLAG$1 = 2;
 /**
 * The base implementation of `_.isMatch` without support for iteratee shorthands.
 *
@@ -2333,8 +2279,7 @@ function hasIn(object, path) {
 //#endregion
 //#region ../../node_modules/lodash-es/_baseMatchesProperty.js
 /** Used to compose bitmasks for value comparisons. */
-var COMPARE_PARTIAL_FLAG = 1;
-var COMPARE_UNORDERED_FLAG = 2;
+var COMPARE_PARTIAL_FLAG = 1, COMPARE_UNORDERED_FLAG = 2;
 /**
 * The base implementation of `_.matchesProperty` which doesn't clone `srcValue`.
 *
@@ -2499,8 +2444,7 @@ var baseEach = createBaseEach(baseForOwn);
 //#endregion
 //#region ../../node_modules/lodash-es/isEmpty.js
 /** `Object#toString` result references. */
-var mapTag = "[object Map]";
-var setTag = "[object Set]";
+var mapTag = "[object Map]", setTag = "[object Set]";
 /** Used to check objects for own properties. */
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 /**
@@ -2668,7 +2612,7 @@ function generate(inputPaths, transform, outputPlugin) {
 			const content = transform(source);
 			outputPlugin.write(content);
 		} catch (e) {
-			if (e instanceof _dbml_core.CompilerDiagnostics) throw e.map((diag) => ({
+			if (e instanceof _dbml_core.CompilerError) throw e.map((diag) => ({
 				...diag,
 				message: diag.message,
 				filepath: path.default.basename(_path),
@@ -2712,11 +2656,6 @@ 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");
 	}
@@ -2839,8 +2778,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.CompilerDiagnostics) {
-			const msg = `\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath ?? "", diag)).map((e) => e.message).join("\n    ")}`;
+		if (error instanceof _dbml_core.CompilerError) {
+			const msg = `\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath ?? "", diag)).map(({ message }) => 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.2",
+  "version": "11.0.0-alpha.2",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
     "test": "vitest run",
     "test:watch": "vitest watch",
     "coverage": "vitest --coverage",
-    "build": "rimraf ./lib && tsc --noEmit && vite build",
+    "build": "rm -rf ./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.2",
-    "@dbml/core": "^10.4.0-alpha.2",
-    "@dbml/parse": "^10.4.0-alpha.2",
+    "@dbml/connector": "^11.0.0-alpha.2",
+    "@dbml/core": "^11.0.0-alpha.2",
+    "@dbml/parse": "^11.0.0-alpha.2",
     "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": "cdf36a18c335cfea80135fabab1b8f80c7466cfd",
+  "gitHead": "75a0e5bf55149fef937ec7d02e48c170421229ff",
   "engines": {
     "node": ">=18"
   }

package/src/NodeProjectLayout.ts

@@ -2,7 +2,7 @@ import {
   readFileSync, readdirSync, statSync,
 } from 'node:fs';
 import {
-  type DbmlProjectLayout, type FileSpecifierInfo, Filepath,
+  type DbmlProjectLayout, Filepath,
 } from '@dbml/parse';
 import {
   fileLogger,
@@ -26,14 +26,6 @@ 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,9 +1,8 @@
 import path from 'path';
 import {
-  CompilerDiagnostics, importer,
+  CompilerError, importer,
 } from '@dbml/core';
 import type {
-  CompilerDiagnostic,
   ImportFormat,
 } from '@dbml/core';
 import chalk from 'chalk';
@@ -46,8 +45,10 @@ 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 CompilerDiagnostics) {
-      const msg = `\n    ${error.diags.map((diag: CompilerDiagnostic) => new SyntaxError(diag.filepath ?? '', diag)).map((e: SyntaxError) => e.message).join('\n    ')}`;
+    if (error instanceof CompilerError) {
+      const msg = `\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath ?? '', diag)).map(({
+        message,
+      }) => message).join('\n    ')}`;
       consoleLogger.error(msg);
       fileLogger.error(msg);
       return;

package/src/cli/utils.ts

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

package/__tests__/dbml2sql/multifile --postgres stdout/in-files/main.dbml

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

package/__tests__/dbml2sql/multifile --postgres stdout/in-files/sub/orders.dbml

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

package/__tests__/dbml2sql/multifile --postgres stdout/in-files/types.dbml

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

package/__tests__/dbml2sql/multifile --postgres stdout/options.json

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

package/__tests__/dbml2sql/multifile --postgres stdout/stdout.txt

@@ -1,12 +0,0 @@
-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__/dbml2sql/multifile error entry-syntax-error/dbml-error.log

@@ -1,5 +0,0 @@
-2026-10-14T03:11:07.079Z
-
-    ./in-files/main.dbml(5,15): Expect an identifier
-    ./in-files/main.dbml(5,21): Custom setting 'pk user_id int' must be a string or a color literal
-