@dbml/cli 5.3.1 → 5.4.1

package/__tests__/testHelpers.ts

@@ -0,0 +1,8 @@
+import fs from 'fs';
+import path from 'path';
+
+export function scanDirNames (dirname: string, subpath: string): string[] {
+  const dirPath = path.join(dirname, subpath);
+  const dirs = fs.readdirSync(dirPath);
+  return dirs;
+};

package/jest.config.ts

@@ -2,12 +2,13 @@ import { type Config } from 'jest';
 
 const config: Config = {
   testMatch: ["**/?(*.)+(spec|test).?([mc])[jt]s?(x)"],
-  setupFiles: [
-    "./jestHelpers.js",
-  ],
+  preset: 'ts-jest',
   transform: {
     "^.+\\.js$": "babel-jest",
   },
+  collectCoverage: true,
+  coverageReporters: ["json", "json-summary", "html", "text"],
+  coverageDirectory: "coverage",
 };
 
 export default config;

package/package.json

@@ -1,12 +1,13 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/cli",
-  "version": "5.3.1",
+  "version": "5.4.1",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "scripts": {
-    "test": "jest",
+    "test": "jest --coverage=false",
+    "coverage": "jest --coverage",
     "build": "babel src --out-dir lib --copy-files",
     "prepublish": "npm run build",
     "lint": "eslint .",
@@ -29,8 +30,8 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/connector": "^5.3.1",
-    "@dbml/core": "^5.3.1",
+    "@dbml/connector": "^5.4.1",
+    "@dbml/core": "^5.4.1",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -55,10 +56,11 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-jest": "^29.0.1",
     "jest": "^29.5.0",
+    "ts-jest": "^29.4.5",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.46.3"
   },
-  "gitHead": "54ca4861d608adbfc17c86d840c2e663e9c428f9",
+  "gitHead": "f5c8bf0c9d95948e3874cfb6cc777f65c4180891",
   "engines": {
     "node": ">=18"
   }

package/__test__/db2dbml/mssql/dbml-error.log

@@ -1,22 +0,0 @@
-2025-08-04T05:04:14.276Z
-ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
-    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
-    at Connection.onConnect (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
-    at Object.onceWrapper (node:events:633:26)
-    at Connection.emit (node:events:518:28)
-    at Connection.emit (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
-    at Connection.socketError (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
-    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
-    at process.processTicksAndRejections (node:internal/process/task_queues:85:11)
-
-2025-08-04T05:10:48.040Z
-ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
-    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
-    at Connection.onConnect (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
-    at Object.onceWrapper (node:events:633:26)
-    at Connection.emit (node:events:518:28)
-    at Connection.emit (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
-    at Connection.socketError (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
-    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
-    at process.processTicksAndRejections (node:internal/process/task_queues:85:11)
-

package/__test__/db2dbml/mysql/dbml-error.log

@@ -1,6 +0,0 @@
-2025-08-04T05:04:14.971Z
-undefined
-
-2025-08-04T05:10:48.738Z
-undefined
-

package/__test__/db2dbml/oracle/dbml-error.log

@@ -1,11 +0,0 @@
-2025-08-15T09:51:19.619Z
-Error: ORA-01017: invalid credential or not authorized; logon denied
-Help: https://docs.oracle.com/error-help/db/ora-01017/
-    at Protocol._processMessage (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/oracledb/lib/thin/protocol/protocol.js:204:17)
-    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
-    at async ThinConnectionImpl.connect (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/oracledb/lib/thin/connection.js:896:9)
-    at async Object.getConnection (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/oracledb/lib/oracledb.js:788:3)
-    at async Object.getConnection (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/oracledb/lib/util.js:298:16)
-    at async fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/oracleConnector.js:344:18)
-    at async connectionHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:24)
-

package/__test__/db2dbml/oracle/out-files/schema.dbml

@@ -1,46 +0,0 @@
-Table "TEST"."category" {
-  "cat_id" NUMBER [pk, not null, increment]
-  "cat_name" NVARCHAR2(100) [not null]
-  "super_cat_id" NUMBER
-  "created_date" TIMESTAMP(6) [default: current_timestamp
-]
-  Note: 'Category is stored as tree like structure'
-}
-
-Table "TEST"."product" {
-  "product_id" NUMBER [pk, not null, increment]
-  "product_name" NVARCHAR2(510) [not null]
-  "current_price" FLOAT [not null]
-  "cat_id" NUMBER [not null]
-  "is_sold" NUMBER(1)
-  "created_date" TIMESTAMP(6) [default: current_timestamp]
-  "is_allow_all" NUMBER(1)
-}
-
-Table "TEST"."user" {
-  "user_id" NUMBER [pk, not null, increment]
-  "username" VARCHAR2(40) [not null]
-  "password" VARCHAR2(255) [not null]
-  "email" NVARCHAR2(80) [not null]
-  "role" NUMBER [default: 0]
-  "created_date" TIMESTAMP(6) [default: current_timestamp
-]
-
-  Indexes {
-    username [type: normal, unique, name: "SYS_C008730"]
-    email [type: normal, unique, name: "SYS_C008731"]
-  }
-}
-
-Table "TEST"."wishlist" {
-  "user_id" NUMBER [pk, not null]
-  "product_id" NUMBER [pk, not null]
-}
-
-Ref "FK_CATEGORY_SUPER":"TEST"."category"."cat_id" < "TEST"."category"."super_cat_id"
-
-Ref "FK_PRODUCT_CATEGORY":"TEST"."category"."cat_id" < "TEST"."product"."cat_id"
-
-Ref "FK_WISHLIST_PRODUCT":"TEST"."product"."product_id" < "TEST"."wishlist"."product_id"
-
-Ref "FK_WISHLIST_USER":"TEST"."user"."user_id" < "TEST"."wishlist"."user_id"

package/__test__/db2dbml/postgres/dbml-error.log

@@ -1,7 +0,0 @@
-2025-08-04T05:04:15.719Z
-Error: PostgreSQL connection error: error: role "dbml" does not exist
-    at getValidatedClient (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/postgresConnector.js:21:19)
-    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
-    at async fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/postgresConnector.js:415:20)
-    at async connectionHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:25:24)
-

package/__test__/db2dbml/sqlite/dbml-error.log

@@ -1,52 +0,0 @@
-2025-08-04T05:11:04.754Z
-SqliteError: file is not a database
-    at Database.prepare (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/better-sqlite3/lib/methods/wrappers.js:5:21)
-    at generateTablesAndEnums (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:161:23)
-    at fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:303:58)
-    at Object.fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:24:58)
-    at connectionHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:25:51)
-    at Object.db2dbml (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/index.js:67:26)
-    at Object.<anonymous> (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
-    at Module._compile (node:internal/modules/cjs/loader:1730:14)
-    at Object..js (node:internal/modules/cjs/loader:1895:10)
-    at Module.load (node:internal/modules/cjs/loader:1465:32)
-
-2025-08-04T05:11:51.381Z
-SqliteError: file is not a database
-    at Database.prepare (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/better-sqlite3/lib/methods/wrappers.js:5:21)
-    at generateTablesAndEnums (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:161:23)
-    at fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:303:58)
-    at Object.fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:24:58)
-    at connectionHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
-    at Object.db2dbml (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/index.js:67:26)
-    at Object.<anonymous> (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
-    at Module._compile (node:internal/modules/cjs/loader:1730:14)
-    at Object..js (node:internal/modules/cjs/loader:1895:10)
-    at Module.load (node:internal/modules/cjs/loader:1465:32)
-
-2025-08-04T05:12:18.072Z
-SqliteError: file is not a database
-    at Database.prepare (/Users/nguyenhoang/Documents/workspace/dbx/dbml/node_modules/better-sqlite3/lib/methods/wrappers.js:5:21)
-    at generateTablesAndEnums (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:133:23)
-    at fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:273:58)
-    at Object.fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:24:58)
-    at connectionHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
-    at Object.db2dbml (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/index.js:67:26)
-    at Object.<anonymous> (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
-    at Module._compile (node:internal/modules/cjs/loader:1730:14)
-    at Object..js (node:internal/modules/cjs/loader:1895:10)
-    at Module.load (node:internal/modules/cjs/loader:1465:32)
-
-2025-08-15T10:09:49.169Z
-Error: SQLite connection error: unable to open database file
-    at connectSQLite (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:37:19)
-    at fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/sqliteConnector.js:306:16)
-    at Object.fetchSchemaJson (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:24:58)
-    at connectionHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
-    at Object.db2dbml (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/lib/cli/index.js:67:26)
-    at Object.<anonymous> (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
-    at Module._compile (node:internal/modules/cjs/loader:1730:14)
-    at Object..js (node:internal/modules/cjs/loader:1895:10)
-    at Module.load (node:internal/modules/cjs/loader:1465:32)
-    at Function._load (node:internal/modules/cjs/loader:1282:12)
-

package/__test__/db2dbml/sqlite/out-files/schema.dbml

@@ -1,108 +0,0 @@
-Table "main"."Customers" {
-  "customer_id" INTEGER [pk, increment]
-  "first_name" VARCHAR(50) [not null]
-  "last_name" VARCHAR(50) [not null]
-  "gender" STRING
-  "household_income" INTEGER
-  "birthdate" DATE [not null]
-  "phone_number" INTEGER [not null]
-  "email" VARCHAR(128)
-}
-
-Table "main"."Car_Vins" {
-  "vin" INTEGER [pk, increment]
-  "model_id" INTEGER [not null]
-  "option_set_id" INTEGER [not null]
-  "manufactured_date" DATE [not null]
-  "manufactured_plant_id" INTEGER [not null]
-}
-
-Table "main"."Car_Options" {
-  "option_set_id" INTEGER [pk, increment]
-  "model_id" INTEGER
-  "engine_id" INTEGER [not null]
-  "transmission_id" INTEGER [not null]
-  "chassis_id" INTEGER [not null]
-  "premium_sound_id" INTEGER
-  "color" VARCHAR(30) [not null]
-  "option_set_price" INTEGER [not null]
-}
-
-Table "main"."Car_Parts" {
-  "part_id" INTEGER [pk, increment]
-  "part_name" VARCHAR(100) [not null]
-  "manufacture_plant_id" INTEGER [not null]
-  "manufacture_start_date" DATE [not null]
-  "manufacture_end_date" DATE
-  "part_recall" INTEGER [default: 0]
-}
-
-Table "main"."Brands" {
-  "brand_id" INTEGER [pk, increment]
-  "brand_name" VARCHAR(50) [not null]
-}
-
-Table "main"."Models" {
-  "model_id" INTEGER [pk, increment]
-  "model_name" VARCHAR(50) [not null]
-  "model_base_price" INTEGER [not null]
-  "brand_id" INTEGER [not null]
-}
-
-Table "main"."Customer_Ownership" {
-  "customer_id" INTEGER [pk, not null, increment]
-  "vin" INTEGER [not null]
-  "purchase_date" DATE [not null]
-  "purchase_price" INTEGER [not null]
-  "warantee_expire_date" DATE
-  "dealer_id" INTEGER [not null]
-}
-
-Table "main"."Manufacture_Plant" {
-  "manufacture_plant_id" INTEGER [pk, increment]
-  "plant_name" VARCHAR(50) [not null]
-  "plant_type" "VARCHAR (7)"
-  "plant_location" VARCHAR(100)
-  "company_owned" INTEGER
-}
-
-Table "main"."Dealers" {
-  "dealer_id" INTEGER [pk, increment]
-  "dealer_name" VARCHAR(50) [not null]
-  "dealer_address" VARCHAR(100)
-}
-
-Table "main"."Dealer_Brand" {
-  "dealer_id" INTEGER [pk, not null, increment]
-  "brand_id" INTEGER [not null]
-}
-
-Ref "fk_Car_Vins_0":"main"."Car_Options"."option_set_id" < "main"."Car_Vins"."option_set_id"
-
-Ref "fk_Car_Vins_1":"main"."Manufacture_Plant"."manufacture_plant_id" < "main"."Car_Vins"."manufactured_plant_id"
-
-Ref "fk_Car_Vins_2":"main"."Models"."model_id" < "main"."Car_Vins"."model_id"
-
-Ref "fk_Car_Options_0":"main"."Car_Parts"."part_id" < "main"."Car_Options"."chassis_id"
-
-Ref "fk_Car_Options_1":"main"."Car_Parts"."part_id" < "main"."Car_Options"."transmission_id"
-
-Ref "fk_Car_Options_2":"main"."Car_Parts"."part_id" < "main"."Car_Options"."premium_sound_id"
-
-Ref "fk_Car_Options_3":"main"."Car_Parts"."part_id" < "main"."Car_Options"."engine_id"
-
-Ref "fk_Car_Options_4":"main"."Models"."model_id" < "main"."Car_Options"."model_id"
-
-Ref "fk_Car_Parts_0":"main"."Manufacture_Plant"."manufacture_plant_id" < "main"."Car_Parts"."manufacture_plant_id"
-
-Ref "fk_Models_0":"main"."Brands"."brand_id" < "main"."Models"."brand_id"
-
-Ref "fk_Customer_Ownership_0":"main"."Dealers"."dealer_id" < "main"."Customer_Ownership"."dealer_id"
-
-Ref "fk_Customer_Ownership_1":"main"."Car_Vins"."vin" < "main"."Customer_Ownership"."vin"
-
-Ref "fk_Customer_Ownership_2":"main"."Customers"."customer_id" < "main"."Customer_Ownership"."customer_id"
-
-Ref "fk_Dealer_Brand_0":"main"."Brands"."brand_id" < "main"."Dealer_Brand"."brand_id"
-
-Ref "fk_Dealer_Brand_1":"main"."Dealers"."dealer_id" < "main"."Dealer_Brand"."dealer_id"