hermes-parser 0.31.2 → 0.32.1

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.
Files changed (30) hide show
  1. package/README.md +3 -0
  2. package/dist/HermesASTAdapter.js +2 -2
  3. package/dist/HermesASTAdapter.js.flow +2 -2
  4. package/dist/HermesParserDeserializer.js +0 -1
  5. package/dist/HermesParserDeserializer.js.flow +0 -1
  6. package/dist/HermesParserWASM.js +1 -1
  7. package/dist/ParserOptions.js +1 -1
  8. package/dist/ParserOptions.js.flow +8 -0
  9. package/dist/babel/TransformESTreeToBabel.js +11 -8
  10. package/dist/babel/TransformESTreeToBabel.js.flow +11 -8
  11. package/dist/estree/{StripComponentSyntax.js → TransformComponentSyntax.js} +2 -2
  12. package/dist/estree/{StripComponentSyntax.js.flow → TransformComponentSyntax.js.flow} +2 -2
  13. package/dist/estree/TransformEnumSyntax.js +106 -0
  14. package/dist/estree/TransformEnumSyntax.js.flow +125 -0
  15. package/dist/index.js +6 -3
  16. package/dist/index.js.flow +6 -3
  17. package/dist/src/HermesASTAdapter.js +2 -2
  18. package/dist/src/HermesParserDeserializer.js +0 -1
  19. package/dist/src/ParserOptions.js +1 -1
  20. package/dist/src/babel/TransformESTreeToBabel.js +11 -8
  21. package/dist/src/estree/{StripComponentSyntax.js → TransformComponentSyntax.js} +2 -2
  22. package/dist/src/estree/TransformEnumSyntax.js +106 -0
  23. package/dist/src/index.js +6 -3
  24. package/dist/src/transform/SimpleTransform.js +20 -4
  25. package/dist/src/transform/astNodeMutationHelpers.js +7 -2
  26. package/dist/transform/SimpleTransform.js +20 -4
  27. package/dist/transform/SimpleTransform.js.flow +34 -8
  28. package/dist/transform/astNodeMutationHelpers.js +7 -2
  29. package/dist/transform/astNodeMutationHelpers.js.flow +10 -2
  30. package/package.json +2 -2
@@ -0,0 +1,106 @@
1
+ /**
2
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
3
+ *
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
6
+ *
7
+ *
8
+ * @format
9
+ */
10
+ 'use strict';
11
+ /**
12
+ * Transform Flow Enum declarations (https://flow.org/en/docs/enums/).
13
+ */
14
+
15
+ Object.defineProperty(exports, "__esModule", {
16
+ value: true
17
+ });
18
+ exports.transformProgram = transformProgram;
19
+
20
+ var _hermesEstree = require("hermes-estree");
21
+
22
+ var _SimpleTransform = require("../transform/SimpleTransform");
23
+
24
+ var _Builders = require("../utils/Builders");
25
+
26
+ function mapEnumDeclaration(node, options) {
27
+ var _options$transformOpt, _options$transformOpt2;
28
+
29
+ const {
30
+ body
31
+ } = node;
32
+ const {
33
+ members
34
+ } = body;
35
+ const getRuntime = (_options$transformOpt = options.transformOptions) == null ? void 0 : (_options$transformOpt2 = _options$transformOpt.TransformEnumSyntax) == null ? void 0 : _options$transformOpt2.getRuntime;
36
+ const enumModule = typeof getRuntime === 'function' ? getRuntime() : (0, _Builders.callExpression)((0, _Builders.ident)('require'), [(0, _Builders.stringLiteral)('flow-enums-runtime')]);
37
+ const mirrored = body.type === 'EnumStringBody' && (!members.length || members[0].type === 'EnumDefaultedMember');
38
+ const enumExpression = mirrored ? (0, _Builders.callExpression)({
39
+ type: 'MemberExpression',
40
+ object: enumModule,
41
+ property: (0, _Builders.ident)('Mirrored'),
42
+ computed: false,
43
+ optional: false,
44
+ ...(0, _Builders.etc)()
45
+ }, [{
46
+ type: 'ArrayExpression',
47
+ elements: members.map(member => (0, _Builders.stringLiteral)(member.id.name)),
48
+ trailingComma: false,
49
+ ...(0, _Builders.etc)()
50
+ }]) : (0, _Builders.callExpression)(enumModule, [{
51
+ type: 'ObjectExpression',
52
+ properties: members.map(member => ({
53
+ type: 'Property',
54
+ key: member.id,
55
+ value: // String enums with `EnumDefaultedMember` are handled above by
56
+ // calculation of `mirrored`.
57
+ member.type === 'EnumDefaultedMember' ? (0, _Builders.callExpression)((0, _Builders.ident)('Symbol'), [(0, _Builders.stringLiteral)(member.id.name)]) : member.init,
58
+ kind: 'init',
59
+ method: false,
60
+ shorthand: false,
61
+ computed: false,
62
+ ...(0, _Builders.etc)(),
63
+ parent: _Builders.EMPTY_PARENT
64
+ })),
65
+ ...(0, _Builders.etc)()
66
+ }]);
67
+ return (0, _Builders.variableDeclaration)('const', node.id, enumExpression);
68
+ }
69
+
70
+ function transformProgram(program, options) {
71
+ return _SimpleTransform.SimpleTransform.transformProgram(program, {
72
+ transform(node) {
73
+ switch (node.type) {
74
+ case 'EnumDeclaration':
75
+ {
76
+ return mapEnumDeclaration(node, options);
77
+ }
78
+
79
+ case 'ExportDefaultDeclaration':
80
+ {
81
+ const {
82
+ declaration
83
+ } = node;
84
+
85
+ if ((0, _hermesEstree.isEnumDeclaration)(declaration)) {
86
+ const enumDeclaration = mapEnumDeclaration(declaration, options);
87
+
88
+ const exportDefault = _SimpleTransform.SimpleTransform.nodeWith(node, {
89
+ declaration: (0, _Builders.ident)(declaration.id.name)
90
+ });
91
+
92
+ return [enumDeclaration, exportDefault];
93
+ } else {
94
+ return node;
95
+ }
96
+ }
97
+
98
+ default:
99
+ {
100
+ return node;
101
+ }
102
+ }
103
+ }
104
+
105
+ });
106
+ }
package/dist/src/index.js CHANGED
@@ -31,7 +31,9 @@ var _ESTreeVisitorKeys = _interopRequireDefault(require("./generated/ESTreeVisit
31
31
 
32
32
  exports.FlowVisitorKeys = _ESTreeVisitorKeys.default;
33
33
 
34
- var StripComponentSyntax = _interopRequireWildcard(require("./estree/StripComponentSyntax"));
34
+ var TransformComponentSyntax = _interopRequireWildcard(require("./estree/TransformComponentSyntax"));
35
+
36
+ var TransformEnumSyntax = _interopRequireWildcard(require("./estree/TransformEnumSyntax"));
35
37
 
36
38
  var TransformMatchSyntax = _interopRequireWildcard(require("./estree/TransformMatchSyntax"));
37
39
 
@@ -140,13 +142,14 @@ function parse(code, opts) {
140
142
  return estreeAST;
141
143
  }
142
144
 
143
- const loweredESTreeAST = [TransformMatchSyntax.transformProgram, StripComponentSyntax.transformProgram, StripFlowTypesForBabel.transformProgram].reduce((ast, transform) => transform(ast, options), estreeAST);
145
+ const loweredESTreeAST = [TransformEnumSyntax.transformProgram, TransformMatchSyntax.transformProgram, TransformComponentSyntax.transformProgram, StripFlowTypesForBabel.transformProgram].reduce((ast, transform) => transform(ast, options), estreeAST);
144
146
  return TransformESTreeToBabel.transformProgram(loweredESTreeAST, options);
145
147
  }
146
148
 
147
149
  const Transforms = {
150
+ transformEnumSyntax: TransformEnumSyntax.transformProgram,
148
151
  transformMatchSyntax: TransformMatchSyntax.transformProgram,
149
- stripComponentSyntax: StripComponentSyntax.transformProgram,
152
+ transformComponentSyntax: TransformComponentSyntax.transformProgram,
150
153
  stripFlowTypesForBabel: StripFlowTypesForBabel.transformProgram,
151
154
  stripFlowTypes: StripFlowTypes.transformProgram
152
155
  };
@@ -20,8 +20,15 @@ var _astNodeMutationHelpers = require("./astNodeMutationHelpers");
20
20
 
21
21
  function setParentPointer(node, parent) {
22
22
  if (parent != null) {
23
- // $FlowExpectedError[cannot-write]
24
- node.parent = parent;
23
+ if (Array.isArray(node)) {
24
+ for (const item of node) {
25
+ // $FlowExpectedError[cannot-write]
26
+ item.parent = parent;
27
+ }
28
+ } else {
29
+ // $FlowExpectedError[cannot-write]
30
+ node.parent = parent;
31
+ }
25
32
  }
26
33
  }
27
34
  /**
@@ -51,7 +58,12 @@ class SimpleTransform {
51
58
  if (resultNode != null) {
52
59
  // Ensure the new node has the correct parent pointers before recursing again.
53
60
  setParentPointer(resultNode, parent);
54
- traversedResultNode = this.transform(resultNode, options);
61
+
62
+ if (Array.isArray(resultNode)) {
63
+ traversedResultNode = resultNode.map(item => this.transform(item, options)).filter(item => item != null);
64
+ } else {
65
+ traversedResultNode = this.transform(resultNode, options);
66
+ }
55
67
  }
56
68
 
57
69
  if (parent == null) {
@@ -59,7 +71,11 @@ class SimpleTransform {
59
71
  throw new Error('SimpleTransform infra error: Parent not set on non root node, this should not be possible');
60
72
  }
61
73
 
62
- resultRootNode = traversedResultNode;
74
+ if (Array.isArray(traversedResultNode)) {
75
+ throw new Error('SimpleTransform: invalid array result for root node');
76
+ } else {
77
+ resultRootNode = traversedResultNode;
78
+ }
63
79
  } else if (traversedResultNode == null) {
64
80
  (0, _astNodeMutationHelpers.removeNodeOnParent)(node, parent, options.visitorKeys);
65
81
  } else {
@@ -34,6 +34,7 @@ function getParentKey(target, parent, visitorKeys) {
34
34
  for (const key of (0, _getVisitorKeys.getVisitorKeys)(parent, visitorKeys)) {
35
35
  if ((0, _getVisitorKeys.isNode)( // $FlowExpectedError[prop-missing]
36
36
  parent[key])) {
37
+ // $FlowFixMe[invalid-compare]
37
38
  if (parent[key] === target) {
38
39
  return {
39
40
  type: 'single',
@@ -73,9 +74,13 @@ function replaceNodeOnParent(originalNode, originalNodeParent, nodeToReplaceWith
73
74
  if (replacementParent.type === 'array') {
74
75
  // $FlowExpectedError[prop-missing]
75
76
  parent[replacementParent.key] = (0, _astArrayMutationHelpers.replaceInArray)( // $FlowExpectedError[prop-missing]
76
- parent[replacementParent.key], replacementParent.targetIndex, [nodeToReplaceWith]);
77
+ parent[replacementParent.key], replacementParent.targetIndex, Array.isArray(nodeToReplaceWith) ? nodeToReplaceWith : [nodeToReplaceWith]);
77
78
  } else {
78
- // $FlowExpectedError[prop-missing]
79
+ if (Array.isArray(nodeToReplaceWith)) {
80
+ throw new Error(`Cannot insert array into non-array parent type: ${parent.type}`);
81
+ } // $FlowExpectedError[prop-missing]
82
+
83
+
79
84
  parent[replacementParent.key] = nodeToReplaceWith;
80
85
  }
81
86
  }
@@ -20,8 +20,15 @@ var _astNodeMutationHelpers = require("./astNodeMutationHelpers");
20
20
 
21
21
  function setParentPointer(node, parent) {
22
22
  if (parent != null) {
23
- // $FlowExpectedError[cannot-write]
24
- node.parent = parent;
23
+ if (Array.isArray(node)) {
24
+ for (const item of node) {
25
+ // $FlowExpectedError[cannot-write]
26
+ item.parent = parent;
27
+ }
28
+ } else {
29
+ // $FlowExpectedError[cannot-write]
30
+ node.parent = parent;
31
+ }
25
32
  }
26
33
  }
27
34
  /**
@@ -51,7 +58,12 @@ class SimpleTransform {
51
58
  if (resultNode != null) {
52
59
  // Ensure the new node has the correct parent pointers before recursing again.
53
60
  setParentPointer(resultNode, parent);
54
- traversedResultNode = this.transform(resultNode, options);
61
+
62
+ if (Array.isArray(resultNode)) {
63
+ traversedResultNode = resultNode.map(item => this.transform(item, options)).filter(item => item != null);
64
+ } else {
65
+ traversedResultNode = this.transform(resultNode, options);
66
+ }
55
67
  }
56
68
 
57
69
  if (parent == null) {
@@ -59,7 +71,11 @@ class SimpleTransform {
59
71
  throw new Error('SimpleTransform infra error: Parent not set on non root node, this should not be possible');
60
72
  }
61
73
 
62
- resultRootNode = traversedResultNode;
74
+ if (Array.isArray(traversedResultNode)) {
75
+ throw new Error('SimpleTransform: invalid array result for root node');
76
+ } else {
77
+ resultRootNode = traversedResultNode;
78
+ }
63
79
  } else if (traversedResultNode == null) {
64
80
  (0, _astNodeMutationHelpers.removeNodeOnParent)(node, parent, options.visitorKeys);
65
81
  } else {
@@ -29,7 +29,9 @@ import {
29
29
  * children are then traversed.
30
30
  * - return null, signals the node should be deleted from the AST.
31
31
  */
32
- export type TransformCallback = (node: ESNode) => ESNode | null;
32
+ export type TransformCallback = (
33
+ node: ESNode,
34
+ ) => ESNode | $ReadOnlyArray<ESNode> | null;
33
35
 
34
36
  export type TransformOptions = $ReadOnly<{
35
37
  /** The callback function which is called on entering each node. */
@@ -39,10 +41,20 @@ export type TransformOptions = $ReadOnly<{
39
41
  visitorKeys?: ?VisitorKeysType,
40
42
  }>;
41
43
 
42
- function setParentPointer(node: ESNode, parent: ?ESNode): void {
44
+ function setParentPointer(
45
+ node: ESNode | $ReadOnlyArray<ESNode>,
46
+ parent: ?ESNode,
47
+ ): void {
43
48
  if (parent != null) {
44
- // $FlowExpectedError[cannot-write]
45
- node.parent = parent;
49
+ if (Array.isArray(node)) {
50
+ for (const item of node) {
51
+ // $FlowExpectedError[cannot-write]
52
+ item.parent = parent;
53
+ }
54
+ } else {
55
+ // $FlowExpectedError[cannot-write]
56
+ node.parent = parent;
57
+ }
46
58
  }
47
59
  }
48
60
 
@@ -63,15 +75,23 @@ export class SimpleTransform {
63
75
  // Ensure the parent pointers are correctly set before entering the node.
64
76
  setParentPointer(node, parent);
65
77
 
66
- const resultNode = options.transform(node);
78
+ const resultNode: ESNode | $ReadOnlyArray<ESNode> | null =
79
+ options.transform(node);
67
80
  if (resultNode !== node) {
68
- let traversedResultNode = null;
81
+ let traversedResultNode: ESNode | $ReadOnlyArray<ESNode> | null =
82
+ null;
69
83
 
70
84
  if (resultNode != null) {
71
85
  // Ensure the new node has the correct parent pointers before recursing again.
72
86
  setParentPointer(resultNode, parent);
73
87
 
74
- traversedResultNode = this.transform(resultNode, options);
88
+ if (Array.isArray(resultNode)) {
89
+ traversedResultNode = resultNode
90
+ .map(item => this.transform(item, options))
91
+ .filter(item => item != null);
92
+ } else {
93
+ traversedResultNode = this.transform(resultNode, options);
94
+ }
75
95
  }
76
96
 
77
97
  if (parent == null) {
@@ -80,7 +100,13 @@ export class SimpleTransform {
80
100
  'SimpleTransform infra error: Parent not set on non root node, this should not be possible',
81
101
  );
82
102
  }
83
- resultRootNode = traversedResultNode;
103
+ if (Array.isArray(traversedResultNode)) {
104
+ throw new Error(
105
+ 'SimpleTransform: invalid array result for root node',
106
+ );
107
+ } else {
108
+ resultRootNode = traversedResultNode;
109
+ }
84
110
  } else if (traversedResultNode == null) {
85
111
  removeNodeOnParent(node, parent, options.visitorKeys);
86
112
  } else {
@@ -34,6 +34,7 @@ function getParentKey(target, parent, visitorKeys) {
34
34
  for (const key of (0, _getVisitorKeys.getVisitorKeys)(parent, visitorKeys)) {
35
35
  if ((0, _getVisitorKeys.isNode)( // $FlowExpectedError[prop-missing]
36
36
  parent[key])) {
37
+ // $FlowFixMe[invalid-compare]
37
38
  if (parent[key] === target) {
38
39
  return {
39
40
  type: 'single',
@@ -73,9 +74,13 @@ function replaceNodeOnParent(originalNode, originalNodeParent, nodeToReplaceWith
73
74
  if (replacementParent.type === 'array') {
74
75
  // $FlowExpectedError[prop-missing]
75
76
  parent[replacementParent.key] = (0, _astArrayMutationHelpers.replaceInArray)( // $FlowExpectedError[prop-missing]
76
- parent[replacementParent.key], replacementParent.targetIndex, [nodeToReplaceWith]);
77
+ parent[replacementParent.key], replacementParent.targetIndex, Array.isArray(nodeToReplaceWith) ? nodeToReplaceWith : [nodeToReplaceWith]);
77
78
  } else {
78
- // $FlowExpectedError[prop-missing]
79
+ if (Array.isArray(nodeToReplaceWith)) {
80
+ throw new Error(`Cannot insert array into non-array parent type: ${parent.type}`);
81
+ } // $FlowExpectedError[prop-missing]
82
+
83
+
79
84
  parent[replacementParent.key] = nodeToReplaceWith;
80
85
  }
81
86
  }
@@ -48,6 +48,7 @@ function getParentKey(
48
48
  parent[key],
49
49
  )
50
50
  ) {
51
+ // $FlowFixMe[invalid-compare]
51
52
  if (parent[key] === target) {
52
53
  return {type: 'single', node: parent, key};
53
54
  }
@@ -74,7 +75,7 @@ function getParentKey(
74
75
  export function replaceNodeOnParent(
75
76
  originalNode: ESNode,
76
77
  originalNodeParent: ESNode,
77
- nodeToReplaceWith: ESNode,
78
+ nodeToReplaceWith: ESNode | $ReadOnlyArray<ESNode>,
78
79
  visitorKeys?: ?VisitorKeysType,
79
80
  ): void {
80
81
  const replacementParent = getParentKey(
@@ -89,9 +90,16 @@ export function replaceNodeOnParent(
89
90
  // $FlowExpectedError[prop-missing]
90
91
  parent[replacementParent.key],
91
92
  replacementParent.targetIndex,
92
- [nodeToReplaceWith],
93
+ Array.isArray(nodeToReplaceWith)
94
+ ? nodeToReplaceWith
95
+ : [nodeToReplaceWith],
93
96
  );
94
97
  } else {
98
+ if (Array.isArray(nodeToReplaceWith)) {
99
+ throw new Error(
100
+ `Cannot insert array into non-array parent type: ${parent.type}`,
101
+ );
102
+ }
95
103
  // $FlowExpectedError[prop-missing]
96
104
  parent[replacementParent.key] = nodeToReplaceWith;
97
105
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hermes-parser",
3
- "version": "0.31.2",
3
+ "version": "0.32.1",
4
4
  "description": "A JavaScript parser built from the Hermes engine",
5
5
  "main": "dist/index.js",
6
6
  "license": "MIT",
@@ -9,7 +9,7 @@
9
9
  "url": "git@github.com:facebook/hermes.git"
10
10
  },
11
11
  "dependencies": {
12
- "hermes-estree": "0.31.2"
12
+ "hermes-estree": "0.32.1"
13
13
  },
14
14
  "devDependencies": {
15
15
  "@babel/parser": "7.7.4",