Update all transforms to apply sequentially

packages/react-native/Libraries/__tests__/public-api-test.js

@@ -12,7 +12,7 @@ import type {TransformVisitor} from 'hermes-transform';
 
 const {
   visitors: stripPrivateProperties,
-} = require('../../../../scripts/build-types/transforms/stripPrivateProperties');
+} = require('../../../../scripts/build-types/transforms/flow/stripPrivateProperties');
 const translate = require('flow-api-translator');
 const {existsSync, promises: fs} = require('fs');
 const glob = require('glob');

scripts/build-types/BuildApiSnapshot.js

@@ -15,8 +15,8 @@ const {PACKAGES_DIR, REACT_NATIVE_PACKAGE_DIR} = require('../consts');
 const {isGitRepo} = require('../scm-utils');
 const {API_EXTRACTOR_CONFIG_FILE, TYPES_OUTPUT_DIR} = require('./config');
 const apiSnapshotTemplate = require('./templates/ReactNativeApi.d.ts-template.js');
-const resolveCyclicImportsInDefinition = require('./transforms/resolveCyclicImportsInDefinition');
-const babel = require('@babel/core');
+const applyBabelTransformsSeq = require('./utils/applyBabelTransformsSeq');
+const resolveCyclicImportsInDefinition = require('./utils/resolveCyclicImportsInDefinition');
 const {
   Extractor,
   ExtractorConfig,
@@ -31,14 +31,14 @@ const osTempDir = require('temp-dir');
 const {styleText} = require('util');
 
 const inputFilesPostTransforms: $ReadOnlyArray<PluginObj<mixed>> = [
-  require('./transforms/renameDefaultExportedIdentifiers'),
+  require('./transforms/typescript/renameDefaultExportedIdentifiers'),
 ];
 
 const postTransforms: $ReadOnlyArray<PluginObj<mixed>> = [
-  require('./transforms/stripUnstableApis'),
-  require('./transforms/sortTypeDefinitions'),
-  require('./transforms/sortProperties'),
-  require('./transforms/sortUnions'),
+  require('./transforms/typescript/stripUnstableApis'),
+  require('./transforms/typescript/sortTypeDefinitions'),
+  require('./transforms/typescript/sortProperties'),
+  require('./transforms/typescript/sortUnions'),
   require('./transforms/removeUndefinedFromOptionalMembers'),
 ];
 
@@ -193,7 +193,7 @@ async function preparePackagesInTempDir(
   await Promise.all(
     typeDefs.map(async file => {
       const source = await fs.readFile(file, 'utf-8');
-      const transformed = await applyPostTransforms(
+      const transformed = await applyBabelTransformsSeq(
         source,
         inputFilesPostTransforms,
       );
@@ -241,7 +241,7 @@ async function getCleanedUpRollup(tempDirectory: string) {
     .replace(/^\s+$/gm, '') // Clear whitespace-only lines
     .replace(/\n+/gm, '\n'); // Collapse empty lines
 
-  const transformedRollup = await applyPostTransforms(
+  const transformedRollup = await applyBabelTransformsSeq(
     cleanedRollup,
     postTransforms,
   );
@@ -255,17 +255,6 @@ async function getCleanedUpRollup(tempDirectory: string) {
   return formattedRollup;
 }
 
-async function applyPostTransforms(
-  inSrc: string,
-  transforms: $ReadOnlyArray<PluginObj<mixed>>,
-): Promise<string> {
-  const result = await babel.transformAsync(inSrc, {
-    plugins: ['@babel/plugin-syntax-typescript', ...transforms],
-  });
-
-  return result.code;
-}
-
 async function generateConfigFiles(tempDirectory: string) {
   // generate tsconfig
   const tsConfig = {

scripts/build-types/transforms/__tests__/ensureNoUnprefixedProps-test.js → scripts/build-types/transforms/flow/__tests__/ensureNoUnprefixedProps-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const ensureNoUnprefixedProps = require('../ensureNoUnprefixedProps.js');
+const ensureNoUnprefixedProps = require('../ensureNoUnprefixedProps');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/reattachDocComments-test.js → scripts/build-types/transforms/flow/__tests__/reattachDocComments-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const reattachDocComments = require('../reattachDocComments.js');
+const reattachDocComments = require('../reattachDocComments');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/replaceEmptyWithNever-test.js → scripts/build-types/transforms/flow/__tests__/replaceEmptyWithNever-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const replaceEmptyWithNever = require('../replaceEmptyWithNever.js');
+const replaceEmptyWithNever = require('../replaceEmptyWithNever');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/replaceNullablePropertiesWithUndefined-test.js → scripts/build-types/transforms/flow/__tests__/replaceNullablePropertiesWithUndefined-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const replaceNullablePropertiesWithUndefined = require('../replaceNullablePropertiesWithUndefined.js');
+const replaceNullablePropertiesWithUndefined = require('../replaceNullablePropertiesWithUndefined');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/replaceRequiresWithImports-test.js → scripts/build-types/transforms/flow/__tests__/replaceRequiresWithImports-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const replaceRequiresWithImports = require('../replaceRequiresWithImports.js');
+const replaceRequiresWithImports = require('../replaceRequiresWithImports');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/replaceStringishWithString-test.js → scripts/build-types/transforms/flow/__tests__/replaceStringishWithString-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const replaceStringishWithString = require('../replaceStringishWithString.js');
+const replaceStringishWithString = require('../replaceStringishWithString');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/stripPrivateProperties-test.js → scripts/build-types/transforms/flow/__tests__/stripPrivateProperties-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const stripPrivateProperties = require('../stripPrivateProperties.js');
+const stripPrivateProperties = require('../stripPrivateProperties');
 const {parse, print} = require('hermes-transform');
 
 const prettierOptions = {parser: 'babel'};

scripts/build-types/transforms/__tests__/renameDefaultExportedIdentifiers-test.js → scripts/build-types/transforms/typescript/__tests__/renameDefaultExportedIdentifiers-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const renameDefaultExportedIdentifiersVisitor = require('../renameDefaultExportedIdentifiers.js');
+const renameDefaultExportedIdentifiersVisitor = require('../renameDefaultExportedIdentifiers');
 const babel = require('@babel/core');
 
 async function translate(code: string): Promise<string> {

scripts/build-types/transforms/__tests__/replaceDefaultExportName-test.js → scripts/build-types/transforms/typescript/__tests__/replaceDefaultExportName-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const createReplaceDefaultExportName = require('../replaceDefaultExportName.js');
+const createReplaceDefaultExportName = require('../replaceDefaultExportName');
 const babel = require('@babel/core');
 const flowApiTranslator = require('flow-api-translator');
 

scripts/build-types/transforms/__tests__/sortProperties-test.js → scripts/build-types/transforms/typescript/__tests__/sortProperties-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const sortPropertiesVisitor = require('../sortProperties.js');
+const sortPropertiesVisitor = require('../sortProperties');
 const babel = require('@babel/core');
 const {promises: fs} = require('fs');
 const path = require('path');

scripts/build-types/transforms/__tests__/sortTypeDefinitions-test.js → scripts/build-types/transforms/typescript/__tests__/sortTypeDefinitions-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const sortTypeDefinitionsVisitor = require('../sortTypeDefinitions.js');
+const sortTypeDefinitionsVisitor = require('../sortTypeDefinitions');
 const babel = require('@babel/core');
 const {promises: fs} = require('fs');
 const path = require('path');

scripts/build-types/transforms/__tests__/sortUnions-test.js → scripts/build-types/transforms/typescript/__tests__/sortUnions-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const sortUnionsVisitor = require('../sortUnions.js');
+const sortUnionsVisitor = require('../sortUnions');
 const babel = require('@babel/core');
 const {promises: fs} = require('fs');
 const path = require('path');

scripts/build-types/transforms/__tests__/stripUnstableApis-test.js → scripts/build-types/transforms/typescript/__tests__/stripUnstableApis-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const stripUnstableApisVisitor = require('../stripUnstableApis.js');
+const stripUnstableApisVisitor = require('../stripUnstableApis');
 const babel = require('@babel/core');
 
 async function translate(code: string): Promise<string> {

scripts/build-types/translateSourceFile.js

@@ -13,23 +13,24 @@ import type {ParseResult} from 'hermes-transform/dist/transform/parse';
 import type {TransformASTResult} from 'hermes-transform/dist/transform/transformAST';
 
 const getDependencies = require('./resolution/getDependencies');
-const createReplaceDefaultExportName = require('./transforms/replaceDefaultExportName');
-const babel = require('@babel/core');
+const applyBabelTransformsSeq = require('./utils/applyBabelTransformsSeq');
 const translate = require('flow-api-translator');
 const {parse, print} = require('hermes-transform');
 
 type PreTransformFn = ParseResult => Promise<TransformASTResult>;
 
 const preTransforms: Array<PreTransformFn> = [
-  require('./transforms/stripPrivateProperties'),
-  require('./transforms/replaceRequiresWithImports'),
-  require('./transforms/replaceEmptyWithNever'),
-  require('./transforms/replaceStringishWithString'),
-  require('./transforms/replaceNullablePropertiesWithUndefined'),
-  require('./transforms/reattachDocComments'),
-  require('./transforms/ensureNoUnprefixedProps'),
+  require('./transforms/flow/stripPrivateProperties'),
+  require('./transforms/flow/replaceRequiresWithImports'),
+  require('./transforms/flow/replaceEmptyWithNever'),
+  require('./transforms/flow/replaceStringishWithString'),
+  require('./transforms/flow/replaceNullablePropertiesWithUndefined'),
+  require('./transforms/flow/reattachDocComments'),
+  require('./transforms/flow/ensureNoUnprefixedProps'),
+];
+const postTransforms = (filePath: string): Array<PluginObj<mixed>> => [
+  require('./transforms/typescript/replaceDefaultExportName')(filePath),
 ];
-const postTransforms: Array<PluginObj<mixed>> = [];
 const prettierOptions = {parser: 'babel'};
 const unsupportedFeatureRegex =
   /Unsupported feature: Translating ".*" is currently not supported/;
@@ -79,7 +80,10 @@ async function translateSourceFile(
   }
 
   // Apply post-transforms
-  const result = await applyPostTransforms(tsDefResult, filePath);
+  const result = await applyBabelTransformsSeq(
+    tsDefResult,
+    postTransforms(filePath),
+  );
 
   return {
     result,
@@ -94,28 +98,9 @@ async function applyPreTransforms(source: ParseResult): Promise<ParseResult> {
       const code = transformed.astWasMutated
         ? await print(transformed.ast, transformed.mutatedCode, prettierOptions)
         : transformed.mutatedCode;
-
       return parse(code);
     });
   }, Promise.resolve(source));
 }
 
-/**
- * Apply post-transforms to .d.ts source code containing @build-types directives.
- */
-async function applyPostTransforms(
-  source: string,
-  filePath: string,
-): Promise<string> {
-  const result = await babel.transformAsync(source, {
-    plugins: [
-      '@babel/plugin-syntax-typescript',
-      ...postTransforms,
-      createReplaceDefaultExportName(filePath),
-    ],
-  });
-
-  return result.code;
-}
-
 module.exports = translateSourceFile;

scripts/build-types/transforms/__tests__/resolveCyclicImportsInDefinition-test.js → scripts/build-types/utils/__tests__/resolveCyclicImportsInDefinition-test.js

@@ -8,7 +8,7 @@
  * @format
  */
 
-const resolveCyclicImportsInDefinition = require('../resolveCyclicImportsInDefinition.js');
+const resolveCyclicImportsInDefinition = require('../resolveCyclicImportsInDefinition');
 const path = require('path');
 
 const packagesPath = '/path/to/package/definition/files';

scripts/build-types/utils/applyBabelTransformsSeq.js

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {PluginObj} from '@babel/core';
+
+import * as babel from '@babel/core';
+
+/**
+ * Apply an array of Babel transforms to a TypeScript source in order.
+ */
+async function applyBabelTransformsSeq(
+  source: string,
+  transforms: $ReadOnlyArray<PluginObj<mixed>>,
+): Promise<string> {
+  const parsed = await babel.parseAsync(source, {
+    plugins: ['@babel/plugin-syntax-typescript'],
+  });
+
+  const finalAST = await transforms.reduce((input, transform) => {
+    return input.then(async ast => {
+      const result = await babel.transformFromAstAsync(ast, source, {
+        plugins: [transform],
+        ast: true,
+        code: false,
+      });
+      if (result == null) {
+        throw new Error('Unexpected null result from Babel transform');
+      }
+      // $FlowIgnore[incompatible-cast]
+      return result.ast as BabelNodeFile;
+    });
+  }, Promise.resolve(parsed));
+
+  const result = await babel.transformFromAstAsync(finalAST, source, {
+    code: true,
+    ast: false,
+  });
+
+  return result.code;
+}
+
+module.exports = applyBabelTransformsSeq;