@putout/plugin-putout 12.8.0 → 13.0.0
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 -4
- package/lib/add-push/index.js +1 -4
- package/lib/apply-async-formatter/index.js +1 -4
- package/lib/check-match/index.js +1 -4
- package/lib/check-replace-code/generate-code.js +3 -9
- package/lib/check-replace-code/index.js +2 -1
- package/lib/convert-babel-types/index.js +1 -4
- package/lib/convert-find-to-traverse/index.js +1 -4
- package/lib/convert-method-to-property/index.js +1 -4
- package/lib/convert-node-to-path-in-get-template-values/index.js +1 -4
- package/lib/convert-replace-with/index.js +17 -18
- package/lib/convert-replace-with-multiple/index.js +17 -21
- package/lib/convert-to-no-transform-code/index.js +2 -8
- package/lib/convert-traverse-to-replace/index.js +1 -4
- package/lib/create-test/index.js +3 -12
- package/lib/move-require-on-top-level/index.js +1 -4
- package/lib/rename-operate-to-operator/index.js +1 -3
- package/lib/replace-test-message/index.js +2 -6
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -541,10 +541,7 @@ isIdentifier(a);
|
|
|
541
541
|
### ✅ Example of correct code
|
|
542
542
|
|
|
543
543
|
```js
|
|
544
|
-
const {
|
|
545
|
-
operator,
|
|
546
|
-
types,
|
|
547
|
-
} = require('putout');
|
|
544
|
+
const {operator, types} = require('putout');
|
|
548
545
|
|
|
549
546
|
const {compare} = operator;
|
|
550
547
|
const {isIdentifier} = types;
|
package/lib/add-push/index.js
CHANGED
package/lib/check-match/index.js
CHANGED
|
@@ -4,11 +4,7 @@ const putout = require('putout');
|
|
|
4
4
|
const tryCatch = require('try-catch');
|
|
5
5
|
const noop = () => {};
|
|
6
6
|
|
|
7
|
-
const {
|
|
8
|
-
types,
|
|
9
|
-
operator,
|
|
10
|
-
} = putout;
|
|
11
|
-
|
|
7
|
+
const {types, operator} = putout;
|
|
12
8
|
const {replaceWith} = operator;
|
|
13
9
|
|
|
14
10
|
const {
|
|
@@ -22,6 +18,7 @@ module.exports = (rootPath, key) => {
|
|
|
22
18
|
const getVar = createVarStore(rootPath);
|
|
23
19
|
|
|
24
20
|
const [transformError, result] = tryCatch(putout, key, {
|
|
21
|
+
printer: 'putout',
|
|
25
22
|
fix: true,
|
|
26
23
|
isTS: true,
|
|
27
24
|
plugins: [
|
|
@@ -34,10 +31,7 @@ module.exports = (rootPath, key) => {
|
|
|
34
31
|
fix: (path) => {
|
|
35
32
|
const {node} = path;
|
|
36
33
|
|
|
37
|
-
const {
|
|
38
|
-
value,
|
|
39
|
-
name,
|
|
40
|
-
} = node;
|
|
34
|
+
const {value, name} = node;
|
|
41
35
|
|
|
42
36
|
if (path.isStringLiteral() && /^__[a-z]$/.test(value)) {
|
|
43
37
|
path.node.value = getVar(name);
|
|
@@ -75,6 +75,7 @@ module.exports.traverse = ({push}) => ({
|
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
const [transformError, result] = tryCatch(putout, keyCode, {
|
|
78
|
+
printer: 'putout',
|
|
78
79
|
fix: true,
|
|
79
80
|
isTS: true,
|
|
80
81
|
plugins: [
|
|
@@ -97,7 +98,7 @@ module.exports.traverse = ({push}) => ({
|
|
|
97
98
|
return;
|
|
98
99
|
}
|
|
99
100
|
|
|
100
|
-
const
|
|
101
|
+
const code = result.code.slice(0, -1);
|
|
101
102
|
const [error, is] = tryCatch(compare, rmSemi(code), template);
|
|
102
103
|
|
|
103
104
|
if (error || !is)
|
|
@@ -8,15 +8,12 @@ const {
|
|
|
8
8
|
|
|
9
9
|
const fullstore = require('fullstore');
|
|
10
10
|
|
|
11
|
-
const {
|
|
12
|
-
|
|
13
|
-
ObjectProperty,
|
|
14
|
-
} = types;
|
|
11
|
+
const {Identifier, ObjectProperty} = types;
|
|
12
|
+
const {replaceWith, insertAfter} = operator;
|
|
15
13
|
|
|
16
|
-
const {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
} = operator;
|
|
14
|
+
const isRecast = (program) => program.get('body.0.expression').isStringLiteral({
|
|
15
|
+
value: 'use strict',
|
|
16
|
+
});
|
|
20
17
|
|
|
21
18
|
module.exports.report = () => {
|
|
22
19
|
return `"operator.replaceWith" should be called instead of "path.replaceWith"`;
|
|
@@ -24,9 +21,7 @@ module.exports.report = () => {
|
|
|
24
21
|
|
|
25
22
|
module.exports.fix = ({path, calleePath, property, object, program, isInserted}) => {
|
|
26
23
|
replaceWith(calleePath, property);
|
|
27
|
-
|
|
28
|
-
const strictModePath = program.get('body.0');
|
|
29
|
-
const {bindings} = strictModePath.scope;
|
|
24
|
+
const {bindings} = program.scope;
|
|
30
25
|
|
|
31
26
|
path.node.arguments.unshift(object);
|
|
32
27
|
|
|
@@ -39,10 +34,17 @@ module.exports.fix = ({path, calleePath, property, object, program, isInserted})
|
|
|
39
34
|
`);
|
|
40
35
|
|
|
41
36
|
const {types} = bindings;
|
|
42
|
-
const
|
|
37
|
+
const first = program.get('body.0');
|
|
38
|
+
const pathToInsert = types ? types.path.parentPath : first;
|
|
39
|
+
|
|
40
|
+
if (isRecast(program))
|
|
41
|
+
insertAfter(pathToInsert, replaceWithAST);
|
|
42
|
+
else if (types)
|
|
43
|
+
insertAfter(pathToInsert, replaceWithAST);
|
|
44
|
+
else
|
|
45
|
+
pathToInsert.insertBefore(replaceWithAST);
|
|
43
46
|
|
|
44
47
|
isInserted(true);
|
|
45
|
-
insertAfter(pathToInsertAfter, replaceWithAST);
|
|
46
48
|
|
|
47
49
|
return;
|
|
48
50
|
}
|
|
@@ -75,15 +77,12 @@ module.exports.traverse = ({push}) => {
|
|
|
75
77
|
if (!calleePath.isMemberExpression())
|
|
76
78
|
return;
|
|
77
79
|
|
|
78
|
-
const {
|
|
79
|
-
object,
|
|
80
|
-
property,
|
|
81
|
-
} = calleePath.node;
|
|
80
|
+
const {object, property} = calleePath.node;
|
|
82
81
|
|
|
83
82
|
if (property.name !== 'replaceWith')
|
|
84
83
|
return;
|
|
85
84
|
|
|
86
|
-
const program = path.
|
|
85
|
+
const program = path.scope.getProgramParent().path;
|
|
87
86
|
|
|
88
87
|
push({
|
|
89
88
|
isInserted,
|
|
@@ -6,15 +6,13 @@ const {
|
|
|
6
6
|
types,
|
|
7
7
|
} = require('putout');
|
|
8
8
|
|
|
9
|
-
const {
|
|
10
|
-
|
|
11
|
-
replaceWith,
|
|
12
|
-
} = operator;
|
|
9
|
+
const {insertAfter, replaceWith} = operator;
|
|
10
|
+
const {Identifier, ObjectProperty} = types;
|
|
13
11
|
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
12
|
+
const isRecast = (program) => program.get('body.0').get('expression')
|
|
13
|
+
.isStringLiteral({
|
|
14
|
+
value: 'use strict',
|
|
15
|
+
});
|
|
18
16
|
|
|
19
17
|
module.exports.report = () => {
|
|
20
18
|
return `"operate.replaceWithMultiple" should be called instead of "path.replaceWithMultiple"`;
|
|
@@ -25,8 +23,8 @@ const replaceWithAST = template.ast(`
|
|
|
25
23
|
`);
|
|
26
24
|
|
|
27
25
|
module.exports.fix = ({path, calleePath, property, object, program}) => {
|
|
28
|
-
const
|
|
29
|
-
const {bindings} =
|
|
26
|
+
const first = program.get('body.0');
|
|
27
|
+
const {bindings} = program.scope;
|
|
30
28
|
|
|
31
29
|
replaceWith(calleePath, property);
|
|
32
30
|
path.node.arguments.unshift(object);
|
|
@@ -34,8 +32,12 @@ module.exports.fix = ({path, calleePath, property, object, program}) => {
|
|
|
34
32
|
if (bindings.replaceWithMultiple)
|
|
35
33
|
return;
|
|
36
34
|
|
|
37
|
-
if (!bindings.replaceWith && !bindings.insertAfter)
|
|
38
|
-
|
|
35
|
+
if (!bindings.replaceWith && !bindings.insertAfter) {
|
|
36
|
+
if (isRecast(program))
|
|
37
|
+
return insertAfter(first, replaceWithAST);
|
|
38
|
+
|
|
39
|
+
return first.insertBefore(replaceWithAST);
|
|
40
|
+
}
|
|
39
41
|
|
|
40
42
|
const id = Identifier('replaceWithMultiple');
|
|
41
43
|
const varPath = getVarPath(bindings);
|
|
@@ -44,10 +46,7 @@ module.exports.fix = ({path, calleePath, property, object, program}) => {
|
|
|
44
46
|
};
|
|
45
47
|
|
|
46
48
|
function getVarPath(bindings) {
|
|
47
|
-
const {
|
|
48
|
-
replaceWith,
|
|
49
|
-
insertAfter,
|
|
50
|
-
} = bindings;
|
|
49
|
+
const {replaceWith, insertAfter} = bindings;
|
|
51
50
|
|
|
52
51
|
if (replaceWith)
|
|
53
52
|
return replaceWith.path;
|
|
@@ -62,15 +61,12 @@ module.exports.traverse = ({push}) => ({
|
|
|
62
61
|
if (!calleePath.isMemberExpression())
|
|
63
62
|
return;
|
|
64
63
|
|
|
65
|
-
const {
|
|
66
|
-
object,
|
|
67
|
-
property,
|
|
68
|
-
} = calleePath.node;
|
|
64
|
+
const {object, property} = calleePath.node;
|
|
69
65
|
|
|
70
66
|
if (property.name !== 'replaceWithMultiple')
|
|
71
67
|
return;
|
|
72
68
|
|
|
73
|
-
const program = path.
|
|
69
|
+
const program = path.scope.getProgramParent().path;
|
|
74
70
|
|
|
75
71
|
push({
|
|
76
72
|
path,
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const {
|
|
4
|
-
isIdentifier,
|
|
5
|
-
Identifier,
|
|
6
|
-
} = require('putout').types;
|
|
3
|
+
const {isIdentifier, Identifier} = require('putout').types;
|
|
7
4
|
|
|
8
5
|
module.exports.report = () => {
|
|
9
6
|
return `"noTransformCode" should be called instead of using same arguments twice in "transformCode"`;
|
|
@@ -16,10 +13,7 @@ module.exports.traverse = ({push}) => ({
|
|
|
16
13
|
if (!calleePath.isMemberExpression())
|
|
17
14
|
return;
|
|
18
15
|
|
|
19
|
-
const {
|
|
20
|
-
object,
|
|
21
|
-
property,
|
|
22
|
-
} = calleePath.node;
|
|
16
|
+
const {object, property} = calleePath.node;
|
|
23
17
|
|
|
24
18
|
if (object.name !== 't' || property.name !== 'transformCode')
|
|
25
19
|
return;
|
package/lib/create-test/index.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const {
|
|
4
|
-
operator,
|
|
5
|
-
types,
|
|
6
|
-
} = require('putout');
|
|
3
|
+
const {operator, types} = require('putout');
|
|
7
4
|
|
|
8
5
|
const {
|
|
9
6
|
StringLiteral,
|
|
@@ -14,10 +11,7 @@ const {
|
|
|
14
11
|
isIdentifier,
|
|
15
12
|
} = types;
|
|
16
13
|
|
|
17
|
-
const {
|
|
18
|
-
replaceWith,
|
|
19
|
-
getProperty,
|
|
20
|
-
} = operator;
|
|
14
|
+
const {replaceWith, getProperty} = operator;
|
|
21
15
|
|
|
22
16
|
module.exports.report = () => `Apply modifications to 'createTest()' options`;
|
|
23
17
|
|
|
@@ -63,10 +57,7 @@ const maybeLiteral = (a) => {
|
|
|
63
57
|
};
|
|
64
58
|
|
|
65
59
|
function convert(objectPath) {
|
|
66
|
-
const {
|
|
67
|
-
key,
|
|
68
|
-
value,
|
|
69
|
-
} = objectPath.node.properties[0];
|
|
60
|
+
const {key, value} = objectPath.node.properties[0];
|
|
70
61
|
|
|
71
62
|
replaceWith(objectPath, ObjectExpression([
|
|
72
63
|
ObjectProperty(Identifier('plugins'), ArrayExpression([
|
|
@@ -5,9 +5,7 @@ const {rename} = operator;
|
|
|
5
5
|
|
|
6
6
|
module.exports.report = () => '"operator" should be used instead of "operate"';
|
|
7
7
|
|
|
8
|
-
module.exports.include = () => [
|
|
9
|
-
'Program',
|
|
10
|
-
];
|
|
8
|
+
module.exports.include = () => ['Program'];
|
|
11
9
|
|
|
12
10
|
module.exports.filter = (path) => {
|
|
13
11
|
const noOperator = !path.scope.bindings.operator;
|
|
@@ -59,16 +59,12 @@ function isCorrect({path, incorrect}) {
|
|
|
59
59
|
const calleePath = path.findParent(isCallExpression);
|
|
60
60
|
|
|
61
61
|
if (!calleePath)
|
|
62
|
-
return [
|
|
63
|
-
CORRECT,
|
|
64
|
-
];
|
|
62
|
+
return [CORRECT];
|
|
65
63
|
|
|
66
64
|
const messagePath = calleePath.get('arguments.0');
|
|
67
65
|
|
|
68
66
|
if (!messagePath.isStringLiteral())
|
|
69
|
-
return [
|
|
70
|
-
CORRECT,
|
|
71
|
-
];
|
|
67
|
+
return [CORRECT];
|
|
72
68
|
|
|
73
69
|
const {value} = messagePath.node;
|
|
74
70
|
const is = !incorrect.test(value);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@putout/plugin-putout",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "13.0.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
|
|
6
6
|
"description": "🐊Putout plugin helps with plugins development",
|
|
@@ -36,18 +36,18 @@
|
|
|
36
36
|
"putout"
|
|
37
37
|
],
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@putout/test": "^
|
|
40
|
-
"c8": "^
|
|
39
|
+
"@putout/test": "^7.0.0",
|
|
40
|
+
"c8": "^8.0.0",
|
|
41
41
|
"eslint": "^8.0.1",
|
|
42
42
|
"eslint-plugin-n": "^16.0.0",
|
|
43
|
-
"eslint-plugin-putout": "^
|
|
43
|
+
"eslint-plugin-putout": "^18.0.0",
|
|
44
44
|
"lerna": "^6.0.1",
|
|
45
45
|
"madrun": "^9.0.0",
|
|
46
46
|
"montag": "^1.2.1",
|
|
47
47
|
"nodemon": "^2.0.1"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"putout": ">=
|
|
50
|
+
"putout": ">=30"
|
|
51
51
|
},
|
|
52
52
|
"license": "MIT",
|
|
53
53
|
"engines": {
|