@putout/printer 18.15.0 → 18.17.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/ChangeLog +10 -0
- package/lib/tokenize/expressions/import-expression/import-expression.js +17 -0
- package/lib/tokenize/expressions/index.js +1 -1
- package/lib/tokenize/expressions/new-expression/new-expression.js +11 -38
- package/lib/tokenize/typescript/ts-import-type/ts-import-type.js +2 -4
- package/package.json +1 -1
- package/lib/tokenize/expressions/import-expression.js +0 -15
package/ChangeLog
CHANGED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import {maybeParens} from '#maybe-parens';
|
|
2
|
+
|
|
3
|
+
export const ImportExpression = maybeParens({
|
|
4
|
+
print: (path, printer) => {
|
|
5
|
+
const {print, maybe} = printer;
|
|
6
|
+
const {options} = path.node;
|
|
7
|
+
|
|
8
|
+
print('import(');
|
|
9
|
+
print('__source');
|
|
10
|
+
|
|
11
|
+
maybe.print(options, ',');
|
|
12
|
+
maybe.print.space(options);
|
|
13
|
+
|
|
14
|
+
print('__options');
|
|
15
|
+
print(')');
|
|
16
|
+
},
|
|
17
|
+
});
|
|
@@ -19,7 +19,7 @@ export {BinaryExpression} from './binary-expression/binary-expression.js';
|
|
|
19
19
|
export {LogicalExpression} from './logical-expression/logical-expression.js';
|
|
20
20
|
export {ConditionalExpression} from './conditional-expression.js';
|
|
21
21
|
export {StaticBlock} from './class/static-block.js';
|
|
22
|
-
export {ImportExpression} from './import-expression.js';
|
|
22
|
+
export {ImportExpression} from './import-expression/import-expression.js';
|
|
23
23
|
export {ParenthesizedExpression} from './parenthesized-expression/parenthesized-expression.js';
|
|
24
24
|
export {
|
|
25
25
|
ClassProperty,
|
|
@@ -1,47 +1,20 @@
|
|
|
1
1
|
import {types} from '@putout/babel';
|
|
2
|
-
import {
|
|
3
|
-
exists,
|
|
4
|
-
isInsideExpression,
|
|
5
|
-
} from '#is';
|
|
6
|
-
import {isMarkedAfter} from '#mark';
|
|
2
|
+
import {maybeParens} from '#maybe-parens';
|
|
7
3
|
|
|
8
|
-
const {
|
|
4
|
+
const {
|
|
5
|
+
isMemberExpression,
|
|
6
|
+
isClassDeclaration,
|
|
7
|
+
} = types;
|
|
9
8
|
|
|
10
|
-
const notFirst = ({parentPath}) => exists(parentPath.getPrevSibling());
|
|
11
9
|
const isInsideMember = ({parentPath}) => isMemberExpression(parentPath);
|
|
12
10
|
|
|
13
|
-
const
|
|
14
|
-
const prev = parentPath.getPrevSibling();
|
|
15
|
-
|
|
16
|
-
return [
|
|
17
|
-
prev.node,
|
|
18
|
-
prev,
|
|
19
|
-
];
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
export const NewExpression = {
|
|
23
|
-
beforeIf(path) {
|
|
24
|
-
if (!isInsideExpression(path))
|
|
25
|
-
return false;
|
|
26
|
-
|
|
27
|
-
const [exists, prev] = getPrev(path);
|
|
28
|
-
|
|
29
|
-
if (!exists)
|
|
30
|
-
return false;
|
|
31
|
-
|
|
32
|
-
if (isMarkedAfter(prev))
|
|
33
|
-
return false;
|
|
34
|
-
|
|
35
|
-
if (prev.isExpressionStatement())
|
|
36
|
-
return false;
|
|
37
|
-
|
|
38
|
-
return notFirst(path);
|
|
39
|
-
},
|
|
40
|
-
before(path, {print}) {
|
|
41
|
-
print.breakline();
|
|
42
|
-
},
|
|
11
|
+
export const NewExpression = maybeParens({
|
|
43
12
|
print(path, printer, semantics) {
|
|
44
13
|
const {print, maybe} = printer;
|
|
14
|
+
const prev = path.parentPath.getPrevSibling();
|
|
15
|
+
|
|
16
|
+
maybe.print.breakline(isClassDeclaration(prev));
|
|
17
|
+
|
|
45
18
|
print('new ');
|
|
46
19
|
print('__callee');
|
|
47
20
|
print('__typeArguments');
|
|
@@ -58,7 +31,7 @@ export const NewExpression = {
|
|
|
58
31
|
|
|
59
32
|
maybePrintCloseBrace(path, printer, semantics);
|
|
60
33
|
},
|
|
61
|
-
};
|
|
34
|
+
});
|
|
62
35
|
|
|
63
36
|
function maybePrintOpenBrace(path, printer, semantics) {
|
|
64
37
|
maybePrintBrace('(', path, printer, semantics);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {ImportExpression} from '../../expressions/import-expression/import-expression.js';
|
|
2
2
|
|
|
3
|
-
export const TSImportType =
|
|
4
|
-
createImportExpression(path, printer);
|
|
5
|
-
};
|
|
3
|
+
export const TSImportType = ImportExpression;
|
package/package.json
CHANGED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
export const ImportExpression = createImportExpression;
|
|
2
|
-
|
|
3
|
-
export function createImportExpression(path, printer) {
|
|
4
|
-
const {print, maybe} = printer;
|
|
5
|
-
const {options} = path.node;
|
|
6
|
-
|
|
7
|
-
print('import(');
|
|
8
|
-
print('__source');
|
|
9
|
-
|
|
10
|
-
maybe.print(options, ',');
|
|
11
|
-
maybe.print.space(options);
|
|
12
|
-
|
|
13
|
-
print('__options');
|
|
14
|
-
print(')');
|
|
15
|
-
}
|