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

package/lib/generators/components/GenerateEventEmitterH.js

@@ -10,15 +10,18 @@
 
 'use strict';
 
+const _require = require('../Utils'),
+  indent = _require.indent,
+  toSafeCppString = _require.toSafeCppString;
+const _require2 = require('./CppHelpers'),
+  generateEventStructName = _require2.generateEventStructName,
+  getCppArrayTypeForAnnotation = _require2.getCppArrayTypeForAnnotation,
+  getCppTypeForAnnotation = _require2.getCppTypeForAnnotation,
+  getImports = _require2.getImports;
 const nullthrows = require('nullthrows');
-const _require = require('./CppHelpers'),
-  getImports = _require.getImports,
-  getCppArrayTypeForAnnotation = _require.getCppArrayTypeForAnnotation,
-  getCppTypeForAnnotation = _require.getCppTypeForAnnotation,
-  generateEventStructName = _require.generateEventStructName;
-const _require2 = require('../Utils'),
-  indent = _require2.indent,
-  toSafeCppString = _require2.toSafeCppString;
+
+// File path -> contents
+
 const FileTemplate = ({componentEmitters, extraIncludes}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -33,11 +36,9 @@ const FileTemplate = ({componentEmitters, extraIncludes}) => `
 #include <react/renderer/components/view/ViewEventEmitter.h>
 ${[...extraIncludes].join('\n')}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 ${componentEmitters}
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const ComponentTemplate = ({className, structs, events}) =>
   `
@@ -226,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

@@ -10,24 +10,23 @@
 
 'use strict';
 
-const nullthrows = require('nullthrows');
-
-const {
-  getImports,
-  getCppArrayTypeForAnnotation,
-  getCppTypeForAnnotation,
-  generateEventStructName,
-} = require('./CppHelpers');
-const {indent, toSafeCppString} = require('../Utils');
-
 import type {
   ComponentShape,
+  EventTypeAnnotation,
   EventTypeShape,
   NamedShape,
-  EventTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
 
+const {indent, toSafeCppString} = require('../Utils');
+const {
+  generateEventStructName,
+  getCppArrayTypeForAnnotation,
+  getCppTypeForAnnotation,
+  getImports,
+} = require('./CppHelpers');
+const nullthrows = require('nullthrows');
+
 // File path -> contents
 type FilesOutput = Map<string, string>;
 type StructsMap = Map<string, string>;
@@ -57,11 +56,9 @@ const FileTemplate = ({
 #include <react/renderer/components/view/ViewEventEmitter.h>
 ${[...extraIncludes].join('\n')}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 ${componentEmitters}
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const ComponentTemplate = ({
@@ -314,6 +311,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const moduleComponents: ComponentCollection = Object.keys(schema.modules)
       .map(moduleName => {

package/lib/generators/components/GeneratePropsCpp.js

@@ -11,12 +11,13 @@
 'use strict';
 
 const _require = require('./CppHelpers'),
+  IncludeTemplate = _require.IncludeTemplate,
   convertDefaultTypeToString = _require.convertDefaultTypeToString,
   getImports = _require.getImports;
 
 // File path -> contents
 
-const FileTemplate = ({libraryName, imports, componentClasses}) => `
+const FileTemplate = ({imports, componentClasses, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -26,16 +27,17 @@ const FileTemplate = ({libraryName, imports, componentClasses}) => `
  * ${'@'}generated by codegen project: GeneratePropsCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/Props.h>
+${IncludeTemplate({
+  headerPrefix,
+  file: 'Props.h',
+})}
 ${imports}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const ComponentTemplate = ({className, extendClasses, props}) =>
   `
@@ -79,7 +81,13 @@ function getClassExtendString(component) {
   return extendString;
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'Props.cpp';
     const allImports = new Set([
       '#include <react/renderer/core/propsConversions.h>',
@@ -118,8 +126,9 @@ module.exports = {
       .join('\n');
     const replacedTemplate = FileTemplate({
       componentClasses: componentProps,
-      libraryName,
       imports: Array.from(allImports).sort().join('\n').trim(),
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },

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

@@ -11,19 +11,24 @@
 'use strict';
 
 import type {ComponentShape, SchemaType} from '../../CodegenSchema';
-const {convertDefaultTypeToString, getImports} = require('./CppHelpers');
+
+const {
+  IncludeTemplate,
+  convertDefaultTypeToString,
+  getImports,
+} = require('./CppHelpers');
 
 // File path -> contents
 type FilesOutput = Map<string, string>;
 
 const FileTemplate = ({
-  libraryName,
   imports,
   componentClasses,
+  headerPrefix,
 }: {
-  libraryName: string,
   imports: string,
   componentClasses: string,
+  headerPrefix: string,
 }) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -34,16 +39,14 @@ const FileTemplate = ({
  * ${'@'}generated by codegen project: GeneratePropsCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/Props.h>
+${IncludeTemplate({headerPrefix, file: 'Props.h'})}
 ${imports}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const ComponentTemplate = ({
@@ -105,6 +108,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'Props.cpp';
     const allImports: Set<string> = new Set([
@@ -152,8 +156,8 @@ module.exports = {
 
     const replacedTemplate = FileTemplate({
       componentClasses: componentProps,
-      libraryName,
       imports: Array.from(allImports).sort().join('\n').trim(),
+      headerPrefix: headerPrefix ?? '',
     });
 
     return new Map([[fileName, replacedTemplate]]);

package/lib/generators/components/GeneratePropsH.js

@@ -10,17 +10,20 @@
 
 'use strict';
 
-const _require = require('./ComponentsGeneratorUtils.js'),
-  getNativeTypeFromAnnotation = _require.getNativeTypeFromAnnotation,
-  getLocalImports = _require.getLocalImports;
-const _require2 = require('./CppHelpers.js'),
-  convertDefaultTypeToString = _require2.convertDefaultTypeToString,
-  getEnumMaskName = _require2.getEnumMaskName,
-  generateStructName = _require2.generateStructName,
-  toIntEnumValueName = _require2.toIntEnumValueName;
-const _require3 = require('../Utils'),
-  getEnumName = _require3.getEnumName,
-  toSafeCppString = _require3.toSafeCppString;
+const _require = require('../Utils'),
+  getEnumName = _require.getEnumName,
+  toSafeCppString = _require.toSafeCppString;
+const _require2 = require('./ComponentsGeneratorUtils.js'),
+  getLocalImports = _require2.getLocalImports,
+  getNativeTypeFromAnnotation = _require2.getNativeTypeFromAnnotation;
+const _require3 = require('./CppHelpers.js'),
+  convertDefaultTypeToString = _require3.convertDefaultTypeToString,
+  generateStructName = _require3.generateStructName,
+  getEnumMaskName = _require3.getEnumMaskName,
+  toIntEnumValueName = _require3.toIntEnumValueName;
+
+// File path -> contents
+
 const FileTemplate = ({imports, componentClasses}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
@@ -34,13 +37,11 @@ const FileTemplate = ({imports, componentClasses}) => `
 
 ${imports}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const ClassTemplate = ({enums, structs, className, props, extendClasses}) =>
   `
@@ -549,7 +550,13 @@ function generateStruct(structs, componentName, nameParts, properties) {
   );
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'Props.h';
     const allImports = new Set();
     const componentClasses = Object.keys(schema.modules)

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

@@ -10,28 +10,25 @@
 
 'use strict';
 import type {ComponentShape} from '../../CodegenSchema';
+import type {
+  ExtendsPropsShape,
+  NamedShape,
+  PropTypeAnnotation,
+  SchemaType,
+} from '../../CodegenSchema';
 
+const {getEnumName, toSafeCppString} = require('../Utils');
 const {
-  getNativeTypeFromAnnotation,
   getLocalImports,
+  getNativeTypeFromAnnotation,
 } = require('./ComponentsGeneratorUtils.js');
-
 const {
   convertDefaultTypeToString,
-  getEnumMaskName,
   generateStructName,
+  getEnumMaskName,
   toIntEnumValueName,
 } = require('./CppHelpers.js');
 
-const {getEnumName, toSafeCppString} = require('../Utils');
-
-import type {
-  ExtendsPropsShape,
-  NamedShape,
-  PropTypeAnnotation,
-  SchemaType,
-} from '../../CodegenSchema';
-
 // File path -> contents
 type FilesOutput = Map<string, string>;
 type StructsMap = Map<string, string>;
@@ -55,13 +52,11 @@ const FileTemplate = ({
 
 ${imports}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentClasses}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 
 const ClassTemplate = ({
@@ -711,6 +706,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'Props.h';
 

package/lib/generators/components/GeneratePropsJavaDelegate.js

@@ -11,10 +11,10 @@
 'use strict';
 
 const _require = require('./JavaHelpers'),
+  getDelegateJavaClassName = _require.getDelegateJavaClassName,
   getImports = _require.getImports,
-  toSafeJavaString = _require.toSafeJavaString,
   getInterfaceJavaClassName = _require.getInterfaceJavaClassName,
-  getDelegateJavaClassName = _require.getDelegateJavaClassName;
+  toSafeJavaString = _require.toSafeJavaString;
 
 // File path -> contents
 
@@ -167,6 +167,8 @@ function getCommandArgJavaType(param, index) {
       return `args.getInt(${index})`;
     case 'StringTypeAnnotation':
       return `args.getString(${index})`;
+    case 'ArrayTypeAnnotation':
+      return `args.getArray(${index})`;
     default:
       typeAnnotation.type;
       throw new Error(`Receieved invalid type: ${typeAnnotation.type}`);
@@ -241,7 +243,13 @@ function generateMethods(propsString, commandsString) {
     .trimRight();
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     // TODO: This doesn't support custom package name yet.
     const normalizedPackageName = 'com.facebook.react.viewmanagers';
     const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;

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

@@ -10,19 +10,19 @@
 
 'use strict';
 import type {CommandParamTypeAnnotation} from '../../CodegenSchema';
-
 import type {
-  NamedShape,
   CommandTypeAnnotation,
   ComponentShape,
+  NamedShape,
   PropTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
+
 const {
+  getDelegateJavaClassName,
   getImports,
-  toSafeJavaString,
   getInterfaceJavaClassName,
-  getDelegateJavaClassName,
+  toSafeJavaString,
 } = require('./JavaHelpers');
 
 // File path -> contents
@@ -202,6 +202,8 @@ function getCommandArgJavaType(
       return `args.getInt(${index})`;
     case 'StringTypeAnnotation':
       return `args.getString(${index})`;
+    case 'ArrayTypeAnnotation':
+      return `args.getArray(${index})`;
     default:
       (typeAnnotation.type: empty);
       throw new Error(`Receieved invalid type: ${typeAnnotation.type}`);
@@ -295,6 +297,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     // TODO: This doesn't support custom package name yet.
     const normalizedPackageName = 'com.facebook.react.viewmanagers';

package/lib/generators/components/GeneratePropsJavaInterface.js

@@ -12,8 +12,8 @@
 
 const _require = require('./JavaHelpers'),
   getImports = _require.getImports,
-  toSafeJavaString = _require.toSafeJavaString,
-  getInterfaceJavaClassName = _require.getInterfaceJavaClassName;
+  getInterfaceJavaClassName = _require.getInterfaceJavaClassName,
+  toSafeJavaString = _require.toSafeJavaString;
 
 // File path -> contents
 
@@ -145,6 +145,8 @@ function getCommandArgJavaType(param) {
       return 'int';
     case 'StringTypeAnnotation':
       return 'String';
+    case 'ArrayTypeAnnotation':
+      return 'ReadableArray';
     default:
       typeAnnotation.type;
       throw new Error('Receieved invalid typeAnnotation');
@@ -191,7 +193,13 @@ function getClassExtendString(component) {
   return extendString;
 }
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     // TODO: This doesn't support custom package name yet.
     const normalizedPackageName = 'com.facebook.react.viewmanagers';
     const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;

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

@@ -10,18 +10,18 @@
 
 'use strict';
 import type {CommandParamTypeAnnotation} from '../../CodegenSchema';
-
 import type {
-  NamedShape,
   CommandTypeAnnotation,
   ComponentShape,
+  NamedShape,
   PropTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
+
 const {
   getImports,
-  toSafeJavaString,
   getInterfaceJavaClassName,
+  toSafeJavaString,
 } = require('./JavaHelpers');
 
 // File path -> contents
@@ -171,6 +171,8 @@ function getCommandArgJavaType(param: NamedShape<CommandParamTypeAnnotation>) {
       return 'int';
     case 'StringTypeAnnotation':
       return 'String';
+    case 'ArrayTypeAnnotation':
+      return 'ReadableArray';
     default:
       (typeAnnotation.type: empty);
       throw new Error('Receieved invalid typeAnnotation');
@@ -235,6 +237,7 @@ module.exports = {
     schema: SchemaType,
     packageName?: string,
     assumeNonnull: boolean = false,
+    headerPrefix?: string,
   ): FilesOutput {
     // TODO: This doesn't support custom package name yet.
     const normalizedPackageName = 'com.facebook.react.viewmanagers';

package/lib/generators/components/GeneratePropsJavaPojo/PojoCollector.js.flow

@@ -11,17 +11,17 @@
 'use strict';
 
 import type {
-  ReservedPropTypeAnnotation,
-  NamedShape,
-  ObjectTypeAnnotation,
+  ArrayTypeAnnotation,
   BooleanTypeAnnotation,
-  StringTypeAnnotation,
   DoubleTypeAnnotation,
   FloatTypeAnnotation,
   Int32TypeAnnotation,
-  PropTypeAnnotation,
   MixedTypeAnnotation,
-  ArrayTypeAnnotation,
+  NamedShape,
+  ObjectTypeAnnotation,
+  PropTypeAnnotation,
+  ReservedPropTypeAnnotation,
+  StringTypeAnnotation,
 } from '../../../CodegenSchema';
 
 const {capitalize} = require('../../Utils');

package/lib/generators/components/GeneratePropsJavaPojo/index.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-const PojoCollector = require('./PojoCollector');
 const _require = require('../../Utils'),
   capitalize = _require.capitalize;
+const PojoCollector = require('./PojoCollector');
 const _require2 = require('./serializePojo'),
   serializePojo = _require2.serializePojo;
 module.exports = {

package/lib/generators/components/GeneratePropsJavaPojo/index.js.flow

@@ -12,8 +12,8 @@
 
 import type {SchemaType} from '../../../CodegenSchema';
 
-const PojoCollector = require('./PojoCollector');
 const {capitalize} = require('../../Utils');
+const PojoCollector = require('./PojoCollector');
 const {serializePojo} = require('./serializePojo');
 
 type FilesOutput = Map<string, string>;

package/lib/generators/components/GeneratePropsJavaPojo/serializePojo.js.flow

@@ -11,6 +11,7 @@
 'use strict';
 
 import type {Pojo, PojoProperty, PojoTypeAnnotation} from './PojoCollector';
+
 const {capitalize} = require('../../Utils');
 
 type ImportCollector = ($import: string) => void;

package/lib/generators/components/GenerateShadowNodeCpp.js

@@ -10,9 +10,12 @@
 
 'use strict';
 
+const _require = require('./CppHelpers'),
+  IncludeTemplate = _require.IncludeTemplate;
+
 // File path -> contents
 
-const FileTemplate = ({libraryName, componentNames}) => `
+const FileTemplate = ({componentNames, headerPrefix}) => `
 /**
  * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
@@ -22,22 +25,29 @@ const FileTemplate = ({libraryName, componentNames}) => `
  * ${'@'}generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include <react/renderer/components/${libraryName}/ShadowNodes.h>
+${IncludeTemplate({
+  headerPrefix,
+  file: 'ShadowNodes.h',
+})}
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ${componentNames}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 `;
 const ComponentTemplate = ({className}) =>
   `
 extern const char ${className}ComponentName[] = "${className}";
 `.trim();
 module.exports = {
-  generate(libraryName, schema, packageName, assumeNonnull = false) {
+  generate(
+    libraryName,
+    schema,
+    packageName,
+    assumeNonnull = false,
+    headerPrefix,
+  ) {
     const fileName = 'ShadowNodes.cpp';
     const componentNames = Object.keys(schema.modules)
       .map(moduleName => {
@@ -66,7 +76,8 @@ module.exports = {
       .join('\n');
     const replacedTemplate = FileTemplate({
       componentNames,
-      libraryName,
+      headerPrefix:
+        headerPrefix !== null && headerPrefix !== void 0 ? headerPrefix : '',
     });
     return new Map([[fileName, replacedTemplate]]);
   },