@dbml/cli 5.1.0 → 5.2.0

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

@@ -0,0 +1,58 @@
+Table "users" {
+  "id" int [pk]
+  "name" nvarchar(255)
+  "pjs" nvarchar(255) [not null, check: `[pjs] IN ('created2', 'running2', 'done2', 'failure2')`]
+  "pjs2" nvarchar(255) [not null, check: `[pjs2] IN ('created2', 'running2', 'done2', 'failure2')`]
+  "pg" nvarchar(255) [not null, check: `[pg] IN ('male', 'female')`]
+  "pg2" nvarchar(255) [not null, check: `[pg2] IN ('male2', 'female2')`]
+}
+
+Table "products" {
+  "id" int [pk]
+  "name" nvarchar(255) [note: 'Product name']
+}
+
+Ref:"schemaA"."locations"."id" < "schemaA"."products"."lid"
+
+Ref "FK_1":"schemaA"."locations"."id" < "schemaA"."products"."lid2"
+
+Ref:"users"."id" < "ecommerce"."users"."id"
+
+Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
+
+Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
+
+Ref:"users"."id" < "schemaA"."locations"."name"
+
+Table "ecommerce"."users" {
+  "id" int [pk]
+  "name" nvarchar(255)
+  "ejs" nvarchar(255) [not null, check: `[ejs] IN ('created2', 'running2', 'done2', 'failure2')`]
+  "ejs2" nvarchar(255) [not null, check: `[ejs2] IN ('created2', 'running2', 'done2', 'failure2')`]
+  "eg" nvarchar(255) [not null, check: `[eg] IN ('male', 'female')`]
+  "eg2" nvarchar(255) [not null, check: `[eg2] IN ('male2', 'female2')`]
+
+  Indexes {
+    (name, ejs) [name: "idx_1"]
+  }
+  Note: 'Note on table users of schema ecommerce'
+}
+
+Table "schemaA"."products" {
+  "id" int [pk]
+  "name" nvarchar(255)
+  "created_at" varchar(255) [default: `now()`]
+  "lid" int
+  "lid2" int
+
+  Indexes {
+    (lid, lid2) [unique, name: "unique_lid_lid2"]
+  }
+  Note: 'Note on table products of schemaA'
+}
+
+Table "schemaA"."locations" {
+  "id" int [pk]
+  "name" nvarchar(255)
+  Note: 'This is a note in table "schemaA"."locations"'
+}

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

@@ -0,0 +1,136 @@
+Enum "users_pjs_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "users_pjs2_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "users_pg_enum" {
+  "male"
+  "female"
+}
+
+Enum "users_pg2_enum" {
+  "male2"
+  "female2"
+}
+
+Table "users" {
+  "id" int [pk]
+  "name" varchar(255)
+  "pjs" users_pjs_enum
+  "pjs2" users_pjs2_enum
+  "pg" users_pg_enum
+  "pg2" users_pg2_enum
+}
+
+Table "products" {
+  "id" int [pk]
+  "name" varchar(255) [note: 'Product name']
+}
+
+Table "orders" {
+  "id1" int
+  "id2" int
+  "pid" int
+  "name" varchar(255)
+  "name2" varchar(255)
+
+  Indexes {
+    (id1, id2) [pk, type: hash, name: "CPK_1"]
+    (name, name2) [type: btree, unique, name: "I_UNIQUE_1"]
+    (id1, id2) [type: hash, name: "INDEX_2"]
+  }
+  Note: 'this is table orders'
+}
+
+Table "orders2" {
+  "id1" int
+  "id2" int
+  "pid" int
+
+  Indexes {
+    (id1, id2) [pk, name: "testCPK"]
+  }
+}
+
+Table "orders4" {
+  "id1" int
+  "id2" int
+
+  Indexes {
+    (id1, id2) [pk, name: "PK_orders4_id1_id2"]
+  }
+}
+
+Ref "FK_1":"schemaA"."locations"."id" < "schemaA"."products"."lid" [delete: cascade]
+
+Ref:"schemaA"."products"."id" < "orders"."pid"
+
+Ref:"schemaA"."products"."id" < "orders2"."pid"
+
+Ref "CFK_1":"orders".("id1", "id2") < "orders2".("id1", "id2") [update: set null, delete: cascade]
+
+Ref:"users"."id" < "ecommerce"."users"."id"
+
+Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
+
+Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
+
+Ref:"users"."id" < "schemaA"."locations"."name"
+
+Enum "ecommerce"."users_ejs_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "ecommerce"."users_ejs2_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "ecommerce"."users_eg_enum" {
+  "male"
+  "female"
+}
+
+Enum "ecommerce"."users_eg2_enum" {
+  "male2"
+  "female2"
+}
+
+Table "ecommerce"."users" {
+  "id" int [pk]
+  "name" varchar(255)
+  "ejs" ecommerce.users_ejs_enum
+  "ejs2" ecommerce.users_ejs2_enum
+  "eg" ecommerce.users_eg_enum
+  "eg2" ecommerce.users_eg2_enum
+}
+
+Table "schemaA"."products" {
+  "id" int [pk]
+  "name" varchar(255) [note: 'Sample field comment on multiples schema']
+  "lid" int
+}
+
+Table "schemaA"."locations" {
+  "id" int [pk]
+  "name" varchar(255)
+}
+
+Table "schemaB"."orders3" {
+  "id1" int [pk]
+  "id2" int
+}

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

@@ -0,0 +1,101 @@
+Enum "job_status" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "gender" {
+  "male2"
+  "female2"
+}
+
+Table "users" {
+  "id" int [pk]
+  "name" varchar
+  "pjs" job_status
+  "pjs2" job_status
+  "pg" schemaB.gender
+  "pg2" gender
+  "country_code" int
+  Note: 'Sample note on table users'
+}
+
+Table "countries" {
+  "code" int [pk]
+  "name" varchar
+  "continent_name" varchar
+}
+
+Table "products" {
+  "id" int [pk]
+  "name" varchar [note: 'Product name of table products in public schema']
+
+  Indexes {
+    id [type: hash, unique]
+  }
+}
+
+Table "booking_reference" {
+  "reference_id" NVARCHAR(10) [not null]
+  "cust_id" NUMBER(10) [not null]
+  "status" NVARCHAR(1) [not null]
+
+  Indexes {
+    (reference_id, cust_id) [pk]
+  }
+}
+
+Table "br_flight" {
+  "reference_id" NVARCHAR(10) [not null]
+  "cust_id" NUMBER(10) [not null]
+  "flight_id" NVARCHAR(10) [not null]
+
+  Indexes {
+    (reference_id, flight_id) [pk]
+  }
+}
+
+Ref "fk_1":"schemaA"."locations"."id" < "schemaA"."products"."lid"
+
+Ref:"users"."id" < "ecommerce"."users"."id"
+
+Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
+
+Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
+
+Ref:"users"."id" < "schemaA"."locations"."name"
+
+Ref "fk_composite":"booking_reference".("reference_id", "cust_id") < "br_flight".("reference_id", "cust_id")
+
+Ref "fk_country_code":"countries"."code" < "users"."country_code"
+
+Enum "schemaB"."gender" {
+  "male"
+  "female"
+}
+
+Table "ecommerce"."users" {
+  "id" int [pk]
+  "name" varchar
+  "ejs" job_status
+  "ejs2" job_status
+  "eg" schemaB.gender
+  "eg2" gender
+}
+
+Table "schemaA"."products" {
+  "id" int [pk]
+  "name" varchar [note: 'Product name of schemaA']
+  "lid" int
+
+  Indexes {
+    (id, name) [name: "product_status"]
+  }
+}
+
+Table "schemaA"."locations" {
+  "id" int [pk]
+  "name" varchar
+  Note: 'This is a note in table "locations"'
+}

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

@@ -0,0 +1,9 @@
+2025-11-17T09:12:23.657Z
+undefined
+
+2025-11-17T09:52:17.717Z
+undefined
+
+2025-11-17T14:38:11.691Z
+undefined
+

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

@@ -0,0 +1,9 @@
+2025-11-17T09:12:24.842Z
+undefined
+
+2025-11-17T09:52:18.833Z
+undefined
+
+2025-11-17T14:38:12.931Z
+undefined
+

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

@@ -0,0 +1,9 @@
+2025-11-17T09:12:25.985Z
+undefined
+
+2025-11-17T09:52:19.827Z
+undefined
+
+2025-11-17T14:38:13.982Z
+undefined
+

package/{__test__ → __tests__}/sql2dbml_bin.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line
 require = require('esm')(module);
 const { sql2dbml } = require('../src');
 

package/bin/db2dbml.js

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
-/* eslint-disable */
 
 require('../lib').db2dbml(process.argv);

package/bin/dbml2sql.js

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
-/* eslint-disable */
 
 require('../lib').dbml2sql(process.argv);

package/bin/sql2dbml.js

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
-/* eslint-disable */
 
 require('../lib').sql2dbml(process.argv);

package/eslint.config.ts

@@ -0,0 +1,96 @@
+import globals from 'globals';
+import eslint from '@eslint/js';
+import { defineConfig } from 'eslint/config';
+import stylistic from '@stylistic/eslint-plugin';
+import tseslint from 'typescript-eslint';
+import tsparser from '@typescript-eslint/parser';
+import jest from 'eslint-plugin-jest';
+
+export default defineConfig(
+  eslint.configs.recommended,
+  tseslint.configs.recommended,
+  stylistic.configs.customize({
+    indent: 2,
+    semi: true,
+    arrowParens: true,
+    braceStyle: '1tbs',
+  }),
+  [
+    {
+      ignores: [
+        'node_modules/*',
+        'lib/*',
+        'bin/*',
+        'jestHelpers.js',
+        'eslint.config.ts',
+        'jest.config.ts',
+      ],
+    },
+    {
+      files: ['**/*.ts', '**/*.js'],
+      languageOptions: {
+        globals: {
+          ...globals.node,
+          ...globals.es2022,
+        },
+        parser: tsparser,
+        parserOptions: {
+          sourceType: 'module',
+          ecmaVersion: 2018,
+          project: './tsconfig.json',
+        },
+      },
+      plugins: {
+        '@stylistic': stylistic,
+      },
+      rules: {
+        '@typescript-eslint/no-explicit-any': 'off',
+        'no-use-before-define': 'off',
+        'no-continue': 'off',
+        '@stylistic/space-before-function-paren': ['error', 'always'],
+        '@typescript-eslint/no-unused-vars': [
+          'warn',
+          {
+            argsIgnorePattern: '^_',
+            varsIgnorePattern: '^_',
+            caughtErrorsIgnorePattern: '^_',
+          },
+        ],
+        'consistent-return': 'off',
+        '@typescript-eslint/consistent-return': [
+          'error',
+        ],
+        '@stylistic/quotes': ['error', 'single', { 'avoidEscape': true }],
+        '@stylistic/max-statements-per-line': 'off',
+        '@stylistic/operator-linebreak': ['error', 'before', { overrides: { '=': 'after' } }],
+      },
+      settings: {
+        'import/resolver': {
+          typescript: {
+            alwaysTryTypes: true,
+            project: 'packages/*/{ts,js}config.json',
+          },
+        },
+      },
+    },
+    {
+      files: ['**/*.test.js', '**/*.spec.js'],
+      ...jest.configs['flat/recommended'],
+      languageOptions: {
+        globals: {
+          ...jest.environments.globals.globals,
+        },
+      },
+      rules: {
+        'no-undef': 'warn',
+      },
+    },
+    {
+      files: ['bin/**/*', '**/*.test.js', '**/*.spec.js', '__tests__/**/*'],
+      rules: {
+        '@typescript-eslint/no-require-imports': 'warn',
+        'no-global-assign': 'warn',
+      },
+    },
+  ],
+);

package/jest.config.ts

@@ -0,0 +1,13 @@
+import { type Config } from 'jest';
+
+const config: Config = {
+  testMatch: ["**/?(*.)+(spec|test).?([mc])[jt]s?(x)"],
+  setupFiles: [
+    "./jestHelpers.js",
+  ],
+  transform: {
+    "^.+\\.js$": "babel-jest",
+  },
+};
+
+export default config;

package/lib/cli/index.js

@@ -12,8 +12,6 @@ var _export = _interopRequireDefault(require("./export"));
 var _connector = _interopRequireDefault(require("./connector"));
 var _package = _interopRequireDefault(require("../../package.json"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/* eslint-disable max-len */
-
 function showHelp(args) {
   if (args.length < 3) _commander.default.help();
 }
@@ -28,7 +26,7 @@ function dbml2sql(args) {
 }
 function sql2dbml(args) {
   _commander.default.version(_package.default.version);
-  _commander.default.usage('[options] <files...>').option('--mysql').option('--mysql-legacy').option('--postgres').option('--postgres-legacy').option('--mssql').option('--mssql-legacy').option('--snowflake').option('-o, --out-file <pathspec>', 'compile all input files into a single files');
+  _commander.default.usage('[options] <files...>').option('--mysql').option('--mysql-legacy').option('--postgres').option('--postgres-legacy').option('--mssql').option('--mssql-legacy').option('--snowflake').option('--oracle').option('-o, --out-file <pathspec>', 'compile all input files into a single files');
   // .option('-d, --out-dir <pathspec>', 'compile an input directory of sql files into an output directory');
 
   showHelp(args);

package/lib/cli/utils.js

@@ -67,12 +67,14 @@ function generate(inputPaths, transform, outputPlugin) {
       const content = transform(source);
       outputPlugin.write(content);
     } catch (e) {
-      if (e instanceof _core.CompilerError) throw e.map(diag => ({
-        ...diag,
-        message: diag.message,
-        filepath: _path2.default.basename(_path),
-        stack: diag.stack
-      }));
+      if (e instanceof _core.CompilerError) {
+        throw e.map(diag => ({
+          ...diag,
+          message: diag.message,
+          filepath: _path2.default.basename(_path),
+          stack: diag.stack
+        }));
+      }
       throw e;
     }
   });

package/lib/helpers/logger.js

@@ -8,8 +8,6 @@ var _winston = require("winston");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/* eslint-disable import/no-import-module-exports */
-
 const {
   combine,
   timestamp,

package/package.json

@@ -1,13 +1,16 @@
 {
+  "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/cli",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "scripts": {
     "test": "jest",
     "build": "babel src --out-dir lib --copy-files",
-    "prepublish": "npm run build"
+    "prepublish": "npm run build",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix ."
   },
   "publishConfig": {
     "access": "public"
@@ -26,8 +29,8 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/connector": "^5.1.0",
-    "@dbml/core": "^5.1.0",
+    "@dbml/connector": "^5.2.0",
+    "@dbml/core": "^5.2.0",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -44,18 +47,18 @@
     "@babel/plugin-transform-runtime": "^7.21.4",
     "@babel/preset-env": "^7.21.4",
     "@babel/runtime": "^7.21.0",
+    "@stylistic/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.3",
+    "@typescript-eslint/parser": "^8.46.3",
     "babel-jest": "^29.5.0",
-    "jest": "^29.5.0"
+    "eslint": "^9.39.1",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-jest": "^29.0.1",
+    "jest": "^29.5.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.3"
   },
-  "jest": {
-    "setupFiles": [
-      "./jestHelpers.js"
-    ],
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    }
-  },
-  "gitHead": "376dca507512a3fe549f630e6f22d7d339939183",
+  "gitHead": "20d556a6e6baad8a989c730e2afd3b65dedcea89",
   "engines": {
     "node": ">=18"
   }

package/src/cli/index.js

@@ -1,4 +1,3 @@
-/* eslint-disable max-len */
 import program from 'commander';
 import importHandler from './import';
 import exportHandler from './export';
@@ -39,6 +38,7 @@ function sql2dbml (args) {
     .option('--mssql')
     .option('--mssql-legacy')
     .option('--snowflake')
+    .option('--oracle')
     .option('-o, --out-file <pathspec>', 'compile all input files into a single files');
   // .option('-d, --out-dir <pathspec>', 'compile an input directory of sql files into an output directory');
 

package/src/cli/utils.js

@@ -68,7 +68,11 @@ function generate (inputPaths, transform, outputPlugin) {
       const content = transform(source);
       outputPlugin.write(content);
     } catch (e) {
-      if (e instanceof CompilerError) throw e.map((diag) => ({ ...diag, message: diag.message, filepath: path.basename(_path), stack: diag.stack }));
+      if (e instanceof CompilerError) {
+        throw e.map((diag) => ({
+          ...diag, message: diag.message, filepath: path.basename(_path), stack: diag.stack,
+        }));
+      }
       throw e;
     }
   });

package/src/helpers/logger.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-import-module-exports */
 import { createLogger, format, transports } from 'winston';
 import chalk from 'chalk';
 import path from 'path';

package/tsconfig.json

@@ -1,10 +1,18 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDirs": ["./src", "./"],                          /* Allow multiple folders to be treated as one when resolving modules. */
-    "baseUrl": "./src",                                   /* Specify the base directory to resolve non-relative module names. */
-    "outDir": "./lib"                                     /* Specify an output folder for all emitted files. */
+    "rootDirs": [
+      "./src",
+      "./"
+    ], /* Allow multiple folders to be treated as one when resolving modules. */
+    "baseUrl": "./src", /* Specify the base directory to resolve non-relative module names. */
+    "outDir": "./lib" /* Specify an output folder for all emitted files. */
   },
-  "files": ["package.json"],
-  "include": ["src/**/*", "__test__/**/*"]
+  "files": [
+    "package.json"
+  ],
+  "include": [
+    "src/**/*",
+    "__tests__/**/*"
+  ]
 }