nitrogen 0.35.4 → 0.35.6

package/lib/syntax/kotlin/KotlinCxxBridgedType.js

@@ -632,18 +632,24 @@ export class KotlinCxxBridgedType {
 `.trim();
                             }
                             default: {
-                                // other arrays need to loop through
+                                // other arrays need to loop through.
+                                // we wrap the lambda with a parameter (`__input`) so that nested arrays
+                                // don't end up shadowing `__element` in their own initializers
+                                // (which would be `const auto& __element = __element[__i]`,
+                                //  an invalid self-referential `auto`-type deduction).
+                                // `auto&&` is a forwarding reference so it binds to both const and
+                                // non-const inputs across nesting levels.
                                 return `
-[&]() {
-  size_t __size = ${parameterName}.size();
+[&](auto&& __input) {
+  size_t __size = __input.size();
   jni::local_ref<${arrayType}> __array = ${arrayType}::newArray(__size);
   for (size_t __i = 0; __i < __size; __i++) {
-    const auto& __element = ${parameterName}[__i];
+    const auto& __element = __input[__i];
     auto __elementJni = ${indent(bridge.parseFromCppToKotlin('__element', 'c++'), '    ')};
     __array->setElement(__i, ${bridge.dereferenceToJObject('__elementJni')});
   }
   return __array;
-}()
+}(${parameterName})
             `.trim();
                             }
                         }
@@ -915,18 +921,25 @@ export class KotlinCxxBridgedType {
 `.trim();
                             }
                             default: {
-                                // other arrays need to loop through
+                                // other arrays need to loop through.
+                                // we wrap the lambda with a parameter (`__input`) so that nested arrays
+                                // don't end up shadowing `__element` in their own initializers
+                                // (which would be `auto __element = __element->getElement(__i)`,
+                                //  an invalid self-referential `auto`-type deduction).
+                                // `auto&&` is a forwarding reference so it binds to both const and
+                                // non-const inputs across nesting levels (and to JNI `local_ref`s,
+                                // which expose non-const `getElement(...)`).
                                 return `
-[&]() {
-  size_t __size = ${parameterName}->size();
+[&](auto&& __input) {
+  size_t __size = __input->size();
   std::vector<${itemType}> __vector;
   __vector.reserve(__size);
   for (size_t __i = 0; __i < __size; __i++) {
-    auto __element = ${parameterName}->getElement(__i);
-    __vector.push_back(${bridge.parseFromKotlinToCpp('__element', 'c++')});
+    auto __element = __input->getElement(__i);
+    __vector.push_back(${indent(bridge.parseFromKotlinToCpp('__element', 'c++'), '    ')});
   }
   return __vector;
-}()
+}(${parameterName})
             `.trim();
                             }
                         }

package/lib/syntax/kotlin/KotlinFunction.js

@@ -134,7 +134,7 @@ class ${name}_java(private val function: ${lambdaSignature}): ${name} {
     let jniCallBody;
     if (functionType.returnType.kind === 'void') {
         // It returns void
-        cppCallBody = `_func(${indent(paramsForward.join(', '), '      ')});`;
+        cppCallBody = `_func(${paramsForward.join(', ')});`;
         jniCallBody = `
 static const auto method = javaClassStatic()->getMethod<${jniSignature}>("invoke");
 method(${jniParamsForward.join(', ')});
@@ -143,7 +143,7 @@ method(${jniParamsForward.join(', ')});
     else {
         // It returns a type!
         cppCallBody = `
-${functionType.returnType.getCode('c++')} __result = _func(${indent(paramsForward.join(', '), '      ')});
+${functionType.returnType.getCode('c++')} __result = _func(${paramsForward.join(', ')});
 return ${bridgedReturn.parseFromCppToKotlin('__result', 'c++')};
 `.trim();
         jniCallBody = `

package/lib/syntax/kotlin/KotlinStruct.js

@@ -32,6 +32,10 @@ val ${name}: ${type.getTypeCode('kotlin', false)}
         .map((i) => `import ${i.name}`)
         .filter(isNotDuplicate);
     const secondaryConstructor = createKotlinConstructor(structType);
+    const equalityComparators = structType.properties.map((p) => `Objects.deepEquals(this.${p.escapedName}, other.${p.escapedName})`);
+    const propertiesList = structType.properties
+        .map((p) => p.escapedName)
+        .join(',\n');
     const code = `
 ${createFileMetadataString(`${structType.structName}.kt`)}
 
@@ -39,6 +43,7 @@ package ${packageName}
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 ${extraImports.join('\n')}
 
 /**
@@ -51,6 +56,18 @@ data class ${structType.structName}(
 ) {
   ${indent(secondaryConstructor, '  ')}
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is ${structType.structName}) return false
+    return ${equalityComparators.join(`\n      && `)}
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf(
+      ${indent(propertiesList, '      ')}
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitrogen",
-  "version": "0.35.4",
+  "version": "0.35.6",
   "description": "The code-generator for react-native-nitro-modules.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "chalk": "^5.3.0",
-    "react-native-nitro-modules": "^0.35.4",
+    "react-native-nitro-modules": "^0.35.6",
     "ts-morph": "^27.0.0",
     "yargs": "^18.0.0",
     "zod": "^4.0.5"

package/src/syntax/kotlin/KotlinCxxBridgedType.ts

@@ -672,18 +672,24 @@ export class KotlinCxxBridgedType implements BridgedType<'kotlin', 'c++'> {
 `.trim()
               }
               default: {
-                // other arrays need to loop through
+                // other arrays need to loop through.
+                // we wrap the lambda with a parameter (`__input`) so that nested arrays
+                // don't end up shadowing `__element` in their own initializers
+                // (which would be `const auto& __element = __element[__i]`,
+                //  an invalid self-referential `auto`-type deduction).
+                // `auto&&` is a forwarding reference so it binds to both const and
+                // non-const inputs across nesting levels.
                 return `
-[&]() {
-  size_t __size = ${parameterName}.size();
+[&](auto&& __input) {
+  size_t __size = __input.size();
   jni::local_ref<${arrayType}> __array = ${arrayType}::newArray(__size);
   for (size_t __i = 0; __i < __size; __i++) {
-    const auto& __element = ${parameterName}[__i];
+    const auto& __element = __input[__i];
     auto __elementJni = ${indent(bridge.parseFromCppToKotlin('__element', 'c++'), '    ')};
     __array->setElement(__i, ${bridge.dereferenceToJObject('__elementJni')});
   }
   return __array;
-}()
+}(${parameterName})
             `.trim()
               }
             }
@@ -976,18 +982,25 @@ export class KotlinCxxBridgedType implements BridgedType<'kotlin', 'c++'> {
 `.trim()
               }
               default: {
-                // other arrays need to loop through
+                // other arrays need to loop through.
+                // we wrap the lambda with a parameter (`__input`) so that nested arrays
+                // don't end up shadowing `__element` in their own initializers
+                // (which would be `auto __element = __element->getElement(__i)`,
+                //  an invalid self-referential `auto`-type deduction).
+                // `auto&&` is a forwarding reference so it binds to both const and
+                // non-const inputs across nesting levels (and to JNI `local_ref`s,
+                // which expose non-const `getElement(...)`).
                 return `
-[&]() {
-  size_t __size = ${parameterName}->size();
+[&](auto&& __input) {
+  size_t __size = __input->size();
   std::vector<${itemType}> __vector;
   __vector.reserve(__size);
   for (size_t __i = 0; __i < __size; __i++) {
-    auto __element = ${parameterName}->getElement(__i);
-    __vector.push_back(${bridge.parseFromKotlinToCpp('__element', 'c++')});
+    auto __element = __input->getElement(__i);
+    __vector.push_back(${indent(bridge.parseFromKotlinToCpp('__element', 'c++'), '    ')});
   }
   return __vector;
-}()
+}(${parameterName})
             `.trim()
               }
             }

package/src/syntax/kotlin/KotlinFunction.ts

@@ -152,7 +152,7 @@ class ${name}_java(private val function: ${lambdaSignature}): ${name} {
   let jniCallBody: string
   if (functionType.returnType.kind === 'void') {
     // It returns void
-    cppCallBody = `_func(${indent(paramsForward.join(', '), '      ')});`
+    cppCallBody = `_func(${paramsForward.join(', ')});`
     jniCallBody = `
 static const auto method = javaClassStatic()->getMethod<${jniSignature}>("invoke");
 method(${jniParamsForward.join(', ')});
@@ -160,7 +160,7 @@ method(${jniParamsForward.join(', ')});
   } else {
     // It returns a type!
     cppCallBody = `
-${functionType.returnType.getCode('c++')} __result = _func(${indent(paramsForward.join(', '), '      ')});
+${functionType.returnType.getCode('c++')} __result = _func(${paramsForward.join(', ')});
 return ${bridgedReturn.parseFromCppToKotlin('__result', 'c++')};
 `.trim()
     jniCallBody = `

package/src/syntax/kotlin/KotlinStruct.ts

@@ -45,6 +45,13 @@ val ${name}: ${type.getTypeCode('kotlin', false)}
 
   const secondaryConstructor = createKotlinConstructor(structType)
 
+  const equalityComparators = structType.properties.map(
+    (p) => `Objects.deepEquals(this.${p.escapedName}, other.${p.escapedName})`
+  )
+  const propertiesList = structType.properties
+    .map((p) => p.escapedName)
+    .join(',\n')
+
   const code = `
 ${createFileMetadataString(`${structType.structName}.kt`)}
 
@@ -52,6 +59,7 @@ package ${packageName}
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 ${extraImports.join('\n')}
 
 /**
@@ -64,6 +72,18 @@ data class ${structType.structName}(
 ) {
   ${indent(secondaryConstructor, '  ')}
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is ${structType.structName}) return false
+    return ${equalityComparators.join(`\n      && `)}
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf(
+      ${indent(propertiesList, '      ')}
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++