@dbml/cli 2.5.2 → 2.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/__test__/dbml2sql/filename --mysql --out-file/out-files/schema.sql +1 -1
- package/__test__/dbml2sql/filename --out-file/out-files/schema.sql +1 -1
- package/__test__/dbml2sql/filename --postgres --out-file/out-files/schema.sql +1 -1
- package/__test__/dbml2sql/filenames --mysql --out-file/out-files/schema.sql +1 -1
- package/__test__/dbml2sql/filenames --out-file/out-files/schema.sql +1 -1
- package/__test__/dbml2sql/filenames --postgres --out-file/out-files/schema.sql +1 -1
- package/__test__/dbml2sql/multiple_schema_mssql/out-files/multiple_schema.out.sql +1 -1
- package/__test__/dbml2sql/multiple_schema_mysql/out-files/multiple_schema.out.sql +1 -1
- package/__test__/dbml2sql/multiple_schema_pg/out-files/multiple_schema.out.sql +1 -1
- package/__test__/dbml2sql/syntax-error/dbml-error.log +189 -0
- package/__test__/sql2dbml/syntax-error/dbml-error.log +189 -0
- package/__test__/sql2dbml/syntax-error-duplicate-endpoints --mssql/dbml-error.log +189 -0
- package/__test__/sql2dbml/syntax-error-duplicate-endpoints --mysql/dbml-error.log +189 -0
- package/lib/cli/export.js +0 -13
- package/lib/cli/import.js +0 -13
- package/lib/cli/index.js +4 -15
- package/lib/cli/outputPlugins/outputConsolePlugin.js +0 -3
- package/lib/cli/outputPlugins/outputFilePlugin.js +0 -8
- package/lib/cli/utils.js +2 -12
- package/lib/cli/validatePlugins/validatePlugins.js +0 -4
- package/lib/errors/domainError.js +0 -3
- package/lib/errors/index.js +0 -3
- package/lib/errors/syntaxError.js +0 -10
- package/lib/helpers/logger.js +0 -14
- package/lib/index.js +0 -1
- package/package.json +12 -16
- package/yarn-error.log +87 -0
|
@@ -4,14 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.validateFilePlugin = validateFilePlugin;
|
|
7
|
-
|
|
8
7
|
var _fs = _interopRequireDefault(require("fs"));
|
|
9
|
-
|
|
10
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
|
-
|
|
12
9
|
function validateFilePlugin(_path) {
|
|
13
10
|
const stat = _fs.default.statSync(_path);
|
|
14
|
-
|
|
15
11
|
if (stat.isDirectory(_path)) {
|
|
16
12
|
throw new Error('Expect input to be files');
|
|
17
13
|
}
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
|
|
8
7
|
class DomainError extends Error {
|
|
9
8
|
constructor(message, rootError = {}) {
|
|
10
9
|
super(message);
|
|
@@ -12,8 +11,6 @@ class DomainError extends Error {
|
|
|
12
11
|
this.rootError = rootError;
|
|
13
12
|
Error.captureStackTrace(this, this.constructor);
|
|
14
13
|
}
|
|
15
|
-
|
|
16
14
|
}
|
|
17
|
-
|
|
18
15
|
var _default = DomainError;
|
|
19
16
|
exports.default = _default;
|
package/lib/errors/index.js
CHANGED
|
@@ -15,9 +15,6 @@ Object.defineProperty(exports, "SyntaxError", {
|
|
|
15
15
|
return _syntaxError.default;
|
|
16
16
|
}
|
|
17
17
|
});
|
|
18
|
-
|
|
19
18
|
var _domainError = _interopRequireDefault(require("./domainError"));
|
|
20
|
-
|
|
21
19
|
var _syntaxError = _interopRequireDefault(require("./syntaxError"));
|
|
22
|
-
|
|
23
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -4,31 +4,21 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
|
|
8
7
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
9
|
-
|
|
10
8
|
var _domainError = _interopRequireDefault(require("./domainError"));
|
|
11
|
-
|
|
12
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
|
-
|
|
14
10
|
class SyntaxError extends _domainError.default {
|
|
15
11
|
constructor(fileName, rootError = {}) {
|
|
16
12
|
let message = `You have a syntax error at "${fileName}"`;
|
|
17
|
-
|
|
18
13
|
if (rootError.location) {
|
|
19
14
|
message += ` line ${rootError.location.start.line} column ${rootError.location.start.column}`;
|
|
20
15
|
}
|
|
21
|
-
|
|
22
16
|
message += '.';
|
|
23
|
-
|
|
24
17
|
if (!_lodash.default.isEmpty(rootError)) {
|
|
25
18
|
message += ` ${rootError.message}`;
|
|
26
19
|
}
|
|
27
|
-
|
|
28
20
|
super(message, rootError);
|
|
29
21
|
}
|
|
30
|
-
|
|
31
22
|
}
|
|
32
|
-
|
|
33
23
|
var _default = SyntaxError;
|
|
34
24
|
exports.default = _default;
|
package/lib/helpers/logger.js
CHANGED
|
@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
|
|
8
7
|
var _winston = require("winston");
|
|
9
|
-
|
|
10
8
|
var _chalk = _interopRequireDefault(require("chalk"));
|
|
11
|
-
|
|
12
9
|
var _path = _interopRequireDefault(require("path"));
|
|
13
|
-
|
|
14
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
-
|
|
16
11
|
const {
|
|
17
12
|
combine,
|
|
18
13
|
timestamp,
|
|
@@ -34,18 +29,14 @@ const fileFormat = printf(info => {
|
|
|
34
29
|
rootError
|
|
35
30
|
} = info;
|
|
36
31
|
let logContent = `${timestamp}\n${stack}\n`;
|
|
37
|
-
|
|
38
32
|
if (rootError) {
|
|
39
33
|
logContent += '\nROOT_ERROR:';
|
|
40
34
|
logContent += `\n${rootError.stack}`;
|
|
41
|
-
|
|
42
35
|
if (rootError.location) {
|
|
43
36
|
logContent += `\n${JSON.stringify(rootError.location)}`;
|
|
44
37
|
}
|
|
45
|
-
|
|
46
38
|
logContent += '\n';
|
|
47
39
|
}
|
|
48
|
-
|
|
49
40
|
return logContent;
|
|
50
41
|
});
|
|
51
42
|
const consoleLogger = (0, _winston.createLogger)({
|
|
@@ -65,25 +56,20 @@ const logger = {
|
|
|
65
56
|
debug(msg) {
|
|
66
57
|
consoleLogger.debug(msg);
|
|
67
58
|
},
|
|
68
|
-
|
|
69
59
|
info(msg) {
|
|
70
60
|
consoleLogger.info(msg);
|
|
71
61
|
},
|
|
72
|
-
|
|
73
62
|
warn(msg) {
|
|
74
63
|
consoleLogger.warn(msg);
|
|
75
64
|
},
|
|
76
|
-
|
|
77
65
|
error(msg) {
|
|
78
66
|
consoleLogger.error(msg);
|
|
79
67
|
fileLogger.error(msg);
|
|
80
68
|
},
|
|
81
|
-
|
|
82
69
|
log(level, msg) {
|
|
83
70
|
const lvl = exports[level];
|
|
84
71
|
lvl(msg);
|
|
85
72
|
}
|
|
86
|
-
|
|
87
73
|
};
|
|
88
74
|
var _default = logger;
|
|
89
75
|
exports.default = _default;
|
package/lib/index.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dbml/cli",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -17,15 +17,15 @@
|
|
|
17
17
|
"sql2dbml": "bin/sql2dbml.js"
|
|
18
18
|
},
|
|
19
19
|
"author": "Holistics <dev@holistics.io>",
|
|
20
|
-
"homepage": "https://dbml.
|
|
20
|
+
"homepage": "https://dbml.dbdiagram.io",
|
|
21
21
|
"repository": "https://github.com/holistics/dbml/tree/master/packages/dbml-cli",
|
|
22
22
|
"keywords": [
|
|
23
23
|
"dbml",
|
|
24
24
|
"dbml-cli"
|
|
25
25
|
],
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@babel/cli": "^7.
|
|
28
|
-
"@dbml/core": "^2.5.
|
|
27
|
+
"@babel/cli": "^7.21.0",
|
|
28
|
+
"@dbml/core": "^2.5.4",
|
|
29
29
|
"bluebird": "^3.5.5",
|
|
30
30
|
"chalk": "^2.4.2",
|
|
31
31
|
"commander": "^2.20.0",
|
|
@@ -37,17 +37,13 @@
|
|
|
37
37
|
"winston": "^3.2.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@babel/core": "^7.
|
|
41
|
-
"@babel/node": "^7.
|
|
42
|
-
"@babel/plugin-transform-runtime": "^7.
|
|
43
|
-
"@babel/preset-env": "^7.
|
|
44
|
-
"@babel/runtime": "^7.
|
|
45
|
-
"babel-jest": "^
|
|
46
|
-
"
|
|
47
|
-
"eslint-config-airbnb-base": "13.2.0",
|
|
48
|
-
"eslint-plugin-import": "^2.17.2",
|
|
49
|
-
"eslint-plugin-jest": "^22.13.6",
|
|
50
|
-
"jest": "^24.8.0"
|
|
40
|
+
"@babel/core": "^7.21.4",
|
|
41
|
+
"@babel/node": "^7.20.7",
|
|
42
|
+
"@babel/plugin-transform-runtime": "^7.21.4",
|
|
43
|
+
"@babel/preset-env": "^7.21.4",
|
|
44
|
+
"@babel/runtime": "^7.21.0",
|
|
45
|
+
"babel-jest": "^29.5.0",
|
|
46
|
+
"jest": "^29.5.0"
|
|
51
47
|
},
|
|
52
48
|
"jest": {
|
|
53
49
|
"setupFiles": [
|
|
@@ -57,5 +53,5 @@
|
|
|
57
53
|
"^.+\\.js$": "babel-jest"
|
|
58
54
|
}
|
|
59
55
|
},
|
|
60
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "2f74de58e4a66ac7390833e3a9434e3fab7e0f4e"
|
|
61
57
|
}
|
package/yarn-error.log
ADDED
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
Arguments:
|
|
2
|
+
/usr/local/bin/node /usr/local/bin/yarn install
|
|
3
|
+
|
|
4
|
+
PATH:
|
|
5
|
+
/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
|
|
6
|
+
|
|
7
|
+
Yarn version:
|
|
8
|
+
1.22.18
|
|
9
|
+
|
|
10
|
+
Node version:
|
|
11
|
+
16.18.0
|
|
12
|
+
|
|
13
|
+
Platform:
|
|
14
|
+
darwin arm64
|
|
15
|
+
|
|
16
|
+
Trace:
|
|
17
|
+
SyntaxError: /Users/nguyenhoang/Documents/workspace/dbx/dbml/package.json: Unexpected token } in JSON at position 130
|
|
18
|
+
at JSON.parse (<anonymous>)
|
|
19
|
+
at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
|
|
20
|
+
at Generator.next (<anonymous>)
|
|
21
|
+
at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
|
|
22
|
+
at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
|
|
23
|
+
|
|
24
|
+
npm manifest:
|
|
25
|
+
{
|
|
26
|
+
"name": "@dbml/cli",
|
|
27
|
+
"version": "2.5.3",
|
|
28
|
+
"description": "",
|
|
29
|
+
"main": "lib/index.js",
|
|
30
|
+
"license": "Apache-2.0",
|
|
31
|
+
"scripts": {
|
|
32
|
+
"test": "jest",
|
|
33
|
+
"build": "babel src --out-dir lib --copy-files",
|
|
34
|
+
"prepublish": "npm run build"
|
|
35
|
+
},
|
|
36
|
+
"publishConfig": {
|
|
37
|
+
"access": "public"
|
|
38
|
+
},
|
|
39
|
+
"bin": {
|
|
40
|
+
"dbml2sql": "bin/dbml2sql.js",
|
|
41
|
+
"sql2dbml": "bin/sql2dbml.js"
|
|
42
|
+
},
|
|
43
|
+
"author": "Holistics <dev@holistics.io>",
|
|
44
|
+
"homepage": "https://dbml.dbdiagram.io",
|
|
45
|
+
"repository": "https://github.com/holistics/dbml/tree/master/packages/dbml-cli",
|
|
46
|
+
"keywords": [
|
|
47
|
+
"dbml",
|
|
48
|
+
"dbml-cli"
|
|
49
|
+
],
|
|
50
|
+
"dependencies": {
|
|
51
|
+
"@babel/cli": "^7.21.0",
|
|
52
|
+
"@dbml/core": "^2.5.3",
|
|
53
|
+
"bluebird": "^3.5.5",
|
|
54
|
+
"chalk": "^2.4.2",
|
|
55
|
+
"commander": "^2.20.0",
|
|
56
|
+
"esm": "^3.2.25",
|
|
57
|
+
"figures": "^3.2.0",
|
|
58
|
+
"lodash": "^4.17.15",
|
|
59
|
+
"pegjs-require-import": "^0.0.2",
|
|
60
|
+
"strip-ansi": "^5.2.0",
|
|
61
|
+
"winston": "^3.2.1"
|
|
62
|
+
},
|
|
63
|
+
"devDependencies": {
|
|
64
|
+
"@babel/core": "^7.21.4",
|
|
65
|
+
"@babel/node": "^7.20.7",
|
|
66
|
+
"@babel/plugin-transform-runtime": "^7.21.4",
|
|
67
|
+
"@babel/preset-env": "^7.21.4",
|
|
68
|
+
"@babel/runtime": "^7.21.0",
|
|
69
|
+
"babel-jest": "^29.5.0",
|
|
70
|
+
"jest": "^29.5.0"
|
|
71
|
+
},
|
|
72
|
+
"jest": {
|
|
73
|
+
"setupFiles": [
|
|
74
|
+
"./jestHelpers.js"
|
|
75
|
+
],
|
|
76
|
+
"transform": {
|
|
77
|
+
"^.+\\.js$": "babel-jest"
|
|
78
|
+
}
|
|
79
|
+
},
|
|
80
|
+
"gitHead": "5cb80e1aa38fb9a4dbe3079e39c9ef93cd4dc556"
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
yarn manifest:
|
|
84
|
+
No manifest
|
|
85
|
+
|
|
86
|
+
Lockfile:
|
|
87
|
+
No lockfile
|