hermes-transform 0.36.1 → 0.37.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/dist/detachedNode.js +3 -57
- package/dist/detachedNode.js.flow +12 -12
- package/dist/generated/TransformCloneSignatures.js.flow +1 -1
- package/dist/generated/TransformModifySignatures.js.flow +1 -1
- package/dist/generated/TransformReplaceSignatures.js.flow +207 -207
- package/dist/generated/node-types.js +0 -21
- package/dist/generated/node-types.js.flow +1086 -978
- package/dist/generated/special-case-node-types/Comment.js +0 -13
- package/dist/generated/special-case-node-types/Comment.js.flow +2 -2
- package/dist/generated/special-case-node-types/DeclareExportDeclaration.js +0 -12
- package/dist/generated/special-case-node-types/DeclareExportDeclaration.js.flow +10 -10
- package/dist/generated/special-case-node-types/DeclareHook.js +0 -9
- package/dist/generated/special-case-node-types/DeclareHook.js.flow +4 -4
- package/dist/generated/special-case-node-types/ExportNamedDeclaration.js +0 -11
- package/dist/generated/special-case-node-types/ExportNamedDeclaration.js.flow +9 -9
- package/dist/generated/special-case-node-types/Literal.js +1 -12
- package/dist/generated/special-case-node-types/Literal.js.flow +20 -20
- package/dist/generated/special-case-node-types/ObjectTypeProperty.js +0 -10
- package/dist/generated/special-case-node-types/ObjectTypeProperty.js.flow +23 -21
- package/dist/generated/special-case-node-types/Property.js +0 -9
- package/dist/generated/special-case-node-types/Property.js.flow +50 -42
- package/dist/generated/special-case-node-types/misc.js +6 -35
- package/dist/generated/special-case-node-types/misc.js.flow +56 -48
- package/dist/index.js +0 -9
- package/dist/src/detachedNode.js +3 -57
- package/dist/src/generated/node-types.js +0 -21
- package/dist/src/generated/special-case-node-types/Comment.js +0 -13
- package/dist/src/generated/special-case-node-types/DeclareExportDeclaration.js +0 -12
- package/dist/src/generated/special-case-node-types/DeclareHook.js +0 -9
- package/dist/src/generated/special-case-node-types/ExportNamedDeclaration.js +0 -11
- package/dist/src/generated/special-case-node-types/Literal.js +1 -12
- package/dist/src/generated/special-case-node-types/ObjectTypeProperty.js +0 -10
- package/dist/src/generated/special-case-node-types/Property.js +0 -9
- package/dist/src/generated/special-case-node-types/misc.js +6 -35
- package/dist/src/index.js +0 -9
- package/dist/src/transform/Errors.js +0 -9
- package/dist/src/transform/MutationContext.js +1 -28
- package/dist/src/transform/TransformContext.js +0 -18
- package/dist/src/transform/comments/comments.js +12 -78
- package/dist/src/transform/comments/prettier/common/util.js +4 -133
- package/dist/src/transform/comments/prettier/language-js/comments.js +12 -137
- package/dist/src/transform/comments/prettier/language-js/loc.js +1 -13
- package/dist/src/transform/comments/prettier/language-js/printer-estree.js +1 -10
- package/dist/src/transform/comments/prettier/language-js/utils.js +3 -33
- package/dist/src/transform/comments/prettier/main/comments.js +11 -77
- package/dist/src/transform/comments/prettier/utils/get-last.js +0 -8
- package/dist/src/transform/mutations/AddComments.js +0 -9
- package/dist/src/transform/mutations/CloneCommentsTo.js +0 -9
- package/dist/src/transform/mutations/InsertStatement.js +4 -16
- package/dist/src/transform/mutations/ModifyNodeInPlace.js +4 -17
- package/dist/src/transform/mutations/RemoveComment.js +0 -10
- package/dist/src/transform/mutations/RemoveNode.js +1 -23
- package/dist/src/transform/mutations/RemoveStatement.js +0 -16
- package/dist/src/transform/mutations/ReplaceNode.js +2 -16
- package/dist/src/transform/mutations/ReplaceStatementWithMany.js +2 -14
- package/dist/src/transform/mutations/utils/getStatementParent.js +3 -19
- package/dist/src/transform/mutations/utils/isValidModuleDeclarationParent.js +5 -20
- package/dist/src/transform/parse.js +6 -25
- package/dist/src/transform/print.js +9 -35
- package/dist/src/transform/transform.js +0 -9
- package/dist/src/transform/transformAST.js +3 -31
- package/dist/src/traverse/NodeEventGenerator.js +2 -108
- package/dist/src/traverse/SafeEmitter.js +0 -19
- package/dist/src/traverse/esquery.js +0 -18
- package/dist/src/traverse/traverse.js +1 -22
- package/dist/transform/Errors.js +0 -9
- package/dist/transform/MutationContext.js +1 -28
- package/dist/transform/MutationContext.js.flow +3 -3
- package/dist/transform/TransformContext.js +0 -18
- package/dist/transform/TransformContext.js.flow +60 -54
- package/dist/transform/comments/comments.js +12 -78
- package/dist/transform/comments/comments.js.flow +8 -8
- package/dist/transform/comments/prettier/common/util.js +4 -133
- package/dist/transform/comments/prettier/language-js/comments.js +12 -137
- package/dist/transform/comments/prettier/language-js/loc.js +1 -13
- package/dist/transform/comments/prettier/language-js/printer-estree.js +1 -10
- package/dist/transform/comments/prettier/language-js/utils.js +3 -33
- package/dist/transform/comments/prettier/main/comments.js +11 -77
- package/dist/transform/comments/prettier/utils/get-last.js +0 -8
- package/dist/transform/mutations/AddComments.js +0 -9
- package/dist/transform/mutations/AddComments.js.flow +2 -2
- package/dist/transform/mutations/CloneCommentsTo.js +0 -9
- package/dist/transform/mutations/CloneCommentsTo.js.flow +1 -1
- package/dist/transform/mutations/InsertStatement.js +4 -16
- package/dist/transform/mutations/InsertStatement.js.flow +7 -6
- package/dist/transform/mutations/ModifyNodeInPlace.js +4 -17
- package/dist/transform/mutations/ModifyNodeInPlace.js.flow +2 -2
- package/dist/transform/mutations/RemoveComment.js +0 -10
- package/dist/transform/mutations/RemoveComment.js.flow +4 -4
- package/dist/transform/mutations/RemoveNode.js +1 -23
- package/dist/transform/mutations/RemoveNode.js.flow +9 -9
- package/dist/transform/mutations/RemoveStatement.js +0 -16
- package/dist/transform/mutations/RemoveStatement.js.flow +3 -3
- package/dist/transform/mutations/ReplaceNode.js +2 -16
- package/dist/transform/mutations/ReplaceNode.js.flow +6 -6
- package/dist/transform/mutations/ReplaceStatementWithMany.js +2 -14
- package/dist/transform/mutations/ReplaceStatementWithMany.js.flow +7 -8
- package/dist/transform/mutations/utils/getStatementParent.js +3 -19
- package/dist/transform/mutations/utils/getStatementParent.js.flow +5 -6
- package/dist/transform/mutations/utils/isValidModuleDeclarationParent.js +5 -20
- package/dist/transform/mutations/utils/isValidModuleDeclarationParent.js.flow +4 -3
- package/dist/transform/parse.js +6 -25
- package/dist/transform/print.js +9 -35
- package/dist/transform/print.js.flow +7 -15
- package/dist/transform/transform.js +0 -9
- package/dist/transform/transformAST.js +3 -31
- package/dist/traverse/NodeEventGenerator.js +2 -108
- package/dist/traverse/NodeEventGenerator.js.flow +13 -9
- package/dist/traverse/SafeEmitter.js +0 -19
- package/dist/traverse/SafeEmitter.js.flow +2 -2
- package/dist/traverse/esquery.js +0 -18
- package/dist/traverse/esquery.js.flow +10 -10
- package/dist/traverse/traverse.js +1 -22
- package/dist/traverse/traverse.js.flow +4 -4
- package/package.json +7 -12
package/dist/detachedNode.js
CHANGED
|
@@ -15,30 +15,16 @@ exports.updateAllParentPointers = updateAllParentPointers;
|
|
|
15
15
|
|
|
16
16
|
var _hermesParser = require("hermes-parser");
|
|
17
17
|
|
|
18
|
-
/**
|
|
19
|
-
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
20
|
-
*
|
|
21
|
-
* This source code is licensed under the MIT license found in the
|
|
22
|
-
* LICENSE file in the root directory of this source tree.
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
* @format
|
|
26
|
-
*/
|
|
27
18
|
const DETACHED_MARKER = Symbol.for('hermes-transform - Detached AST Node');
|
|
28
19
|
const ORIGINAL_NODE = Symbol.for('hermes-transform - Original Node');
|
|
29
20
|
|
|
30
21
|
function isDetachedNode(node) {
|
|
31
|
-
// $FlowExpectedError[invalid-in-lhs] flow doesn't support symbols as keys
|
|
32
22
|
return DETACHED_MARKER in node;
|
|
33
23
|
}
|
|
34
24
|
|
|
35
25
|
function getOriginalNode(node) {
|
|
36
|
-
// $FlowExpectedError[prop-missing]
|
|
37
26
|
return node[ORIGINAL_NODE];
|
|
38
27
|
}
|
|
39
|
-
/* $FlowExpectedError[unclear-type] Type safety is not needed for generated
|
|
40
|
-
* code, this avoids us always having to pass a generic property within codegen */
|
|
41
|
-
|
|
42
28
|
|
|
43
29
|
function asDetachedNodeForCodeGen(node) {
|
|
44
30
|
if (node == null) {
|
|
@@ -66,30 +52,13 @@ const asDetachedNode = (node, {
|
|
|
66
52
|
}
|
|
67
53
|
|
|
68
54
|
return useDeepClone ? deepCloneNode(node, {}) : shallowCloneNode(node, {});
|
|
69
|
-
};
|
|
70
|
-
|
|
55
|
+
};
|
|
71
56
|
|
|
72
57
|
exports.asDetachedNode = asDetachedNode;
|
|
73
58
|
|
|
74
59
|
function detachedProps(parent, props, config = {}) {
|
|
75
|
-
// $FlowExpectedError[incompatible-type]
|
|
76
60
|
const detachedNode = { ...props,
|
|
77
61
|
...((config == null ? void 0 : config.preserveLocation) !== true ? {
|
|
78
|
-
// if this is [0,0] AND the file has a docblock then prettier will insert newlines between
|
|
79
|
-
// certain detached nodes. Because of "intended" formatting behaviour (https://github.com/prettier/prettier/issues/12078)
|
|
80
|
-
// this can cause us to output weirdly formatted code that should have been collapsed.
|
|
81
|
-
//
|
|
82
|
-
// prettier works backwards from the position you give it to find newlines or non whitespace
|
|
83
|
-
// tokens and uses this to determine if newlines should be inserted between nodes.
|
|
84
|
-
// By placing the range at [1, 1] we can ensure a token is always found before a newline
|
|
85
|
-
// and therefore no newlines will be placed between nodes.
|
|
86
|
-
//
|
|
87
|
-
// NOTE: we will still run into the bug if there is weird code like a docblock with whitespace
|
|
88
|
-
// characters before it. However we assume this isn't going to happen because any file
|
|
89
|
-
// already formatted by prettier will have that whitespace removed.
|
|
90
|
-
// We considered a more complex solution involving traversing the AST and manually updating
|
|
91
|
-
// detached node ranges after mutations are applied - however this is a lot heavier and will
|
|
92
|
-
// probably never be needed.
|
|
93
62
|
range: [1, 1],
|
|
94
63
|
loc: {
|
|
95
64
|
start: {
|
|
@@ -102,12 +71,8 @@ function detachedProps(parent, props, config = {}) {
|
|
|
102
71
|
}
|
|
103
72
|
}
|
|
104
73
|
} : {}),
|
|
105
|
-
// if not provided, then we purposely don't set this here
|
|
106
|
-
// and will rely on the tooling to update it as appropriate.
|
|
107
|
-
// nothing should be reading from this before it's set anyway.
|
|
108
74
|
parent: parent
|
|
109
|
-
};
|
|
110
|
-
|
|
75
|
+
};
|
|
111
76
|
Object.defineProperty(detachedNode, DETACHED_MARKER, {
|
|
112
77
|
configurable: false,
|
|
113
78
|
enumerable: false,
|
|
@@ -126,10 +91,6 @@ function detachedProps(parent, props, config = {}) {
|
|
|
126
91
|
|
|
127
92
|
return detachedNode;
|
|
128
93
|
}
|
|
129
|
-
/**
|
|
130
|
-
* Shallowly clones the node, but not its children.
|
|
131
|
-
*/
|
|
132
|
-
|
|
133
94
|
|
|
134
95
|
function shallowCloneNode(node, newProps, config = {}) {
|
|
135
96
|
var _config$preserveLocat, _config$originalNode;
|
|
@@ -141,37 +102,22 @@ function shallowCloneNode(node, newProps, config = {}) {
|
|
|
141
102
|
originalNode: (_config$originalNode = config.originalNode) != null ? _config$originalNode : node
|
|
142
103
|
});
|
|
143
104
|
}
|
|
144
|
-
/**
|
|
145
|
-
* Deeply clones node and its entire tree.
|
|
146
|
-
*/
|
|
147
|
-
|
|
148
105
|
|
|
149
106
|
function deepCloneNode(node, newProps) {
|
|
150
|
-
// $FlowFixMe[unsafe-object-assign]
|
|
151
107
|
const clone = Object.assign(JSON.parse(JSON.stringify(node, (key, value) => {
|
|
152
|
-
// null out parent pointers
|
|
153
108
|
if (key === 'parent') {
|
|
154
109
|
return undefined;
|
|
155
110
|
}
|
|
156
111
|
|
|
157
112
|
return value;
|
|
158
113
|
})), newProps);
|
|
159
|
-
updateAllParentPointers(clone);
|
|
160
|
-
|
|
114
|
+
updateAllParentPointers(clone);
|
|
161
115
|
return detachedProps(null, clone);
|
|
162
116
|
}
|
|
163
|
-
/**
|
|
164
|
-
* Corrects the parent pointers in direct children of the given node
|
|
165
|
-
*/
|
|
166
|
-
|
|
167
117
|
|
|
168
118
|
function setParentPointersInDirectChildren(node) {
|
|
169
119
|
_hermesParser.astNodeMutationHelpers.setParentPointersInDirectChildren(node);
|
|
170
120
|
}
|
|
171
|
-
/**
|
|
172
|
-
* Traverses the entire subtree to ensure the parent pointers are set correctly
|
|
173
|
-
*/
|
|
174
|
-
|
|
175
121
|
|
|
176
122
|
function updateAllParentPointers(node) {
|
|
177
123
|
_hermesParser.astNodeMutationHelpers.updateAllParentPointers(node);
|
|
@@ -12,10 +12,10 @@ import type {BaseNode, ESNode} from 'hermes-estree';
|
|
|
12
12
|
|
|
13
13
|
import {astNodeMutationHelpers} from 'hermes-parser';
|
|
14
14
|
|
|
15
|
-
export opaque type DetachedNode
|
|
16
|
-
export type MaybeDetachedNode
|
|
15
|
+
export opaque type DetachedNode<out T> = T;
|
|
16
|
+
export type MaybeDetachedNode<out T> = T | DetachedNode<T>;
|
|
17
17
|
|
|
18
|
-
type DetachConfig =
|
|
18
|
+
type DetachConfig = Readonly<{
|
|
19
19
|
preserveLocation?: boolean,
|
|
20
20
|
originalNode?: ESNode,
|
|
21
21
|
}>;
|
|
@@ -47,16 +47,16 @@ export function asDetachedNodeForCodeGen(node: any): ?DetachedNode<any> {
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
export const asDetachedNode: {
|
|
50
|
-
<T
|
|
50
|
+
<T extends ESNode>(
|
|
51
51
|
node: MaybeDetachedNode<T>,
|
|
52
52
|
config?: {useDeepClone: boolean},
|
|
53
53
|
): DetachedNode<T>,
|
|
54
|
-
<T
|
|
54
|
+
<T extends ?ESNode>(
|
|
55
55
|
node: ?MaybeDetachedNode<T>,
|
|
56
56
|
config?: {useDeepClone: boolean},
|
|
57
57
|
): ?DetachedNode<T>,
|
|
58
58
|
// $FlowFixMe[incompatible-exact]
|
|
59
|
-
} = <T
|
|
59
|
+
} = <T extends ESNode>(
|
|
60
60
|
node: ?MaybeDetachedNode<T>,
|
|
61
61
|
{useDeepClone}: {useDeepClone: boolean} = {useDeepClone: false},
|
|
62
62
|
): // $FlowExpectedError[incompatible-type]
|
|
@@ -65,7 +65,7 @@ export const asDetachedNode: {
|
|
|
65
65
|
return null;
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
if (isDetachedNode(
|
|
68
|
+
if (isDetachedNode(node as MaybeDetachedNode<T>)) {
|
|
69
69
|
return node;
|
|
70
70
|
}
|
|
71
71
|
|
|
@@ -75,7 +75,7 @@ export const asDetachedNode: {
|
|
|
75
75
|
};
|
|
76
76
|
|
|
77
77
|
// used by the node type function codegen
|
|
78
|
-
export function detachedProps<T
|
|
78
|
+
export function detachedProps<T extends BaseNode>(
|
|
79
79
|
parent: ?ESNode,
|
|
80
80
|
props: {...},
|
|
81
81
|
config: DetachConfig = {},
|
|
@@ -116,7 +116,7 @@ export function detachedProps<T: BaseNode>(
|
|
|
116
116
|
// if not provided, then we purposely don't set this here
|
|
117
117
|
// and will rely on the tooling to update it as appropriate.
|
|
118
118
|
// nothing should be reading from this before it's set anyway.
|
|
119
|
-
parent:
|
|
119
|
+
parent: parent as $FlowFixMe,
|
|
120
120
|
};
|
|
121
121
|
|
|
122
122
|
// mark the node as detached
|
|
@@ -142,14 +142,14 @@ export function detachedProps<T: BaseNode>(
|
|
|
142
142
|
/**
|
|
143
143
|
* Shallowly clones the node, but not its children.
|
|
144
144
|
*/
|
|
145
|
-
export function shallowCloneNode<T
|
|
145
|
+
export function shallowCloneNode<T extends ESNode>(
|
|
146
146
|
node: T,
|
|
147
147
|
newProps: {...},
|
|
148
148
|
config?: DetachConfig = {},
|
|
149
149
|
): DetachedNode<T> {
|
|
150
150
|
return detachedProps<T>(
|
|
151
151
|
null,
|
|
152
|
-
{...(node
|
|
152
|
+
{...(node as $FlowFixMe), ...newProps},
|
|
153
153
|
{
|
|
154
154
|
preserveLocation: config.preserveLocation ?? true,
|
|
155
155
|
originalNode: config.originalNode ?? node,
|
|
@@ -160,7 +160,7 @@ export function shallowCloneNode<T: ESNode>(
|
|
|
160
160
|
/**
|
|
161
161
|
* Deeply clones node and its entire tree.
|
|
162
162
|
*/
|
|
163
|
-
export function deepCloneNode<T
|
|
163
|
+
export function deepCloneNode<T extends ESNode>(
|
|
164
164
|
node: T,
|
|
165
165
|
newProps: {...},
|
|
166
166
|
): DetachedNode<T> {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
// lint directives to let us do some basic validation of generated files
|
|
19
19
|
/* eslint no-undef: 'error', no-unused-vars: ['error', {vars: "local"}], no-redeclare: 'error' */
|
|
20
|
-
/* global
|
|
20
|
+
/* global NonNullable, Partial, Readonly, ReadonlyArray, $FlowFixMe */
|
|
21
21
|
|
|
22
22
|
'use strict';
|
|
23
23
|
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
// lint directives to let us do some basic validation of generated files
|
|
19
19
|
/* eslint no-undef: 'error', no-unused-vars: ['error', {vars: "local"}], no-redeclare: 'error' */
|
|
20
|
-
/* global
|
|
20
|
+
/* global NonNullable, Partial, Readonly, ReadonlyArray, $FlowFixMe */
|
|
21
21
|
|
|
22
22
|
'use strict';
|
|
23
23
|
|