hermes-transform 0.29.1 → 0.31.0

package/dist/generated/node-types.js

@@ -788,6 +788,8 @@ function DeclareOpaqueType(props) {
     id: (0, _detachedNode.asDetachedNodeForCodeGen)(props.id),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
     impltype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.impltype),
+    lowerBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.lowerBound),
+    upperBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.upperBound),
     supertype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.supertype)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);
@@ -1763,6 +1765,8 @@ function OpaqueType(props) {
     id: (0, _detachedNode.asDetachedNodeForCodeGen)(props.id),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
     impltype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.impltype),
+    lowerBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.lowerBound),
+    upperBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.upperBound),
     supertype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.supertype)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);

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

@@ -444,6 +444,8 @@ export type DeclareOpaqueTypeProps = {
   +id: MaybeDetachedNode<DeclareOpaqueTypeType['id']>,
   +typeParameters?: ?MaybeDetachedNode<DeclareOpaqueTypeType['typeParameters']>,
   +impltype?: ?MaybeDetachedNode<DeclareOpaqueTypeType['impltype']>,
+  +lowerBound?: ?MaybeDetachedNode<DeclareOpaqueTypeType['lowerBound']>,
+  +upperBound?: ?MaybeDetachedNode<DeclareOpaqueTypeType['upperBound']>,
   +supertype?: ?MaybeDetachedNode<DeclareOpaqueTypeType['supertype']>,
 };
 
@@ -1013,6 +1015,8 @@ export type OpaqueTypeProps = {
   +id: MaybeDetachedNode<OpaqueTypeType['id']>,
   +typeParameters?: ?MaybeDetachedNode<OpaqueTypeType['typeParameters']>,
   +impltype: MaybeDetachedNode<OpaqueTypeType['impltype']>,
+  +lowerBound?: ?MaybeDetachedNode<OpaqueTypeType['lowerBound']>,
+  +upperBound?: ?MaybeDetachedNode<OpaqueTypeType['upperBound']>,
   +supertype?: ?MaybeDetachedNode<OpaqueTypeType['supertype']>,
 };
 
@@ -1820,6 +1824,8 @@ export function DeclareOpaqueType(props: {
       id: asDetachedNodeForCodeGen(props.id),
       typeParameters: asDetachedNodeForCodeGen(props.typeParameters),
       impltype: asDetachedNodeForCodeGen(props.impltype),
+      lowerBound: asDetachedNodeForCodeGen(props.lowerBound),
+      upperBound: asDetachedNodeForCodeGen(props.upperBound),
       supertype: asDetachedNodeForCodeGen(props.supertype),
     },
   );
@@ -3222,6 +3228,8 @@ export function OpaqueType(props: {
     id: asDetachedNodeForCodeGen(props.id),
     typeParameters: asDetachedNodeForCodeGen(props.typeParameters),
     impltype: asDetachedNodeForCodeGen(props.impltype),
+    lowerBound: asDetachedNodeForCodeGen(props.lowerBound),
+    upperBound: asDetachedNodeForCodeGen(props.upperBound),
     supertype: asDetachedNodeForCodeGen(props.supertype),
   });
   setParentPointersInDirectChildren((node: $FlowFixMe));

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

@@ -788,6 +788,8 @@ function DeclareOpaqueType(props) {
     id: (0, _detachedNode.asDetachedNodeForCodeGen)(props.id),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
     impltype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.impltype),
+    lowerBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.lowerBound),
+    upperBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.upperBound),
     supertype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.supertype)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);
@@ -1763,6 +1765,8 @@ function OpaqueType(props) {
     id: (0, _detachedNode.asDetachedNodeForCodeGen)(props.id),
     typeParameters: (0, _detachedNode.asDetachedNodeForCodeGen)(props.typeParameters),
     impltype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.impltype),
+    lowerBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.lowerBound),
+    upperBound: (0, _detachedNode.asDetachedNodeForCodeGen)(props.upperBound),
     supertype: (0, _detachedNode.asDetachedNodeForCodeGen)(props.supertype)
   });
   (0, _detachedNode.setParentPointersInDirectChildren)(node);

package/dist/src/transform/parse.js

@@ -18,7 +18,7 @@ var _comments = require("./comments/comments");
 
 var _hermesEslint = require("hermes-eslint");
 
-async function parse(code) {
+function parse(code) {
   const {
     ast,
     scopeManager

package/dist/src/transform/print.js

@@ -24,9 +24,6 @@ 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; }
 
-let cache = 1;
-const cacheBase = Math.random();
-
 async function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
   // $FlowExpectedError[incompatible-type] This is now safe to access.
   const program = ast; // If the AST body is empty, we can skip the cost of prettier by returning a static string of the contents.
@@ -47,88 +44,24 @@ async function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
 
   const codeForPrinting = (0, _comments.mutateESTreeASTCommentsForPrettier)(program, originalCode); // Fix up the AST to match what prettier expects.
 
-  (0, _hermesParser.mutateESTreeASTForPrettier)(program, visitorKeys);
-
-  switch (getPrettierMajorVersion()) {
-    case '3':
-      {
-        // Lazy require this module as it only exists in prettier v3.
-        const prettierFlowPlugin = require('prettier/plugins/flow');
-
-        return prettier.format(codeForPrinting, // $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;
-                }
-
-              }
-            }
-          }]
-        });
-      }
+  (0, _hermesParser.mutateESTreeASTForPrettier)(program, visitorKeys); // Lazy require this module as it only exists in prettier v3.
 
-    case '2':
-      {
-        var _hermesPlugin$parsers;
+  const prettierFlowPlugin = require('prettier/plugins/flow');
 
-        const hermesPlugin = require('prettier-plugin-hermes-parser');
+  return prettier.format(codeForPrinting, // $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,
 
-        const hermesParser = (_hermesPlugin$parsers = hermesPlugin.parsers) == null ? void 0 : _hermesPlugin$parsers.hermes;
+          parse() {
+            return program;
+          }
 
-        if (hermesParser == null) {
-          throw new Error('Hermes parser plugin not found');
         }
-
-        return prettier.format(codeForPrinting, // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
-        { ...prettierOptions,
-          parser: 'hermes',
-          requirePragma: false,
-          plugins: [// $FlowExpectedError[incompatible-call] Cache value is not expected but needed in this case.
-          {
-            parsers: {
-              hermes: { ...hermesParser,
-                // Prettier caches the plugin, by making this key always unique we ensure the new `parse`
-                // function with the correct AST is always called.
-                cache: `${cacheBase}-${cache++}`,
-
-                // Provide the passed AST to prettier
-                parse() {
-                  return program;
-                }
-
-              }
-            },
-            printers: hermesPlugin.printers
-          }]
-        });
-      }
-
-    case 'UNSUPPORTED':
-    default:
-      {
-        throw new Error(`Unknown or unsupported prettier version of "${prettier.version}". Only major versions 3 or 2 of prettier are supported.`);
       }
-  }
-}
-
-function getPrettierMajorVersion() {
-  const {
-    version
-  } = prettier;
-
-  if (version.startsWith('3.')) {
-    return '3';
-  }
-
-  if (version.startsWith('2.')) {
-    return '2';
-  }
-
-  return 'UNSUPPORTED';
+    }]
+  });
 }

package/dist/src/transform/transform.js

@@ -21,7 +21,7 @@ var _parse = require("./parse");
 var _print = require("./print");
 
 async function transform(originalCode, visitors, prettierOptions = {}) {
-  const parseResult = await (0, _parse.parse)(originalCode);
+  const parseResult = (0, _parse.parse)(originalCode);
   const {
     ast,
     astWasMutated,

package/dist/transform/parse.js

@@ -18,7 +18,7 @@ var _comments = require("./comments/comments");
 
 var _hermesEslint = require("hermes-eslint");
 
-async function parse(code) {
+function parse(code) {
   const {
     ast,
     scopeManager

package/dist/transform/parse.js.flow

@@ -22,7 +22,7 @@ export type ParseResult = {
   code: string,
 };
 
-export async function parse(code: string): Promise<ParseResult> {
+export function parse(code: string): ParseResult {
   const {ast, scopeManager} = parseForESLint(code, {
     sourceType: 'module',
     enableExperimentalComponentSyntax: true,

package/dist/transform/print.js

@@ -24,9 +24,6 @@ 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; }
 
-let cache = 1;
-const cacheBase = Math.random();
-
 async function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
   // $FlowExpectedError[incompatible-type] This is now safe to access.
   const program = ast; // If the AST body is empty, we can skip the cost of prettier by returning a static string of the contents.
@@ -47,88 +44,24 @@ async function print(ast, originalCode, prettierOptions = {}, visitorKeys) {
 
   const codeForPrinting = (0, _comments.mutateESTreeASTCommentsForPrettier)(program, originalCode); // Fix up the AST to match what prettier expects.
 
-  (0, _hermesParser.mutateESTreeASTForPrettier)(program, visitorKeys);
-
-  switch (getPrettierMajorVersion()) {
-    case '3':
-      {
-        // Lazy require this module as it only exists in prettier v3.
-        const prettierFlowPlugin = require('prettier/plugins/flow');
-
-        return prettier.format(codeForPrinting, // $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;
-                }
-
-              }
-            }
-          }]
-        });
-      }
+  (0, _hermesParser.mutateESTreeASTForPrettier)(program, visitorKeys); // Lazy require this module as it only exists in prettier v3.
 
-    case '2':
-      {
-        var _hermesPlugin$parsers;
+  const prettierFlowPlugin = require('prettier/plugins/flow');
 
-        const hermesPlugin = require('prettier-plugin-hermes-parser');
+  return prettier.format(codeForPrinting, // $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,
 
-        const hermesParser = (_hermesPlugin$parsers = hermesPlugin.parsers) == null ? void 0 : _hermesPlugin$parsers.hermes;
+          parse() {
+            return program;
+          }
 
-        if (hermesParser == null) {
-          throw new Error('Hermes parser plugin not found');
         }
-
-        return prettier.format(codeForPrinting, // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
-        { ...prettierOptions,
-          parser: 'hermes',
-          requirePragma: false,
-          plugins: [// $FlowExpectedError[incompatible-call] Cache value is not expected but needed in this case.
-          {
-            parsers: {
-              hermes: { ...hermesParser,
-                // Prettier caches the plugin, by making this key always unique we ensure the new `parse`
-                // function with the correct AST is always called.
-                cache: `${cacheBase}-${cache++}`,
-
-                // Provide the passed AST to prettier
-                parse() {
-                  return program;
-                }
-
-              }
-            },
-            printers: hermesPlugin.printers
-          }]
-        });
-      }
-
-    case 'UNSUPPORTED':
-    default:
-      {
-        throw new Error(`Unknown or unsupported prettier version of "${prettier.version}". Only major versions 3 or 2 of prettier are supported.`);
       }
-  }
-}
-
-function getPrettierMajorVersion() {
-  const {
-    version
-  } = prettier;
-
-  if (version.startsWith('3.')) {
-    return '3';
-  }
-
-  if (version.startsWith('2.')) {
-    return '2';
-  }
-
-  return 'UNSUPPORTED';
+    }]
+  });
 }

package/dist/transform/print.js.flow

@@ -18,9 +18,6 @@ import * as prettier from 'prettier';
 import {mutateESTreeASTCommentsForPrettier} from './comments/comments';
 import type {VisitorKeysType} from 'hermes-parser';
 
-let cache = 1;
-const cacheBase = Math.random();
-
 export async function print(
   ast: MaybeDetachedNode<Program>,
   originalCode: string,
@@ -50,88 +47,27 @@ export async function print(
   // Fix up the AST to match what prettier expects.
   mutateESTreeASTForPrettier(program, visitorKeys);
 
-  switch (getPrettierMajorVersion()) {
-    case '3': {
-      // Lazy require this module as it only exists in prettier v3.
-      const prettierFlowPlugin = require('prettier/plugins/flow');
-      return prettier.format(
-        codeForPrinting,
-        // $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': {
-      const hermesPlugin = require('prettier-plugin-hermes-parser');
-      const hermesParser = hermesPlugin.parsers?.hermes;
-      if (hermesParser == null) {
-        throw new Error('Hermes parser plugin not found');
-      }
-
-      return prettier.format(
-        codeForPrinting,
-        // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
+  // Lazy require this module as it only exists in prettier v3.
+  const prettierFlowPlugin = require('prettier/plugins/flow');
+  return prettier.format(
+    codeForPrinting,
+    // $FlowExpectedError[incompatible-exact] - we don't want to create a dependency on the prettier types
+    {
+      ...prettierOptions,
+      parser: 'flow',
+      requirePragma: false,
+      plugins: [
         {
-          ...prettierOptions,
-          parser: 'hermes',
-          requirePragma: false,
-          plugins: [
-            // $FlowExpectedError[incompatible-call] Cache value is not expected but needed in this case.
-            {
-              parsers: {
-                hermes: {
-                  ...hermesParser,
-
-                  // Prettier caches the plugin, by making this key always unique we ensure the new `parse`
-                  // function with the correct AST is always called.
-                  cache: `${cacheBase}-${cache++}`,
-
-                  // Provide the passed AST to prettier
-                  parse() {
-                    return program;
-                  },
-                },
+          parsers: {
+            flow: {
+              ...prettierFlowPlugin.parsers.flow,
+              parse() {
+                return program;
               },
-              printers: hermesPlugin.printers,
             },
-          ],
+          },
         },
-      );
-    }
-    case 'UNSUPPORTED':
-    default: {
-      throw new Error(
-        `Unknown or unsupported prettier version of "${prettier.version}". Only major versions 3 or 2 of prettier are supported.`,
-      );
-    }
-  }
-}
-
-function getPrettierMajorVersion(): '3' | '2' | 'UNSUPPORTED' {
-  const {version} = prettier;
-
-  if (version.startsWith('3.')) {
-    return '3';
-  }
-
-  if (version.startsWith('2.')) {
-    return '2';
-  }
-
-  return 'UNSUPPORTED';
+      ],
+    },
+  );
 }

package/dist/transform/transform.js

@@ -21,7 +21,7 @@ var _parse = require("./parse");
 var _print = require("./print");
 
 async function transform(originalCode, visitors, prettierOptions = {}) {
-  const parseResult = await (0, _parse.parse)(originalCode);
+  const parseResult = (0, _parse.parse)(originalCode);
   const {
     ast,
     astWasMutated,

package/dist/transform/transform.js.flow

@@ -24,7 +24,7 @@ export async function transform(
   visitors: TransformVisitor,
   prettierOptions: {...} = {},
 ): Promise<string> {
-  const parseResult = await parse(originalCode);
+  const parseResult = parse(originalCode);
 
   const {ast, astWasMutated, mutatedCode} = transformAST(parseResult, visitors);
   if (!astWasMutated) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-transform",
-  "version": "0.29.1",
+  "version": "0.31.0",
   "description": "Tools built on top of Hermes-ESTree to enable codebase transformation",
   "main": "dist/index.js",
   "license": "MIT",
@@ -12,14 +12,13 @@
     "@babel/code-frame": "^7.16.0",
     "esquery": "^1.4.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-eslint": "0.29.1",
-    "hermes-estree": "0.29.1",
-    "hermes-parser": "0.29.1",
+    "hermes-eslint": "0.31.0",
+    "hermes-estree": "0.31.0",
+    "hermes-parser": "0.31.0",
     "string-width": "4.2.3"
   },
   "peerDependencies": {
-    "prettier": "^3.0.0 || ^2.7.1",
-    "prettier-plugin-hermes-parser": "0.29.1"
+    "prettier": "^3.0.0"
   },
   "files": [
     "dist",