@dbml/cli 2.6.1 → 3.1.0

package/lib/cli/config.js

@@ -8,6 +8,9 @@ var _default = {
   mysql: {
     name: 'MySQL'
   },
+  mysqlLegacy: {
+    name: 'MySQL'
+  },
   postgres: {
     name: 'PostgreSQL'
   },

package/lib/cli/export.js

@@ -28,7 +28,9 @@ async function exportHandler(program) {
       (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 (err) {
-    _logger.default.error(err);
+  } catch (errors) {
+    _logger.default.error(`\n    ${errors.map(({
+      message
+    }) => message).join('\n    ')}`);
   }
 }

package/lib/cli/import.js

@@ -28,6 +28,9 @@ async function importHandler(program) {
       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(({
+      message
+    }) => message).join('\n    ')}`);
     _logger.default.error(err);
   }
 }

package/lib/cli/index.js

@@ -20,7 +20,7 @@ function dbml2sql(args) {
 }
 function sql2dbml(args) {
   _commander.default.version(_package.default.version);
-  _commander.default.usage('[options] <files...>').option('--mysql').option('--postgres').option('--postgres-legacy').option('--mssql').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('-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');
 
   _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'].includes(opt);
+    return ['postgres', 'mysql', 'mssql', 'postgresLegacy', 'mysqlLegacy'].includes(opt);
   });
   let format = 'postgres';
   let cnt = 0;
@@ -42,6 +42,9 @@ function generate(inputPaths, transform, outputPlugin) {
       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);
     }
   });

package/package.json

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

package/src/cli/config.js

@@ -2,6 +2,9 @@ export default {
   mysql: {
     name: 'MySQL',
   },
+  mysqlLegacy: {
+    name: 'MySQL',
+  },
   postgres: {
     name: 'PostgreSQL',
   },

package/src/cli/export.js

@@ -36,7 +36,7 @@ export default async function exportHandler (program) {
 
       console.log(`  ${chalk.green(figures.main.tick)} Generated SQL dump file (${config[format].name}): ${path.basename(opts.outFile)}`);
     }
-  } catch (err) {
-    logger.error(err);
+  } catch (errors) {
+    logger.error(`\n    ${errors.map(({ message }) => message).join('\n    ')}`);
   }
 }

package/src/cli/import.js

@@ -31,6 +31,7 @@ export default async function importHandler (program) {
       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);
   }
 }

package/src/cli/index.js

@@ -25,6 +25,7 @@ function sql2dbml (args) {
   program
     .usage('[options] <files...>')
     .option('--mysql')
+    .option('--mysql-legacy')
     .option('--postgres')
     .option('--postgres-legacy')
     .option('--mssql')

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'].includes(opt);
+    return ['postgres', 'mysql', 'mssql', 'postgresLegacy', 'mysqlLegacy'].includes(opt);
   });
 
   let format = 'postgres';
@@ -39,6 +39,9 @@ function generate (inputPaths, transform, outputPlugin) {
       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);
     }
   });

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