@react-native/codegen 0.74.0 → 0.75.0-nightly-20240221-a1171f79f

package/lib/CodegenSchema.d.ts

@@ -199,7 +199,16 @@ export type CommandParamTypeAnnotation =
   | Int32TypeAnnotation
   | DoubleTypeAnnotation
   | FloatTypeAnnotation
-  | StringTypeAnnotation;
+  | StringTypeAnnotation
+  | {
+    readonly type: 'ArrayTypeAnnotation';
+    readonly elementType:
+    | Int32TypeAnnotation
+    | DoubleTypeAnnotation
+    | FloatTypeAnnotation
+    | BooleanTypeAnnotation
+    | StringTypeAnnotation
+  };
 
 export interface ReservedTypeAnnotation {
   readonly type: 'ReservedTypeAnnotation';

package/lib/CodegenSchema.js.flow

@@ -213,7 +213,8 @@ export type CommandParamTypeAnnotation =
   | Int32TypeAnnotation
   | DoubleTypeAnnotation
   | FloatTypeAnnotation
-  | StringTypeAnnotation;
+  | StringTypeAnnotation
+  | ArrayTypeAnnotation;
 
 export type ReservedTypeAnnotation = $ReadOnly<{
   type: 'ReservedTypeAnnotation',

package/lib/SchemaValidator.js.flow

@@ -10,10 +10,10 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-
 import type {SchemaType} from './CodegenSchema';
 
+const nullthrows = require('nullthrows');
+
 function getErrors(schema: SchemaType): $ReadOnlyArray<string> {
   const errors = new Set<string>();
 

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

@@ -11,46 +11,65 @@
 
 'use strict';
 
-const combine = require('./combine-js-to-schema');
-const fs = require('fs');
-const glob = require('glob');
-const path = require('path');
-const _require = require('./combine-utils'),
-  parseArgs = _require.parseArgs,
-  filterJSFile = _require.filterJSFile;
-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.',
+function _toArray(arr) {
+  return (
+    _arrayWithHoles(arr) ||
+    _iterableToArray(arr) ||
+    _unsupportedIterableToArray(arr) ||
+    _nonIterableRest()
+  );
+}
+function _nonIterableRest() {
+  throw new TypeError(
+    'Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.',
   );
 }
-const formattedSchema = JSON.stringify(combined, null, 2);
-if (outfile != null) {
-  fs.writeFileSync(outfile, formattedSchema);
-} else {
-  console.log(formattedSchema);
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === 'string') return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === 'Object' && o.constructor) n = o.constructor.name;
+  if (n === 'Map' || n === 'Set') return Array.from(o);
+  if (n === 'Arguments' || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
+    return _arrayLikeToArray(o, minLen);
+}
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+  return arr2;
+}
+function _iterableToArray(iter) {
+  if (
+    (typeof Symbol !== 'undefined' && iter[Symbol.iterator] != null) ||
+    iter['@@iterator'] != null
+  )
+    return Array.from(iter);
+}
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
 }
+const _require = require('./combine-js-to-schema'),
+  combineSchemasInFileListAndWriteToFile =
+    _require.combineSchemasInFileListAndWriteToFile;
+const yargs = require('yargs');
+const argv = yargs
+  .option('p', {
+    alias: 'platform',
+  })
+  .option('e', {
+    alias: 'exclude',
+  })
+  .parseSync();
+const _argv$_ = _toArray(argv._),
+  outfile = _argv$_[0],
+  fileList = _argv$_.slice(1);
+const platform = argv.platform;
+const exclude = argv.exclude;
+const excludeRegExp =
+  exclude != null && exclude !== '' ? new RegExp(exclude) : null;
+combineSchemasInFileListAndWriteToFile(
+  fileList,
+  platform != null ? platform.toLowerCase() : platform,
+  outfile,
+  excludeRegExp,
+);

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

@@ -11,45 +11,29 @@
 
 'use strict';
 
-const combine = require('./combine-js-to-schema');
-const fs = require('fs');
-const glob = require('glob');
-const path = require('path');
-const {parseArgs, filterJSFile} = require('./combine-utils');
+const {
+  combineSchemasInFileListAndWriteToFile,
+} = require('./combine-js-to-schema');
+const yargs = require('yargs');
 
-const {platform, outfile, fileList} = parseArgs(process.argv);
+const argv = yargs
+  .option('p', {
+    alias: 'platform',
+  })
+  .option('e', {
+    alias: 'exclude',
+  })
+  .parseSync();
 
-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 [outfile, ...fileList] = argv._;
+const platform: ?string = argv.platform;
+const exclude: string = argv.exclude;
+const excludeRegExp: ?RegExp =
+  exclude != null && exclude !== '' ? new RegExp(exclude) : null;
 
-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 != null ? platform.toLowerCase() : platform,
+  outfile,
+  excludeRegExp,
+);

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,49 @@ function combineSchemas(files) {
     },
   );
 }
-module.exports = combineSchemas;
+function expandDirectoriesIntoFiles(fileList, platform, exclude) {
+  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, exclude));
+}
+function combineSchemasInFileList(fileList, platform, exclude) {
+  const expandedFileList = expandDirectoriesIntoFiles(
+    fileList,
+    platform,
+    exclude,
+  );
+  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,
+  exclude,
+) {
+  const combined = combineSchemasInFileList(fileList, platform, exclude);
+  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,60 @@ function combineSchemas(files: Array<string>): SchemaType {
   );
 }
 
-module.exports = combineSchemas;
+function expandDirectoriesIntoFiles(
+  fileList: Array<string>,
+  platform: ?string,
+  exclude: ?RegExp,
+): 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, exclude));
+}
+
+function combineSchemasInFileList(
+  fileList: Array<string>,
+  platform: ?string,
+  exclude: ?RegExp,
+): SchemaType {
+  const expandedFileList = expandDirectoriesIntoFiles(
+    fileList,
+    platform,
+    exclude,
+  );
+  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,
+  exclude: ?RegExp,
+): void {
+  const combined = combineSchemasInFileList(fileList, platform, exclude);
+  const formattedSchema = JSON.stringify(combined, null, 2);
+  fs.writeFileSync(outfile, formattedSchema);
+}
+
+module.exports = {
+  combineSchemas,
+  combineSchemasInFileList,
+  combineSchemasInFileListAndWriteToFile,
+};

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

@@ -0,0 +1,77 @@
+/**
+ * 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 yargs = require('yargs');
+const argv = yargs
+  .option('p', {
+    alias: 'platform',
+    type: 'string',
+    demandOption: true,
+  })
+  .option('o', {
+    alias: 'output',
+  })
+  .option('s', {
+    alias: 'schema-query',
+  })
+  .parseSync();
+const platform = argv.platform.toLowerCase();
+const output = argv.output;
+const schemaQuery = argv.s;
+if (!['ios', 'android'].includes(platform)) {
+  throw new Error(`Invalid platform ${platform}`);
+}
+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,87 @@
+/**
+ * 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 yargs = require('yargs');
+
+const argv = yargs
+  .option('p', {
+    alias: 'platform',
+    type: 'string',
+    demandOption: true,
+  })
+  .option('o', {
+    alias: 'output',
+  })
+  .option('s', {
+    alias: 'schema-query',
+  })
+  .parseSync();
+
+const platform: string = argv.platform.toLowerCase();
+const output: string = argv.output;
+const schemaQuery: string = argv.s;
+
+if (!['ios', 'android'].includes(platform)) {
+  throw new Error(`Invalid platform ${platform}`);
+}
+
+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

@@ -11,66 +11,7 @@
 
 'use strict';
 
-function _toArray(arr) {
-  return (
-    _arrayWithHoles(arr) ||
-    _iterableToArray(arr) ||
-    _unsupportedIterableToArray(arr) ||
-    _nonIterableRest()
-  );
-}
-function _nonIterableRest() {
-  throw new TypeError(
-    'Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.',
-  );
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === 'string') return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === 'Object' && o.constructor) n = o.constructor.name;
-  if (n === 'Map' || n === 'Set') return Array.from(o);
-  if (n === 'Arguments' || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
-    return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _iterableToArray(iter) {
-  if (
-    (typeof Symbol !== 'undefined' && iter[Symbol.iterator] != null) ||
-    iter['@@iterator'] != null
-  )
-    return Array.from(iter);
-}
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
 const path = require('path');
-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);
-  return {
-    platform: null,
-    outfile,
-    fileList,
-  };
-}
 
 /**
  * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
@@ -80,18 +21,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('.');
@@ -113,6 +52,5 @@ function filterJSFile(file, currentPlatform) {
   return isValidCandidate && currentPlatform === filePlatform;
 }
 module.exports = {
-  parseArgs,
   filterJSFile,
 };

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

@@ -13,28 +13,6 @@
 
 const path = require('path');
 
-function parseArgs(args: string[]): {
-  platform: ?string,
-  outfile: string,
-  fileList: string[],
-} {
-  if (args.length > 2 && ['-p', '--platform'].indexOf(args[2]) >= 0) {
-    const [outfile, ...fileList] = args.slice(4);
-    return {
-      platform: args[3],
-      outfile,
-      fileList,
-    };
-  }
-
-  const [outfile, ...fileList] = args.slice(2);
-  return {
-    platform: null,
-    outfile,
-    fileList,
-  };
-}
-
 /**
  * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
  * Parameters:
@@ -43,19 +21,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;
 
@@ -80,6 +60,5 @@ function filterJSFile(file: string, currentPlatform: ?string): boolean {
 }
 
 module.exports = {
-  parseArgs,
   filterJSFile,
 };

package/lib/cli/parser/parser.js

@@ -10,11 +10,11 @@
 
 'use strict';
 
-const path = require('path');
 const _require = require('../../parsers/flow/parser'),
   FlowParser = _require.FlowParser;
 const _require2 = require('../../parsers/typescript/parser'),
   TypeScriptParser = _require2.TypeScriptParser;
+const path = require('path');
 const flowParser = new FlowParser();
 const typescriptParser = new TypeScriptParser();
 function parseFiles(files) {