@react-native/codegen 0.74.0-nightly-20231122-d4399c5f1 → 0.74.0-nightly-20231124-c464b215e

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

@@ -16,8 +16,9 @@ const _require = require('./combine-js-to-schema'),
     _require.combineSchemasInFileListAndWriteToFile;
 const _require2 = require('./combine-utils'),
   parseArgs = _require2.parseArgs;
-const _parseArgs = parseArgs(process.argv),
-  platform = _parseArgs.platform,
-  outfile = _parseArgs.outfile,
-  fileList = _parseArgs.fileList;
-combineSchemasInFileListAndWriteToFile(fileList, platform, outfile);
+const parsedArgs = parseArgs(process.argv);
+const platform = parsedArgs.platform,
+  outfile = parsedArgs.outfile,
+  fileList = parsedArgs.fileList,
+  exclude = parsedArgs.exclude;
+combineSchemasInFileListAndWriteToFile(fileList, platform, outfile, exclude);

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

@@ -16,6 +16,8 @@ const {
 } = require('./combine-js-to-schema');
 const {parseArgs} = require('./combine-utils');
 
-const {platform, outfile, fileList} = parseArgs(process.argv);
+const parsedArgs = parseArgs(process.argv);
 
-combineSchemasInFileListAndWriteToFile(fileList, platform, outfile);
+const {platform, outfile, fileList, exclude} = parsedArgs;
+
+combineSchemasInFileListAndWriteToFile(fileList, platform, outfile, exclude);

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

@@ -110,7 +110,7 @@ function combineSchemas(files) {
     },
   );
 }
-function expandDirectoriesIntoFiles(fileList, platform) {
+function expandDirectoriesIntoFiles(fileList, platform, exclude) {
   return fileList
     .flatMap(file => {
       if (!fs.lstatSync(file).isDirectory()) {
@@ -125,10 +125,14 @@ function expandDirectoriesIntoFiles(fileList, platform) {
         // windowsPathsNoEscape: true,
       });
     })
-    .filter(element => filterJSFile(element, platform));
+    .filter(element => filterJSFile(element, platform, exclude));
 }
-function combineSchemasInFileList(fileList, platform) {
-  const expandedFileList = expandDirectoriesIntoFiles(fileList, platform);
+function combineSchemasInFileList(fileList, platform, exclude) {
+  const expandedFileList = expandDirectoriesIntoFiles(
+    fileList,
+    platform,
+    exclude,
+  );
   const combined = combineSchemas(expandedFileList);
   if (Object.keys(combined.modules).length === 0) {
     console.error(
@@ -137,8 +141,13 @@ function combineSchemasInFileList(fileList, platform) {
   }
   return combined;
 }
-function combineSchemasInFileListAndWriteToFile(fileList, platform, outfile) {
-  const combined = combineSchemasInFileList(fileList, platform);
+function combineSchemasInFileListAndWriteToFile(
+  fileList,
+  platform,
+  outfile,
+  exclude,
+) {
+  const combined = combineSchemasInFileList(fileList, platform, exclude);
   const formattedSchema = JSON.stringify(combined, null, 2);
   fs.writeFileSync(outfile, formattedSchema);
 }

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

@@ -51,6 +51,7 @@ function combineSchemas(files: Array<string>): SchemaType {
 function expandDirectoriesIntoFiles(
   fileList: Array<string>,
   platform: ?string,
+  exclude: ?RegExp,
 ): Array<string> {
   return fileList
     .flatMap(file => {
@@ -66,14 +67,19 @@ function expandDirectoriesIntoFiles(
         // windowsPathsNoEscape: true,
       });
     })
-    .filter(element => filterJSFile(element, platform));
+    .filter(element => filterJSFile(element, platform, exclude));
 }
 
 function combineSchemasInFileList(
   fileList: Array<string>,
   platform: ?string,
+  exclude: ?RegExp,
 ): SchemaType {
-  const expandedFileList = expandDirectoriesIntoFiles(fileList, platform);
+  const expandedFileList = expandDirectoriesIntoFiles(
+    fileList,
+    platform,
+    exclude,
+  );
   const combined = combineSchemas(expandedFileList);
   if (Object.keys(combined.modules).length === 0) {
     console.error(
@@ -87,8 +93,9 @@ function combineSchemasInFileListAndWriteToFile(
   fileList: Array<string>,
   platform: ?string,
   outfile: string,
+  exclude: ?RegExp,
 ): void {
-  const combined = combineSchemasInFileList(fileList, platform);
+  const combined = combineSchemasInFileList(fileList, platform, exclude);
   const formattedSchema = JSON.stringify(combined, null, 2);
   fs.writeFileSync(outfile, formattedSchema);
 }

package/lib/cli/combine/combine-schemas-cli.js

@@ -0,0 +1,78 @@
+/**
+ * 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.
+ *
+ *
+ * @format
+ */
+
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const util = require('util');
+const _util$parseArgs = util.parseArgs({
+    options: {
+      platform: {
+        type: 'string',
+      },
+      output: {
+        type: 'string',
+      },
+      ['schema-query']: {
+        type: 'string',
+      },
+    },
+  }),
+  args = _util$parseArgs.values;
+if (!['iOS', 'android'].includes(args.platform)) {
+  throw new Error(`Invalid platform ${args.platform}`);
+}
+const platform = args.platform;
+const output = args.output;
+const schemaQuery = args['schema-query'];
+if (!schemaQuery.startsWith('@')) {
+  throw new Error(
+    "The argument provided to --schema-query must be a filename that starts with '@'.",
+  );
+}
+const schemaQueryOutputFile = schemaQuery.replace(/^@/, '');
+const schemaQueryOutput = fs.readFileSync(schemaQueryOutputFile, 'utf8');
+const schemaFiles = schemaQueryOutput.split(' ');
+const modules = {};
+const specNameToFile = {};
+for (const file of schemaFiles) {
+  const schema = JSON.parse(fs.readFileSync(file, 'utf8'));
+  if (schema.modules) {
+    for (const specName in schema.modules) {
+      const module = schema.modules[specName];
+      if (modules[specName]) {
+        assert.deepEqual(
+          module,
+          modules[specName],
+          `App contained two specs with the same file name '${specName}'. Schemas: ${specNameToFile[specName]}, ${file}. Please rename one of the specs.`,
+        );
+      }
+      if (
+        module.excludedPlatforms &&
+        module.excludedPlatforms.indexOf(platform) >= 0
+      ) {
+        continue;
+      }
+      modules[specName] = module;
+      specNameToFile[specName] = file;
+    }
+  }
+}
+fs.writeFileSync(
+  output,
+  JSON.stringify(
+    {
+      modules,
+    },
+    null,
+    2,
+  ),
+);

package/lib/cli/combine/combine-schemas-cli.js.flow

@@ -0,0 +1,85 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+import type {
+  ComponentSchema,
+  NativeModuleSchema,
+  SchemaType,
+} from '../../CodegenSchema.js';
+
+const assert = require('assert');
+const fs = require('fs');
+const util = require('util');
+
+const {values: args} = util.parseArgs({
+  options: {
+    platform: {
+      type: 'string',
+    },
+    output: {
+      type: 'string',
+    },
+    ['schema-query']: {
+      type: 'string',
+    },
+  },
+});
+if (!['iOS', 'android'].includes(args.platform)) {
+  throw new Error(`Invalid platform ${args.platform}`);
+}
+const platform = args.platform;
+const output = args.output;
+const schemaQuery: string = args['schema-query'];
+
+if (!schemaQuery.startsWith('@')) {
+  throw new Error(
+    "The argument provided to --schema-query must be a filename that starts with '@'.",
+  );
+}
+
+const schemaQueryOutputFile = schemaQuery.replace(/^@/, '');
+const schemaQueryOutput = fs.readFileSync(schemaQueryOutputFile, 'utf8');
+
+const schemaFiles = schemaQueryOutput.split(' ');
+const modules: {
+  [hasteModuleName: string]: NativeModuleSchema | ComponentSchema,
+} = {};
+const specNameToFile: {[hasteModuleName: string]: string} = {};
+
+for (const file of schemaFiles) {
+  const schema: SchemaType = JSON.parse(fs.readFileSync(file, 'utf8'));
+
+  if (schema.modules) {
+    for (const specName in schema.modules) {
+      const module = schema.modules[specName];
+      if (modules[specName]) {
+        assert.deepEqual(
+          module,
+          modules[specName],
+          `App contained two specs with the same file name '${specName}'. Schemas: ${specNameToFile[specName]}, ${file}. Please rename one of the specs.`,
+        );
+      }
+
+      if (
+        module.excludedPlatforms &&
+        module.excludedPlatforms.indexOf(platform) >= 0
+      ) {
+        continue;
+      }
+
+      modules[specName] = module;
+      specNameToFile[specName] = file;
+    }
+  }
+}
+
+fs.writeFileSync(output, JSON.stringify({modules}, null, 2));

package/lib/cli/combine/combine-utils.js

@@ -49,26 +49,34 @@ function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
 const path = require('path');
+const util = require('util');
 function parseArgs(args) {
-  if (args.length > 2 && ['-p', '--platform'].indexOf(args[2]) >= 0) {
-    const _args$slice = args.slice(4),
-      _args$slice2 = _toArray(_args$slice),
-      outfile = _args$slice2[0],
-      fileList = _args$slice2.slice(1);
-    return {
-      platform: args[3],
-      outfile,
-      fileList,
-    };
-  }
-  const _args$slice3 = args.slice(2),
-    _args$slice4 = _toArray(_args$slice3),
-    outfile = _args$slice4[0],
-    fileList = _args$slice4.slice(1);
+  const parsedArgs = util.parseArgs({
+    args: args.slice(2),
+    options: {
+      platform: {
+        short: 'p',
+        type: 'string',
+      },
+      exclude: {
+        short: 'e',
+        type: 'string',
+      },
+    },
+    allowPositionals: true,
+  });
+  const _parsedArgs$values = parsedArgs.values,
+    platform = _parsedArgs$values.platform,
+    exclude = _parsedArgs$values.exclude,
+    files = parsedArgs.positionals;
+  const _files = _toArray(files),
+    outfile = _files[0],
+    fileList = _files.slice(1);
   return {
-    platform: null,
+    platform: platform !== null && platform !== void 0 ? platform : null,
     outfile,
     fileList,
+    exclude: exclude != null && exclude !== '' ? new RegExp(exclude) : null,
   };
 }
 
@@ -80,18 +88,16 @@ function parseArgs(args) {
  * Returns: `true` if the file can be used to generate some code; `false` otherwise
  *
  */
-function filterJSFile(file, currentPlatform) {
+function filterJSFile(file, currentPlatform, excludeRegExp) {
   const isSpecFile = /^(Native.+|.+NativeComponent)/.test(path.basename(file));
   const isNotNativeUIManager = !file.endsWith('NativeUIManager.js');
-  const isNotNativeSampleTurboModule = !file.endsWith(
-    'NativeSampleTurboModule.js',
-  );
   const isNotTest = !file.includes('__tests');
+  const isNotExcluded = excludeRegExp == null || !excludeRegExp.test(file);
   const isNotTSTypeDefinition = !file.endsWith('.d.ts');
   const isValidCandidate =
     isSpecFile &&
     isNotNativeUIManager &&
-    isNotNativeSampleTurboModule &&
+    isNotExcluded &&
     isNotTest &&
     isNotTSTypeDefinition;
   const filenameComponents = path.basename(file).split('.');

package/lib/cli/combine/combine-utils.js.flow

@@ -12,26 +12,41 @@
 'use strict';
 
 const path = require('path');
+const util = require('util');
 
 function parseArgs(args: string[]): {
   platform: ?string,
   outfile: string,
   fileList: string[],
+  exclude: ?RegExp,
 } {
-  if (args.length > 2 && ['-p', '--platform'].indexOf(args[2]) >= 0) {
-    const [outfile, ...fileList] = args.slice(4);
-    return {
-      platform: args[3],
-      outfile,
-      fileList,
-    };
-  }
+  const parsedArgs = util.parseArgs({
+    args: args.slice(2),
+    options: {
+      platform: {
+        short: 'p',
+        type: 'string',
+      },
+      exclude: {
+        short: 'e',
+        type: 'string',
+      },
+    },
+    allowPositionals: true,
+  });
+
+  const {
+    values: {platform, exclude},
+    positionals: files,
+  } = parsedArgs;
+
+  const [outfile, ...fileList] = files;
 
-  const [outfile, ...fileList] = args.slice(2);
   return {
-    platform: null,
+    platform: platform ?? null,
     outfile,
     fileList,
+    exclude: exclude != null && exclude !== '' ? new RegExp(exclude) : null,
   };
 }
 
@@ -43,19 +58,21 @@ function parseArgs(args: string[]): {
  * Returns: `true` if the file can be used to generate some code; `false` otherwise
  *
  */
-function filterJSFile(file: string, currentPlatform: ?string): boolean {
+function filterJSFile(
+  file: string,
+  currentPlatform: ?string,
+  excludeRegExp: ?RegExp,
+): boolean {
   const isSpecFile = /^(Native.+|.+NativeComponent)/.test(path.basename(file));
   const isNotNativeUIManager = !file.endsWith('NativeUIManager.js');
-  const isNotNativeSampleTurboModule = !file.endsWith(
-    'NativeSampleTurboModule.js',
-  );
   const isNotTest = !file.includes('__tests');
+  const isNotExcluded = excludeRegExp == null || !excludeRegExp.test(file);
   const isNotTSTypeDefinition = !file.endsWith('.d.ts');
 
   const isValidCandidate =
     isSpecFile &&
     isNotNativeUIManager &&
-    isNotNativeSampleTurboModule &&
+    isNotExcluded &&
     isNotTest &&
     isNotTSTypeDefinition;
 

package/package.json

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