nitrogen 0.31.3 → 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.3",
+  "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.3",
+    "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(),

package/lib/syntax/isOverridingFromBase.d.ts

@@ -1,11 +0,0 @@
-import type { Language } from '../getPlatformSpecs.js';
-import type { HybridObjectSpec } from './HybridObjectSpec.js';
-/**
- * Returns true when the given {@linkcode memberName} is overriding a
- * property or method from any base class inside the given
- * {@linkcode hybridObject}'s prototype chain (all the way up).
- *
- * For example, `"toString"` would return `true` since it overrides from base HybridObject.
- * On Kotlin, `"hashCode"` would return `true` since it overrides from base `kotlin.Any`.
- */
-export declare function isMemberOverridingFromBase(memberName: string, hybridObject: HybridObjectSpec, language: Language): boolean;

package/lib/syntax/isOverridingFromBase.js

@@ -1,64 +0,0 @@
-function getMemberNamesOfBaseType(language) {
-    switch (language) {
-        case 'c++':
-            // C++ classes don't have any base type.
-            return [];
-        case 'swift':
-            // Swift classes conform to `AnyObject`, but that doesn't have any properties
-            return [];
-        case 'kotlin':
-            // Kotlin/JVM classes always extends `Any`, which has 3 methods
-            return ['toString', 'equals', 'hashCode'];
-    }
-}
-function getMemberNamesOfHybridObject() {
-    const allKeys = {
-        __type: true,
-        dispose: true,
-        equals: true,
-        name: true,
-        toString: true,
-    };
-    return Object.keys(allKeys);
-}
-function flatBaseTypes(type) {
-    return type.baseTypes.flatMap((b) => [b, ...flatBaseTypes(b)]);
-}
-/**
- * Returns true when the given {@linkcode memberName} is overriding a
- * property or method from any base class inside the given
- * {@linkcode hybridObject}'s prototype chain (all the way up).
- *
- * For example, `"toString"` would return `true` since it overrides from base HybridObject.
- * On Kotlin, `"hashCode"` would return `true` since it overrides from base `kotlin.Any`.
- */
-export function isMemberOverridingFromBase(memberName, hybridObject, language) {
-    // 1. Check if the HybridObject inherits from other HybridObjects,
-    //    if yes, check if those have properties of that given name.
-    const allBases = flatBaseTypes(hybridObject);
-    const anyBaseOverrides = allBases.some((h) => {
-        if (h.properties.some((p) => p.name === memberName)) {
-            return true;
-        }
-        if (h.methods.some((m) => m.name === memberName)) {
-            return true;
-        }
-        return false;
-    });
-    if (anyBaseOverrides) {
-        // A HybridObject base type has the same property name - we need to override it.
-        return true;
-    }
-    // 2. Check if the base `HybridObject` type contains a property of the given name
-    const baseHybridObjectProps = getMemberNamesOfHybridObject();
-    if (baseHybridObjectProps.includes(memberName)) {
-        return true;
-    }
-    // 3. Check if the base type in our language contains a property of the given name
-    const baseTypeProps = getMemberNamesOfBaseType(language);
-    if (baseTypeProps.includes(memberName)) {
-        return true;
-    }
-    // 4. Apparently no base type has a property of that name - we are safe!
-    return false;
-}

package/lib/syntax/kotlin/isBaseObjectMethodName.d.ts

@@ -1,7 +0,0 @@
-import type { Method } from '../Method.js';
-/**
- * Returns `true` if the given {@linkcode method} is a
- * method that exists in the base `Object` type in Java.
- * If this is true, it needs an `override` modifier.
- */
-export declare function isBaseObjectMethodName(method: Method): boolean;

package/lib/syntax/kotlin/isBaseObjectMethodName.js

@@ -1,9 +0,0 @@
-const kotlinAnyMethodNames = ['equals', 'hashCode', 'toString'];
-/**
- * Returns `true` if the given {@linkcode method} is a
- * method that exists in the base `Object` type in Java.
- * If this is true, it needs an `override` modifier.
- */
-export function isBaseObjectMethodName(method) {
-    return kotlinAnyMethodNames.includes(method.name);
-}

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

@@ -1,7 +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 declare function isPrimitivelyCopyable(type: Type): boolean;

package/lib/syntax/swift/isPrimitivelyCopyable.js

@@ -1,18 +0,0 @@
-/**
- * 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) {
-    switch (type.kind) {
-        case 'number':
-        case 'boolean':
-        case 'bigint':
-        case 'enum':
-        case 'null':
-        case 'void':
-            return true;
-        default:
-            return false;
-    }
-}

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

@@ -1,11 +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 HybridObjectBaseType implements Type {
-    constructor();
-    get canBePassedByReference(): boolean;
-    get kind(): TypeKind;
-    getCode(language: Language): string;
-    getExtraFiles(): SourceFile[];
-    getRequiredImports(language: Language): SourceImport[];
-}

package/lib/syntax/types/HybridObjectBaseType.js

@@ -1,47 +0,0 @@
-import { getForwardDeclaration } from '../c++/getForwardDeclaration.js';
-export class HybridObjectBaseType {
-    constructor() { }
-    get canBePassedByReference() {
-        // It's a shared_ptr<..>, no copy.
-        return true;
-    }
-    get kind() {
-        return 'hybrid-object-base';
-    }
-    getCode(language) {
-        switch (language) {
-            case 'c++':
-                return `std::shared_ptr<HybridObject>`;
-            default:
-                throw new Error(`The base type \`HybridObject\` cannot be used directly in ${language} yet. Use a specific derived class of \`HybridObject\` instead!`);
-        }
-    }
-    getExtraFiles() {
-        return [];
-    }
-    getRequiredImports(language) {
-        const imports = [];
-        switch (language) {
-            case 'c++':
-                imports.push({
-                    language: 'c++',
-                    name: 'memory',
-                    space: 'system',
-                }, {
-                    name: `NitroModules/HybridObject.hpp`,
-                    forwardDeclaration: getForwardDeclaration('class', 'HybridObject', 'margelo::nitro'),
-                    language: 'c++',
-                    space: 'system',
-                });
-                break;
-            case 'kotlin':
-                imports.push({
-                    name: 'com.margelo.nitro.core.HybridObject',
-                    space: 'system',
-                    language: 'kotlin',
-                });
-                break;
-        }
-        return imports;
-    }
-}