@dbml/cli 3.3.0 → 3.4.1-alpha.0

package/lib/cli/config.js

@@ -19,6 +19,9 @@ var _default = {
   },
   mssql: {
     name: 'SQL Server'
+  },
+  oracle: {
+    name: 'Oracle'
   }
 };
 exports.default = _default;

package/lib/cli/export.js

@@ -14,6 +14,7 @@ var _outputConsolePlugin = _interopRequireDefault(require("./outputPlugins/outpu
 var _outputFilePlugin = _interopRequireDefault(require("./outputPlugins/outputFilePlugin"));
 var _config = _interopRequireDefault(require("./config"));
 var _logger = _interopRequireDefault(require("../helpers/logger"));
+var _errors = require("../errors");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function exportHandler(program) {
   try {
@@ -24,12 +25,12 @@ async function exportHandler(program) {
     if (!opts.outFile && !opts.outDir) {
       (0, _utils.generate)(inputPaths, dbml => _core.exporter.export(dbml, format), _outputConsolePlugin.default);
     } else if (opts.outFile) {
-      const header = ['-- SQL dump generated using DBML (dbml-lang.org)\n', `-- Database: ${_config.default[format].name}\n`, `-- Generated at: ${new Date().toISOString()}\n\n`].join('');
+      const header = ['-- SQL dump generated using DBML (dbml.dbdiagram.io)\n', `-- Database: ${_config.default[format].name}\n`, `-- Generated at: ${new Date().toISOString()}\n\n`].join('');
       (0, _utils.generate)(inputPaths, dbml => _core.exporter.export(dbml, format), new _outputFilePlugin.default((0, _utils.resolvePaths)(opts.outFile), header));
       console.log(`  ${_chalk.default.green(_figures.default.main.tick)} Generated SQL dump file (${_config.default[format].name}): ${_path.default.basename(opts.outFile)}`);
     }
-  } catch (errors) {
-    _logger.default.error(`\n    ${errors.map(({
+  } catch (error) {
+    _logger.default.error(`\n    ${error.diags.map(diag => new _errors.SyntaxError(diag.filepath, diag)).map(({
       message
     }) => message).join('\n    ')}`);
   }

package/lib/cli/import.js

@@ -14,6 +14,7 @@ var _validatePlugins = require("./validatePlugins/validatePlugins");
 var _outputConsolePlugin = _interopRequireDefault(require("./outputPlugins/outputConsolePlugin"));
 var _outputFilePlugin = _interopRequireDefault(require("./outputPlugins/outputFilePlugin"));
 var _logger = _interopRequireDefault(require("../helpers/logger"));
+var _errors = require("../errors");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function importHandler(program) {
   try {
@@ -27,10 +28,9 @@ async function importHandler(program) {
       (0, _utils.generate)(inputPaths, sql => _core.importer.import(sql, format), new _outputFilePlugin.default((0, _utils.resolvePaths)(opts.outFile)));
       console.log(`  ${_chalk.default.green(_figures.default.main.tick)} Generated DBML file from SQL file (${_config.default[format].name}): ${_path.default.basename(opts.outFile)}`);
     }
-  } catch (err) {
-    if (err instanceof Array) return _logger.default.error(`\n    ${err.map(({
+  } catch (error) {
+    _logger.default.error(`\n    ${error.diags.map(diag => new _errors.SyntaxError(diag.filepath, diag)).map(({
       message
     }) => message).join('\n    ')}`);
-    _logger.default.error(err);
   }
 }

package/lib/cli/index.js

@@ -12,7 +12,7 @@ var _package = _interopRequireDefault(require("../../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function dbml2sql(args) {
   _commander.default.version(_package.default.version);
-  _commander.default.usage('[options] <files...>').option('--mysql').option('--postgres').option('--mssql').option('-o, --out-file <pathspec>', 'compile all input files into a single files');
+  _commander.default.usage('[options] <files...>').option('--mysql').option('--postgres').option('--mssql').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 dbml files into an output directory');
 
   _commander.default.parse(args);

package/lib/cli/utils.js

@@ -9,7 +9,7 @@ exports.resolvePaths = resolvePaths;
 exports.validateInputFilePaths = validateInputFilePaths;
 var _path2 = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
-var _errors = require("../errors");
+var _core = require("@dbml/core");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function resolvePaths(paths) {
   if (!Array.isArray(paths)) {
@@ -22,7 +22,7 @@ function validateInputFilePaths(paths, validatePlugin) {
 }
 function getFormatOpt(opts) {
   const formatOpts = Object.keys(opts).filter(opt => {
-    return ['postgres', 'mysql', 'mssql', 'postgresLegacy', 'mysqlLegacy'].includes(opt);
+    return ['postgres', 'mysql', 'mssql', 'postgresLegacy', 'mysqlLegacy', 'oracle'].includes(opt);
   });
   let format = 'postgres';
   let cnt = 0;
@@ -41,11 +41,13 @@ function generate(inputPaths, transform, outputPlugin) {
     try {
       const content = transform(source);
       outputPlugin.write(content);
-    } catch (err) {
-      if (Array.isArray(err)) {
-        throw err.map(e => new _errors.SyntaxError(_path2.default.basename(_path), e));
-      }
-      throw new _errors.SyntaxError(_path2.default.basename(_path), err);
+    } catch (e) {
+      if (e instanceof _core.CompilerError) throw e.map(diag => ({
+        ...diag,
+        message: diag.message,
+        filepath: _path2.default.basename(_path)
+      }));
+      throw e;
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/cli",
-  "version": "3.3.0",
+  "version": "3.4.1-alpha.0",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/core": "^3.3.0",
+    "@dbml/core": "^3.4.1-alpha.0",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -53,5 +53,5 @@
       "^.+\\.js$": "babel-jest"
     }
   },
-  "gitHead": "4594bf6ee08c4bc73498f919673b12a4ecf06359"
+  "gitHead": "452294fcc48326294bf66a76daa418668d6ba8a9"
 }

package/src/cli/config.js

@@ -14,4 +14,7 @@ export default {
   mssql: {
     name: 'SQL Server',
   },
+  oracle: {
+    name: 'Oracle',
+  },
 };

package/src/cli/export.js

@@ -13,6 +13,7 @@ import OutputConsolePlugin from './outputPlugins/outputConsolePlugin';
 import OutputFilePlugin from './outputPlugins/outputFilePlugin';
 import config from './config';
 import logger from '../helpers/logger';
+import { SyntaxError } from '../errors';
 
 export default async function exportHandler (program) {
   try {
@@ -26,17 +27,20 @@ export default async function exportHandler (program) {
       generate(inputPaths, (dbml) => exporter.export(dbml, format), OutputConsolePlugin);
     } else if (opts.outFile) {
       const header = [
-        '-- SQL dump generated using DBML (dbml-lang.org)\n',
+        '-- SQL dump generated using DBML (dbml.dbdiagram.io)\n',
         `-- Database: ${config[format].name}\n`,
         `-- Generated at: ${new Date().toISOString()}\n\n`,
       ].join('');
 
-      generate(inputPaths, (dbml) => exporter.export(dbml, format),
-        new OutputFilePlugin(resolvePaths(opts.outFile), header));
+      generate(
+        inputPaths,
+        (dbml) => exporter.export(dbml, format),
+        new OutputFilePlugin(resolvePaths(opts.outFile), header),
+      );
 
       console.log(`  ${chalk.green(figures.main.tick)} Generated SQL dump file (${config[format].name}): ${path.basename(opts.outFile)}`);
     }
-  } catch (errors) {
-    logger.error(`\n    ${errors.map(({ message }) => message).join('\n    ')}`);
+  } catch (error) {
+    logger.error(`\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath, diag)).map(({ message }) => message).join('\n    ')}`);
   }
 }

package/src/cli/import.js

@@ -13,6 +13,7 @@ import { validateFilePlugin } from './validatePlugins/validatePlugins';
 import OutputConsolePlugin from './outputPlugins/outputConsolePlugin';
 import OutputFilePlugin from './outputPlugins/outputFilePlugin';
 import logger from '../helpers/logger';
+import { SyntaxError } from '../errors';
 
 export default async function importHandler (program) {
   try {
@@ -25,13 +26,11 @@ export default async function importHandler (program) {
     if (!opts.outFile && !opts.outDir) {
       generate(inputPaths, (sql) => importer.import(sql, format), OutputConsolePlugin);
     } else if (opts.outFile) {
-      generate(inputPaths, (sql) => importer.import(sql, format),
-        new OutputFilePlugin(resolvePaths(opts.outFile)));
+      generate(inputPaths, (sql) => importer.import(sql, format), new OutputFilePlugin(resolvePaths(opts.outFile)));
 
       console.log(`  ${chalk.green(figures.main.tick)} Generated DBML file from SQL file (${config[format].name}): ${path.basename(opts.outFile)}`);
     }
-  } catch (err) {
-    if (err instanceof Array) return logger.error(`\n    ${err.map(({ message }) => message).join('\n    ')}`);
-    logger.error(err);
+  } catch (error) {
+    logger.error(`\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath, diag)).map(({ message }) => message).join('\n    ')}`);
   }
 }

package/src/cli/index.js

@@ -11,6 +11,7 @@ function dbml2sql (args) {
     .option('--mysql')
     .option('--postgres')
     .option('--mssql')
+    .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 dbml files into an output directory');
 

package/src/cli/utils.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import fs from 'fs';
-import { SyntaxError } from '../errors';
+import { CompilerError } from '@dbml/core';
 
 function resolvePaths (paths) {
   if (!Array.isArray(paths)) {
@@ -15,7 +15,7 @@ function validateInputFilePaths (paths, validatePlugin) {
 
 function getFormatOpt (opts) {
   const formatOpts = Object.keys(opts).filter((opt) => {
-    return ['postgres', 'mysql', 'mssql', 'postgresLegacy', 'mysqlLegacy'].includes(opt);
+    return ['postgres', 'mysql', 'mssql', 'postgresLegacy', 'mysqlLegacy', 'oracle'].includes(opt);
   });
 
   let format = 'postgres';
@@ -38,11 +38,9 @@ function generate (inputPaths, transform, outputPlugin) {
     try {
       const content = transform(source);
       outputPlugin.write(content);
-    } catch (err) {
-      if (Array.isArray(err)) {
-        throw err.map((e) => new SyntaxError(path.basename(_path), e));
-      }
-      throw new SyntaxError(path.basename(_path), err);
+    } catch (e) {
+      if (e instanceof CompilerError) throw e.map((diag) => ({ ...diag, message: diag.message, filepath: path.basename(_path) }));
+      throw e;
     }
   });
 }

package/yarn-error.log

@@ -1,87 +0,0 @@
-Arguments: 
-  /usr/local/bin/node /usr/local/bin/yarn install
-
-PATH: 
-  /opt/homebrew/opt/openjdk/bin:/opt/homebrew/opt/postgresql@13/bin:/Library/Frameworks/Python.framework/Versions/3.11/bin:/Library/Frameworks/Python.framework/Versions/3.10/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/opt/homebrew/opt/openjdk/bin:/opt/homebrew/opt/postgresql@13/bin:/Library/Frameworks/Python.framework/Versions/3.11/bin:/Library/Frameworks/Python.framework/Versions/3.10/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/Users/nguyenhoang/.cargo/bin
-
-Yarn version: 
-  1.22.18
-
-Node version: 
-  16.18.0
-
-Platform: 
-  darwin arm64
-
-Trace: 
-  SyntaxError: /Users/nguyenhoang/Documents/workspace/dbx/dbml/package.json: Unexpected token } in JSON at position 130
-      at JSON.parse (<anonymous>)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
-      at Generator.next (<anonymous>)
-      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
-
-npm manifest: 
-  {
-    "name": "@dbml/cli",
-    "version": "2.5.3",
-    "description": "",
-    "main": "lib/index.js",
-    "license": "Apache-2.0",
-    "scripts": {
-      "test": "jest",
-      "build": "babel src --out-dir lib --copy-files",
-      "prepublish": "npm run build"
-    },
-    "publishConfig": {
-      "access": "public"
-    },
-    "bin": {
-      "dbml2sql": "bin/dbml2sql.js",
-      "sql2dbml": "bin/sql2dbml.js"
-    },
-    "author": "Holistics <dev@holistics.io>",
-    "homepage": "https://dbml.dbdiagram.io",
-    "repository": "https://github.com/holistics/dbml/tree/master/packages/dbml-cli",
-    "keywords": [
-      "dbml",
-      "dbml-cli"
-    ],
-    "dependencies": {
-      "@babel/cli": "^7.21.0",
-      "@dbml/core": "^2.5.3",
-      "bluebird": "^3.5.5",
-      "chalk": "^2.4.2",
-      "commander": "^2.20.0",
-      "esm": "^3.2.25",
-      "figures": "^3.2.0",
-      "lodash": "^4.17.15",
-      "pegjs-require-import": "^0.0.2",
-      "strip-ansi": "^5.2.0",
-      "winston": "^3.2.1"
-    },
-    "devDependencies": {
-      "@babel/core": "^7.21.4",
-      "@babel/node": "^7.20.7",
-      "@babel/plugin-transform-runtime": "^7.21.4",
-      "@babel/preset-env": "^7.21.4",
-      "@babel/runtime": "^7.21.0",
-      "babel-jest": "^29.5.0",
-      "jest": "^29.5.0"
-    },
-    "jest": {
-      "setupFiles": [
-        "./jestHelpers.js"
-      ],
-      "transform": {
-        "^.+\\.js$": "babel-jest"
-      }
-    },
-    "gitHead": "5cb80e1aa38fb9a4dbe3079e39c9ef93cd4dc556"
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile