nitrogen 0.29.4 → 0.29.6

package/README.md

@@ -12,12 +12,16 @@
 
 ## Installation
 
-Install [nitrogen](https://npmjs.org/nitrogen) as a `devDependency` in your react-native library:
+Install [nitrogen](https://npmjs.org/nitrogen) as a `devDependency` in your Nitro Module:
 ```sh
 npm i nitrogen -D
 ```
 
+Then, generate your specs;
 
+```sh
+npx nitrogen
+```
 
 ## Usage
 

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,12 +57,9 @@ target_sources(
   ${indent(androidFiles.join('\n'), '  ')}
 )
 
-# Define a flag to check if we are building properly
-add_definitions(-D${buildingWithDefinition})
-
 # 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/views/CppHybridViewComponent.js

@@ -1,5 +1,5 @@
 import { createIndentation, indent } from '../utils.js';
-import { createFileMetadataString, escapeCppName, isFunction, } from '../syntax/helpers.js';
+import { createFileMetadataString, escapeCppName, isFunction, isNotDuplicate, } from '../syntax/helpers.js';
 import { getHybridObjectName } from '../syntax/getHybridObjectName.js';
 import { includeHeader } from '../syntax/c++/includeNitroHeader.js';
 import { createHostComponentJs } from './createHostComponentJs.js';
@@ -38,7 +38,9 @@ export function createViewComponentShadowNodeFiles(spec) {
     const props = [...spec.properties, getHybridRefProperty(spec)];
     const properties = props.map((p) => `CachedProp<${p.type.getCode('c++')}> ${escapeCppName(p.name)};`);
     const cases = props.map((p) => `case hashString("${p.name}"): return true;`);
-    const includes = props.flatMap((p) => p.getRequiredImports('c++').map((i) => includeHeader(i, true)));
+    const includes = props
+        .flatMap((p) => p.getRequiredImports('c++').map((i) => includeHeader(i, true)))
+        .filter(isNotDuplicate);
     // .hpp code
     const shadowIndent = createIndentation(shadowNodeClassName.length);
     const componentHeaderCode = `

package/lib/views/kotlin/KotlinHybridViewManager.js

@@ -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.4",
+  "version": "0.29.6",
   "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.29.4",
+    "react-native-nitro-modules": "^0.29.6",
     "ts-morph": "^25.0.0",
     "yargs": "^17.7.2",
     "zod": "^4.0.5"

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,12 +74,9 @@ target_sources(
   ${indent(androidFiles.join('\n'), '  ')}
 )
 
-# Define a flag to check if we are building properly
-add_definitions(-D${buildingWithDefinition})
-
 # 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/views/CppHybridViewComponent.ts

@@ -5,6 +5,7 @@ import {
   createFileMetadataString,
   escapeCppName,
   isFunction,
+  isNotDuplicate,
 } from '../syntax/helpers.js'
 import { getHybridObjectName } from '../syntax/getHybridObjectName.js'
 import { includeHeader } from '../syntax/c++/includeNitroHeader.js'
@@ -75,9 +76,11 @@ export function createViewComponentShadowNodeFiles(
     (p) => `CachedProp<${p.type.getCode('c++')}> ${escapeCppName(p.name)};`
   )
   const cases = props.map((p) => `case hashString("${p.name}"): return true;`)
-  const includes = props.flatMap((p) =>
-    p.getRequiredImports('c++').map((i) => includeHeader(i, true))
-  )
+  const includes = props
+    .flatMap((p) =>
+      p.getRequiredImports('c++').map((i) => includeHeader(i, true))
+    )
+    .filter(isNotDuplicate)
 
   // .hpp code
   const shadowIndent = createIndentation(shadowNodeClassName.length)

package/src/views/kotlin/KotlinHybridViewManager.ts

@@ -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>