nitrogen 0.29.5 → 0.29.7

package/lib/autolinking/android/createCMakeExtension.js

@@ -32,6 +32,12 @@ ${createFileMetadataString(`${name}+autolinking.cmake`, '#')}
 # include(\${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/${name}+autolinking.cmake)
 # \`\`\`
 
+# Define a flag to check if we are building properly
+add_definitions(-D${buildingWithDefinition})
+
+# Enable Raw Props parsing in react-native (for Nitro Views)
+add_definitions(-DRN_SERIALIZABLE_STATE)
+
 # Add all headers that were generated by Nitrogen
 include_directories(
   "../nitrogen/generated/shared/c++"
@@ -51,15 +57,9 @@ target_sources(
   ${indent(androidFiles.join('\n'), '  ')}
 )
 
-# Define a flag to check if we are building properly
-add_definitions(-D${buildingWithDefinition})
-
-# Enable Raw Props parsing in react-native (for Nitro Views)
-add_compile_options(-DRN_SERIALIZABLE_STATE=1)
-
 # From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake
 # Used in node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
- target_compile_definitions(
+target_compile_definitions(
   ${name} PRIVATE
   -DFOLLY_NO_CONFIG=1
   -DFOLLY_HAVE_CLOCK_GETTIME=1

package/lib/syntax/HybridObjectSpec.d.ts

@@ -0,0 +1,13 @@
+import type { NitroConfig } from '../config/NitroConfig.js';
+import type { Language } from '../getPlatformSpecs.js';
+import type { Method } from './Method.js';
+import type { Property } from './Property.js';
+export interface HybridObjectSpec {
+    name: string;
+    language: Language;
+    properties: Property[];
+    methods: Method[];
+    baseTypes: HybridObjectSpec[];
+    isHybridView: boolean;
+    config: NitroConfig;
+}

package/lib/syntax/swift/SwiftCxxBridgedType.js

@@ -14,7 +14,7 @@ import { StructType } from '../types/StructType.js';
 import { TupleType } from '../types/TupleType.js';
 import { VariantType } from '../types/VariantType.js';
 import { getReferencedTypes } from '../getReferencedTypes.js';
-import { createSwiftCxxHelpers, } from './SwiftCxxTypeHelper.js';
+import { createSwiftCxxHelpers, isPrimitivelyCopyable, } from './SwiftCxxTypeHelper.js';
 import { createSwiftEnumBridge } from './SwiftEnum.js';
 import { createSwiftStructBridge } from './SwiftStruct.js';
 import { createSwiftVariant } from './SwiftVariant.js';
@@ -68,17 +68,11 @@ export class SwiftCxxBridgedType {
             case 'tuple':
                 // (A, B) <> std::tuple<A, B>
                 return true;
-            case 'struct':
-                // SomeStruct (Swift extension) <> SomeStruct (C++)
-                return true;
             case 'function':
                 // (@ecaping () -> Void) <> std::function<...>
                 return true;
             case 'array-buffer':
                 // ArrayBufferHolder <> std::shared_ptr<ArrayBuffer>
-                if (this.isBridgingToDirectCppTarget) {
-                    return false;
-                }
                 return true;
             case 'date':
                 // Date <> double
@@ -452,7 +446,21 @@ export class SwiftCxxBridgedType {
                 const wrapping = new SwiftCxxBridgedType(array.itemType, true);
                 switch (language) {
                     case 'swift':
-                        return `${cppParameterName}.map({ __item in ${wrapping.parseFromCppToSwift('__item', 'swift')} })`.trim();
+                        if (isPrimitivelyCopyable(array.itemType)) {
+                            // We can primitively copy the data, raw:
+                            const bridge = this.getBridgeOrThrow();
+                            const getDataFunc = `bridge.get_data_${bridge.specializationName}`;
+                            return `
+{ () -> ${array.getCode('swift')} in
+  let __data = ${getDataFunc}(${cppParameterName})
+  let __size = ${cppParameterName}.size()
+  return Array(UnsafeBufferPointer(start: __data, count: __size))
+}()`.trim();
+                        }
+                        else {
+                            // We have to iterate the element one by one to create a resulting Array (mapped)
+                            return `${cppParameterName}.map({ __item in ${wrapping.parseFromCppToSwift('__item', 'swift')} })`.trim();
+                        }
                     default:
                         return cppParameterName;
                 }
@@ -698,12 +706,22 @@ case ${i}:
             }
             case 'array': {
                 const bridge = this.getBridgeOrThrow();
-                const makeFunc = `bridge.${bridge.funcName}`;
                 const array = getTypeAs(this.type, ArrayType);
                 const wrapping = new SwiftCxxBridgedType(array.itemType, true);
                 switch (language) {
                     case 'swift':
-                        return `
+                        if (isPrimitivelyCopyable(array.itemType)) {
+                            // memory can be copied primitively
+                            const copyFunc = `bridge.${bridge.funcName}`;
+                            return `
+${swiftParameterName}.withUnsafeBufferPointer { __pointer -> bridge.${bridge.specializationName} in
+  return ${copyFunc}(__pointer.baseAddress!, ${swiftParameterName}.count)
+}`.trim();
+                        }
+                        else {
+                            // array has to be iterated and converted one-by-one
+                            const makeFunc = `bridge.${bridge.funcName}`;
+                            return `
 { () -> bridge.${bridge.specializationName} in
   var __vector = ${makeFunc}(${swiftParameterName}.count)
   for __item in ${swiftParameterName} {
@@ -711,6 +729,7 @@ case ${i}:
   }
   return __vector
 }()`.trim();
+                        }
                     default:
                         return swiftParameterName;
                 }

package/lib/syntax/swift/SwiftCxxTypeHelper.d.ts

@@ -0,0 +1,18 @@
+import type { SourceImport } from '../SourceFile.js';
+import type { Type } from '../types/Type.js';
+export interface SwiftCxxHelper {
+    cxxHeader: {
+        code: string;
+        requiredIncludes: SourceImport[];
+    };
+    cxxImplementation?: {
+        code: string;
+        requiredIncludes: SourceImport[];
+    };
+    funcName: string;
+    specializationName: string;
+    cxxType: string;
+    dependencies: SwiftCxxHelper[];
+}
+export declare function createSwiftCxxHelpers(type: Type): SwiftCxxHelper | undefined;
+export declare function isPrimitivelyCopyable(type: Type): boolean;

package/lib/syntax/swift/SwiftCxxTypeHelper.js

@@ -115,17 +115,17 @@ return ${cxxNamespace}::get_${internalName}(cppType);
  * Specialized version of \`${escapeComments(actualType)}\`.
  */
 using ${name} = ${actualType};
-${actualType} create_${name}(void* _Nonnull swiftUnsafePointer) noexcept;
-void* _Nonnull get_${name}(${name} cppType) noexcept;
+${actualType} create_${name}(void* NON_NULL swiftUnsafePointer) noexcept;
+void* NON_NULL get_${name}(${name} cppType) noexcept;
     `.trim(),
             requiredIncludes: type.getRequiredImports('c++'),
         },
         cxxImplementation: {
             code: `
-${actualType} create_${name}(void* _Nonnull swiftUnsafePointer) noexcept {
+${actualType} create_${name}(void* NON_NULL swiftUnsafePointer) noexcept {
   ${indent(createImplementation, '  ')}
 }
-void* _Nonnull get_${name}(${name} cppType) noexcept {
+void* NON_NULL get_${name}(${name} cppType) noexcept {
   ${indent(getImplementation, '  ')}
 }
     `.trim(),
@@ -219,6 +219,10 @@ inline ${wrappedBridge.getTypeCode('c++')} get_${name}(const ${actualType}& opti
         dependencies: [],
     };
 }
+export function isPrimitivelyCopyable(type) {
+    const bridgedType = new SwiftCxxBridgedType(type, true);
+    return !bridgedType.needsSpecialHandling;
+}
 /**
  * Creates a C++ `create_vector_T<T>(size)` function that can be called from Swift.
  */
@@ -226,12 +230,27 @@ function createCxxVectorSwiftHelper(type) {
     const actualType = type.getCode('c++');
     const bridgedType = new SwiftCxxBridgedType(type);
     const name = escapeCppName(actualType);
-    return {
-        cxxType: actualType,
-        funcName: `create_${name}`,
-        specializationName: name,
-        cxxHeader: {
-            code: `
+    let code;
+    let funcName;
+    if (isPrimitivelyCopyable(type.itemType)) {
+        const itemType = type.itemType.getCode('c++');
+        funcName = `copy_${name}`;
+        code = `
+/**
+ * Specialized version of \`${escapeComments(actualType)}\`.
+ */
+using ${name} = ${actualType};
+inline ${actualType} copy_${name}(const ${itemType}* CONTIGUOUS_MEMORY NON_NULL data, size_t size) noexcept {
+  return margelo::nitro::FastVectorCopy<${itemType}>(data, size);
+}
+inline const ${itemType}* CONTIGUOUS_MEMORY NON_NULL get_data_${name}(const ${actualType}& vector) noexcept {
+  return vector.data();
+}
+`.trim();
+    }
+    else {
+        funcName = `create_${name}`;
+        code = `
 /**
  * Specialized version of \`${escapeComments(actualType)}\`.
  */
@@ -240,14 +259,25 @@ inline ${actualType} create_${name}(size_t size) noexcept {
   ${actualType} vector;
   vector.reserve(size);
   return vector;
-}
-    `.trim(),
+}`.trim();
+    }
+    return {
+        cxxType: actualType,
+        funcName: funcName,
+        specializationName: name,
+        cxxHeader: {
+            code: code,
             requiredIncludes: [
                 {
                     name: 'vector',
                     space: 'system',
                     language: 'c++',
                 },
+                {
+                    name: 'NitroModules/FastVectorCopy.hpp',
+                    space: 'system',
+                    language: 'c++',
+                },
                 ...bridgedType.getRequiredImports('c++'),
             ],
         },
@@ -382,7 +412,7 @@ public:
 private:
   std::unique_ptr<${actualType}> _function;
 } SWIFT_NONCOPYABLE;
-${name} create_${name}(void* _Nonnull swiftClosureWrapper) noexcept;
+${name} create_${name}(void* NON_NULL swiftClosureWrapper) noexcept;
 inline ${wrapperName} wrap_${name}(${name} value) noexcept {
   return ${wrapperName}(std::move(value));
 }
@@ -403,7 +433,7 @@ inline ${wrapperName} wrap_${name}(${name} value) noexcept {
         },
         cxxImplementation: {
             code: `
-${name} create_${name}(void* _Nonnull swiftClosureWrapper) noexcept {
+${name} create_${name}(void* NON_NULL swiftClosureWrapper) noexcept {
   auto swiftClosure = ${swiftClassName}::fromUnsafe(swiftClosureWrapper);
   return [swiftClosure = std::move(swiftClosure)](${paramsSignature.join(', ')}) mutable -> ${type.returnType.getCode('c++')} {
     ${indent(body, '    ')}

package/lib/views/kotlin/KotlinHybridViewManager.js

@@ -31,7 +31,7 @@ import ${javaNamespace}.*
 /**
  * Represents the React Native \`ViewManager\` for the "${spec.name}" Nitro HybridView.
  */
-class ${manager}: SimpleViewManager<View>() {
+open class ${manager}: SimpleViewManager<View>() {
   private val views = hashMapOf<View, ${viewImplementation}>()
 
   override fun getName(): String {
@@ -89,6 +89,10 @@ ${createFileMetadataString(`J${stateUpdaterName}.hpp`)}
 
 #pragma once
 
+#ifndef RN_SERIALIZABLE_STATE
+#error ${spec.config.getAndroidCxxLibName()} was compiled without the 'RN_SERIALIZABLE_STATE' flag. This flag is required for Nitro Views - set it in your CMakeLists!
+#endif
+
 #include <fbjni/fbjni.h>
 #include <react/fabric/StateWrapperImpl.h>
 #include <react/fabric/CoreComponentsRegistry.h>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitrogen",
-  "version": "0.29.5",
+  "version": "0.29.7",
   "description": "The code-generator for react-native-nitro-modules.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -36,13 +36,13 @@
   },
   "dependencies": {
     "chalk": "^5.3.0",
-    "react-native-nitro-modules": "^0.29.5",
-    "ts-morph": "^25.0.0",
+    "react-native-nitro-modules": "^0.29.7",
+    "ts-morph": "^27.0.0",
     "yargs": "^17.7.2",
     "zod": "^4.0.5"
   },
   "devDependencies": {
-    "@types/node": "^22.8.4"
+    "@types/node": "^24.5.2"
   },
   "release-it": {
     "npm": {

package/src/autolinking/android/createCMakeExtension.ts

@@ -49,6 +49,12 @@ ${createFileMetadataString(`${name}+autolinking.cmake`, '#')}
 # include(\${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/${name}+autolinking.cmake)
 # \`\`\`
 
+# Define a flag to check if we are building properly
+add_definitions(-D${buildingWithDefinition})
+
+# Enable Raw Props parsing in react-native (for Nitro Views)
+add_definitions(-DRN_SERIALIZABLE_STATE)
+
 # Add all headers that were generated by Nitrogen
 include_directories(
   "../nitrogen/generated/shared/c++"
@@ -68,15 +74,9 @@ target_sources(
   ${indent(androidFiles.join('\n'), '  ')}
 )
 
-# Define a flag to check if we are building properly
-add_definitions(-D${buildingWithDefinition})
-
-# Enable Raw Props parsing in react-native (for Nitro Views)
-add_compile_options(-DRN_SERIALIZABLE_STATE=1)
-
 # From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake
 # Used in node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
- target_compile_definitions(
+target_compile_definitions(
   ${name} PRIVATE
   -DFOLLY_NO_CONFIG=1
   -DFOLLY_HAVE_CLOCK_GETTIME=1

package/src/getFiles.ts

@@ -1,7 +1,9 @@
 import { Dirent, promises as fs } from 'fs'
 import path from 'path'
 
-function getFilePath(file: Dirent, rootDir: string): string {
+type DirentCompat = Dirent & { path?: string }
+
+function getFilePath(file: DirentCompat, rootDir: string): string {
   const dir = file.parentPath ?? file.path ?? rootDir
   return path.join(dir, file.name)
 }

package/src/syntax/swift/SwiftCxxBridgedType.ts

@@ -22,6 +22,7 @@ import { VariantType } from '../types/VariantType.js'
 import { getReferencedTypes } from '../getReferencedTypes.js'
 import {
   createSwiftCxxHelpers,
+  isPrimitivelyCopyable,
   type SwiftCxxHelper,
 } from './SwiftCxxTypeHelper.js'
 import { createSwiftEnumBridge } from './SwiftEnum.js'
@@ -84,17 +85,11 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> {
       case 'tuple':
         // (A, B) <> std::tuple<A, B>
         return true
-      case 'struct':
-        // SomeStruct (Swift extension) <> SomeStruct (C++)
-        return true
       case 'function':
         // (@ecaping () -> Void) <> std::function<...>
         return true
       case 'array-buffer':
         // ArrayBufferHolder <> std::shared_ptr<ArrayBuffer>
-        if (this.isBridgingToDirectCppTarget) {
-          return false
-        }
         return true
       case 'date':
         // Date <> double
@@ -492,7 +487,20 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> {
         const wrapping = new SwiftCxxBridgedType(array.itemType, true)
         switch (language) {
           case 'swift':
-            return `${cppParameterName}.map({ __item in ${wrapping.parseFromCppToSwift('__item', 'swift')} })`.trim()
+            if (isPrimitivelyCopyable(array.itemType)) {
+              // We can primitively copy the data, raw:
+              const bridge = this.getBridgeOrThrow()
+              const getDataFunc = `bridge.get_data_${bridge.specializationName}`
+              return `
+{ () -> ${array.getCode('swift')} in
+  let __data = ${getDataFunc}(${cppParameterName})
+  let __size = ${cppParameterName}.size()
+  return Array(UnsafeBufferPointer(start: __data, count: __size))
+}()`.trim()
+            } else {
+              // We have to iterate the element one by one to create a resulting Array (mapped)
+              return `${cppParameterName}.map({ __item in ${wrapping.parseFromCppToSwift('__item', 'swift')} })`.trim()
+            }
           default:
             return cppParameterName
         }
@@ -749,12 +757,21 @@ case ${i}:
       }
       case 'array': {
         const bridge = this.getBridgeOrThrow()
-        const makeFunc = `bridge.${bridge.funcName}`
         const array = getTypeAs(this.type, ArrayType)
         const wrapping = new SwiftCxxBridgedType(array.itemType, true)
         switch (language) {
           case 'swift':
-            return `
+            if (isPrimitivelyCopyable(array.itemType)) {
+              // memory can be copied primitively
+              const copyFunc = `bridge.${bridge.funcName}`
+              return `
+${swiftParameterName}.withUnsafeBufferPointer { __pointer -> bridge.${bridge.specializationName} in
+  return ${copyFunc}(__pointer.baseAddress!, ${swiftParameterName}.count)
+}`.trim()
+            } else {
+              // array has to be iterated and converted one-by-one
+              const makeFunc = `bridge.${bridge.funcName}`
+              return `
 { () -> bridge.${bridge.specializationName} in
   var __vector = ${makeFunc}(${swiftParameterName}.count)
   for __item in ${swiftParameterName} {
@@ -762,6 +779,7 @@ case ${i}:
   }
   return __vector
 }()`.trim()
+            }
           default:
             return swiftParameterName
         }

package/src/syntax/swift/SwiftCxxTypeHelper.ts

@@ -147,17 +147,17 @@ return ${cxxNamespace}::get_${internalName}(cppType);
  * Specialized version of \`${escapeComments(actualType)}\`.
  */
 using ${name} = ${actualType};
-${actualType} create_${name}(void* _Nonnull swiftUnsafePointer) noexcept;
-void* _Nonnull get_${name}(${name} cppType) noexcept;
+${actualType} create_${name}(void* NON_NULL swiftUnsafePointer) noexcept;
+void* NON_NULL get_${name}(${name} cppType) noexcept;
     `.trim(),
       requiredIncludes: type.getRequiredImports('c++'),
     },
     cxxImplementation: {
       code: `
-${actualType} create_${name}(void* _Nonnull swiftUnsafePointer) noexcept {
+${actualType} create_${name}(void* NON_NULL swiftUnsafePointer) noexcept {
   ${indent(createImplementation, '  ')}
 }
-void* _Nonnull get_${name}(${name} cppType) noexcept {
+void* NON_NULL get_${name}(${name} cppType) noexcept {
   ${indent(getImplementation, '  ')}
 }
     `.trim(),
@@ -260,6 +260,11 @@ inline ${wrappedBridge.getTypeCode('c++')} get_${name}(const ${actualType}& opti
   }
 }
 
+export function isPrimitivelyCopyable(type: Type): boolean {
+  const bridgedType = new SwiftCxxBridgedType(type, true)
+  return !bridgedType.needsSpecialHandling
+}
+
 /**
  * Creates a C++ `create_vector_T<T>(size)` function that can be called from Swift.
  */
@@ -267,12 +272,26 @@ function createCxxVectorSwiftHelper(type: ArrayType): SwiftCxxHelper {
   const actualType = type.getCode('c++')
   const bridgedType = new SwiftCxxBridgedType(type)
   const name = escapeCppName(actualType)
-  return {
-    cxxType: actualType,
-    funcName: `create_${name}`,
-    specializationName: name,
-    cxxHeader: {
-      code: `
+  let code: string
+  let funcName: string
+  if (isPrimitivelyCopyable(type.itemType)) {
+    const itemType = type.itemType.getCode('c++')
+    funcName = `copy_${name}`
+    code = `
+/**
+ * Specialized version of \`${escapeComments(actualType)}\`.
+ */
+using ${name} = ${actualType};
+inline ${actualType} copy_${name}(const ${itemType}* CONTIGUOUS_MEMORY NON_NULL data, size_t size) noexcept {
+  return margelo::nitro::FastVectorCopy<${itemType}>(data, size);
+}
+inline const ${itemType}* CONTIGUOUS_MEMORY NON_NULL get_data_${name}(const ${actualType}& vector) noexcept {
+  return vector.data();
+}
+`.trim()
+  } else {
+    funcName = `create_${name}`
+    code = `
 /**
  * Specialized version of \`${escapeComments(actualType)}\`.
  */
@@ -281,14 +300,26 @@ inline ${actualType} create_${name}(size_t size) noexcept {
   ${actualType} vector;
   vector.reserve(size);
   return vector;
-}
-    `.trim(),
+}`.trim()
+  }
+
+  return {
+    cxxType: actualType,
+    funcName: funcName,
+    specializationName: name,
+    cxxHeader: {
+      code: code,
       requiredIncludes: [
         {
           name: 'vector',
           space: 'system',
           language: 'c++',
         },
+        {
+          name: 'NitroModules/FastVectorCopy.hpp',
+          space: 'system',
+          language: 'c++',
+        },
         ...bridgedType.getRequiredImports('c++'),
       ],
     },
@@ -426,7 +457,7 @@ public:
 private:
   std::unique_ptr<${actualType}> _function;
 } SWIFT_NONCOPYABLE;
-${name} create_${name}(void* _Nonnull swiftClosureWrapper) noexcept;
+${name} create_${name}(void* NON_NULL swiftClosureWrapper) noexcept;
 inline ${wrapperName} wrap_${name}(${name} value) noexcept {
   return ${wrapperName}(std::move(value));
 }
@@ -447,7 +478,7 @@ inline ${wrapperName} wrap_${name}(${name} value) noexcept {
     },
     cxxImplementation: {
       code: `
-${name} create_${name}(void* _Nonnull swiftClosureWrapper) noexcept {
+${name} create_${name}(void* NON_NULL swiftClosureWrapper) noexcept {
   auto swiftClosure = ${swiftClassName}::fromUnsafe(swiftClosureWrapper);
   return [swiftClosure = std::move(swiftClosure)](${paramsSignature.join(', ')}) mutable -> ${type.returnType.getCode('c++')} {
     ${indent(body, '    ')}

package/src/views/kotlin/KotlinHybridViewManager.ts

@@ -51,7 +51,7 @@ import ${javaNamespace}.*
 /**
  * Represents the React Native \`ViewManager\` for the "${spec.name}" Nitro HybridView.
  */
-class ${manager}: SimpleViewManager<View>() {
+open class ${manager}: SimpleViewManager<View>() {
   private val views = hashMapOf<View, ${viewImplementation}>()
 
   override fun getName(): String {
@@ -115,6 +115,10 @@ ${createFileMetadataString(`J${stateUpdaterName}.hpp`)}
 
 #pragma once
 
+#ifndef RN_SERIALIZABLE_STATE
+#error ${spec.config.getAndroidCxxLibName()} was compiled without the 'RN_SERIALIZABLE_STATE' flag. This flag is required for Nitro Views - set it in your CMakeLists!
+#endif
+
 #include <fbjni/fbjni.h>
 #include <react/fabric/StateWrapperImpl.h>
 #include <react/fabric/CoreComponentsRegistry.h>