nitrogen 0.31.1 → 0.31.2

package/lib/config/nitrogenVersion.d.ts

@@ -0,0 +1 @@
+export declare const NITROGEN_VERSION: string;

package/lib/config/nitrogenVersion.js

@@ -0,0 +1,2 @@
+import packageJson from 'nitrogen/package.json' with { type: 'json' };
+export const NITROGEN_VERSION = packageJson.version;

package/lib/index.js

@@ -8,7 +8,7 @@ import { runNitrogen } from './nitrogen.js';
 import { promises as fs } from 'fs';
 import { isValidLogLevel, setLogLevel } from './Logger.js';
 import { initNewNitroModule } from './init.js';
-import { NITROGEN_VERSION } from './utils.js';
+import { NITROGEN_VERSION } from './config/nitrogenVersion.js';
 const commandName = 'nitrogen';
 // Maximum of 100 col width
 const cliWidth = Math.min(process.stdout.columns * 0.9, 100);
@@ -71,6 +71,7 @@ await yargs(hideBin(process.argv))
     `$Nitrogen Version: ${chalk.bold(NITROGEN_VERSION)}`)
     .help()
     .strict()
+    .version(NITROGEN_VERSION)
     .wrap(cliWidth).argv;
 async function runNitrogenCommand(baseDirectory, outputDirectory) {
     // 1. Prepare output folders

package/lib/nitrogen.js

@@ -3,7 +3,7 @@ import { extendsHybridObject, isHybridView, getHybridObjectPlatforms, getHybridV
 import { generatePlatformFiles } from './createPlatformSpec.js';
 import path from 'path';
 import { prettifyDirectory } from './prettifyDirectory.js';
-import { capitalizeName, deduplicateFiles, errorToString, indent, NITROGEN_VERSION, } from './utils.js';
+import { capitalizeName, deduplicateFiles, errorToString, indent, } from './utils.js';
 import { writeFile } from './writeFile.js';
 import chalk from 'chalk';
 import { groupByPlatform } from './syntax/SourceFile.js';
@@ -12,6 +12,7 @@ import { NitroConfig } from './config/NitroConfig.js';
 import { createIOSAutolinking } from './autolinking/createIOSAutolinking.js';
 import { createAndroidAutolinking } from './autolinking/createAndroidAutolinking.js';
 import { createGitAttributes } from './createGitAttributes.js';
+import { NITROGEN_VERSION } from './config/nitrogenVersion.js';
 export async function runNitrogen({ baseDirectory, outputDirectory, }) {
     let targetSpecs = 0;
     let generatedSpecs = 0;

package/lib/syntax/swift/SwiftCxxBridgedType.js

@@ -22,7 +22,6 @@ import { VoidType } from '../types/VoidType.js';
 import { NamedWrappingType } from '../types/NamedWrappingType.js';
 import { ErrorType } from '../types/ErrorType.js';
 import { createSwiftFunctionBridge } from './SwiftFunction.js';
-import { isPrimitivelyCopyable } from './isPrimitivelyCopyable.js';
 // TODO: Remove enum bridge once Swift fixes bidirectional enums crashing the `-Swift.h` header.
 export class SwiftCxxBridgedType {
     type;
@@ -449,21 +448,8 @@ export class SwiftCxxBridgedType {
                 const wrapping = new SwiftCxxBridgedType(array.itemType, true);
                 switch (language) {
                     case 'swift':
-                        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();
-                        }
+                        // 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;
                 }
@@ -713,18 +699,9 @@ case ${i}:
                 const wrapping = new SwiftCxxBridgedType(array.itemType, true);
                 switch (language) {
                     case 'swift':
-                        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 `
+                        // 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} {
@@ -732,7 +709,6 @@ ${swiftParameterName}.withUnsafeBufferPointer { __pointer -> bridge.${bridge.spe
   }
   return __vector
 }()`.trim();
-                        }
                     default:
                         return swiftParameterName;
                 }

package/lib/syntax/swift/SwiftCxxTypeHelper.js

@@ -17,7 +17,6 @@ import { VoidType } from '../types/VoidType.js';
 import { NamedWrappingType } from '../types/NamedWrappingType.js';
 import { ErrorType } from '../types/ErrorType.js';
 import { ResultWrappingType } from '../types/ResultWrappingType.js';
-import { isPrimitivelyCopyable } from './isPrimitivelyCopyable.js';
 export function createSwiftCxxHelpers(type) {
     switch (type.kind) {
         case 'hybrid-object':
@@ -227,27 +226,8 @@ function createCxxVectorSwiftHelper(type) {
     const actualType = type.getCode('c++');
     const bridgedType = new SwiftCxxBridgedType(type);
     const name = escapeCppName(actualType);
-    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 = `
+    const funcName = `create_${name}`;
+    const code = `
 /**
  * Specialized version of \`${escapeComments(actualType)}\`.
  */
@@ -257,7 +237,6 @@ inline ${actualType} create_${name}(size_t size) noexcept {
   vector.reserve(size);
   return vector;
 }`.trim();
-    }
     return {
         cxxType: actualType,
         funcName: funcName,
@@ -270,11 +249,6 @@ inline ${actualType} create_${name}(size_t size) noexcept {
                     space: 'system',
                     language: 'c++',
                 },
-                {
-                    name: 'NitroModules/FastVectorCopy.hpp',
-                    space: 'system',
-                    language: 'c++',
-                },
                 ...bridgedType.getRequiredImports('c++'),
             ],
         },

package/lib/utils.d.ts

@@ -2,7 +2,6 @@ import type { SourceFile } from './syntax/SourceFile.js';
 import type { SwiftCxxHelper } from './syntax/swift/SwiftCxxTypeHelper.js';
 import type { Type } from 'ts-morph';
 import { NitroConfig } from './config/NitroConfig.js';
-export declare const NITROGEN_VERSION: string;
 export declare function capitalizeName(name: string): string;
 export declare function createIndentation(spacesCount: number): string;
 export declare function indent(string: string, spacesCount: number): string;

package/lib/utils.js

@@ -3,7 +3,6 @@ import fs from 'fs';
 import { isNotDuplicate } from './syntax/helpers.js';
 import { readUserConfig } from './config/getConfig.js';
 import { NitroConfig } from './config/NitroConfig.js';
-export const NITROGEN_VERSION = process.env.npm_package_version ?? '?.?.?';
 export function capitalizeName(name) {
     if (name.length === 0)
         return name;

package/package.json

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

package/src/config/nitrogenVersion.ts

@@ -0,0 +1,3 @@
+import packageJson from 'nitrogen/package.json' with { type: 'json' }
+
+export const NITROGEN_VERSION = packageJson.version

package/src/index.ts

@@ -9,7 +9,7 @@ import { runNitrogen } from './nitrogen.js'
 import { promises as fs } from 'fs'
 import { isValidLogLevel, setLogLevel } from './Logger.js'
 import { initNewNitroModule } from './init.js'
-import { NITROGEN_VERSION } from './utils.js'
+import { NITROGEN_VERSION } from './config/nitrogenVersion.js'
 
 const commandName = 'nitrogen'
 
@@ -90,6 +90,7 @@ await yargs(hideBin(process.argv))
   )
   .help()
   .strict()
+  .version(NITROGEN_VERSION)
   .wrap(cliWidth).argv
 
 async function runNitrogenCommand(

package/src/nitrogen.ts

@@ -14,7 +14,6 @@ import {
   deduplicateFiles,
   errorToString,
   indent,
-  NITROGEN_VERSION,
 } from './utils.js'
 import { writeFile } from './writeFile.js'
 import chalk from 'chalk'
@@ -26,6 +25,7 @@ import { createAndroidAutolinking } from './autolinking/createAndroidAutolinking
 import type { Autolinking } from './autolinking/Autolinking.js'
 import { createGitAttributes } from './createGitAttributes.js'
 import type { PlatformSpec } from 'react-native-nitro-modules'
+import { NITROGEN_VERSION } from './config/nitrogenVersion.js'
 
 interface NitrogenOptions {
   baseDirectory: string

package/src/syntax/swift/SwiftCxxBridgedType.ts

@@ -32,7 +32,6 @@ import { NamedWrappingType } from '../types/NamedWrappingType.js'
 import { ErrorType } from '../types/ErrorType.js'
 import { createSwiftFunctionBridge } from './SwiftFunction.js'
 import type { Language } from '../../getPlatformSpecs.js'
-import { isPrimitivelyCopyable } from './isPrimitivelyCopyable.js'
 
 // TODO: Remove enum bridge once Swift fixes bidirectional enums crashing the `-Swift.h` header.
 
@@ -490,20 +489,8 @@ export class SwiftCxxBridgedType implements BridgedType<'swift', 'c++'> {
         const wrapping = new SwiftCxxBridgedType(array.itemType, true)
         switch (language) {
           case 'swift':
-            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()
-            }
+            // 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
         }
@@ -764,17 +751,9 @@ case ${i}:
         const wrapping = new SwiftCxxBridgedType(array.itemType, true)
         switch (language) {
           case 'swift':
-            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 `
+            // 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} {
@@ -782,7 +761,6 @@ ${swiftParameterName}.withUnsafeBufferPointer { __pointer -> bridge.${bridge.spe
   }
   return __vector
 }()`.trim()
-            }
           default:
             return swiftParameterName
         }

package/src/syntax/swift/SwiftCxxTypeHelper.ts

@@ -19,7 +19,6 @@ import { VoidType } from '../types/VoidType.js'
 import { NamedWrappingType } from '../types/NamedWrappingType.js'
 import { ErrorType } from '../types/ErrorType.js'
 import { ResultWrappingType } from '../types/ResultWrappingType.js'
-import { isPrimitivelyCopyable } from './isPrimitivelyCopyable.js'
 
 export interface SwiftCxxHelper {
   cxxHeader: {
@@ -268,26 +267,8 @@ function createCxxVectorSwiftHelper(type: ArrayType): SwiftCxxHelper {
   const actualType = type.getCode('c++')
   const bridgedType = new SwiftCxxBridgedType(type)
   const name = escapeCppName(actualType)
-  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 = `
+  const funcName = `create_${name}`
+  const code = `
 /**
  * Specialized version of \`${escapeComments(actualType)}\`.
  */
@@ -297,7 +278,6 @@ inline ${actualType} create_${name}(size_t size) noexcept {
   vector.reserve(size);
   return vector;
 }`.trim()
-  }
 
   return {
     cxxType: actualType,
@@ -311,11 +291,6 @@ inline ${actualType} create_${name}(size_t size) noexcept {
           space: 'system',
           language: 'c++',
         },
-        {
-          name: 'NitroModules/FastVectorCopy.hpp',
-          space: 'system',
-          language: 'c++',
-        },
         ...bridgedType.getRequiredImports('c++'),
       ],
     },

package/src/utils.ts

@@ -7,8 +7,6 @@ import { isNotDuplicate } from './syntax/helpers.js'
 import { readUserConfig } from './config/getConfig.js'
 import { NitroConfig } from './config/NitroConfig.js'
 
-export const NITROGEN_VERSION = process.env.npm_package_version ?? '?.?.?'
-
 export function capitalizeName(name: string): string {
   if (name.length === 0) return name
   return name.charAt(0).toUpperCase() + name.slice(1)

package/src/syntax/swift/isPrimitivelyCopyable.ts

@@ -1,20 +0,0 @@
-import type { Type } from '../types/Type.js'
-
-/**
- * Returns `true` if the given {@linkcode type} is a datatype that
- * can be copied without running a copy constructor or special logic
- * to copy the data over. In other words; it's _primitively copyable_.
- */
-export function isPrimitivelyCopyable(type: Type): boolean {
-  switch (type.kind) {
-    case 'number':
-    case 'boolean':
-    case 'bigint':
-    case 'enum':
-    case 'null':
-    case 'void':
-      return true
-    default:
-      return false
-  }
-}