@dbml/cli 5.1.0 → 5.3.0

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

@@ -0,0 +1,51 @@
+2025-11-06T03:16:05.656Z
+undefined
+
+2025-11-18T08:13:06.818Z
+undefined
+
+2025-11-18T08:15:11.950Z
+undefined
+
+2025-11-18T08:24:18.153Z
+undefined
+
+2025-11-18T08:29:25.741Z
+undefined
+
+2025-11-18T08:38:41.996Z
+undefined
+
+2025-11-18T08:43:08.963Z
+undefined
+
+2025-11-18T08:44:00.740Z
+undefined
+
+2025-11-18T08:47:34.240Z
+undefined
+
+2025-11-18T08:49:01.829Z
+undefined
+
+2025-11-18T08:50:49.395Z
+undefined
+
+2025-11-18T08:53:26.784Z
+undefined
+
+2025-11-18T09:00:48.153Z
+undefined
+
+2025-11-18T09:04:26.928Z
+undefined
+
+2025-11-18T09:11:02.751Z
+undefined
+
+2025-11-18T09:12:26.991Z
+undefined
+
+2025-11-27T14:15:10.912Z
+undefined
+

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

@@ -0,0 +1,51 @@
+2025-11-06T03:16:06.556Z
+undefined
+
+2025-11-18T08:13:08.010Z
+undefined
+
+2025-11-18T08:15:13.192Z
+undefined
+
+2025-11-18T08:24:19.338Z
+undefined
+
+2025-11-18T08:29:27.033Z
+undefined
+
+2025-11-18T08:38:43.240Z
+undefined
+
+2025-11-18T08:43:10.230Z
+undefined
+
+2025-11-18T08:44:01.781Z
+undefined
+
+2025-11-18T08:47:35.442Z
+undefined
+
+2025-11-18T08:49:03.205Z
+undefined
+
+2025-11-18T08:50:50.561Z
+undefined
+
+2025-11-18T08:53:27.983Z
+undefined
+
+2025-11-18T09:00:49.327Z
+undefined
+
+2025-11-18T09:04:28.191Z
+undefined
+
+2025-11-18T09:11:03.998Z
+undefined
+
+2025-11-18T09:12:28.214Z
+undefined
+
+2025-11-27T14:15:12.145Z
+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);
@@ -43,6 +41,7 @@ function db2dbml(args) {
                         - postgres: 'postgresql://user:password@localhost:5432/dbname?schemas=schema1,schema2,schema3'
                         - mysql: 'mysql://user:password@localhost:3306/dbname'
                         - mssql: 'Server=localhost,1433;Database=master;User Id=sa;Password=your_password;Encrypt=true;TrustServerCertificate=true;Schemas=schema1,schema2,schema3;'
+                        - oracle: 'username/password@[//]host[:port][/service_name]'
                         - snowflake:
                           - password-based authentication: 'SERVER=<account_identifier>.<region>;UID=<your_username>;PWD=<your_password>;DATABASE=<your_database>;WAREHOUSE=<your_warehouse>;ROLE=<your_role>;SCHEMAS=schema1,schema2,schema3;'
                           - key pair authentication: 'SERVER=<account_identifier>.<region>;UID=<your_username>;AUTHENTICATOR=SNOWFLAKE_JWT;PRIVATE_KEY_PATH=<path_to_your_private_key.p8>;PASSPHRASE=<your_private_key_passphrase>;DATABASE=<your_database>;WAREHOUSE=<your_warehouse>;ROLE=<your_role>;SCHEMAS=schema1,schema2,schema3;'

package/lib/cli/utils.js

@@ -38,7 +38,7 @@ function getFormatOpt(opts) {
   return format;
 }
 function getConnectionOpt(args) {
-  const supportedDatabases = ['postgres', 'mysql', 'mssql', 'snowflake', 'bigquery'];
+  const supportedDatabases = ['postgres', 'mysql', 'mssql', 'snowflake', 'bigquery', 'oracle'];
   const defaultConnectionOpt = {
     connection: args[0],
     databaseType: 'unknown'
@@ -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.3.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.3.0",
+    "@dbml/core": "^5.3.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": "c8e67b627584b81d18c16a6f2983a92d75a326d9",
   "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');
 
@@ -57,6 +57,7 @@ function db2dbml (args) {
                         - postgres: 'postgresql://user:password@localhost:5432/dbname?schemas=schema1,schema2,schema3'
                         - mysql: 'mysql://user:password@localhost:3306/dbname'
                         - mssql: 'Server=localhost,1433;Database=master;User Id=sa;Password=your_password;Encrypt=true;TrustServerCertificate=true;Schemas=schema1,schema2,schema3;'
+                        - oracle: 'username/password@[//]host[:port][/service_name]'
                         - snowflake:
                           - password-based authentication: 'SERVER=<account_identifier>.<region>;UID=<your_username>;PWD=<your_password>;DATABASE=<your_database>;WAREHOUSE=<your_warehouse>;ROLE=<your_role>;SCHEMAS=schema1,schema2,schema3;'
                           - key pair authentication: 'SERVER=<account_identifier>.<region>;UID=<your_username>;AUTHENTICATOR=SNOWFLAKE_JWT;PRIVATE_KEY_PATH=<path_to_your_private_key.p8>;PASSPHRASE=<your_private_key_passphrase>;DATABASE=<your_database>;WAREHOUSE=<your_warehouse>;ROLE=<your_role>;SCHEMAS=schema1,schema2,schema3;'

package/src/cli/utils.js

@@ -34,7 +34,7 @@ function getFormatOpt (opts) {
 }
 
 function getConnectionOpt (args) {
-  const supportedDatabases = ['postgres', 'mysql', 'mssql', 'snowflake', 'bigquery'];
+  const supportedDatabases = ['postgres', 'mysql', 'mssql', 'snowflake', 'bigquery', 'oracle'];
   const defaultConnectionOpt = {
     connection: args[0],
     databaseType: 'unknown',
@@ -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__/**/*"
+  ]
 }