hermes-transform 0.11.1 → 0.12.1

package/dist/detachedNode.js.flow

@@ -55,6 +55,7 @@ export const asDetachedNode: {
     node: ?MaybeDetachedNode<T>,
     config?: {useDeepClone: boolean},
   ): ?DetachedNode<T>,
+  // $FlowFixMe[incompatible-exact]
 } = <T: ESNode>(
   node: ?MaybeDetachedNode<T>,
   {useDeepClone}: {useDeepClone: boolean} = {useDeepClone: false},

package/dist/generated/node-types.js

@@ -549,7 +549,7 @@ function ComponentDeclaration(props) {
     params: props.params.map(n => (0, _detachedNode.asDetachedNodeForCodeGen)(n)),
     body: (0, _detachedNode.asDetachedNodeForCodeGen)(props.body),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
-    returnType: (0, _detachedNode.asDetachedNodeForCodeGen)(props.returnType)
+    rendersType: (0, _detachedNode.asDetachedNodeForCodeGen)(props.rendersType)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);
   return node;
@@ -572,7 +572,7 @@ function ComponentTypeAnnotation(props) {
     params: props.params.map(n => (0, _detachedNode.asDetachedNodeForCodeGen)(n)),
     rest: (0, _detachedNode.asDetachedNodeForCodeGen)(props.rest),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
-    returnType: (0, _detachedNode.asDetachedNodeForCodeGen)(props.returnType)
+    rendersType: (0, _detachedNode.asDetachedNodeForCodeGen)(props.rendersType)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);
   return node;
@@ -649,7 +649,7 @@ function DeclareComponent(props) {
     params: props.params.map(n => (0, _detachedNode.asDetachedNodeForCodeGen)(n)),
     rest: (0, _detachedNode.asDetachedNodeForCodeGen)(props.rest),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
-    returnType: (0, _detachedNode.asDetachedNodeForCodeGen)(props.returnType)
+    rendersType: (0, _detachedNode.asDetachedNodeForCodeGen)(props.rendersType)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);
   return node;
@@ -1788,7 +1788,8 @@ function TypeParameter(props) {
     name: props.name,
     bound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.bound),
     variance: (0, _detachedNode.asDetachedNodeForCodeGen)(props.variance),
-    default: (0, _detachedNode.asDetachedNodeForCodeGen)(props.default)
+    default: (0, _detachedNode.asDetachedNodeForCodeGen)(props.default),
+    usesExtendsBound: props.usesExtendsBound
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);
   return node;

package/dist/generated/node-types.js.flow

@@ -301,7 +301,7 @@ export type ComponentDeclarationProps = {
   +typeParameters?: ?MaybeDetachedNode<
     ComponentDeclarationType['typeParameters'],
   >,
-  +returnType?: ?MaybeDetachedNode<ComponentDeclarationType['returnType']>,
+  +rendersType?: ?MaybeDetachedNode<ComponentDeclarationType['rendersType']>,
 };
 
 export type ComponentParameterProps = {
@@ -318,12 +318,12 @@ export type ComponentTypeAnnotationProps = {
   +typeParameters?: ?MaybeDetachedNode<
     ComponentTypeAnnotationType['typeParameters'],
   >,
-  +returnType?: ?MaybeDetachedNode<ComponentTypeAnnotationType['returnType']>,
+  +rendersType?: ?MaybeDetachedNode<ComponentTypeAnnotationType['rendersType']>,
 };
 
 export type ComponentTypeParameterProps = {
   +name?: ?MaybeDetachedNode<ComponentTypeParameterType['name']>,
-  +typeAnnotation?: ?MaybeDetachedNode<
+  +typeAnnotation: MaybeDetachedNode<
     ComponentTypeParameterType['typeAnnotation'],
   >,
   +optional: ComponentTypeParameterType['optional'],
@@ -370,7 +370,7 @@ export type DeclareComponentProps = {
   >,
   +rest?: ?MaybeDetachedNode<DeclareComponentType['rest']>,
   +typeParameters?: ?MaybeDetachedNode<DeclareComponentType['typeParameters']>,
-  +returnType?: ?MaybeDetachedNode<DeclareComponentType['returnType']>,
+  +rendersType?: ?MaybeDetachedNode<DeclareComponentType['rendersType']>,
 };
 
 export type DeclaredPredicateProps = {
@@ -1025,6 +1025,7 @@ export type TypeParameterProps = {
   +bound?: ?MaybeDetachedNode<TypeParameterType['bound']>,
   +variance?: ?MaybeDetachedNode<TypeParameterType['variance']>,
   +default?: ?MaybeDetachedNode<TypeParameterType['default']>,
+  +usesExtendsBound: TypeParameterType['usesExtendsBound'],
 };
 
 export type TypeParameterDeclarationProps = {
@@ -1358,7 +1359,7 @@ export function ComponentDeclaration(props: {
     params: props.params.map(n => asDetachedNodeForCodeGen(n)),
     body: asDetachedNodeForCodeGen(props.body),
     typeParameters: asDetachedNodeForCodeGen(props.typeParameters),
-    returnType: asDetachedNodeForCodeGen(props.returnType),
+    rendersType: asDetachedNodeForCodeGen(props.rendersType),
   });
   setParentPointersInDirectChildren(node);
   return node;
@@ -1387,7 +1388,7 @@ export function ComponentTypeAnnotation(props: {
     params: props.params.map(n => asDetachedNodeForCodeGen(n)),
     rest: asDetachedNodeForCodeGen(props.rest),
     typeParameters: asDetachedNodeForCodeGen(props.typeParameters),
-    returnType: asDetachedNodeForCodeGen(props.returnType),
+    rendersType: asDetachedNodeForCodeGen(props.rendersType),
   });
   setParentPointersInDirectChildren(node);
   return node;
@@ -1485,7 +1486,7 @@ export function DeclareComponent(props: {
     params: props.params.map(n => asDetachedNodeForCodeGen(n)),
     rest: asDetachedNodeForCodeGen(props.rest),
     typeParameters: asDetachedNodeForCodeGen(props.typeParameters),
-    returnType: asDetachedNodeForCodeGen(props.returnType),
+    rendersType: asDetachedNodeForCodeGen(props.rendersType),
   });
   setParentPointersInDirectChildren(node);
   return node;
@@ -2962,6 +2963,7 @@ export function TypeParameter(props: {
     bound: asDetachedNodeForCodeGen(props.bound),
     variance: asDetachedNodeForCodeGen(props.variance),
     default: asDetachedNodeForCodeGen(props.default),
+    usesExtendsBound: props.usesExtendsBound,
   });
   setParentPointersInDirectChildren(node);
   return node;

package/dist/transform/TransformContext.js

@@ -47,6 +47,7 @@ function getTransformContext() {
   }
 
   const cloneAPIs = {
+    // $FlowFixMe[incompatible-exact]
     shallowCloneNode: node => {
       if (node == null) {
         return null;
@@ -61,6 +62,7 @@ function getTransformContext() {
 
       return (0, _detachedNode.shallowCloneNode)(node, newProps);
     },
+    // $FlowFixMe[incompatible-exact]
     shallowCloneArray: nodes => {
       if (nodes == null) {
         return null;
@@ -75,6 +77,7 @@ function getTransformContext() {
         return (0, _detachedNode.shallowCloneNode)(node, {});
       });
     },
+    // $FlowFixMe[incompatible-exact]
     deepCloneNode: node => {
       if (node == null) {
         return null;
@@ -154,6 +157,7 @@ function getTransformContext() {
     }
   };
   const replaceAPIs = {
+    // $FlowFixMe[incompatible-exact]
     replaceNode: (target, nodeToReplaceWith, options) => {
       pushMutation((0, _ReplaceNode.createReplaceNodeMutation)(target, (0, _detachedNode.asDetachedNode)(nodeToReplaceWith), options));
     },

package/dist/transform/TransformContext.js.flow

@@ -330,6 +330,7 @@ export function getTransformContext(): TransformContextAdditions {
   }
 
   const cloneAPIs: TransformCloneAPIs = {
+    // $FlowFixMe[incompatible-exact]
     shallowCloneNode: ((
       node: ?ESNode,
     ): // $FlowExpectedError[incompatible-cast]
@@ -354,6 +355,7 @@ export function getTransformContext(): TransformContextAdditions {
       return shallowCloneNode(node, newProps);
     }: TransformCloneAPIs['shallowCloneNodeWithOverrides']),
 
+    // $FlowFixMe[incompatible-exact]
     shallowCloneArray: (<T: ESNode>(
       nodes: ?$ReadOnlyArray<?T>,
     ): // $FlowExpectedError[incompatible-cast]
@@ -371,6 +373,7 @@ export function getTransformContext(): TransformContextAdditions {
       });
     }: TransformCloneAPIs['shallowCloneArray']),
 
+    // $FlowFixMe[incompatible-exact]
     deepCloneNode: ((
       node: ?ESNode,
     ): // $FlowExpectedError[incompatible-cast]
@@ -501,6 +504,7 @@ export function getTransformContext(): TransformContextAdditions {
     }: TransformRemoveAPIs['removeStatement']),
   };
   const replaceAPIs: TransformReplaceAPIs = {
+    // $FlowFixMe[incompatible-exact]
     replaceNode: ((
       target: ESNode,
       nodeToReplaceWith: MaybeDetachedNode<ESNode>,

package/dist/transform/mutations/RemoveNode.js

@@ -29,6 +29,7 @@ function createRemoveNodeMutation(node) {
 const VALID_ENUM_MEMBER_PARENTS = ['EnumBooleanBody', 'EnumNumberBody', 'EnumStringBody', 'EnumSymbolBody'];
 const VALID_FUNCTION_PARAMETER_PARENTS = ['ArrowFunctionExpression', 'FunctionDeclaration', 'FunctionExpression'];
 const VALID_PROPERTY_PARENTS = ['ObjectExpression', 'ObjectPattern'];
+const VALID_COMPONENT_TYPE_PARAMETER_PARENTS = ['DeclareComponent', 'ComponentTypeAnnotation'];
 
 function getRemovalParent(node) {
   const key = (() => {
@@ -57,6 +58,15 @@ function getRemovalParent(node) {
       case 'EnumStringMember':
         assertParent(VALID_ENUM_MEMBER_PARENTS);
         return 'members';
+      // Components
+
+      case 'ComponentParameter':
+        assertParent('ComponentDeclaration');
+        return 'params';
+
+      case 'ComponentTypeParameter':
+        assertParent(VALID_COMPONENT_TYPE_PARAMETER_PARENTS);
+        return 'params';
       // FunctionParameter
 
       case 'AssignmentPattern':
@@ -121,6 +131,7 @@ function getRemovalParent(node) {
           case 'ArrowFunctionExpression':
           case 'FunctionDeclaration':
           case 'FunctionExpression':
+          case 'ComponentDeclaration':
             return 'params';
 
           case 'ArrayPattern':
@@ -135,7 +146,7 @@ function getRemovalParent(node) {
             return 'arguments';
 
           default:
-            throw new _Errors.InvalidRemovalError(getErrorMessage(['ArrowFunctionExpression', 'FunctionDeclaration', 'FunctionExpression', 'ArrayPattern', 'ObjectPattern', 'CallExpression', 'OptionalCallExpression', 'NewExpression']));
+            throw new _Errors.InvalidRemovalError(getErrorMessage(['ArrowFunctionExpression', 'FunctionDeclaration', 'FunctionExpression', 'ComponentDeclaration', 'ArrayPattern', 'ObjectPattern', 'CallExpression', 'OptionalCallExpression', 'NewExpression']));
         }
 
       // SpreadElement can be the child of a number of usecases

package/dist/transform/mutations/RemoveNode.js.flow

@@ -10,6 +10,8 @@
 
 import type {
   ESNode,
+  ComponentParameter,
+  ComponentTypeParameter,
   ClassMember,
   EnumBooleanMember,
   EnumDefaultedMember,
@@ -37,6 +39,8 @@ export type RemoveNodeMutation = $ReadOnly<{
   type: 'removeNode',
   node:
     | ClassMember
+    | ComponentParameter
+    | ComponentTypeParameter
     | EnumBooleanMember
     | EnumDefaultedMember
     | EnumNumberMember
@@ -78,6 +82,10 @@ const VALID_PROPERTY_PARENTS: $ReadOnlyArray<string> = [
   'ObjectExpression',
   'ObjectPattern',
 ];
+const VALID_COMPONENT_TYPE_PARAMETER_PARENTS: $ReadOnlyArray<string> = [
+  'DeclareComponent',
+  'ComponentTypeAnnotation',
+];
 function getRemovalParent(node: RemoveNodeMutation['node']): $ReadOnly<{
   type: 'array',
   parent: ESNode,
@@ -118,6 +126,15 @@ function getRemovalParent(node: RemoveNodeMutation['node']): $ReadOnly<{
         assertParent(VALID_ENUM_MEMBER_PARENTS);
         return 'members';
 
+      // Components
+      case 'ComponentParameter':
+        assertParent('ComponentDeclaration');
+        return 'params';
+
+      case 'ComponentTypeParameter':
+        assertParent(VALID_COMPONENT_TYPE_PARAMETER_PARENTS);
+        return 'params';
+
       // FunctionParameter
       case 'AssignmentPattern':
       case 'ArrayPattern':
@@ -188,6 +205,7 @@ function getRemovalParent(node: RemoveNodeMutation['node']): $ReadOnly<{
           case 'ArrowFunctionExpression':
           case 'FunctionDeclaration':
           case 'FunctionExpression':
+          case 'ComponentDeclaration':
             return 'params';
 
           case 'ArrayPattern':
@@ -207,6 +225,7 @@ function getRemovalParent(node: RemoveNodeMutation['node']): $ReadOnly<{
                 'ArrowFunctionExpression',
                 'FunctionDeclaration',
                 'FunctionExpression',
+                'ComponentDeclaration',
                 'ArrayPattern',
                 'ObjectPattern',
                 'CallExpression',

package/dist/transform/parse.js

@@ -18,12 +18,13 @@ var _comments = require("./comments/comments");
 
 var _hermesEslint = require("hermes-eslint");
 
-function parse(code) {
+async function parse(code) {
   const {
     ast,
     scopeManager
   } = (0, _hermesEslint.parseForESLint)(code, {
-    sourceType: 'module'
+    sourceType: 'module',
+    enableExperimentalComponentSyntax: true
   }); // Don't include the docblock comment in the comment list as we don't want to attach it
   // as it should be maintained at the top of the file as nodes are moved around.
 

package/dist/transform/parse.js.flow

@@ -22,9 +22,10 @@ export type ParseResult = {
   code: string,
 };
 
-export function parse(code: string): ParseResult {
+export async function parse(code: string): Promise<ParseResult> {
   const {ast, scopeManager} = parseForESLint(code, {
     sourceType: 'module',
+    enableExperimentalComponentSyntax: true,
   });
 
   // Don't include the docblock comment in the comment list as we don't want to attach it

package/dist/transform/print.js

@@ -24,7 +24,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
+async function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
   // $FlowExpectedError[incompatible-type] This is now safe to access.
   const program = ast; // The docblock comment is never attached to any AST nodes, since its technically
   // attached to the program. However this is specific to our AST and in order for
@@ -42,119 +42,69 @@ function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
   } // Fix up the AST to match what prettier expects.
 
 
-  mutateASTForPrettier(program, visitorKeys); // we need to delete the comments prop or else prettier will do
+  (0, _hermesParser.mutateESTreeASTForPrettier)(program, visitorKeys); // we need to delete the comments prop or else prettier will do
   // its own attachment pass after the mutation and duplicate the
   // comments on each node, borking the output
   // $FlowExpectedError[cannot-write]
 
   delete program.comments;
-  return prettier.format(originalCode, // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
-  { ...prettierOptions,
 
-    parser() {
-      return program;
-    }
+  switch (getPrettierMajorVersion()) {
+    case '3':
+      {
+        // Lazy require this module as it only exists in prettier v3.
+        const prettierFlowPlugin = require('prettier/plugins/flow');
+
+        return prettier.format(originalCode, // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
+        { ...prettierOptions,
+          parser: 'flow',
+          requirePragma: false,
+          plugins: [{
+            parsers: {
+              flow: { ...prettierFlowPlugin.parsers.flow,
+
+                parse() {
+                  return program;
+                }
+
+              }
+            }
+          }]
+        });
+      }
 
-  });
-}
+    case '2':
+      {
+        return prettier.format(originalCode, // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
+        { ...prettierOptions,
+
+          parser() {
+            return program;
+          }
+
+        });
+      }
 
-function mutateASTForPrettier(rootNode, visitorKeys) {
-  _hermesParser.SimpleTraverser.traverse(rootNode, {
-    enter(node) {
-      // prettier fully expects the parent pointers are NOT set and
-      // certain cases can crash due to prettier infinite-looping
-      // whilst naively traversing the parent property
-      // https://github.com/prettier/prettier/issues/11793
-      // $FlowExpectedError[cannot-write]
-      delete node.parent; // prettier currently relies on the AST being in the old-school, deprecated AST format for optional chaining
-      // so we have to apply their transform to our AST so it can actually format it.
-
-      if (node.type === 'ChainExpression') {
-        const newNode = transformChainExpression(node.expression); // Clear out existing properties
-
-        for (const k of Object.keys(node)) {
-          // $FlowExpectedError[prop-missing]
-          delete node[k];
-        } // Traverse `newNode` and its children.
-
-
-        mutateASTForPrettier(newNode, visitorKeys); // Overwrite `node` to match `newNode` while retaining the reference.
-        // $FlowExpectedError[prop-missing]
-        // $FlowExpectedError[cannot-write]
-
-        Object.assign(node, newNode); // Skip traversing the existing nodes since we are replacing them.
-
-        throw _hermesParser.SimpleTraverser.Skip;
-      } // Prettier currently relies on comparing the `node` vs `node.value` start positions to know if an
-      // `ObjectTypeProperty` is a method or not (instead of using the `node.method` boolean). To correctly print
-      // the node when its not a method we need the start position to be different from the `node.value`s start
-      // position.
-
-
-      if (node.type === 'ObjectTypeProperty') {
-        if (node.method === false && node.kind === 'init' && node.range[0] === 1 && node.value.range[0] === 1) {
-          // $FlowExpectedError[cannot-write]
-          // $FlowExpectedError[cannot-spread-interface]
-          node.value = { ...node.value,
-            range: [2, node.value.range[1]]
-          };
-        }
-      } // Prettier currently relies on comparing the the start positions to know if the import/export specifier should have a
-      // rename (eg `Name` vs `Name as Name`) when the name is exactly the same
-      // So we need to ensure that the range is always the same to avoid the useless code printing
-
-
-      if (node.type === 'ImportSpecifier') {
-        if (node.local.name === node.imported.name) {
-          if (node.local.range == null) {
-            // for our TS-ast printing which has no locs
-            // $FlowExpectedError[cannot-write]
-            node.local.range = [0, 0];
-          } // $FlowExpectedError[cannot-write]
-
-
-          node.imported.range = [...node.local.range];
-        }
+    case 'UNSUPPORTED':
+    default:
+      {
+        throw new Error(`Unknown or unsupported prettier version of "${prettier.version}". Only major versions 3 or 2 of prettier are supported.`);
       }
+  }
+}
 
-      if (node.type === 'ExportSpecifier') {
-        if (node.local.name === node.exported.name) {
-          if (node.local.range == null) {
-            // for our TS-ast printing which has no locs
-            // $FlowExpectedError[cannot-write]
-            node.local.range = [0, 0];
-          } // $FlowExpectedError[cannot-write]
+function getPrettierMajorVersion() {
+  const {
+    version
+  } = prettier;
 
+  if (version.startsWith('3.')) {
+    return '3';
+  }
 
-          node.exported.range = [...node.local.range];
-        }
-      }
-    },
-
-    leave() {},
-
-    visitorKeys
-  });
-} // https://github.com/prettier/prettier/blob/d962466a828f8ef51435e3e8840178d90b7ec6cd/src/language-js/parse/postprocess/index.js#L161-L182
-
-
-function transformChainExpression(node) {
-  switch (node.type) {
-    case 'CallExpression':
-      // $FlowExpectedError[cannot-spread-interface]
-      return { ...node,
-        type: 'OptionalCallExpression',
-        callee: transformChainExpression(node.callee)
-      };
-
-    case 'MemberExpression':
-      // $FlowExpectedError[cannot-spread-interface]
-      return { ...node,
-        type: 'OptionalMemberExpression',
-        object: transformChainExpression(node.object)
-      };
-    // No default
+  if (version.startsWith('2.')) {
+    return '2';
   }
 
-  return node;
+  return 'UNSUPPORTED';
 }