@react-native/codegen 0.74.2 → 0.75.0-main

package/lib/generators/modules/GenerateModuleCpp.js

@@ -153,7 +153,6 @@ function serializeArg(moduleName, arg, index, resolveAlias, enumMap) {
     _unwrapNullable2 = _slicedToArray(_unwrapNullable, 2),
     typeAnnotation = _unwrapNullable2[0],
     nullable = _unwrapNullable2[1];
-  const isRequired = !optional && !nullable;
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
     realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
@@ -161,21 +160,27 @@ function serializeArg(moduleName, arg, index, resolveAlias, enumMap) {
   function wrap(callback) {
     const val = `args[${index}]`;
     const expression = callback(val);
-    if (isRequired) {
-      return expression;
-    } else {
-      let condition = `${val}.isNull() || ${val}.isUndefined()`;
-      if (optional) {
-        condition = `count <= ${index} || ${condition}`;
-      }
-      return `${condition} ? std::nullopt : std::make_optional(${expression})`;
+
+    // param?: T
+    if (optional && !nullable) {
+      // throw new Error('are we hitting this case? ' + moduleName);
+      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: ?T
+    // param?: ?T
+    if (nullable || optional) {
+      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
     }
+
+    // param: T
+    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
   }
   switch (realTypeAnnotation.type) {
     case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return wrap(val => `${val}.getNumber()`);
+          return wrap(val => `${val}.asNumber()`);
         default:
           realTypeAnnotation.name;
           throw new Error(

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

@@ -122,7 +122,6 @@ function serializeArg(
   const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
   const [typeAnnotation, nullable] =
     unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
-  const isRequired = !optional && !nullable;
 
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -132,22 +131,28 @@ function serializeArg(
   function wrap(callback: (val: string) => string) {
     const val = `args[${index}]`;
     const expression = callback(val);
-    if (isRequired) {
-      return expression;
-    } else {
-      let condition = `${val}.isNull() || ${val}.isUndefined()`;
-      if (optional) {
-        condition = `count <= ${index} || ${condition}`;
-      }
-      return `${condition} ? std::nullopt : std::make_optional(${expression})`;
+
+    // param?: T
+    if (optional && !nullable) {
+      // throw new Error('are we hitting this case? ' + moduleName);
+      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: ?T
+    // param?: ?T
+    if (nullable || optional) {
+      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
     }
+
+    // param: T
+    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
   }
 
   switch (realTypeAnnotation.type) {
     case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return wrap(val => `${val}.getNumber()`);
+          return wrap(val => `${val}.asNumber()`);
         default:
           (realTypeAnnotation.name: empty);
           throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.74.2",
+  "version": "0.75.0-main",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
   "dependencies": {
     "@babel/parser": "^7.20.0",
     "glob": "^7.1.1",
-    "hermes-parser": "0.19.1",
+    "hermes-parser": "0.20.1",
     "invariant": "^2.2.4",
     "jscodeshift": "^0.14.0",
     "mkdirp": "^0.5.1",
@@ -49,7 +49,7 @@
     "@babel/plugin-transform-flow-strip-types": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "chalk": "^4.0.0",
-    "hermes-estree": "0.19.1",
+    "hermes-estree": "0.20.1",
     "micromatch": "^4.0.4",
     "prettier": "2.8.8",
     "rimraf": "^3.0.2",