@dbml/cli 3.2.0 → 3.4.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

@@ -24,11 +24,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) {
+    // TODO: handle error in case errors object is not mappable
     _logger.default.error(`\n    ${errors.map(({
       message
     }) => message).join('\n    ')}`);

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

@@ -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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/cli",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/core": "^3.2.0",
+    "@dbml/core": "^3.4.0",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -53,5 +53,5 @@
       "^.+\\.js$": "babel-jest"
     }
   },
-  "gitHead": "772cb1cd617af9b024f964517231f61f0dcfd902"
+  "gitHead": "d46067f19bf80a245c77576106dac68bec5cbe5a"
 }

package/src/cli/config.js

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

package/src/cli/export.js

@@ -26,17 +26,21 @@ 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) {
+    // TODO: handle error in case errors object is not mappable
     logger.error(`\n    ${errors.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

@@ -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';

package/yarn-error.log

@@ -0,0 +1,87 @@
+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