hermes-parser 0.21.1 → 0.23.0

package/dist/ParserOptions.js

@@ -14,5 +14,5 @@ exports.ParserOptionsKeys = void 0;
  * 
  * @format
  */
-const ParserOptionsKeys = new Set(['allowReturnOutsideFunction', 'babel', 'flow', 'enableExperimentalComponentSyntax', 'sourceFilename', 'sourceType', 'tokens']);
+const ParserOptionsKeys = new Set(['allowReturnOutsideFunction', 'babel', 'flow', 'enableExperimentalComponentSyntax', 'reactRuntimeTarget', 'sourceFilename', 'sourceType', 'tokens']);
 exports.ParserOptionsKeys = ParserOptionsKeys;

package/dist/ParserOptions.js.flow

@@ -13,6 +13,7 @@ export type ParserOptions = {
   babel?: boolean,
   flow?: 'all' | 'detect',
   enableExperimentalComponentSyntax?: boolean,
+  reactRuntimeTarget?: '18' | '19',
   sourceFilename?: string,
   sourceType?: 'module' | 'script' | 'unambiguous',
   tokens?: boolean,
@@ -23,6 +24,7 @@ export const ParserOptionsKeys: $ReadOnlySet<$Keys<ParserOptions>> = new Set([
   'babel',
   'flow',
   'enableExperimentalComponentSyntax',
+  'reactRuntimeTarget',
   'sourceFilename',
   'sourceType',
   'tokens',

package/dist/estree/StripComponentSyntax.js

@@ -138,7 +138,9 @@ function createPropsTypeAnnotation(propTypes, spread, loc, range) {
   };
 }
 
-function mapComponentParameters(params) {
+function mapComponentParameters(params, options) {
+  var _options$reactRuntime;
+
   if (params.length === 0) {
     return {
       props: null,
@@ -153,18 +155,19 @@ function mapComponentParameters(params) {
       props: restElementArgument,
       ref: null
     };
-  } // Filter out any ref param and capture it's details.
+  } // Filter out any ref param and capture it's details when targeting React 18.
+  // React 19+ treats ref as a regular prop for function components.
 
 
   let refParam = null;
-  const paramsWithoutRef = params.filter(param => {
+  const paramsWithoutRef = ((_options$reactRuntime = options.reactRuntimeTarget) != null ? _options$reactRuntime : '18') === '18' ? params.filter(param => {
     if (param.type === 'ComponentParameter' && getComponentParameterName(param.name) === 'ref') {
       refParam = param;
       return false;
     }
 
     return true;
-  });
+  }) : params;
   const [propTypes, spread] = paramsWithoutRef.reduce(([propTypes, spread], param) => {
     switch (param.type) {
       case 'RestElement':
@@ -436,7 +439,7 @@ function createForwardRefWrapper(originalComponent) {
   };
 }
 
-function mapComponentDeclaration(node) {
+function mapComponentDeclaration(node, options) {
   // Create empty loc for return type annotation nodes
   const createRendersTypeLoc = () => ({
     loc: {
@@ -477,7 +480,7 @@ function mapComponentDeclaration(node) {
   const {
     props,
     ref
-  } = mapComponentParameters(node.params);
+  } = mapComponentParameters(node.params, options);
   let forwardRefDetails = null;
 
   if (ref != null) {
@@ -596,11 +599,11 @@ function scanForFirstComponentReference(compName, bodyList) {
   return null;
 }
 
-function mapComponentDeclarationIntoList(node, newBody, insertExport) {
+function mapComponentDeclarationIntoList(node, newBody, options, insertExport) {
   const {
     comp,
     forwardRefDetails
-  } = mapComponentDeclaration(node);
+  } = mapComponentDeclaration(node, options);
 
   if (forwardRefDetails != null) {
     // Scan for references to our component.
@@ -624,14 +627,14 @@ function mapComponentDeclarationIntoList(node, newBody, insertExport) {
   newBody.push(insertExport != null ? insertExport(comp) : comp);
 }
 
-function mapStatementList(stmts) {
+function mapStatementList(stmts, options) {
   const newBody = [];
 
   for (const node of stmts) {
     switch (node.type) {
       case 'ComponentDeclaration':
         {
-          mapComponentDeclarationIntoList(node, newBody);
+          mapComponentDeclarationIntoList(node, newBody, options);
           break;
         }
 
@@ -647,7 +650,7 @@ function mapStatementList(stmts) {
           var _node$declaration, _node$declaration2;
 
           if (((_node$declaration = node.declaration) == null ? void 0 : _node$declaration.type) === 'ComponentDeclaration') {
-            mapComponentDeclarationIntoList(node.declaration, newBody, componentOrRef => {
+            mapComponentDeclarationIntoList(node.declaration, newBody, options, componentOrRef => {
               switch (componentOrRef.type) {
                 case 'FunctionDeclaration':
                   {
@@ -700,7 +703,7 @@ function mapStatementList(stmts) {
           var _node$declaration3, _node$declaration4;
 
           if (((_node$declaration3 = node.declaration) == null ? void 0 : _node$declaration3.type) === 'ComponentDeclaration') {
-            mapComponentDeclarationIntoList(node.declaration, newBody, componentOrRef => nodeWith(node, {
+            mapComponentDeclarationIntoList(node.declaration, newBody, options, componentOrRef => nodeWith(node, {
               declaration: componentOrRef
             }));
             break;
@@ -728,7 +731,7 @@ function mapStatementList(stmts) {
   return newBody;
 }
 
-function transformProgram(program, _options) {
+function transformProgram(program, options) {
   return _SimpleTransform.SimpleTransform.transformProgram(program, {
     transform(node) {
       switch (node.type) {
@@ -746,16 +749,17 @@ function transformProgram(program, _options) {
         case 'BlockStatement':
           {
             return nodeWith(node, {
-              body: mapStatementList(node.body)
+              body: mapStatementList(node.body, options)
             });
           }
 
         case 'SwitchCase':
           {
+            const consequent = mapStatementList(node.consequent, options);
             return nodeWith(node, {
               /* $FlowExpectedError[incompatible-call] We know `mapStatementList` will
                  not return `ModuleDeclaration` nodes if it is not passed any */
-              consequent: mapStatementList(node.consequent)
+              consequent
             });
           }
 

package/dist/estree/StripComponentSyntax.js.flow

@@ -174,6 +174,7 @@ function createPropsTypeAnnotation(
 
 function mapComponentParameters(
   params: $ReadOnlyArray<ComponentParameter | RestElement>,
+  options: ParserOptions,
 ): $ReadOnly<{
   props: ?(ObjectPattern | Identifier),
   ref: ?(BindingName | AssignmentPattern),
@@ -195,19 +196,22 @@ function mapComponentParameters(
     };
   }
 
-  // Filter out any ref param and capture it's details.
+  // Filter out any ref param and capture it's details when targeting React 18.
+  // React 19+ treats ref as a regular prop for function components.
   let refParam = null;
-  const paramsWithoutRef = params.filter(param => {
-    if (
-      param.type === 'ComponentParameter' &&
-      getComponentParameterName(param.name) === 'ref'
-    ) {
-      refParam = param;
-      return false;
-    }
-
-    return true;
-  });
+  const paramsWithoutRef =
+    (options.reactRuntimeTarget ?? '18') === '18'
+      ? params.filter(param => {
+          if (
+            param.type === 'ComponentParameter' &&
+            getComponentParameterName(param.name) === 'ref'
+          ) {
+            refParam = param;
+            return false;
+          }
+          return true;
+        })
+      : params;
 
   const [propTypes, spread] = paramsWithoutRef.reduce<
     [Array<ObjectTypePropertySignature>, ?ObjectTypeSpreadProperty],
@@ -522,7 +526,10 @@ function createForwardRefWrapper(
   };
 }
 
-function mapComponentDeclaration(node: ComponentDeclaration): {
+function mapComponentDeclaration(
+  node: ComponentDeclaration,
+  options: ParserOptions,
+): {
   comp: FunctionDeclaration,
   forwardRefDetails: ?ForwardRefDetails,
 } {
@@ -563,7 +570,7 @@ function mapComponentDeclaration(node: ComponentDeclaration): {
     ...createRendersTypeLoc(),
   };
 
-  const {props, ref} = mapComponentParameters(node.params);
+  const {props, ref} = mapComponentParameters(node.params, options);
 
   let forwardRefDetails: ?ForwardRefDetails = null;
 
@@ -685,9 +692,10 @@ function scanForFirstComponentReference(
 function mapComponentDeclarationIntoList(
   node: ComponentDeclaration,
   newBody: Array<Statement | ModuleDeclaration>,
+  options: ParserOptions,
   insertExport?: (Identifier | FunctionDeclaration) => ModuleDeclaration,
 ) {
-  const {comp, forwardRefDetails} = mapComponentDeclaration(node);
+  const {comp, forwardRefDetails} = mapComponentDeclaration(node, options);
   if (forwardRefDetails != null) {
     // Scan for references to our component.
     const referencePos = scanForFirstComponentReference(
@@ -715,12 +723,13 @@ function mapComponentDeclarationIntoList(
 
 function mapStatementList(
   stmts: $ReadOnlyArray<Statement | ModuleDeclaration>,
+  options: ParserOptions,
 ) {
   const newBody: Array<Statement | ModuleDeclaration> = [];
   for (const node of stmts) {
     switch (node.type) {
       case 'ComponentDeclaration': {
-        mapComponentDeclarationIntoList(node, newBody);
+        mapComponentDeclarationIntoList(node, newBody, options);
         break;
       }
       case 'HookDeclaration': {
@@ -733,6 +742,7 @@ function mapStatementList(
           mapComponentDeclarationIntoList(
             node.declaration,
             newBody,
+            options,
             componentOrRef => {
               switch (componentOrRef.type) {
                 case 'FunctionDeclaration': {
@@ -781,6 +791,7 @@ function mapStatementList(
           mapComponentDeclarationIntoList(
             node.declaration,
             newBody,
+            options,
             componentOrRef => nodeWith(node, {declaration: componentOrRef}),
           );
           break;
@@ -806,7 +817,7 @@ function mapStatementList(
 
 export function transformProgram(
   program: Program,
-  _options: ParserOptions,
+  options: ParserOptions,
 ): Program {
   return SimpleTransform.transformProgram(program, {
     transform(node: ESNode) {
@@ -819,13 +830,14 @@ export function transformProgram(
         }
         case 'Program':
         case 'BlockStatement': {
-          return nodeWith(node, {body: mapStatementList(node.body)});
+          return nodeWith(node, {body: mapStatementList(node.body, options)});
         }
         case 'SwitchCase': {
+          const consequent = mapStatementList(node.consequent, options);
           return nodeWith(node, {
             /* $FlowExpectedError[incompatible-call] We know `mapStatementList` will
                not return `ModuleDeclaration` nodes if it is not passed any */
-            consequent: mapStatementList(node.consequent),
+            consequent,
           });
         }
         case 'ComponentDeclaration': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-parser",
-  "version": "0.21.1",
+  "version": "0.23.0",
   "description": "A JavaScript parser built from the Hermes engine",
   "main": "dist/index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "url": "git@github.com:facebook/hermes.git"
   },
   "dependencies": {
-    "hermes-estree": "0.21.1"
+    "hermes-estree": "0.23.0"
   },
   "devDependencies": {
     "@babel/parser": "7.7.4",