@react-native/codegen 0.73.0 → 0.74.0-nightly-20231003-5dedf277c

package/README.md

@@ -15,7 +15,7 @@ yarn add --dev @react-native/codegen
 
 ## Testing
 
-To run the tests in this package, run the following commands from the react Native root folder:
+To run the tests in this package, run the following commands from the React Native root folder:
 
 1. `yarn` to install the dependencies. You just need to run this once
-2. `yarn jest react-native-codegen`.
+2. `yarn jest packages/react-native-codegen`.

package/lib/CodegenSchema.d.ts

@@ -50,6 +50,10 @@ export interface ObjectTypeAnnotation<T> {
   readonly baseTypes?: readonly string[] | undefined;
 }
 
+export interface MixedTypeAnnotation {
+  readonly type: 'MixedTypeAnnotation';
+}
+
 export interface FunctionTypeAnnotation<P, R> {
   readonly type: 'FunctionTypeAnnotation';
   readonly params: readonly NamedShape<P>[];
@@ -74,6 +78,7 @@ export interface ComponentShape extends OptionsShape {
   readonly events: readonly EventTypeShape[];
   readonly props: readonly NamedShape<PropTypeAnnotation>[];
   readonly commands: readonly NamedShape<CommandTypeAnnotation>[];
+  readonly deprecatedViewConfigName?: string | undefined;
 }
 
 export interface OptionsShape {
@@ -108,7 +113,11 @@ export type EventTypeAnnotation =
   | FloatTypeAnnotation
   | Int32TypeAnnotation
   | StringEnumTypeAnnotation
-  | ObjectTypeAnnotation<EventTypeAnnotation>;
+  | ObjectTypeAnnotation<EventTypeAnnotation>
+  | {
+    readonly type: 'ArrayTypeAnnotation';
+    readonly elementType: EventTypeAnnotation
+  };
 
 export type PropTypeAnnotation =
   | {
@@ -168,7 +177,8 @@ export type PropTypeAnnotation =
             readonly type: 'ArrayTypeAnnotation';
             readonly elementType: ObjectTypeAnnotation<PropTypeAnnotation>;
           };
-    };
+    }
+  | MixedTypeAnnotation;
 
 export interface ReservedPropTypeAnnotation {
   readonly type: 'ReservedPropTypeAnnotation';
@@ -263,7 +273,7 @@ export interface NativeModuleBooleanTypeAnnotation {
 
 export type NativeModuleEnumMembers = readonly {
   readonly name: string;
-  readonly value: string;
+  readonly value: string | number;
 }[];
 
 export type NativeModuleEnumMemberType =
@@ -285,6 +295,7 @@ export interface NativeModuleEnumDeclarationWithMembers {
 
 export interface NativeModuleGenericObjectTypeAnnotation {
   readonly type: 'GenericObjectTypeAnnotation';
+  readonly dictionaryValueType?: Nullable<NativeModuleTypeAnnotation> | undefined;
 }
 
 export interface NativeModuleTypeAliasTypeAnnotation {
@@ -343,6 +354,6 @@ export type NativeModuleTypeAnnotation =
 export type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
 
 export type NativeModuleReturnOnlyTypeAnnotation =
+  | NativeModuleFunctionTypeAnnotation
   | NativeModulePromiseTypeAnnotation
   | VoidTypeAnnotation;
-

package/lib/CodegenSchema.js.flow

@@ -126,8 +126,34 @@ export type EventTypeAnnotation =
   | DoubleTypeAnnotation
   | FloatTypeAnnotation
   | Int32TypeAnnotation
+  | MixedTypeAnnotation
   | StringEnumTypeAnnotation
-  | ObjectTypeAnnotation<EventTypeAnnotation>;
+  | ObjectTypeAnnotation<EventTypeAnnotation>
+  | $ReadOnly<{
+      type: 'ArrayTypeAnnotation',
+      elementType: EventTypeAnnotation,
+    }>;
+
+export type ArrayTypeAnnotation = $ReadOnly<{
+  type: 'ArrayTypeAnnotation',
+  elementType:
+    | BooleanTypeAnnotation
+    | StringTypeAnnotation
+    | DoubleTypeAnnotation
+    | FloatTypeAnnotation
+    | Int32TypeAnnotation
+    | $ReadOnly<{
+        type: 'StringEnumTypeAnnotation',
+        default: string,
+        options: $ReadOnlyArray<string>,
+      }>
+    | ObjectTypeAnnotation<PropTypeAnnotation>
+    | ReservedPropTypeAnnotation
+    | $ReadOnly<{
+        type: 'ArrayTypeAnnotation',
+        elementType: ObjectTypeAnnotation<PropTypeAnnotation>,
+      }>,
+}>;
 
 export type PropTypeAnnotation =
   | $ReadOnly<{
@@ -162,26 +188,7 @@ export type PropTypeAnnotation =
     }>
   | ReservedPropTypeAnnotation
   | ObjectTypeAnnotation<PropTypeAnnotation>
-  | $ReadOnly<{
-      type: 'ArrayTypeAnnotation',
-      elementType:
-        | BooleanTypeAnnotation
-        | StringTypeAnnotation
-        | DoubleTypeAnnotation
-        | FloatTypeAnnotation
-        | Int32TypeAnnotation
-        | $ReadOnly<{
-            type: 'StringEnumTypeAnnotation',
-            default: string,
-            options: $ReadOnlyArray<string>,
-          }>
-        | ObjectTypeAnnotation<PropTypeAnnotation>
-        | ReservedPropTypeAnnotation
-        | $ReadOnly<{
-            type: 'ArrayTypeAnnotation',
-            elementType: ObjectTypeAnnotation<PropTypeAnnotation>,
-          }>,
-    }>
+  | ArrayTypeAnnotation
   | MixedTypeAnnotation;
 
 export type ReservedPropTypeAnnotation = $ReadOnly<{
@@ -323,6 +330,11 @@ export type NativeModuleEnumDeclarationWithMembers = {
 
 export type NativeModuleGenericObjectTypeAnnotation = $ReadOnly<{
   type: 'GenericObjectTypeAnnotation',
+
+  // a dictionary type is codegen as "Object"
+  // but we know all its members are in the same type
+  // when it happens, the following field is non-null
+  dictionaryValueType?: Nullable<NativeModuleTypeAnnotation>,
 }>;
 
 export type NativeModuleTypeAliasTypeAnnotation = $ReadOnly<{

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

@@ -14,6 +14,7 @@
 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;
@@ -24,9 +25,14 @@ const _parseArgs = 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(`${file}/**/*.{js,ts,tsx}`, {
+      .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);

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

@@ -14,6 +14,7 @@
 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 {platform, outfile, fileList} = parseArgs(process.argv);
@@ -21,9 +22,14 @@ 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(`${file}/**/*.{js,ts,tsx}`, {
+      .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);

package/lib/generators/components/CppHelpers.js

@@ -28,11 +28,45 @@ function getCppTypeForAnnotation(type) {
       return 'double';
     case 'FloatTypeAnnotation':
       return 'Float';
+    case 'MixedTypeAnnotation':
+      return 'folly::dynamic';
     default:
       type;
       throw new Error(`Received invalid typeAnnotation ${type}`);
   }
 }
+function getCppArrayTypeForAnnotation(typeElement, structParts) {
+  switch (typeElement.type) {
+    case 'BooleanTypeAnnotation':
+    case 'StringTypeAnnotation':
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'Int32TypeAnnotation':
+    case 'MixedTypeAnnotation':
+      return `std::vector<${getCppTypeForAnnotation(typeElement.type)}>`;
+    case 'StringEnumTypeAnnotation':
+    case 'ObjectTypeAnnotation':
+      if (!structParts) {
+        throw new Error(
+          `Trying to generate the event emitter for an Array of ${typeElement.type} without informations to generate the generic type`,
+        );
+      }
+      return `std::vector<${generateEventStructName(structParts)}>`;
+    case 'ArrayTypeAnnotation':
+      return `std::vector<${getCppArrayTypeForAnnotation(
+        typeElement.elementType,
+        structParts,
+      )}>`;
+    default:
+      throw new Error(
+        `Can't determine array type with typeElement: ${JSON.stringify(
+          typeElement,
+          null,
+          2,
+        )}`,
+      );
+  }
+}
 function getImports(properties) {
   const imports = new Set();
   function addImportsForNativeName(name) {
@@ -67,6 +101,9 @@ function getImports(properties) {
     ) {
       addImportsForNativeName(typeAnnotation.elementType.name);
     }
+    if (typeAnnotation.type === 'MixedTypeAnnotation') {
+      imports.add('#include <folly/dynamic.h>');
+    }
     if (typeAnnotation.type === 'ObjectTypeAnnotation') {
       const objectImports = getImports(typeAnnotation.properties);
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
@@ -76,8 +113,7 @@ function getImports(properties) {
   return imports;
 }
 function generateEventStructName(parts = []) {
-  const additional = parts.map(toSafeCppString).join('');
-  return `${additional}`;
+  return parts.map(toSafeCppString).join('');
 }
 function generateStructName(componentName, parts = []) {
   const additional = parts.map(toSafeCppString).join('');
@@ -174,6 +210,7 @@ function convertDefaultTypeToString(componentName, prop) {
 }
 module.exports = {
   convertDefaultTypeToString,
+  getCppArrayTypeForAnnotation,
   getCppTypeForAnnotation,
   getEnumMaskName,
   getImports,

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

@@ -9,7 +9,11 @@
  */
 
 'use strict';
-import type {NamedShape, PropTypeAnnotation} from '../../CodegenSchema';
+import type {
+  EventTypeAnnotation,
+  NamedShape,
+  PropTypeAnnotation,
+} from '../../CodegenSchema';
 
 const {getEnumName, toSafeCppString} = require('../Utils');
 
@@ -23,7 +27,8 @@ function getCppTypeForAnnotation(
     | 'StringTypeAnnotation'
     | 'Int32TypeAnnotation'
     | 'DoubleTypeAnnotation'
-    | 'FloatTypeAnnotation',
+    | 'FloatTypeAnnotation'
+    | 'MixedTypeAnnotation',
 ): string {
   switch (type) {
     case 'BooleanTypeAnnotation':
@@ -36,14 +41,54 @@ function getCppTypeForAnnotation(
       return 'double';
     case 'FloatTypeAnnotation':
       return 'Float';
+    case 'MixedTypeAnnotation':
+      return 'folly::dynamic';
     default:
       (type: empty);
       throw new Error(`Received invalid typeAnnotation ${type}`);
   }
 }
 
+function getCppArrayTypeForAnnotation(
+  typeElement: EventTypeAnnotation,
+  structParts?: string[],
+): string {
+  switch (typeElement.type) {
+    case 'BooleanTypeAnnotation':
+    case 'StringTypeAnnotation':
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'Int32TypeAnnotation':
+    case 'MixedTypeAnnotation':
+      return `std::vector<${getCppTypeForAnnotation(typeElement.type)}>`;
+    case 'StringEnumTypeAnnotation':
+    case 'ObjectTypeAnnotation':
+      if (!structParts) {
+        throw new Error(
+          `Trying to generate the event emitter for an Array of ${typeElement.type} without informations to generate the generic type`,
+        );
+      }
+      return `std::vector<${generateEventStructName(structParts)}>`;
+    case 'ArrayTypeAnnotation':
+      return `std::vector<${getCppArrayTypeForAnnotation(
+        typeElement.elementType,
+        structParts,
+      )}>`;
+    default:
+      throw new Error(
+        `Can't determine array type with typeElement: ${JSON.stringify(
+          typeElement,
+          null,
+          2,
+        )}`,
+      );
+  }
+}
+
 function getImports(
-  properties: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
+  properties:
+    | $ReadOnlyArray<NamedShape<PropTypeAnnotation>>
+    | $ReadOnlyArray<NamedShape<EventTypeAnnotation>>,
 ): Set<string> {
   const imports: Set<string> = new Set();
 
@@ -91,6 +136,10 @@ function getImports(
       addImportsForNativeName(typeAnnotation.elementType.name);
     }
 
+    if (typeAnnotation.type === 'MixedTypeAnnotation') {
+      imports.add('#include <folly/dynamic.h>');
+    }
+
     if (typeAnnotation.type === 'ObjectTypeAnnotation') {
       const objectImports = getImports(typeAnnotation.properties);
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
@@ -102,8 +151,7 @@ function getImports(
 }
 
 function generateEventStructName(parts: $ReadOnlyArray<string> = []): string {
-  const additional = parts.map(toSafeCppString).join('');
-  return `${additional}`;
+  return parts.map(toSafeCppString).join('');
 }
 
 function generateStructName(
@@ -210,6 +258,7 @@ function convertDefaultTypeToString(
 
 module.exports = {
   convertDefaultTypeToString,
+  getCppArrayTypeForAnnotation,
   getCppTypeForAnnotation,
   getEnumMaskName,
   getImports,