nitrogen 0.30.0 → 0.30.1

package/lib/init.js

@@ -41,7 +41,7 @@ async function isGitInstalled() {
         execSync('git --version');
         return true;
     }
-    catch (error) {
+    catch {
         return false;
     }
 }

package/lib/syntax/kotlin/KotlinCxxBridgedType.js

@@ -32,10 +32,6 @@ export class KotlinCxxBridgedType {
             case 'function':
                 // Function needs to be converted from JFunc_... to Lambda
                 return true;
-            case 'struct':
-                // Structs don't need special handling - they have direct mappings
-                // Returning false prevents secondary constructor generation that causes duplicates
-                return false;
             case 'optional':
                 // Optionals need special handling if the wrapped type needs special handling
                 const optional = getTypeAs(this.type, OptionalType);
@@ -44,16 +40,6 @@ export class KotlinCxxBridgedType {
             default:
                 break;
         }
-        // check if any types this type references (e.g. underlying optional, array element, ...)
-        // needs special handling. if yes, we need it as well
-        const referencedTypes = getReferencedTypes(this.type)
-            .filter((t) => t !== this.type)
-            .map((t) => new KotlinCxxBridgedType(t));
-        for (const type of referencedTypes) {
-            if (type.needsSpecialHandling) {
-                return true;
-            }
-        }
         // no special handling needed
         return false;
     }

package/lib/syntax/kotlin/KotlinHybridObject.js

@@ -81,7 +81,7 @@ abstract class ${name.HybridTSpec}: ${kotlinBase}() {
   private external fun initHybrid(): HybridData
 
   companion object {
-    private const val TAG = "${name.HybridTSpec}"
+    protected const val TAG = "${name.HybridTSpec}"
   }
 }
   `.trim();

package/lib/syntax/kotlin/KotlinStruct.js

@@ -6,44 +6,25 @@ import { createFileMetadataString, isNotDuplicate } from '../helpers.js';
 import { KotlinCxxBridgedType } from './KotlinCxxBridgedType.js';
 export function createKotlinStruct(structType) {
     const packageName = NitroConfig.current.getAndroidPackage('java/kotlin');
-    const values = structType.properties.map((p) => {
-        const bridged = new KotlinCxxBridgedType(p);
-        return `
+    const parameters = structType.properties
+        .map((p) => `
 @DoNotStrip
 @Keep
-val ${p.escapedName}: ${bridged.getTypeCode('kotlin', false)}
-`.trim();
-    });
-    let secondaryConstructor;
-    const needsSpecialHandling = structType.properties.some((p) => {
+val ${p.escapedName}: ${p.getCode('kotlin')}
+`.trim())
+        .join(',\n');
+    const cxxCreateFunctionParameters = structType.properties
+        .map((p) => {
         const bridged = new KotlinCxxBridgedType(p);
-        const parseCode = bridged.parseFromKotlinToCpp(p.escapedName, 'kotlin', false);
-        return parseCode !== p.escapedName;
-    });
-    if (needsSpecialHandling) {
-        // If we need special handling for any of our properties, we need to add a convenience initializer.
-        const params = structType.properties.map((p) => `${p.escapedName}: ${p.getCode('kotlin')}`);
-        const paramsForward = structType.properties.map((p) => {
-            const bridged = new KotlinCxxBridgedType(p);
-            if (bridged.needsSpecialHandling) {
-                // We need special parsing for this type
-                return bridged.parseFromKotlinToCpp(p.escapedName, 'kotlin', false);
-            }
-            else {
-                return p.escapedName;
-            }
-        });
-        secondaryConstructor = `
-/**
- * Initialize a new instance of \`${structType.structName}\` from Kotlin.
- */
-constructor(${indent(params.join(', '), 12)})
-     : this(${indent(paramsForward.join(', '), 12)})
-    `.trim();
-    }
-    else {
-        secondaryConstructor = `/* main constructor */`;
-    }
+        return `${p.escapedName}: ${bridged.getTypeCode('kotlin', false)}`;
+    })
+        .join(', ');
+    const cxxCreateFunctionForward = structType.properties
+        .map((p) => {
+        const bridged = new KotlinCxxBridgedType(p);
+        return bridged.parseFromCppToKotlin(p.escapedName, 'kotlin', false);
+    })
+        .join(', ');
     const extraImports = structType.properties
         .flatMap((t) => t.getRequiredImports('kotlin'))
         .map((i) => `import ${i.name}`);
@@ -62,13 +43,21 @@ ${extraImports.join('\n')}
  */
 @DoNotStrip
 @Keep
-data class ${structType.structName}
-  @DoNotStrip
-  @Keep
-  constructor(
-    ${indent(values.join(',\n'), '    ')}
-  ) {
-  ${indent(secondaryConstructor, '  ')}
+data class ${structType.structName}(
+  ${indent(parameters, '  ')}
+) {
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
+    @DoNotStrip
+    @Keep
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(${cxxCreateFunctionParameters}): ${structType.structName} {
+      return ${structType.structName}(${cxxCreateFunctionForward})
+    }
+  }
 }
   `.trim();
     const cxxNamespace = NitroConfig.current.getCxxNamespace('c++');
@@ -163,14 +152,26 @@ function createJNIStructInitializer(structType) {
     return lines.join('\n');
 }
 function createCppStructInitializer(cppValueName, structType) {
-    const lines = [];
-    lines.push(`return newInstance(`);
-    const names = structType.properties.map((p) => {
+    const jniTypes = structType.properties
+        .map((p) => {
+        const bridge = new KotlinCxxBridgedType(p);
+        return bridge.asJniReferenceType('alias');
+    })
+        .join(', ');
+    const params = structType.properties
+        .map((p) => {
         const name = `${cppValueName}.${p.escapedName}`;
         const bridge = new KotlinCxxBridgedType(p);
         return bridge.parse(name, 'c++', 'kotlin', 'c++');
-    });
-    lines.push(`  ${indent(names.join(',\n'), '  ')}`);
-    lines.push(');');
-    return lines.join('\n');
+    })
+        .join(',\n');
+    return `
+using JSignature = J${structType.structName}(${jniTypes});
+static const auto clazz = javaClassStatic();
+static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+return create(
+  clazz,
+  ${indent(params, '  ')}
+);
+  `.trim();
 }

package/lib/syntax/kotlin/KotlinVariant.js

@@ -2,17 +2,19 @@ import { NitroConfig } from '../../config/NitroConfig.js';
 import { capitalizeName, indent } from '../../utils.js';
 import { includeHeader } from '../c++/includeNitroHeader.js';
 import { createFileMetadataString, isNotDuplicate, toReferenceType, } from '../helpers.js';
+import { OptionalType } from '../types/OptionalType.js';
 import {} from '../types/VariantType.js';
 import { KotlinCxxBridgedType } from './KotlinCxxBridgedType.js';
 export function createKotlinVariant(variant) {
-    const jsName = variant.variants.map((v) => v.getCode('kotlin')).join('|');
+    const jsName = variant.variants.map((v) => v.getCode('kotlin')).join(' | ');
     const kotlinName = variant.getAliasName('kotlin');
     const namespace = `J${kotlinName}_impl`;
     const innerClasses = variant.cases.map(([label, v]) => {
         const innerName = capitalizeName(label);
+        const bridge = new KotlinCxxBridgedType(v);
         return `
 @DoNotStrip
-data class ${innerName}(@DoNotStrip val value: ${v.getCode('kotlin')}): ${kotlinName}()
+data class ${innerName}(@DoNotStrip val value: ${bridge.getTypeCode('kotlin')}): ${kotlinName}()
       `.trim();
     });
     const packageName = NitroConfig.current.getAndroidPackage('java/kotlin');
@@ -25,15 +27,37 @@ data class ${innerName}(@DoNotStrip val value: ${v.getCode('kotlin')}): ${kotlin
         return `
 val is${innerName}: Boolean
   get() = this is ${innerName}
+    `.trim();
+    });
+    const asFunctions = variant.cases.map(([label, v]) => {
+        const innerName = capitalizeName(label);
+        const bridge = new KotlinCxxBridgedType(v);
+        const optional = new OptionalType(v);
+        return `
+fun as${innerName}OrNull(): ${optional.getCode('kotlin')} {
+  val value = (this as? ${innerName})?.value ?: return null
+  return ${bridge.parseFromCppToKotlin('value', 'kotlin')}
+}
+    `.trim();
+    });
+    const matchParameters = variant.cases.map(([label, v]) => {
+        return `${label}: (${v.getCode('kotlin')}) -> R`;
+    });
+    const matchCases = variant.cases.map(([label, v]) => {
+        const innerName = capitalizeName(label);
+        const bridge = new KotlinCxxBridgedType(v);
+        return `
+is ${innerName} -> ${label}(${bridge.parseFromCppToKotlin('value', 'kotlin')})
     `.trim();
     });
     const createFunctions = variant.cases.map(([label, v]) => {
+        const bridge = new KotlinCxxBridgedType(v);
         const innerName = capitalizeName(label);
         return `
 @JvmStatic
 @DoNotStrip
-fun create(value: ${v.getCode('kotlin')}): ${kotlinName} = ${innerName}(value)
-    `.trim();
+fun create(value: ${bridge.getTypeCode('kotlin')}): ${kotlinName} = ${innerName}(${bridge.parseFromCppToKotlin('value', 'kotlin')})
+`.trim();
     });
     const extraImports = variant.variants
         .flatMap((t) => t.getRequiredImports('kotlin'))
@@ -54,12 +78,21 @@ ${extraImports.join('\n')}
 sealed class ${kotlinName} {
   ${indent(innerClasses.join('\n'), '  ')}
 
+  @Deprecated("getAs() is not type-safe. Use fold/asFirstOrNull/asSecondOrNull instead.", level = DeprecationLevel.ERROR)
   inline fun <reified T> getAs(): T? = when (this) {
     ${indent(getterCases.join('\n'), '    ')}
   }
 
   ${indent(isFunctions.join('\n'), '  ')}
 
+  ${indent(asFunctions.join('\n'), '  ')}
+
+  inline fun <R> match(${matchParameters.join(', ')}): R {
+    return when (this) {
+      ${indent(matchCases.join('\n'), '      ')}
+    }
+  }
+
   companion object {
     ${indent(createFunctions.join('\n'), '    ')}
   }

package/lib/syntax/swift/SwiftCxxBridgedType.js

@@ -409,7 +409,9 @@ export class SwiftCxxBridgedType {
                                 return `${cppParameterName}.has_value() ? ${cppParameterName}.pointee : nil`;
                             }
                         }
-                        if (!wrapping.needsSpecialHandling) {
+                        // TODO: Remove this check for booleans once https://github.com/swiftlang/swift/issues/84848 is fixed.
+                        const swiftBug84848Workaround = optional.wrappingType.kind === 'boolean';
+                        if (!wrapping.needsSpecialHandling && !swiftBug84848Workaround) {
                             return `${cppParameterName}.value`;
                         }
                         return `

package/package.json

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

package/src/init.ts

@@ -70,7 +70,7 @@ async function isGitInstalled(): Promise<boolean> {
   try {
     execSync('git --version')
     return true
-  } catch (error) {
+  } catch {
     return false
   }
 }

package/src/syntax/kotlin/KotlinCxxBridgedType.ts

@@ -41,10 +41,6 @@ export class KotlinCxxBridgedType implements BridgedType<'kotlin', 'c++'> {
       case 'function':
         // Function needs to be converted from JFunc_... to Lambda
         return true
-      case 'struct':
-        // Structs don't need special handling - they have direct mappings
-        // Returning false prevents secondary constructor generation that causes duplicates
-        return false
       case 'optional':
         // Optionals need special handling if the wrapped type needs special handling
         const optional = getTypeAs(this.type, OptionalType)
@@ -53,16 +49,6 @@ export class KotlinCxxBridgedType implements BridgedType<'kotlin', 'c++'> {
       default:
         break
     }
-    // check if any types this type references (e.g. underlying optional, array element, ...)
-    // needs special handling. if yes, we need it as well
-    const referencedTypes = getReferencedTypes(this.type)
-      .filter((t) => t !== this.type)
-      .map((t) => new KotlinCxxBridgedType(t))
-    for (const type of referencedTypes) {
-      if (type.needsSpecialHandling) {
-        return true
-      }
-    }
     // no special handling needed
     return false
   }

package/src/syntax/kotlin/KotlinHybridObject.ts

@@ -95,7 +95,7 @@ abstract class ${name.HybridTSpec}: ${kotlinBase}() {
   private external fun initHybrid(): HybridData
 
   companion object {
-    private const val TAG = "${name.HybridTSpec}"
+    protected const val TAG = "${name.HybridTSpec}"
   }
 }
   `.trim()

package/src/syntax/kotlin/KotlinStruct.ts

@@ -9,50 +9,28 @@ import { KotlinCxxBridgedType } from './KotlinCxxBridgedType.js'
 
 export function createKotlinStruct(structType: StructType): SourceFile[] {
   const packageName = NitroConfig.current.getAndroidPackage('java/kotlin')
-  const values = structType.properties.map((p) => {
-    const bridged = new KotlinCxxBridgedType(p)
-    return `
+  const parameters = structType.properties
+    .map((p) =>
+      `
 @DoNotStrip
 @Keep
-val ${p.escapedName}: ${bridged.getTypeCode('kotlin', false)}
+val ${p.escapedName}: ${p.getCode('kotlin')}
 `.trim()
-  })
-  let secondaryConstructor: string
-
-  const needsSpecialHandling = structType.properties.some((p) => {
-    const bridged = new KotlinCxxBridgedType(p)
-    const parseCode = bridged.parseFromKotlinToCpp(
-      p.escapedName,
-      'kotlin',
-      false
     )
-    return parseCode !== p.escapedName
-  })
+    .join(',\n')
 
-  if (needsSpecialHandling) {
-    // If we need special handling for any of our properties, we need to add a convenience initializer.
-    const params = structType.properties.map(
-      (p) => `${p.escapedName}: ${p.getCode('kotlin')}`
-    )
-    const paramsForward = structType.properties.map((p) => {
+  const cxxCreateFunctionParameters = structType.properties
+    .map((p) => {
       const bridged = new KotlinCxxBridgedType(p)
-      if (bridged.needsSpecialHandling) {
-        // We need special parsing for this type
-        return bridged.parseFromKotlinToCpp(p.escapedName, 'kotlin', false)
-      } else {
-        return p.escapedName
-      }
+      return `${p.escapedName}: ${bridged.getTypeCode('kotlin', false)}`
     })
-    secondaryConstructor = `
-/**
- * Initialize a new instance of \`${structType.structName}\` from Kotlin.
- */
-constructor(${indent(params.join(', '), 12)})
-     : this(${indent(paramsForward.join(', '), 12)})
-    `.trim()
-  } else {
-    secondaryConstructor = `/* main constructor */`
-  }
+    .join(', ')
+  const cxxCreateFunctionForward = structType.properties
+    .map((p) => {
+      const bridged = new KotlinCxxBridgedType(p)
+      return bridged.parseFromCppToKotlin(p.escapedName, 'kotlin', false)
+    })
+    .join(', ')
 
   const extraImports = structType.properties
     .flatMap((t) => t.getRequiredImports('kotlin'))
@@ -73,13 +51,21 @@ ${extraImports.join('\n')}
  */
 @DoNotStrip
 @Keep
-data class ${structType.structName}
-  @DoNotStrip
-  @Keep
-  constructor(
-    ${indent(values.join(',\n'), '    ')}
-  ) {
-  ${indent(secondaryConstructor, '  ')}
+data class ${structType.structName}(
+  ${indent(parameters, '  ')}
+) {
+  private companion object {
+    /**
+     * Constructor called from C++
+     */
+    @DoNotStrip
+    @Keep
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(${cxxCreateFunctionParameters}): ${structType.structName} {
+      return ${structType.structName}(${cxxCreateFunctionForward})
+    }
+  }
 }
   `.trim()
 
@@ -193,14 +179,27 @@ function createCppStructInitializer(
   cppValueName: string,
   structType: StructType
 ): string {
-  const lines: string[] = []
-  lines.push(`return newInstance(`)
-  const names = structType.properties.map((p) => {
-    const name = `${cppValueName}.${p.escapedName}`
-    const bridge = new KotlinCxxBridgedType(p)
-    return bridge.parse(name, 'c++', 'kotlin', 'c++')
-  })
-  lines.push(`  ${indent(names.join(',\n'), '  ')}`)
-  lines.push(');')
-  return lines.join('\n')
+  const jniTypes = structType.properties
+    .map((p) => {
+      const bridge = new KotlinCxxBridgedType(p)
+      return bridge.asJniReferenceType('alias')
+    })
+    .join(', ')
+  const params = structType.properties
+    .map((p) => {
+      const name = `${cppValueName}.${p.escapedName}`
+      const bridge = new KotlinCxxBridgedType(p)
+      return bridge.parse(name, 'c++', 'kotlin', 'c++')
+    })
+    .join(',\n')
+
+  return `
+using JSignature = J${structType.structName}(${jniTypes});
+static const auto clazz = javaClassStatic();
+static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+return create(
+  clazz,
+  ${indent(params, '  ')}
+);
+  `.trim()
 }

package/src/syntax/kotlin/KotlinVariant.ts

@@ -7,19 +7,21 @@ import {
   toReferenceType,
 } from '../helpers.js'
 import type { SourceFile } from '../SourceFile.js'
+import { OptionalType } from '../types/OptionalType.js'
 import { type VariantType } from '../types/VariantType.js'
 import { KotlinCxxBridgedType } from './KotlinCxxBridgedType.js'
 
 export function createKotlinVariant(variant: VariantType): SourceFile[] {
-  const jsName = variant.variants.map((v) => v.getCode('kotlin')).join('|')
+  const jsName = variant.variants.map((v) => v.getCode('kotlin')).join(' | ')
   const kotlinName = variant.getAliasName('kotlin')
   const namespace = `J${kotlinName}_impl`
 
   const innerClasses = variant.cases.map(([label, v]) => {
     const innerName = capitalizeName(label)
+    const bridge = new KotlinCxxBridgedType(v)
     return `
 @DoNotStrip
-data class ${innerName}(@DoNotStrip val value: ${v.getCode('kotlin')}): ${kotlinName}()
+data class ${innerName}(@DoNotStrip val value: ${bridge.getTypeCode('kotlin')}): ${kotlinName}()
       `.trim()
   })
 
@@ -35,14 +37,36 @@ val is${innerName}: Boolean
   get() = this is ${innerName}
     `.trim()
   })
+  const asFunctions = variant.cases.map(([label, v]) => {
+    const innerName = capitalizeName(label)
+    const bridge = new KotlinCxxBridgedType(v)
+    const optional = new OptionalType(v)
+    return `
+fun as${innerName}OrNull(): ${optional.getCode('kotlin')} {
+  val value = (this as? ${innerName})?.value ?: return null
+  return ${bridge.parseFromCppToKotlin('value', 'kotlin')}
+}
+    `.trim()
+  })
+  const matchParameters = variant.cases.map(([label, v]) => {
+    return `${label}: (${v.getCode('kotlin')}) -> R`
+  })
+  const matchCases = variant.cases.map(([label, v]) => {
+    const innerName = capitalizeName(label)
+    const bridge = new KotlinCxxBridgedType(v)
+    return `
+is ${innerName} -> ${label}(${bridge.parseFromCppToKotlin('value', 'kotlin')})
+    `.trim()
+  })
 
   const createFunctions = variant.cases.map(([label, v]) => {
+    const bridge = new KotlinCxxBridgedType(v)
     const innerName = capitalizeName(label)
     return `
 @JvmStatic
 @DoNotStrip
-fun create(value: ${v.getCode('kotlin')}): ${kotlinName} = ${innerName}(value)
-    `.trim()
+fun create(value: ${bridge.getTypeCode('kotlin')}): ${kotlinName} = ${innerName}(${bridge.parseFromCppToKotlin('value', 'kotlin')})
+`.trim()
   })
 
   const extraImports = variant.variants
@@ -65,12 +89,21 @@ ${extraImports.join('\n')}
 sealed class ${kotlinName} {
   ${indent(innerClasses.join('\n'), '  ')}
 
+  @Deprecated("getAs() is not type-safe. Use fold/asFirstOrNull/asSecondOrNull instead.", level = DeprecationLevel.ERROR)
   inline fun <reified T> getAs(): T? = when (this) {
     ${indent(getterCases.join('\n'), '    ')}
   }
 
   ${indent(isFunctions.join('\n'), '  ')}
 
+  ${indent(asFunctions.join('\n'), '  ')}
+
+  inline fun <R> match(${matchParameters.join(', ')}): R {
+    return when (this) {
+      ${indent(matchCases.join('\n'), '      ')}
+    }
+  }
+
   companion object {
     ${indent(createFunctions.join('\n'), '    ')}
   }

package/src/syntax/swift/SwiftCxxBridgedType.ts

@@ -449,7 +449,10 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> {
                 return `${cppParameterName}.has_value() ? ${cppParameterName}.pointee : nil`
               }
             }
-            if (!wrapping.needsSpecialHandling) {
+            // TODO: Remove this check for booleans once https://github.com/swiftlang/swift/issues/84848 is fixed.
+            const swiftBug84848Workaround =
+              optional.wrappingType.kind === 'boolean'
+            if (!wrapping.needsSpecialHandling && !swiftBug84848Workaround) {
               return `${cppParameterName}.value`
             }
             return `