@dbml/cli 3.0.0 → 3.1.1

package/dbml-error.log

@@ -197,3 +197,198 @@ TypeError: Cannot read properties of undefined (reading 'name')
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
     at node:internal/main/run_main_module:22:47
 
+2023-12-27T06:16:03.315Z
+Error: ENOENT: no such file or directory, stat 'C:\schema.sql'
+    at Object.statSync (node:fs:1583:3)
+    at validateFilePlugin (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\validatePlugins\validatePlugins.js:10:28)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:31
+    at Array.every (<anonymous>)
+    at validateInputFilePaths (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:16)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:21:39)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+
+2023-12-27T06:16:20.082Z
+undefined
+
+2023-12-27T06:31:51.932Z
+Error: ENOENT: no such file or directory, stat 'C:\schema.sql'
+    at Object.statSync (node:fs:1583:3)
+    at validateFilePlugin (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\validatePlugins\validatePlugins.js:10:28)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:31
+    at Array.every (<anonymous>)
+    at validateInputFilePaths (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:16)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:21:39)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+
+2023-12-27T06:37:04.235Z
+Error: ENOENT: no such file or directory, stat 'C:\schema.sql'
+    at Object.statSync (node:fs:1583:3)
+    at validateFilePlugin (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\validatePlugins\validatePlugins.js:10:28)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:31
+    at Array.every (<anonymous>)
+    at validateInputFilePaths (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:16)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:21:39)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+
+2023-12-27T06:37:13.392Z
+undefined
+
+2023-12-27T06:37:21.453Z
+undefined
+
+2023-12-27T06:43:20.778Z
+SyntaxError: You have a syntax error at "general_schema.in.sql".
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:48:13
+    at Array.forEach (<anonymous>)
+    at generate (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:39:14)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:25:27)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+    at Module.load (node:internal/modules/cjs/loader:1033:32)
+    at Function.Module._load (node:internal/modules/cjs/loader:868:12)
+
+ROOT_ERROR:
+TypeError: Cannot read properties of null (reading 'accept')
+    at PostgresASTGen.visitCommentstmt (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\postgres\PostgresASTGen.js:982:36)
+    at CommentstmtContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1928587)
+    at PostgresASTGen.visitStmt (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\postgres\PostgresASTGen.js:119:27)
+    at StmtContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1555825)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\postgres\PostgresASTGen.js:92:21
+    at Array.map (<anonymous>)
+    at PostgresASTGen.visitStmtmulti (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\postgres\PostgresASTGen.js:91:18)
+    at StmtmultiContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1540498)
+    at PostgresASTGen.visitStmtblock (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\postgres\PostgresASTGen.js:83:23)
+    at StmtblockContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1539299)
+
+2023-12-27T06:44:28.674Z
+undefined
+
+2023-12-27T06:44:46.176Z
+Error: ENOENT: no such file or directory, stat 'C:\general_schema.in.sqlcls'
+    at Object.statSync (node:fs:1583:3)
+    at validateFilePlugin (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\validatePlugins\validatePlugins.js:10:28)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:31
+    at Array.every (<anonymous>)
+    at validateInputFilePaths (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:16)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:21:39)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+
+2023-12-27T06:44:48.599Z
+Error: ENOENT: no such file or directory, stat 'C:\general_schema.in.sqlcls'
+    at Object.statSync (node:fs:1583:3)
+    at validateFilePlugin (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\validatePlugins\validatePlugins.js:10:28)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:31
+    at Array.every (<anonymous>)
+    at validateInputFilePaths (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:21:16)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:21:39)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+
+2023-12-27T06:44:55.666Z
+undefined
+
+2023-12-27T06:52:26.830Z
+undefined
+
+2023-12-27T06:54:32.529Z
+undefined
+
+2023-12-27T07:00:09.936Z
+SyntaxError: You have a syntax error at "mysqldump_test.sql" line 30 column 3. Expected ")" or fields but "P" found.
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:48:13
+    at Array.forEach (<anonymous>)
+    at generate (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:39:14)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:25:27)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+    at Module.load (node:internal/modules/cjs/loader:1033:32)
+    at Function.Module._load (node:internal/modules/cjs/loader:868:12)
+
+ROOT_ERROR:
+SyntaxError: Expected ")" or fields but "P" found.
+    at peg$buildStructuredError (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\mysqlParser.js:1043:12)
+    at Object.peg$parse [as parse] (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\mysqlParser.js:8795:11)
+    at Function.parseMySQLToJSON (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\Parser.js:111:38)
+    at Parser.parse (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\Parser.js:38:32)
+    at Object._import [as import] (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\import\index.js:11:43)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:25:68
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:42:23
+    at Array.forEach (<anonymous>)
+    at generate (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:39:14)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:25:27)
+{"start":{"offset":1251,"line":30,"column":3},"end":{"offset":1252,"line":30,"column":4}}
+
+2023-12-27T09:29:30.704Z
+SyntaxError: You have a syntax error at "sakila-schema.sql".
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:48:13
+    at Array.forEach (<anonymous>)
+    at generate (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:39:14)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:25:27)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+    at Module.load (node:internal/modules/cjs/loader:1033:32)
+    at Function.Module._load (node:internal/modules/cjs/loader:868:12)
+
+ROOT_ERROR:
+TypeError: ctx.indexType is not a function
+    at MySQLASTGen.visitSpecialIndexDeclaration (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\mysql\MySQLASTGen.js:1000:41)
+    at SpecialIndexDeclarationContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\mysql\MySqlParser.js:3:1224927)
+    at MySQLASTGen.visitIndexDeclaration (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\mysql\MySQLASTGen.js:372:42)
+    at IndexDeclarationContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\mysql\MySqlParser.js:3:1189694)
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\mysql\MySQLASTGen.js:335:19
+    at Array.map (<anonymous>)
+    at MySQLASTGen.visitCreateDefinitions (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\mysql\MySQLASTGen.js:334:37)
+    at CreateDefinitionsContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\mysql\MySqlParser.js:3:1185691)
+    at MySQLASTGen.visitColumnCreateTable (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\ASTGeneration\mysql\MySQLASTGen.js:255:49)
+    at ColumnCreateTableContext.accept (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\mysql\MySqlParser.js:3:1136471)
+
+2023-12-27T09:30:35.220Z
+undefined
+
+2023-12-27T09:31:06.308Z
+undefined
+
+2023-12-27T09:31:15.926Z
+undefined
+
+2023-12-27T09:31:50.404Z
+undefined
+
+2023-12-27T09:32:02.964Z
+undefined
+
+2023-12-27T09:32:22.796Z
+undefined
+
+2023-12-27T09:32:48.007Z
+undefined
+
+2023-12-27T09:33:05.762Z
+undefined
+
+2023-12-27T09:33:44.511Z
+undefined
+
+2023-12-27T09:34:21.118Z
+undefined
+

package/lib/cli/config.js

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

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;

package/package.json

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

package/src/cli/config.js

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

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