nitrogen 0.31.4 → 0.31.5

package/lib/init.js

@@ -54,7 +54,7 @@ async function downloadGitHubFolder(owner, repo, branch, folder, outputPath) {
     Logger.info(`⏳ Cloning ${chalk.underline(repoUrl)}...`);
     const tempPath = randomUUID();
     const tempDir = path.join(outputPath, tempPath);
-    execSync(`git clone --depth 1 --filter=blob:none -b ${branch} --quiet --sparse ${repoUrl} ${tempDir}`);
+    execSync(`git clone --depth 1 --filter=blob:none -b ${branch} --quiet --sparse ${repoUrl} "${tempDir}"`);
     const prettyOutputPath = prettifyDirectory(outputPath);
     const initialDir = process.cwd();
     try {

package/lib/syntax/createType.js

@@ -269,7 +269,10 @@ export function createType(language, type, isOptional) {
         }
         else if (type.isInterface()) {
             // It is an `interface T { ... }`, which is a `struct`
-            const typename = type.getSymbolOrThrow().getName();
+            const symbol = type.getAliasSymbol() ?? type.getSymbol();
+            if (symbol == null)
+                throw new Error(`Interface "${type.getText()}" does not have a Symbol!`);
+            const typename = symbol.getName();
             const properties = getInterfaceProperties(language, type);
             return new StructType(typename, properties);
         }
@@ -291,6 +294,9 @@ export function createType(language, type, isOptional) {
         else if (type.isStringLiteral()) {
             throw new Error(`String literal ${type.getText()} cannot be represented in C++ because it is ambiguous between a string and a discriminating union enum.`);
         }
+        else if (type.isAny()) {
+            throw new Error(`The TypeScript type "${type.getText()}" resolved to any - any is not supported in Nitro.`);
+        }
         else {
             if (type.getSymbol() == null) {
                 // There is no declaration for it!

package/lib/syntax/getInterfaceProperties.js

@@ -1,8 +1,20 @@
 import { createNamedType } from './createType.js';
 export function getInterfaceProperties(language, interfaceType) {
+    const symbol = interfaceType.getAliasSymbol() ?? interfaceType.getSymbol();
+    if (symbol == null)
+        throw new Error(`Interface "${interfaceType.getText()}" does not have a Symbol!`);
     return interfaceType.getProperties().map((prop) => {
-        const declaration = prop.getValueDeclarationOrThrow();
-        const propType = prop.getTypeAtLocation(declaration);
+        let propType = prop.getDeclaredType();
+        if (propType.isAny() || propType.isUnknown()) {
+            // the interface is aliased/merged - we need to look into the actual declaration
+            for (const declaration of symbol.getDeclarations()) {
+                const declared = prop.getTypeAtLocation(declaration);
+                if (!declared.isAny() && !declared.isUnknown()) {
+                    propType = declared;
+                    break;
+                }
+            }
+        }
         const refType = createNamedType(language, prop.getName(), propType, prop.isOptional() || propType.isNullable());
         return refType;
     });

package/package.json

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

package/src/init.ts

@@ -94,7 +94,7 @@ async function downloadGitHubFolder(
   const tempPath = randomUUID()
   const tempDir = path.join(outputPath, tempPath)
   execSync(
-    `git clone --depth 1 --filter=blob:none -b ${branch} --quiet --sparse ${repoUrl} ${tempDir}`
+    `git clone --depth 1 --filter=blob:none -b ${branch} --quiet --sparse ${repoUrl} "${tempDir}"`
   )
   const prettyOutputPath = prettifyDirectory(outputPath)
 

package/src/syntax/createType.ts

@@ -329,7 +329,10 @@ export function createType(
       return new HybridObjectType(typename, language, baseHybrids, sourceConfig)
     } else if (type.isInterface()) {
       // It is an `interface T { ... }`, which is a `struct`
-      const typename = type.getSymbolOrThrow().getName()
+      const symbol = type.getAliasSymbol() ?? type.getSymbol()
+      if (symbol == null)
+        throw new Error(`Interface "${type.getText()}" does not have a Symbol!`)
+      const typename = symbol.getName()
       const properties = getInterfaceProperties(language, type)
       return new StructType(typename, properties)
     } else if (type.isObject()) {
@@ -351,6 +354,10 @@ export function createType(
       throw new Error(
         `String literal ${type.getText()} cannot be represented in C++ because it is ambiguous between a string and a discriminating union enum.`
       )
+    } else if (type.isAny()) {
+      throw new Error(
+        `The TypeScript type "${type.getText()}" resolved to any - any is not supported in Nitro.`
+      )
     } else {
       if (type.getSymbol() == null) {
         // There is no declaration for it!

package/src/syntax/getInterfaceProperties.ts

@@ -7,9 +7,24 @@ export function getInterfaceProperties(
   language: Language,
   interfaceType: Type<ts.ObjectType>
 ): NamedType[] {
+  const symbol = interfaceType.getAliasSymbol() ?? interfaceType.getSymbol()
+  if (symbol == null)
+    throw new Error(
+      `Interface "${interfaceType.getText()}" does not have a Symbol!`
+    )
   return interfaceType.getProperties().map((prop) => {
-    const declaration = prop.getValueDeclarationOrThrow()
-    const propType = prop.getTypeAtLocation(declaration)
+    let propType = prop.getDeclaredType()
+    if (propType.isAny() || propType.isUnknown()) {
+      // the interface is aliased/merged - we need to look into the actual declaration
+      for (const declaration of symbol.getDeclarations()) {
+        const declared = prop.getTypeAtLocation(declaration)
+        if (!declared.isAny() && !declared.isUnknown()) {
+          propType = declared
+          break
+        }
+      }
+    }
+
     const refType = createNamedType(
       language,
       prop.getName(),