@react-native/codegen 0.74.0-nightly-20231121-a6964b362 → 0.74.0-nightly-20231122-d4399c5f1

package/lib/cli/combine/combine-js-to-schema-cli.js

@@ -11,46 +11,13 @@
 
 'use strict';
 
-const combine = require('./combine-js-to-schema');
-const _require = require('./combine-utils'),
-  filterJSFile = _require.filterJSFile,
-  parseArgs = _require.parseArgs;
-const fs = require('fs');
-const glob = require('glob');
-const path = require('path');
+const _require = require('./combine-js-to-schema'),
+  combineSchemasInFileListAndWriteToFile =
+    _require.combineSchemasInFileListAndWriteToFile;
+const _require2 = require('./combine-utils'),
+  parseArgs = _require2.parseArgs;
 const _parseArgs = parseArgs(process.argv),
   platform = _parseArgs.platform,
   outfile = _parseArgs.outfile,
   fileList = _parseArgs.fileList;
-const allFiles = [];
-fileList.forEach(file => {
-  if (fs.lstatSync(file).isDirectory()) {
-    const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
-    const dirFiles = glob
-      .sync(`${filePattern}/**/*.{js,ts,tsx}`, {
-        nodir: true,
-        // TODO: This will remove the need of slash substitution above for Windows,
-        // but it requires glob@v9+; with the package currenlty relying on
-        // glob@7.1.1; and flow-typed repo not having definitions for glob@9+.
-        // windowsPathsNoEscape: true,
-      })
-      .filter(element => filterJSFile(element, platform));
-    allFiles.push(...dirFiles);
-  } else if (filterJSFile(file)) {
-    allFiles.push(file);
-  }
-});
-const combined = combine(allFiles);
-
-// Warn users if there is no modules to process
-if (Object.keys(combined.modules).length === 0) {
-  console.error(
-    'No modules to process in combine-js-to-schema-cli. If this is unexpected, please check if you set up your NativeComponent correctly. See combine-js-to-schema.js for how codegen finds modules.',
-  );
-}
-const formattedSchema = JSON.stringify(combined, null, 2);
-if (outfile != null) {
-  fs.writeFileSync(outfile, formattedSchema);
-} else {
-  console.log(formattedSchema);
-}
+combineSchemasInFileListAndWriteToFile(fileList, platform, outfile);

package/lib/cli/combine/combine-js-to-schema-cli.js.flow

@@ -11,45 +11,11 @@
 
 'use strict';
 
-const combine = require('./combine-js-to-schema');
-const {filterJSFile, parseArgs} = require('./combine-utils');
-const fs = require('fs');
-const glob = require('glob');
-const path = require('path');
+const {
+  combineSchemasInFileListAndWriteToFile,
+} = require('./combine-js-to-schema');
+const {parseArgs} = require('./combine-utils');
 
 const {platform, outfile, fileList} = parseArgs(process.argv);
 
-const allFiles = [];
-fileList.forEach(file => {
-  if (fs.lstatSync(file).isDirectory()) {
-    const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
-    const dirFiles = glob
-      .sync(`${filePattern}/**/*.{js,ts,tsx}`, {
-        nodir: true,
-        // TODO: This will remove the need of slash substitution above for Windows,
-        // but it requires glob@v9+; with the package currenlty relying on
-        // glob@7.1.1; and flow-typed repo not having definitions for glob@9+.
-        // windowsPathsNoEscape: true,
-      })
-      .filter(element => filterJSFile(element, platform));
-    allFiles.push(...dirFiles);
-  } else if (filterJSFile(file)) {
-    allFiles.push(file);
-  }
-});
-
-const combined = combine(allFiles);
-
-// Warn users if there is no modules to process
-if (Object.keys(combined.modules).length === 0) {
-  console.error(
-    'No modules to process in combine-js-to-schema-cli. If this is unexpected, please check if you set up your NativeComponent correctly. See combine-js-to-schema.js for how codegen finds modules.',
-  );
-}
-const formattedSchema = JSON.stringify(combined, null, 2);
-
-if (outfile != null) {
-  fs.writeFileSync(outfile, formattedSchema);
-} else {
-  console.log(formattedSchema);
-}
+combineSchemasInFileListAndWriteToFile(fileList, platform, outfile);

package/lib/cli/combine/combine-js-to-schema.js

@@ -76,7 +76,10 @@ const _require = require('../../parsers/flow/parser'),
   FlowParser = _require.FlowParser;
 const _require2 = require('../../parsers/typescript/parser'),
   TypeScriptParser = _require2.TypeScriptParser;
+const _require3 = require('./combine-utils'),
+  filterJSFile = _require3.filterJSFile;
 const fs = require('fs');
+const glob = require('glob');
 const path = require('path');
 const flowParser = new FlowParser();
 const typescriptParser = new TypeScriptParser();
@@ -107,4 +110,40 @@ function combineSchemas(files) {
     },
   );
 }
-module.exports = combineSchemas;
+function expandDirectoriesIntoFiles(fileList, platform) {
+  return fileList
+    .flatMap(file => {
+      if (!fs.lstatSync(file).isDirectory()) {
+        return [file];
+      }
+      const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
+      return glob.sync(`${filePattern}/**/*.{js,ts,tsx}`, {
+        nodir: true,
+        // TODO: This will remove the need of slash substitution above for Windows,
+        // but it requires glob@v9+; with the package currenlty relying on
+        // glob@7.1.1; and flow-typed repo not having definitions for glob@9+.
+        // windowsPathsNoEscape: true,
+      });
+    })
+    .filter(element => filterJSFile(element, platform));
+}
+function combineSchemasInFileList(fileList, platform) {
+  const expandedFileList = expandDirectoriesIntoFiles(fileList, platform);
+  const combined = combineSchemas(expandedFileList);
+  if (Object.keys(combined.modules).length === 0) {
+    console.error(
+      'No modules to process in combine-js-to-schema-cli. If this is unexpected, please check if you set up your NativeComponent correctly. See combine-js-to-schema.js for how codegen finds modules.',
+    );
+  }
+  return combined;
+}
+function combineSchemasInFileListAndWriteToFile(fileList, platform, outfile) {
+  const combined = combineSchemasInFileList(fileList, platform);
+  const formattedSchema = JSON.stringify(combined, null, 2);
+  fs.writeFileSync(outfile, formattedSchema);
+}
+module.exports = {
+  combineSchemas,
+  combineSchemasInFileList,
+  combineSchemasInFileListAndWriteToFile,
+};

package/lib/cli/combine/combine-js-to-schema.js.flow

@@ -13,7 +13,9 @@ import type {SchemaType} from '../../CodegenSchema.js';
 
 const {FlowParser} = require('../../parsers/flow/parser');
 const {TypeScriptParser} = require('../../parsers/typescript/parser');
+const {filterJSFile} = require('./combine-utils');
 const fs = require('fs');
+const glob = require('glob');
 const path = require('path');
 
 const flowParser = new FlowParser();
@@ -46,4 +48,53 @@ function combineSchemas(files: Array<string>): SchemaType {
   );
 }
 
-module.exports = combineSchemas;
+function expandDirectoriesIntoFiles(
+  fileList: Array<string>,
+  platform: ?string,
+): Array<string> {
+  return fileList
+    .flatMap(file => {
+      if (!fs.lstatSync(file).isDirectory()) {
+        return [file];
+      }
+      const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
+      return glob.sync(`${filePattern}/**/*.{js,ts,tsx}`, {
+        nodir: true,
+        // TODO: This will remove the need of slash substitution above for Windows,
+        // but it requires glob@v9+; with the package currenlty relying on
+        // glob@7.1.1; and flow-typed repo not having definitions for glob@9+.
+        // windowsPathsNoEscape: true,
+      });
+    })
+    .filter(element => filterJSFile(element, platform));
+}
+
+function combineSchemasInFileList(
+  fileList: Array<string>,
+  platform: ?string,
+): SchemaType {
+  const expandedFileList = expandDirectoriesIntoFiles(fileList, platform);
+  const combined = combineSchemas(expandedFileList);
+  if (Object.keys(combined.modules).length === 0) {
+    console.error(
+      'No modules to process in combine-js-to-schema-cli. If this is unexpected, please check if you set up your NativeComponent correctly. See combine-js-to-schema.js for how codegen finds modules.',
+    );
+  }
+  return combined;
+}
+
+function combineSchemasInFileListAndWriteToFile(
+  fileList: Array<string>,
+  platform: ?string,
+  outfile: string,
+): void {
+  const combined = combineSchemasInFileList(fileList, platform);
+  const formattedSchema = JSON.stringify(combined, null, 2);
+  fs.writeFileSync(outfile, formattedSchema);
+}
+
+module.exports = {
+  combineSchemas,
+  combineSchemasInFileList,
+  combineSchemasInFileListAndWriteToFile,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.74.0-nightly-20231121-a6964b362",
+  "version": "0.74.0-nightly-20231122-d4399c5f1",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {