@react-native/codegen 0.78.0-nightly-20241201-91e217ff5 → 0.78.0-nightly-20241203-bfc8b3391

package/lib/CodegenSchema.d.ts

@@ -327,7 +327,7 @@ export interface NativeModuleBooleanTypeAnnotation {
 
 export type NativeModuleEnumMember = {
   readonly name: string;
-  readonly value: string | number;
+  readonly value: NativeModuleStringLiteralTypeAnnotation | NativeModuleNumberLiteralTypeAnnotation,
 };
 
 export type NativeModuleEnumMemberType =

package/lib/CodegenSchema.js.flow

@@ -311,7 +311,7 @@ export type NativeModuleNumberTypeAnnotation = $ReadOnly<{
 
 export type NativeModuleEnumMember = {
   name: string,
-  value: string | number,
+  value: StringLiteralTypeAnnotation | NumberLiteralTypeAnnotation,
 };
 
 export type NativeModuleEnumMemberType =

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

@@ -140,7 +140,7 @@ function combineSchemasInFileListAndWriteToFile(
   exclude,
 ) {
   const combined = combineSchemasInFileList(fileList, platform, exclude);
-  const formattedSchema = JSON.stringify(combined, null, 2);
+  const formattedSchema = JSON.stringify(combined);
   fs.writeFileSync(outfile, formattedSchema);
 }
 module.exports = {

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

@@ -96,7 +96,7 @@ function combineSchemasInFileListAndWriteToFile(
   exclude: ?RegExp,
 ): void {
   const combined = combineSchemasInFileList(fileList, platform, exclude);
-  const formattedSchema = JSON.stringify(combined, null, 2);
+  const formattedSchema = JSON.stringify(combined);
   fs.writeFileSync(outfile, formattedSchema);
 }
 

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

@@ -67,11 +67,7 @@ for (const file of schemaFiles) {
 }
 fs.writeFileSync(
   output,
-  JSON.stringify(
-    {
-      modules,
-    },
-    null,
-    2,
-  ),
+  JSON.stringify({
+    modules,
+  }),
 );

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

@@ -84,4 +84,4 @@ for (const file of schemaFiles) {
   }
 }
 
-fs.writeFileSync(output, JSON.stringify({modules}, null, 2));
+fs.writeFileSync(output, JSON.stringify({modules}));

package/lib/generators/modules/GenerateModuleH.js

@@ -429,12 +429,17 @@ struct Bridging<${enumName}> {
   }
 };`;
 };
+function getMemberValueAppearance(member) {
+  if (member.type === 'StringLiteralTypeAnnotation') {
+    return `"${member.value}"`;
+  } else {
+    return member.value;
+  }
+}
 function generateEnum(hasteModuleName, origEnumName, members, memberType) {
   const enumName = getEnumName(hasteModuleName, origEnumName);
   const nativeEnumMemberType =
     memberType === 'StringTypeAnnotation' ? 'std::string' : 'int32_t';
-  const getMemberValueAppearance = value =>
-    memberType === 'StringTypeAnnotation' ? `"${value}"` : `${value}`;
   const fromCases =
     members
       .map(

package/lib/generators/modules/GenerateModuleH.js.flow

@@ -406,6 +406,14 @@ struct Bridging<${enumName}> {
 };`;
 };
 
+function getMemberValueAppearance(member: NativeModuleEnumMember['value']) {
+  if (member.type === 'StringLiteralTypeAnnotation') {
+    return `"${member.value}"`;
+  } else {
+    return member.value;
+  }
+}
+
 function generateEnum(
   hasteModuleName: string,
   origEnumName: string,
@@ -417,9 +425,6 @@ function generateEnum(
   const nativeEnumMemberType: NativeEnumMemberValueType =
     memberType === 'StringTypeAnnotation' ? 'std::string' : 'int32_t';
 
-  const getMemberValueAppearance = (value: string | number) =>
-    memberType === 'StringTypeAnnotation' ? `"${value}"` : `${value}`;
-
   const fromCases =
     members
       .map(

package/lib/generators/modules/__test_fixtures__/fixtures.js

@@ -159,11 +159,17 @@ const SIMPLE_NATIVE_MODULES = {
           members: [
             {
               name: 'ONE',
-              value: '1',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 1,
+              },
             },
             {
               name: 'TWO',
-              value: '2',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 2,
+              },
             },
           ],
         },
@@ -174,15 +180,24 @@ const SIMPLE_NATIVE_MODULES = {
           members: [
             {
               name: 'POINT_ZERO',
-              value: '0.0',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 0.0,
+              },
             },
             {
               name: 'POINT_ONE',
-              value: '0.1',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 0.1,
+              },
             },
             {
               name: 'POINT_TWO',
-              value: '0.2',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 0.2,
+              },
             },
           ],
         },
@@ -193,11 +208,17 @@ const SIMPLE_NATIVE_MODULES = {
           members: [
             {
               name: 'HELLO',
-              value: 'hello',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'hello',
+              },
             },
             {
               name: 'GoodBye',
-              value: 'goodbye',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'goodbye',
+              },
             },
           ],
         },
@@ -1916,11 +1937,17 @@ const CXX_ONLY_NATIVE_MODULES = {
           members: [
             {
               name: 'IA',
-              value: '23',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 23,
+              },
             },
             {
               name: 'IB',
-              value: '42',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 42,
+              },
             },
           ],
         },
@@ -1931,11 +1958,17 @@ const CXX_ONLY_NATIVE_MODULES = {
           members: [
             {
               name: 'FA',
-              value: '1.23',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 1.23,
+              },
             },
             {
               name: 'FB',
-              value: '4.56',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 4.56,
+              },
             },
           ],
         },
@@ -1946,11 +1979,17 @@ const CXX_ONLY_NATIVE_MODULES = {
           members: [
             {
               name: 'NA',
-              value: 'NA',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'NA',
+              },
             },
             {
               name: 'NB',
-              value: 'NB',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'NB',
+              },
             },
           ],
         },
@@ -1961,11 +2000,17 @@ const CXX_ONLY_NATIVE_MODULES = {
           members: [
             {
               name: 'SA',
-              value: 's---a',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 's---a',
+              },
             },
             {
               name: 'SB',
-              value: 's---b',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 's---b',
+              },
             },
           ],
         },

package/lib/generators/modules/__test_fixtures__/fixtures.js.flow

@@ -163,11 +163,17 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'ONE',
-              value: '1',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 1,
+              },
             },
             {
               name: 'TWO',
-              value: '2',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 2,
+              },
             },
           ],
         },
@@ -178,15 +184,24 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'POINT_ZERO',
-              value: '0.0',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 0.0,
+              },
             },
             {
               name: 'POINT_ONE',
-              value: '0.1',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 0.1,
+              },
             },
             {
               name: 'POINT_TWO',
-              value: '0.2',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 0.2,
+              },
             },
           ],
         },
@@ -197,11 +212,17 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'HELLO',
-              value: 'hello',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'hello',
+              },
             },
             {
               name: 'GoodBye',
-              value: 'goodbye',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'goodbye',
+              },
             },
           ],
         },
@@ -1926,11 +1947,17 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'IA',
-              value: '23',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 23,
+              },
             },
             {
               name: 'IB',
-              value: '42',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 42,
+              },
             },
           ],
         },
@@ -1941,11 +1968,17 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'FA',
-              value: '1.23',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 1.23,
+              },
             },
             {
               name: 'FB',
-              value: '4.56',
+              value: {
+                type: 'NumberLiteralTypeAnnotation',
+                value: 4.56,
+              },
             },
           ],
         },
@@ -1956,11 +1989,17 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'NA',
-              value: 'NA',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'NA',
+              },
             },
             {
               name: 'NB',
-              value: 'NB',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 'NB',
+              },
             },
           ],
         },
@@ -1971,11 +2010,17 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
           members: [
             {
               name: 'SA',
-              value: 's---a',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 's---a',
+              },
             },
             {
               name: 'SB',
-              value: 's---b',
+              value: {
+                type: 'StringLiteralTypeAnnotation',
+                value: 's---b',
+              },
             },
           ],
         },

package/lib/parsers/flow/parser.js

@@ -210,16 +210,30 @@ class FlowParser {
   }
   parseEnumMembers(typeAnnotation) {
     return typeAnnotation.members.map(member => {
-      var _member$init$value, _member$init;
+      var _member$init, _member$init2;
+      const value =
+        typeof ((_member$init = member.init) === null || _member$init === void 0
+          ? void 0
+          : _member$init.value) === 'number'
+          ? {
+              type: 'NumberLiteralTypeAnnotation',
+              value: member.init.value,
+            }
+          : typeof ((_member$init2 = member.init) === null ||
+            _member$init2 === void 0
+              ? void 0
+              : _member$init2.value) === 'string'
+          ? {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.init.value,
+            }
+          : {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.id.name,
+            };
       return {
         name: member.id.name,
-        value:
-          (_member$init$value =
-            (_member$init = member.init) === null || _member$init === void 0
-              ? void 0
-              : _member$init.value) !== null && _member$init$value !== void 0
-            ? _member$init$value
-            : member.id.name,
+        value: value,
       };
     });
   }

package/lib/parsers/flow/parser.js.flow

@@ -230,10 +230,28 @@ class FlowParser implements Parser {
   parseEnumMembers(
     typeAnnotation: $FlowFixMe,
   ): $ReadOnlyArray<NativeModuleEnumMember> {
-    return typeAnnotation.members.map(member => ({
-      name: member.id.name,
-      value: member.init?.value ?? member.id.name,
-    }));
+    return typeAnnotation.members.map(member => {
+      const value =
+        typeof member.init?.value === 'number'
+          ? {
+              type: 'NumberLiteralTypeAnnotation',
+              value: member.init.value,
+            }
+          : typeof member.init?.value === 'string'
+          ? {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.init.value,
+            }
+          : {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.id.name,
+            };
+
+      return {
+        name: member.id.name,
+        value: value,
+      };
+    });
   }
 
   isModuleInterface(node: $FlowFixMe): boolean {

package/lib/parsers/parserMock.js

@@ -158,21 +158,33 @@ export class MockedParser {
       ? [
           {
             name: 'Hello',
-            value: 'hello',
+            value: {
+              type: 'StringLiteralTypeAnnotation',
+              value: 'hello',
+            },
           },
           {
             name: 'Goodbye',
-            value: 'goodbye',
+            value: {
+              type: 'StringLiteralTypeAnnotation',
+              value: 'goodbye',
+            },
           },
         ]
       : [
           {
             name: 'On',
-            value: '1',
+            value: {
+              type: 'NumberLiteralTypeAnnotation',
+              value: 1,
+            },
           },
           {
             name: 'Off',
-            value: '0',
+            value: {
+              type: 'NumberLiteralTypeAnnotation',
+              value: 0,
+            },
           },
         ];
   }

package/lib/parsers/parserMock.js.flow

@@ -175,21 +175,33 @@ export class MockedParser implements Parser {
       ? [
           {
             name: 'Hello',
-            value: 'hello',
+            value: {
+              type: 'StringLiteralTypeAnnotation',
+              value: 'hello',
+            },
           },
           {
             name: 'Goodbye',
-            value: 'goodbye',
+            value: {
+              type: 'StringLiteralTypeAnnotation',
+              value: 'goodbye',
+            },
           },
         ]
       : [
           {
             name: 'On',
-            value: '1',
+            value: {
+              type: 'NumberLiteralTypeAnnotation',
+              value: 1,
+            },
           },
           {
             name: 'Off',
-            value: '0',
+            value: {
+              type: 'NumberLiteralTypeAnnotation',
+              value: 0,
+            },
           },
         ];
   }

package/lib/parsers/typescript/parser.js

@@ -255,41 +255,60 @@ class TypeScriptParser {
   }
   parseEnumMembers(typeAnnotation) {
     return typeAnnotation.members.map(member => {
-      var _member$initializer5, _member$initializer$v, _member$initializer7;
-      // Handle negative values
-      if (
+      var _member$initializer5,
+        _member$initializer6,
+        _member$initializer7,
+        _member$initializer8,
+        _member$initializer9,
+        _member$initializer10;
+      const value =
         ((_member$initializer5 = member.initializer) === null ||
         _member$initializer5 === void 0
           ? void 0
           : _member$initializer5.operator) === '-'
-      ) {
-        var _member$initializer$a, _member$initializer6;
-        return {
-          name: member.id.name,
-          value:
-            (_member$initializer$a = -((_member$initializer6 =
-              member.initializer) === null ||
-            _member$initializer6 === void 0 ||
-            (_member$initializer6 = _member$initializer6.argument) === null ||
-            _member$initializer6 === void 0
+          ? {
+              type: 'NumberLiteralTypeAnnotation',
+              value:
+                -1 *
+                ((_member$initializer6 = member.initializer) === null ||
+                _member$initializer6 === void 0 ||
+                (_member$initializer6 = _member$initializer6.argument) ===
+                  null ||
+                _member$initializer6 === void 0
+                  ? void 0
+                  : _member$initializer6.value),
+            }
+          : typeof ((_member$initializer7 = member.initializer) === null ||
+            _member$initializer7 === void 0
               ? void 0
-              : _member$initializer6.value)) !== null &&
-            _member$initializer$a !== void 0
-              ? _member$initializer$a
-              : member.id.name,
-        };
-      }
+              : _member$initializer7.value) === 'number'
+          ? {
+              type: 'NumberLiteralTypeAnnotation',
+              value:
+                (_member$initializer8 = member.initializer) === null ||
+                _member$initializer8 === void 0
+                  ? void 0
+                  : _member$initializer8.value,
+            }
+          : typeof ((_member$initializer9 = member.initializer) === null ||
+            _member$initializer9 === void 0
+              ? void 0
+              : _member$initializer9.value) === 'string'
+          ? {
+              type: 'StringLiteralTypeAnnotation',
+              value:
+                (_member$initializer10 = member.initializer) === null ||
+                _member$initializer10 === void 0
+                  ? void 0
+                  : _member$initializer10.value,
+            }
+          : {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.id.name,
+            };
       return {
         name: member.id.name,
-        value:
-          (_member$initializer$v =
-            (_member$initializer7 = member.initializer) === null ||
-            _member$initializer7 === void 0
-              ? void 0
-              : _member$initializer7.value) !== null &&
-          _member$initializer$v !== void 0
-            ? _member$initializer$v
-            : member.id.name,
+        value,
       };
     });
   }

package/lib/parsers/typescript/parser.js.flow

@@ -250,17 +250,30 @@ class TypeScriptParser implements Parser {
     typeAnnotation: $FlowFixMe,
   ): $ReadOnlyArray<NativeModuleEnumMember> {
     return typeAnnotation.members.map(member => {
-      // Handle negative values
-      if (member.initializer?.operator === '-') {
-        return {
-          name: member.id.name,
-          value: -member.initializer?.argument?.value ?? member.id.name,
-        };
-      }
+      const value =
+        member.initializer?.operator === '-'
+          ? {
+              type: 'NumberLiteralTypeAnnotation',
+              value: -1 * member.initializer?.argument?.value,
+            }
+          : typeof member.initializer?.value === 'number'
+          ? {
+              type: 'NumberLiteralTypeAnnotation',
+              value: member.initializer?.value,
+            }
+          : typeof member.initializer?.value === 'string'
+          ? {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.initializer?.value,
+            }
+          : {
+              type: 'StringLiteralTypeAnnotation',
+              value: member.id.name,
+            };
 
       return {
         name: member.id.name,
-        value: member.initializer?.value ?? member.id.name,
+        value,
       };
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.78.0-nightly-20241201-91e217ff5",
+  "version": "0.78.0-nightly-20241203-bfc8b3391",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {