@mongosh/js-multiline-to-singleline 1.10.1 → 1.10.3
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/.depcheckrc +11 -0
- package/.eslintrc.js +10 -1
- package/.prettierignore +6 -0
- package/.prettierrc.json +1 -0
- package/AUTHORS +1 -0
- package/lib/index.js +42 -26
- package/lib/index.js.map +1 -1
- package/package.json +20 -9
- package/tsconfig-lint.json +5 -0
- package/tsconfig.lint.json +0 -8
package/.depcheckrc
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
ignores:
|
|
2
|
+
- '@mongodb-js/eslint-config-mongosh'
|
|
3
|
+
- '@mongodb-js/tsconfig-mongosh'
|
|
4
|
+
- '@mongodb-js/prettier-config-devtools'
|
|
5
|
+
- '@typescript-eslint/parser'
|
|
6
|
+
- '@typescript-eslint/eslint-plugin'
|
|
7
|
+
- chai
|
|
8
|
+
- eslint-plugin-mocha
|
|
9
|
+
- eslint-config-mongodb-js
|
|
10
|
+
ignore-patterns:
|
|
11
|
+
- .eslintrc.js
|
package/.eslintrc.js
CHANGED
|
@@ -1 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
const { fixCygwinPath } = require('@mongodb-js/eslint-config-mongosh/utils');
|
|
2
|
+
|
|
3
|
+
module.exports = {
|
|
4
|
+
root: true,
|
|
5
|
+
extends: ['@mongodb-js/eslint-config-mongosh'],
|
|
6
|
+
parserOptions: {
|
|
7
|
+
tsconfigRootDir: fixCygwinPath(__dirname),
|
|
8
|
+
project: ['./tsconfig-lint.json'],
|
|
9
|
+
},
|
|
10
|
+
};
|
package/.prettierignore
ADDED
package/.prettierrc.json
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"@mongodb-js/prettier-config-devtools"
|
package/AUTHORS
CHANGED
package/lib/index.js
CHANGED
|
@@ -32,14 +32,21 @@ function lineCommentToBlockComment() {
|
|
|
32
32
|
if (existing) {
|
|
33
33
|
return existing;
|
|
34
34
|
}
|
|
35
|
-
const replacement = {
|
|
35
|
+
const replacement = {
|
|
36
|
+
...original,
|
|
37
|
+
type: 'CommentBlock',
|
|
38
|
+
};
|
|
36
39
|
visitedComments.set(original, replacement);
|
|
37
40
|
return replacement;
|
|
38
41
|
}
|
|
39
42
|
function transformComments(path) {
|
|
40
43
|
var _a, _b;
|
|
41
44
|
const node = path.node;
|
|
42
|
-
const keys = [
|
|
45
|
+
const keys = [
|
|
46
|
+
'leadingComments',
|
|
47
|
+
'trailingComments',
|
|
48
|
+
'innerComments',
|
|
49
|
+
];
|
|
43
50
|
for (const key of keys) {
|
|
44
51
|
node[key] = (_b = (_a = node[key]) === null || _a === void 0 ? void 0 : _a.map(turnCommentIntoBlock)) !== null && _b !== void 0 ? _b : null;
|
|
45
52
|
}
|
|
@@ -51,55 +58,64 @@ function lineCommentToBlockComment() {
|
|
|
51
58
|
path.traverse({
|
|
52
59
|
enter(path) {
|
|
53
60
|
transformComments(path);
|
|
54
|
-
}
|
|
61
|
+
},
|
|
55
62
|
});
|
|
56
|
-
}
|
|
57
|
-
}
|
|
63
|
+
},
|
|
64
|
+
},
|
|
58
65
|
};
|
|
59
66
|
}
|
|
60
|
-
function multilineTemplateStringToSingleLine({ types: t }) {
|
|
67
|
+
function multilineTemplateStringToSingleLine({ types: t, }) {
|
|
61
68
|
return {
|
|
62
69
|
visitor: {
|
|
63
70
|
TemplateLiteral(path) {
|
|
64
71
|
var _a, _b;
|
|
65
|
-
if (!path.node.quasis.some(({ value }) =>
|
|
72
|
+
if (!path.node.quasis.some(({ value }) => /[\r\n]/.exec(value.raw))) {
|
|
66
73
|
return;
|
|
67
74
|
}
|
|
68
75
|
if (path.parentPath.isTaggedTemplateExpression()) {
|
|
69
|
-
path.parentPath.replaceWith(t.callExpression(t.identifier('eval'), [
|
|
76
|
+
path.parentPath.replaceWith(t.callExpression(t.identifier('eval'), [
|
|
77
|
+
t.stringLiteral(this.file.code.slice((_a = path.parent.start) !== null && _a !== void 0 ? _a : undefined, (_b = path.parent.end) !== null && _b !== void 0 ? _b : undefined)),
|
|
78
|
+
]));
|
|
70
79
|
return;
|
|
71
80
|
}
|
|
72
|
-
path.replaceWith(t.templateLiteral(path.node.quasis.map(el => t.templateElement({
|
|
73
|
-
raw: el.value.raw.replace(/\n|\r\n?/g, '\\n')
|
|
81
|
+
path.replaceWith(t.templateLiteral(path.node.quasis.map((el) => t.templateElement({
|
|
82
|
+
raw: el.value.raw.replace(/\n|\r\n?/g, '\\n'),
|
|
74
83
|
}, el.tail)), path.node.expressions));
|
|
75
|
-
}
|
|
76
|
-
}
|
|
84
|
+
},
|
|
85
|
+
},
|
|
77
86
|
};
|
|
78
87
|
}
|
|
79
88
|
function makeMultilineJSIntoSingleLine(src) {
|
|
80
89
|
var _a, _b;
|
|
81
90
|
let postASI;
|
|
82
91
|
try {
|
|
83
|
-
postASI =
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
92
|
+
postASI =
|
|
93
|
+
(_b = (_a = babel.transformSync(src, {
|
|
94
|
+
retainLines: true,
|
|
95
|
+
compact: false,
|
|
96
|
+
code: true,
|
|
97
|
+
comments: true,
|
|
98
|
+
configFile: false,
|
|
99
|
+
babelrc: false,
|
|
100
|
+
browserslistConfigFile: false,
|
|
101
|
+
plugins: [
|
|
102
|
+
lineCommentToBlockComment,
|
|
103
|
+
multilineTemplateStringToSingleLine,
|
|
104
|
+
],
|
|
105
|
+
sourceType: 'script',
|
|
106
|
+
})) === null || _a === void 0 ? void 0 : _a.code) !== null && _b !== void 0 ? _b : src;
|
|
94
107
|
}
|
|
95
108
|
catch (_c) {
|
|
96
109
|
postASI = src;
|
|
97
110
|
}
|
|
98
|
-
const asSingleLine = postASI
|
|
99
|
-
.
|
|
111
|
+
const asSingleLine = postASI
|
|
112
|
+
.split(/[\r\n]+/g)
|
|
113
|
+
.map((line) => line.trim())
|
|
100
114
|
.join(' ')
|
|
101
115
|
.trim();
|
|
102
|
-
return src.trim().endsWith(';')
|
|
116
|
+
return src.trim().endsWith(';')
|
|
117
|
+
? asSingleLine
|
|
118
|
+
: asSingleLine.replace(/;$/, '');
|
|
103
119
|
}
|
|
104
120
|
exports.makeMultilineJSIntoSingleLine = makeMultilineJSIntoSingleLine;
|
|
105
121
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AAIrC,SAAS,yBAAyB;IAChC,MAAM,eAAe,GAAG,IAAI,GAAG,EAA4C,CAAC;IAE5E,SAAS,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mongosh/js-multiline-to-singleline",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.3",
|
|
4
4
|
"description": "Make multiline JS into a single line",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -13,10 +13,14 @@
|
|
|
13
13
|
"scripts": {
|
|
14
14
|
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
|
|
15
15
|
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
|
|
16
|
-
"
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
16
|
+
"eslint": "eslint",
|
|
17
|
+
"lint": "npm run eslint . && npm run prettier -- --check .",
|
|
18
|
+
"check": "npm run lint && npm run depcheck",
|
|
19
|
+
"depcheck": "depcheck",
|
|
20
|
+
"compile": "tsc -p tsconfig.json",
|
|
21
|
+
"prepublish": "npm run compile",
|
|
22
|
+
"prettier": "prettier",
|
|
23
|
+
"reformat": "npm run prettier -- --write . && npm run eslint --fix"
|
|
20
24
|
},
|
|
21
25
|
"license": "Apache-2.0",
|
|
22
26
|
"publishConfig": {
|
|
@@ -29,10 +33,17 @@
|
|
|
29
33
|
"unitTestsOnly": true
|
|
30
34
|
},
|
|
31
35
|
"dependencies": {
|
|
32
|
-
"@babel/core": "^7.16.12"
|
|
36
|
+
"@babel/core": "^7.16.12",
|
|
37
|
+
"@babel/types": "^7.21.2"
|
|
33
38
|
},
|
|
34
39
|
"devDependencies": {
|
|
35
|
-
"@
|
|
36
|
-
|
|
37
|
-
|
|
40
|
+
"@mongodb-js/eslint-config-mongosh": "1.10.3",
|
|
41
|
+
"@mongodb-js/prettier-config-devtools": "^1.0.1",
|
|
42
|
+
"@mongodb-js/tsconfig-mongosh": "1.10.3",
|
|
43
|
+
"@types/babel__core": "^7.1.18",
|
|
44
|
+
"depcheck": "^1.4.3",
|
|
45
|
+
"eslint": "^7.25.0",
|
|
46
|
+
"prettier": "^2.8.8"
|
|
47
|
+
},
|
|
48
|
+
"gitHead": "5df718faed3916fc5ce637f953eef2f913b14303"
|
|
38
49
|
}
|