nitrogen 0.33.8 → 0.34.0

package/lib/autolinking/android/createHybridObjectInitializer.js

@@ -49,21 +49,30 @@ export function createHybridObjectIntializer() {
 ${createFileMetadataString(`${autolinkingClassName}.hpp`)}
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace ${cxxNamespace} {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of ${cppLibName}, and autolinks all Hybrid Objects.
-   * Call this in your \`JNI_OnLoad\` function (probably inside \`cpp-adapter.cpp\`).
+   * Register the native (C++) part of ${cppLibName}, and autolinks all Hybrid Objects.
+   * Call this in your \`JNI_OnLoad\` function (probably inside \`cpp-adapter.cpp\`),
+   * inside a \`facebook::jni::initialize(vm, ...)\` call.
    * Example:
    * \`\`\`cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return ${cxxNamespace}::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all ${cppLibName} HybridObjects
+   *     ${cxxNamespace}::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * \`\`\`
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace ${cxxNamespace}
 
@@ -86,17 +95,20 @@ ${includes}
 namespace ${cxxNamespace} {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::${cxxNamespace}::registerAllNatives();
+  });
+}
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace ${cxxNamespace};
-  using namespace facebook;
 
-  return facebook::jni::initialize(vm, [] {
     // Register native JNI methods
-    ${indent(jniRegistrations.join('\n'), '    ')}
+  ${indent(jniRegistrations.join('\n'), '  ')}
 
-    // Register Nitro Hybrid Objects
-    ${indent(cppRegistrations.join('\n'), '    ')}
-  });
+  // Register Nitro Hybrid Objects
+  ${indent(cppRegistrations.join('\n'), '  ')}
 }
 
 } // namespace ${cxxNamespace}

package/lib/syntax/Property.js

@@ -3,7 +3,6 @@ import {} from './SourceFile.js';
 import { Method } from './Method.js';
 import { VoidType } from './types/VoidType.js';
 import { Parameter } from './Parameter.js';
-import { isBooleanPropertyPrefix } from './helpers.js';
 export class Property {
     name;
     type;
@@ -26,13 +25,29 @@ export class Property {
         return this.type.getRequiredImports(language);
     }
     getGetterName(environment) {
-        if (this.type.kind === 'boolean' && isBooleanPropertyPrefix(this.name)) {
+        if (this.type.kind === 'boolean') {
             // Boolean accessors where the property starts with "is" or "has" are renamed in JVM and Swift
             switch (environment) {
                 case 'jvm':
+                    if (this.name.startsWith('is')) {
+                        // isSomething -> isSomething()
+                        return this.name;
+                    }
+                    else {
+                        break;
+                    }
                 case 'swift':
-                    // isSomething -> isSomething()
-                    return this.name;
+                    if (this.name.startsWith('is')) {
+                        // isSomething -> isSomething()
+                        return this.name;
+                    }
+                    else if (this.name.startsWith('has')) {
+                        // hasSomething -> hasSomething()
+                        return this.name;
+                    }
+                    else {
+                        break;
+                    }
                 default:
                     break;
             }
@@ -41,12 +56,20 @@ export class Property {
         return `get${capitalizeName(this.name)}`;
     }
     getSetterName(environment) {
-        if (this.type.kind === 'boolean' && this.name.startsWith('is')) {
+        if (this.type.kind === 'boolean') {
             // Boolean accessors where the property starts with "is" are renamed in JVM
-            if (environment === 'jvm') {
-                // isSomething -> setSomething()
-                const cleanName = this.name.replace('is', '');
-                return `set${capitalizeName(cleanName)}`;
+            switch (environment) {
+                case 'jvm':
+                    if (this.name.startsWith('is')) {
+                        // isSomething -> setSomething()
+                        const cleanName = this.name.replace('is', '');
+                        return `set${capitalizeName(cleanName)}`;
+                    }
+                    else {
+                        break;
+                    }
+                default:
+                    break;
             }
         }
         // isSomething -> setIsSomething()

package/lib/syntax/helpers.d.ts

@@ -11,7 +11,6 @@ export declare function escapeCppName(string: string): string;
  * and a negative number if otherwise.
  */
 export declare function compareLooselyness(a: Type, b: Type): number;
-export declare function isBooleanPropertyPrefix(name: string): boolean;
 export declare function isNotDuplicate<T>(item: T, index: number, array: T[]): boolean;
 export declare function isCppFile(file: SourceFile): boolean;
 export declare function getRelativeDirectory(file: SourceFile): string;

package/lib/syntax/helpers.js

@@ -134,9 +134,6 @@ function getTypeLooselyness(type) {
 export function compareLooselyness(a, b) {
     return getTypeLooselyness(a) - getTypeLooselyness(b);
 }
-export function isBooleanPropertyPrefix(name) {
-    return name.startsWith('is') || name.startsWith('has');
-}
 export function isNotDuplicate(item, index, array) {
     return array.indexOf(item) === index;
 }

package/lib/syntax/swift/SwiftCxxBridgedType.js

@@ -425,10 +425,14 @@ export class SwiftCxxBridgedType {
                                 return `${cppParameterName}.has_value() ? ${cppParameterName}.pointee : nil`;
                             }
                         }
-                        // 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`;
+                        // TODO: Remove this check for booleans/doubles once https://github.com/swiftlang/swift/issues/84848 is fixed.
+                        //       Right now, optionals of doubles or booleans (and who knows what else?) fail to compile when `.value` is used.
+                        const swiftBug84848Workaround = optional.wrappingType.kind === 'boolean' ||
+                            optional.wrappingType.kind === 'number';
+                        if (!swiftBug84848Workaround) {
+                            if (!wrapping.needsSpecialHandling) {
+                                return `${cppParameterName}.value`;
+                            }
                         }
                         return `
 { () -> ${optional.getCode('swift')} in

package/lib/syntax/swift/SwiftCxxTypeHelper.js

@@ -209,7 +209,7 @@ inline bool has_value_${name}(const ${actualType}& optional) noexcept {
   return optional.has_value();
 }
 inline ${wrappedBridge.getTypeCode('c++')} get_${name}(const ${actualType}& optional) noexcept {
-  return *optional;
+  return optional.value();
 }
     `.trim(),
             requiredIncludes: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitrogen",
-  "version": "0.33.8",
+  "version": "0.34.0",
   "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.33.8",
+    "react-native-nitro-modules": "^0.34.0",
     "ts-morph": "^27.0.0",
     "yargs": "^18.0.0",
     "zod": "^4.0.5"

package/src/autolinking/android/createHybridObjectInitializer.ts

@@ -62,21 +62,30 @@ export function createHybridObjectIntializer(): SourceFile[] {
 ${createFileMetadataString(`${autolinkingClassName}.hpp`)}
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace ${cxxNamespace} {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of ${cppLibName}, and autolinks all Hybrid Objects.
-   * Call this in your \`JNI_OnLoad\` function (probably inside \`cpp-adapter.cpp\`).
+   * Register the native (C++) part of ${cppLibName}, and autolinks all Hybrid Objects.
+   * Call this in your \`JNI_OnLoad\` function (probably inside \`cpp-adapter.cpp\`),
+   * inside a \`facebook::jni::initialize(vm, ...)\` call.
    * Example:
    * \`\`\`cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return ${cxxNamespace}::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all ${cppLibName} HybridObjects
+   *     ${cxxNamespace}::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * \`\`\`
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace ${cxxNamespace}
 
@@ -99,17 +108,20 @@ ${includes}
 namespace ${cxxNamespace} {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::${cxxNamespace}::registerAllNatives();
+  });
+}
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace ${cxxNamespace};
-  using namespace facebook;
 
-  return facebook::jni::initialize(vm, [] {
     // Register native JNI methods
-    ${indent(jniRegistrations.join('\n'), '    ')}
+  ${indent(jniRegistrations.join('\n'), '  ')}
 
-    // Register Nitro Hybrid Objects
-    ${indent(cppRegistrations.join('\n'), '    ')}
-  });
+  // Register Nitro Hybrid Objects
+  ${indent(cppRegistrations.join('\n'), '  ')}
 }
 
 } // namespace ${cxxNamespace}

package/src/syntax/Property.ts

@@ -6,7 +6,6 @@ import type { Type } from './types/Type.js'
 import { Method } from './Method.js'
 import { VoidType } from './types/VoidType.js'
 import { Parameter } from './Parameter.js'
-import { isBooleanPropertyPrefix } from './helpers.js'
 
 export interface PropertyBody {
   getter: string
@@ -73,13 +72,26 @@ export class Property implements CodeNode {
   }
 
   getGetterName(environment: LanguageEnvironment): string {
-    if (this.type.kind === 'boolean' && isBooleanPropertyPrefix(this.name)) {
+    if (this.type.kind === 'boolean') {
       // Boolean accessors where the property starts with "is" or "has" are renamed in JVM and Swift
       switch (environment) {
         case 'jvm':
+          if (this.name.startsWith('is')) {
+            // isSomething -> isSomething()
+            return this.name
+          } else {
+            break
+          }
         case 'swift':
-          // isSomething -> isSomething()
-          return this.name
+          if (this.name.startsWith('is')) {
+            // isSomething -> isSomething()
+            return this.name
+          } else if (this.name.startsWith('has')) {
+            // hasSomething -> hasSomething()
+            return this.name
+          } else {
+            break
+          }
         default:
           break
       }
@@ -89,12 +101,19 @@ export class Property implements CodeNode {
   }
 
   getSetterName(environment: LanguageEnvironment): string {
-    if (this.type.kind === 'boolean' && this.name.startsWith('is')) {
+    if (this.type.kind === 'boolean') {
       // Boolean accessors where the property starts with "is" are renamed in JVM
-      if (environment === 'jvm') {
-        // isSomething -> setSomething()
-        const cleanName = this.name.replace('is', '')
-        return `set${capitalizeName(cleanName)}`
+      switch (environment) {
+        case 'jvm':
+          if (this.name.startsWith('is')) {
+            // isSomething -> setSomething()
+            const cleanName = this.name.replace('is', '')
+            return `set${capitalizeName(cleanName)}`
+          } else {
+            break
+          }
+        default:
+          break
       }
     }
     // isSomething -> setIsSomething()

package/src/syntax/helpers.ts

@@ -150,10 +150,6 @@ export function compareLooselyness(a: Type, b: Type): number {
   return getTypeLooselyness(a) - getTypeLooselyness(b)
 }
 
-export function isBooleanPropertyPrefix(name: string): boolean {
-  return name.startsWith('is') || name.startsWith('has')
-}
-
 export function isNotDuplicate<T>(item: T, index: number, array: T[]): boolean {
   return array.indexOf(item) === index
 }

package/src/syntax/swift/SwiftCxxBridgedType.ts

@@ -465,11 +465,15 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> {
                 return `${cppParameterName}.has_value() ? ${cppParameterName}.pointee : nil`
               }
             }
-            // TODO: Remove this check for booleans once https://github.com/swiftlang/swift/issues/84848 is fixed.
+            // TODO: Remove this check for booleans/doubles once https://github.com/swiftlang/swift/issues/84848 is fixed.
+            //       Right now, optionals of doubles or booleans (and who knows what else?) fail to compile when `.value` is used.
             const swiftBug84848Workaround =
-              optional.wrappingType.kind === 'boolean'
-            if (!wrapping.needsSpecialHandling && !swiftBug84848Workaround) {
-              return `${cppParameterName}.value`
+              optional.wrappingType.kind === 'boolean' ||
+              optional.wrappingType.kind === 'number'
+            if (!swiftBug84848Workaround) {
+              if (!wrapping.needsSpecialHandling) {
+                return `${cppParameterName}.value`
+              }
             }
             return `
 { () -> ${optional.getCode('swift')} in

package/src/syntax/swift/SwiftCxxTypeHelper.ts

@@ -249,7 +249,7 @@ inline bool has_value_${name}(const ${actualType}& optional) noexcept {
   return optional.has_value();
 }
 inline ${wrappedBridge.getTypeCode('c++')} get_${name}(const ${actualType}& optional) noexcept {
-  return *optional;
+  return optional.value();
 }
     `.trim(),
       requiredIncludes: [

package/lib/syntax/types/BigIntType.d.ts

@@ -1,13 +0,0 @@
-import type { Language } from '../../getPlatformSpecs.js';
-import type { SourceFile, SourceImport } from '../SourceFile.js';
-import type { Type, TypeKind } from './Type.js';
-export declare class BigIntType implements Type {
-    private signed;
-    constructor(signed: boolean);
-    get canBePassedByReference(): boolean;
-    get kind(): TypeKind;
-    get isEquatable(): boolean;
-    getCode(language: Language): string;
-    getExtraFiles(): SourceFile[];
-    getRequiredImports(): SourceImport[];
-}

package/lib/syntax/types/BigIntType.js

@@ -1,48 +0,0 @@
-export class BigIntType {
-    signed;
-    constructor(signed) {
-        this.signed = signed;
-    }
-    get canBePassedByReference() {
-        // It's a primitive.
-        return false;
-    }
-    get kind() {
-        return 'bigint';
-    }
-    get isEquatable() {
-        return true;
-    }
-    getCode(language) {
-        if (this.signed) {
-            switch (language) {
-                case 'c++':
-                    return 'int64_t';
-                case 'swift':
-                    return 'Int64';
-                case 'kotlin':
-                    return 'Long';
-                default:
-                    throw new Error(`Language ${language} is not yet supported for BigIntType!`);
-            }
-        }
-        else {
-            switch (language) {
-                case 'c++':
-                    return 'uint64_t';
-                case 'swift':
-                    return 'UInt64';
-                case 'kotlin':
-                    return 'ULong';
-                default:
-                    throw new Error(`Language ${language} is not yet supported for BigIntType!`);
-            }
-        }
-    }
-    getExtraFiles() {
-        return [];
-    }
-    getRequiredImports() {
-        return [];
-    }
-}