@react-native/codegen 0.74.0-nightly-20231217-2441fa284 → 0.74.0-nightly-20231220-dae4a11e9

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

@@ -11,14 +11,65 @@
 
 '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 _require = require('./combine-js-to-schema'),
   combineSchemasInFileListAndWriteToFile =
     _require.combineSchemasInFileListAndWriteToFile;
-const _require2 = require('./combine-utils'),
-  parseArgs = _require2.parseArgs;
-const parsedArgs = parseArgs(process.argv);
-const platform = parsedArgs.platform,
-  outfile = parsedArgs.outfile,
-  fileList = parsedArgs.fileList,
-  exclude = parsedArgs.exclude;
-combineSchemasInFileListAndWriteToFile(fileList, platform, outfile, exclude);
+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

@@ -14,10 +14,26 @@
 const {
   combineSchemasInFileListAndWriteToFile,
 } = require('./combine-js-to-schema');
-const {parseArgs} = require('./combine-utils');
+const yargs = require('yargs');
 
-const parsedArgs = parseArgs(process.argv);
+const argv = yargs
+  .option('p', {
+    alias: 'platform',
+  })
+  .option('e', {
+    alias: 'exclude',
+  })
+  .parseSync();
 
-const {platform, outfile, fileList, exclude} = parsedArgs;
+const [outfile, ...fileList] = argv._;
+const platform: ?string = argv.platform;
+const exclude: string = argv.exclude;
+const excludeRegExp: ?RegExp =
+  exclude != null && exclude !== '' ? new RegExp(exclude) : null;
 
-combineSchemasInFileListAndWriteToFile(fileList, platform, outfile, exclude);
+combineSchemasInFileListAndWriteToFile(
+  fileList,
+  platform != null ? platform.toLowerCase() : platform,
+  outfile,
+  excludeRegExp,
+);

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

@@ -12,27 +12,26 @@
 
 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 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}`);
 }
-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 '@'.",

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

@@ -18,27 +18,29 @@ import type {
 
 const assert = require('assert');
 const fs = require('fs');
-const util = require('util');
+const yargs = require('yargs');
 
-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 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}`);
 }
-const platform = args.platform;
-const output = args.output;
-const schemaQuery: string = args['schema-query'];
 
 if (!schemaQuery.startsWith('@')) {
   throw new Error(

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

@@ -11,74 +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');
-const util = require('util');
-function parseArgs(args) {
-  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: platform !== null && platform !== void 0 ? platform : null,
-    outfile,
-    fileList,
-    exclude: exclude != null && exclude !== '' ? new RegExp(exclude) : null,
-  };
-}
 
 /**
  * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
@@ -119,6 +52,5 @@ function filterJSFile(file, currentPlatform, excludeRegExp) {
   return isValidCandidate && currentPlatform === filePlatform;
 }
 module.exports = {
-  parseArgs,
   filterJSFile,
 };

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

@@ -12,43 +12,6 @@
 'use strict';
 
 const path = require('path');
-const util = require('util');
-
-function parseArgs(args: string[]): {
-  platform: ?string,
-  outfile: string,
-  fileList: string[],
-  exclude: ?RegExp,
-} {
-  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;
-
-  return {
-    platform: platform ?? null,
-    outfile,
-    fileList,
-    exclude: exclude != null && exclude !== '' ? new RegExp(exclude) : null,
-  };
-}
 
 /**
  * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
@@ -97,6 +60,5 @@ function filterJSFile(
 }
 
 module.exports = {
-  parseArgs,
   filterJSFile,
 };

package/lib/generators/RNCodegen.js

@@ -166,14 +166,28 @@ module.exports = {
   libraryGenerators: LIBRARY_GENERATORS,
   schemaGenerators: SCHEMAS_GENERATORS,
   generate(
-    {libraryName, schema, outputDirectory, packageName, assumeNonnull},
+    {
+      libraryName,
+      schema,
+      outputDirectory,
+      packageName,
+      assumeNonnull,
+      useLocalIncludePaths,
+    },
     {generators, test},
   ) {
     schemaValidator.validate(schema);
+    const defaultHeaderPrefix = 'react/renderer/components';
+    const headerPrefix =
+      useLocalIncludePaths === true
+        ? ''
+        : `${defaultHeaderPrefix}/${libraryName}/`;
     function composePath(intermediate) {
       return path.join(outputDirectory, intermediate, libraryName);
     }
-    const componentIOSOutput = composePath('react/renderer/components/');
+    const componentIOSOutput = composePath(
+      useLocalIncludePaths === true ? '' : defaultHeaderPrefix,
+    );
     const modulesIOSOutput = composePath('./');
     const outputFoldersForGenerators = {
       componentsIOS: componentIOSOutput,
@@ -191,15 +205,19 @@ module.exports = {
     const generatedFiles = [];
     for (const name of generators) {
       for (const generator of LIBRARY_GENERATORS[name]) {
-        generator(libraryName, schema, packageName, assumeNonnull).forEach(
-          (contents, fileName) => {
-            generatedFiles.push({
-              name: fileName,
-              content: contents,
-              outputDir: outputFoldersForGenerators[name],
-            });
-          },
-        );
+        generator(
+          libraryName,
+          schema,
+          packageName,
+          assumeNonnull,
+          headerPrefix,
+        ).forEach((contents, fileName) => {
+          generatedFiles.push({
+            name: fileName,
+            content: contents,
+            outputDir: outputFoldersForGenerators[name],
+          });
+        });
       }
     }
     return checkOrWriteFiles(generatedFiles, test);

package/lib/generators/RNCodegen.js.flow

@@ -77,6 +77,7 @@ type LibraryOptions = $ReadOnly<{
   outputDirectory: string,
   packageName?: string, // Some platforms have a notion of package, which should be configurable.
   assumeNonnull: boolean,
+  useLocalIncludePaths?: boolean,
 }>;
 
 type SchemasOptions = $ReadOnly<{
@@ -232,16 +233,24 @@ module.exports = {
       outputDirectory,
       packageName,
       assumeNonnull,
+      useLocalIncludePaths,
     }: LibraryOptions,
     {generators, test}: LibraryConfig,
   ): boolean {
     schemaValidator.validate(schema);
 
+    const defaultHeaderPrefix = 'react/renderer/components';
+    const headerPrefix =
+      useLocalIncludePaths === true
+        ? ''
+        : `${defaultHeaderPrefix}/${libraryName}/`;
     function composePath(intermediate: string) {
       return path.join(outputDirectory, intermediate, libraryName);
     }
 
-    const componentIOSOutput = composePath('react/renderer/components/');
+    const componentIOSOutput = composePath(
+      useLocalIncludePaths === true ? '' : defaultHeaderPrefix,
+    );
     const modulesIOSOutput = composePath('./');
 
     const outputFoldersForGenerators = {
@@ -262,15 +271,19 @@ module.exports = {
 
     for (const name of generators) {
       for (const generator of LIBRARY_GENERATORS[name]) {
-        generator(libraryName, schema, packageName, assumeNonnull).forEach(
-          (contents: string, fileName: string) => {
-            generatedFiles.push({
-              name: fileName,
-              content: contents,
-              outputDir: outputFoldersForGenerators[name],
-            });
-          },
-        );
+        generator(
+          libraryName,
+          schema,
+          packageName,
+          assumeNonnull,
+          headerPrefix,
+        ).forEach((contents: string, fileName: string) => {
+          generatedFiles.push({
+            name: fileName,
+            content: contents,
+            outputDir: outputFoldersForGenerators[name],
+          });
+        });
       }
     }
     return checkOrWriteFiles(generatedFiles, test);

package/lib/generators/components/GenerateComponentDescriptorH.js

@@ -12,7 +12,7 @@
 
 // File path -> contents
 
-const FileTemplate = ({componentDescriptors, libraryName}) => `
+const FileTemplate = ({componentDescriptors, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -24,7 +24,7 @@ const FileTemplate = ({componentDescriptors, libraryName}) => `
 
 #pragma once
 
-#include <react/renderer/components/${libraryName}/ShadowNodes.h>
+#include <${headerPrefix}ShadowNodes.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
@@ -38,7 +38,13 @@ const ComponentTemplate = ({className}) =>
 using ${className}ComponentDescriptor = ConcreteComponentDescriptor<${className}ShadowNode>;
 `.trim();
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'ComponentDescriptors.h';
     const componentDescriptors = Object.keys(schema.modules)
       .map(moduleName => {
@@ -66,7 +72,8 @@ module.exports = {
       .join('\n');
     const replacedTemplate = FileTemplate({
       componentDescriptors,
-      libraryName,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

package/lib/generators/components/GenerateComponentDescriptorH.js.flow

@@ -17,10 +17,10 @@ type FilesOutput = Map<string, string>;
 
 const FileTemplate = ({
   componentDescriptors,
-  libraryName,
+  headerPrefix,
 }: {
   componentDescriptors: string,
-  libraryName: string,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -33,7 +33,7 @@ const FileTemplate = ({
 
 #pragma once
 
-#include <react/renderer/components/${libraryName}/ShadowNodes.h>
+#include <${headerPrefix}ShadowNodes.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
@@ -54,6 +54,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'ComponentDescriptors.h';
 
@@ -85,7 +86,7 @@ module.exports = {
 
     const replacedTemplate = FileTemplate({
       componentDescriptors,
-      libraryName,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateComponentHObjCpp.js

@@ -294,7 +294,13 @@ function generateCommandHandler(component, componentName) {
   });
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'RCTComponentViewHelpers.h';
     const componentContent = Object.keys(schema.modules)
       .map(moduleName => {

package/lib/generators/components/GenerateComponentHObjCpp.js.flow

@@ -380,6 +380,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'RCTComponentViewHelpers.h';
 

package/lib/generators/components/GenerateEventEmitterCpp.js

@@ -17,7 +17,7 @@ const _require2 = require('./CppHelpers'),
 
 // File path -> contents
 
-const FileTemplate = ({events, libraryName, extraIncludes}) => `
+const FileTemplate = ({events, extraIncludes, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -27,7 +27,7 @@ const FileTemplate = ({events, libraryName, extraIncludes}) => `
  * ${'@'}generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/EventEmitters.h>
+#include <${headerPrefix}EventEmitters.h>
 ${[...extraIncludes].join('\n')}
 
 namespace facebook::react {
@@ -351,7 +351,13 @@ function generateEvent(componentName, event, extraIncludes) {
   });
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const moduleComponents = Object.keys(schema.modules)
       .map(moduleName => {
         const module = schema.modules[moduleName];
@@ -378,9 +384,10 @@ module.exports = {
       .join('\n');
     const fileName = 'EventEmitters.cpp';
     const replacedTemplate = FileTemplate({
-      libraryName,
       events: componentEmitters,
       extraIncludes,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

package/lib/generators/components/GenerateEventEmitterCpp.js.flow

@@ -31,12 +31,12 @@ type ComponentCollection = $ReadOnly<{
 
 const FileTemplate = ({
   events,
-  libraryName,
   extraIncludes,
+  headerPrefix,
 }: {
   events: string,
-  libraryName: string,
   extraIncludes: Set<string>,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -47,7 +47,7 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/EventEmitters.h>
+#include <${headerPrefix}EventEmitters.h>
 ${[...extraIncludes].join('\n')}
 
 namespace facebook::react {
@@ -411,6 +411,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const moduleComponents: ComponentCollection = Object.keys(schema.modules)
       .map(moduleName => {
@@ -442,9 +443,9 @@ module.exports = {
 
     const fileName = 'EventEmitters.cpp';
     const replacedTemplate = FileTemplate({
-      libraryName,
       events: componentEmitters,
       extraIncludes,
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GenerateEventEmitterH.js

@@ -227,7 +227,13 @@ function generateEvents(componentName, component) {
     .join('\n\n' + '  ');
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const moduleComponents = Object.keys(schema.modules)
       .map(moduleName => {
         const module = schema.modules[moduleName];

package/lib/generators/components/GenerateEventEmitterH.js.flow

@@ -311,6 +311,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const moduleComponents: ComponentCollection = Object.keys(schema.modules)
       .map(moduleName => {