@dbml/cli 3.7.1 → 3.7.3

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

@@ -465,3 +465,42 @@ ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequen
     at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
     at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
 
+2024-08-14T07:37:01.055Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+
+2024-08-14T07:52:46.210Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+
+2024-08-14T07:55:35.512Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+

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

@@ -279,3 +279,42 @@ Error: TypeError: Cannot read properties of undefined (reading 'map')
     at _next (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:15:194)
     at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
 
+2024-08-14T07:37:01.413Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+
+2024-08-14T07:52:46.566Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+
+2024-08-14T07:55:35.868Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+

package/__test__/db2dbml/mysql/options.json

@@ -1,7 +1,7 @@
 {
   "args": [
     "mysql",
-    "mysql://root:root@localhost:3306/mysql_connector_test",
+    "mysql://root:root@localhost:3306/dbml_test",
     "-o",
     "./out-files/schema.dbml"
   ]

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

@@ -250,3 +250,42 @@ undefined
 2024-08-10T14:43:52.134Z
 undefined
 
+2024-08-14T07:37:01.821Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+
+2024-08-14T07:52:46.959Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+
+2024-08-14T07:55:36.355Z
+Error: TypeError: Cannot read properties of undefined (reading 'map')
+    at generateDatabase (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/parse/databaseGenerator.js:115:11)
+    at Object.generateDbml (/Users/huylm/code/dbx/dbml/packages/dbml-core/lib/import/index.js:17:58)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:29:34)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:55:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+    at Module._load (node:internal/modules/cjs/loader:960:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+

package/__test__/dbml2sql/filename --mysql --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: MySQL
--- Generated at: 2024-08-11T02:27:52.128Z
+-- Generated at: 2024-08-14T07:55:12.776Z
 
 CREATE TABLE `orders` (
   `id` int PRIMARY KEY AUTO_INCREMENT,

package/__test__/dbml2sql/filename --oracle --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: Oracle
--- Generated at: 2024-08-11T02:27:53.200Z
+-- Generated at: 2024-08-14T07:55:13.499Z
 
 CREATE TABLE "orders" (
   "id" int GENERATED AS IDENTITY PRIMARY KEY,

package/__test__/dbml2sql/filename --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: PostgreSQL
--- Generated at: 2024-08-11T02:27:54.276Z
+-- Generated at: 2024-08-14T07:55:14.207Z
 
 CREATE TYPE "orders_status" AS ENUM (
   'created',

package/__test__/dbml2sql/filename --postgres --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: PostgreSQL
--- Generated at: 2024-08-11T02:27:54.808Z
+-- Generated at: 2024-08-14T07:55:14.564Z
 
 CREATE TYPE "orders_status" AS ENUM (
   'created',

package/__test__/dbml2sql/filenames --mysql --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: MySQL
--- Generated at: 2024-08-11T02:27:56.421Z
+-- Generated at: 2024-08-14T07:55:15.707Z
 
 CREATE TABLE `staff` (
   `id` int PRIMARY KEY,

package/__test__/dbml2sql/filenames --oracle --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: Oracle
--- Generated at: 2024-08-11T02:27:57.507Z
+-- Generated at: 2024-08-14T07:55:16.929Z
 
 CREATE TABLE "staff" (
   "id" int PRIMARY KEY,

package/__test__/dbml2sql/filenames --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: PostgreSQL
--- Generated at: 2024-08-11T02:27:58.615Z
+-- Generated at: 2024-08-14T07:55:18.055Z
 
 CREATE TABLE "staff" (
   "id" int PRIMARY KEY,

package/__test__/dbml2sql/filenames --postgres --out-file/out-files/schema.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: PostgreSQL
--- Generated at: 2024-08-11T02:27:59.155Z
+-- Generated at: 2024-08-14T07:55:18.581Z
 
 CREATE TABLE "staff" (
   "id" int PRIMARY KEY,

package/__test__/dbml2sql/multiple_schema_mssql/out-files/multiple_schema.out.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: SQL Server
--- Generated at: 2024-08-11T02:28:00.785Z
+-- Generated at: 2024-08-14T07:55:19.920Z
 
 CREATE SCHEMA [schemaB]
 GO

package/__test__/dbml2sql/multiple_schema_mysql/out-files/multiple_schema.out.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: MySQL
--- Generated at: 2024-08-11T02:28:01.320Z
+-- Generated at: 2024-08-14T07:55:20.297Z
 
 CREATE SCHEMA `schemaB`;
 

package/__test__/dbml2sql/multiple_schema_oracle/out-files/multiple_schema.out.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: Oracle
--- Generated at: 2024-08-11T02:28:01.857Z
+-- Generated at: 2024-08-14T07:55:20.666Z
 
 CREATE USER "C##test01"
 NO AUTHENTICATION

package/__test__/dbml2sql/multiple_schema_pg/out-files/multiple_schema.out.sql

@@ -1,6 +1,6 @@
 -- SQL dump generated using DBML (dbml.dbdiagram.io)
 -- Database: PostgreSQL
--- Generated at: 2024-08-11T02:28:02.391Z
+-- Generated at: 2024-08-14T07:55:21.032Z
 
 CREATE SCHEMA "schemaB";
 

package/__test__/dbml2sql/syntax-error/dbml-error.log

@@ -10,3 +10,12 @@ undefined
 2024-08-11T02:28:02.933Z
 undefined
 
+2024-08-14T07:36:46.426Z
+undefined
+
+2024-08-14T07:52:32.300Z
+undefined
+
+2024-08-14T07:55:21.406Z
+undefined
+

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

@@ -10,3 +10,12 @@ undefined
 2024-08-11T02:28:22.795Z
 undefined
 
+2024-08-14T07:36:59.814Z
+undefined
+
+2024-08-14T07:52:45.007Z
+undefined
+
+2024-08-14T07:55:34.170Z
+undefined
+

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

@@ -10,3 +10,12 @@ undefined
 2024-08-11T02:28:23.316Z
 undefined
 
+2024-08-14T07:37:00.182Z
+undefined
+
+2024-08-14T07:52:45.362Z
+undefined
+
+2024-08-14T07:55:34.526Z
+undefined
+

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

@@ -10,3 +10,12 @@ undefined
 2024-08-11T02:28:24.073Z
 undefined
 
+2024-08-14T07:37:00.693Z
+undefined
+
+2024-08-14T07:52:45.854Z
+undefined
+
+2024-08-14T07:55:35.143Z
+undefined
+

package/lib/cli/connector.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = connectionHandler;
 var _core = require("@dbml/core");
+var _connector = require("@dbml/connector");
 var _figures = _interopRequireDefault(require("figures"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
@@ -20,11 +21,12 @@ async function connectionHandler(program) {
       format
     } = (0, _utils.getConnectionOpt)(program.args);
     const opts = program.opts();
+    const schemaJson = await _connector.connector.fetchSchemaJson(connection, format);
     if (!opts.outFile && !opts.outDir) {
-      const res = await _core.importer.generateDbml(connection, format);
+      const res = _core.importer.generateDbml(schemaJson);
       _outputConsolePlugin.default.write(res);
     } else if (opts.outFile) {
-      const res = await _core.importer.generateDbml(connection, format);
+      const res = _core.importer.generateDbml(schemaJson);
       new _outputFilePlugin.default((0, _utils.resolvePaths)(opts.outFile)).write(res);
 
       // bearer:disable javascript_lang_logger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/cli",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -26,7 +26,8 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/core": "^3.7.1",
+    "@dbml/connector": "^3.7.3",
+    "@dbml/core": "^3.7.3",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -54,7 +55,7 @@
       "^.+\\.js$": "babel-jest"
     }
   },
-  "gitHead": "71d7e2cd00ba5d60d2e36c465d43ce1d91189274",
+  "gitHead": "b9e7ed2421f83872b3319510155225a228d3e75e",
   "engines": {
     "node": ">=18"
   }

package/src/cli/connector.js

@@ -1,4 +1,5 @@
 import { importer } from '@dbml/core';
+import { connector } from '@dbml/connector';
 import figures from 'figures';
 import chalk from 'chalk';
 import path from 'path';
@@ -14,12 +15,13 @@ export default async function connectionHandler (program) {
   try {
     const { connection, format } = getConnectionOpt(program.args);
     const opts = program.opts();
+    const schemaJson = await connector.fetchSchemaJson(connection, format);
 
     if (!opts.outFile && !opts.outDir) {
-      const res = await importer.generateDbml(connection, format);
+      const res = importer.generateDbml(schemaJson);
       OutputConsolePlugin.write(res);
     } else if (opts.outFile) {
-      const res = await importer.generateDbml(connection, format);
+      const res = importer.generateDbml(schemaJson);
       (new OutputFilePlugin(resolvePaths(opts.outFile))).write(res);
 
       // bearer:disable javascript_lang_logger