fix: Generate now

Author: mrousavy

packages/nitrogen/src/getPlatformSpecs.ts

@@ -166,15 +166,10 @@ export function getHybridObjectPlatforms(
   }
 
   const genericArguments = base.getTypeArguments()
-  if (genericArguments.length === 0) {
-    // it uses `HybridObject` without generic arguments. This defaults to C++
-    return { android: 'c++', ios: 'c++' }
-  }
   const platformSpecsArgument = genericArguments[0]
   if (platformSpecsArgument == null) {
-    throw new Error(
-      `${declaration.getName()} does not properly extend HybridObject<T>! ${base.getText()} does not have a single generic type argument for platform spec languages!`
-    )
+    // it uses `HybridObject` without generic arguments. This defaults to C++
+    return { android: 'c++', ios: 'c++' }
   }
 
   return getPlatformSpec(declaration.getName(), platformSpecsArgument)
@@ -184,13 +179,9 @@ export function getHybridViewPlatforms(
   view: InterfaceDeclaration | TypeAliasDeclaration
 ): PlatformSpec | undefined {
   const genericArguments = view.getType().getTypeArguments()
-  if (genericArguments.length === 0) {
-    throw new Error(
-      `${view.getName()} does not properly extend HybridView<Props, Methods, Platforms?>!`
-    )
-  }
-  const platformSpecsArgument = genericArguments[2]
+  const platformSpecsArgument = genericArguments[0]
   if (platformSpecsArgument == null) {
+    // it uses `HybridObject` without generic arguments. This defaults to platform native languages
     return { ios: 'swift', android: 'kotlin' }
   }
 

packages/nitrogen/src/nitrogen.ts

@@ -101,13 +101,22 @@ export async function runNitrogen({
       ...sourceFile.getTypeAliases(),
     ]
     for (const type of types) {
-      console.log('---->', type.getName())
       // Get name of interface (= our module name)
       const typeName = type.getName()
       try {
         let allFiles: SourceFile[]
         let platformSpec: PlatformSpec
-        if (extendsHybridObject(type.getType(), true)) {
+        if (extendsHybridView(type.getType(), true)) {
+          // Hybrid View Props
+          const targetPlatforms = getHybridViewPlatforms(type)
+          if (targetPlatforms == null) {
+            // It does not extend HybridView, continue..
+            continue
+          }
+          platformSpec = targetPlatforms
+          targetSpecs++
+          allFiles = []
+        } else if (extendsHybridObject(type.getType(), true)) {
           // Hybrid View
           const targetPlatforms = getHybridObjectPlatforms(type)
           if (targetPlatforms == null) {
@@ -139,16 +148,6 @@ export async function runNitrogen({
               return generatePlatformFiles(type.getType(), language)
             })
             .filter(filterDuplicateFiles)
-        } else if (extendsHybridView(type.getType(), true)) {
-          // Hybrid View Props
-          const targetPlatforms = getHybridViewPlatforms(type)
-          if (targetPlatforms == null) {
-            // It does not extend HybridView, continue..
-            continue
-          }
-          platformSpec = targetPlatforms
-          targetSpecs++
-          allFiles = []
         } else {
           continue
         }

packages/react-native-nitro-image/src/specs/TestView.nitro.ts

@@ -1,15 +1,7 @@
-import type {
-  HybridView,
-  HybridViewMethods,
-  HybridViewProps,
-} from 'react-native-nitro-modules'
+import type { HybridView } from 'react-native-nitro-modules'
 
-export interface TestViewProps extends HybridViewProps {
-  someString: string
+export interface TestView extends HybridView {
+  someProp: string
+  someCallback: (value: number) => void
+  someRefMethod(): number
 }
-
-export interface TestViewMethods extends HybridViewMethods {
-  doSomething(): void
-}
-
-export type TestView = HybridView<TestViewProps, TestViewMethods>

packages/react-native-nitro-modules/src/HybridView.ts

@@ -1,17 +1,12 @@
-interface ViewPlatformSpec {
-  ios?: 'swift'
-  android?: 'kotlin'
-}
-
-/**
- * Represents the React props of a Nitro {@linkcode HybridView}.
- */
-export interface HybridViewProps {}
+import type { HybridObject } from './HybridObject'
 
 /**
- * Represents the methods of the React `ref` to a Nitro {@linkcode HybridView}.
+ * Describes the languages this view will be implemented in.
  */
-export interface HybridViewMethods {}
+export interface ViewPlatformSpec {
+  ios?: 'swift'
+  android?: 'kotlin'
+}
 
 /**
  * Represents a Nitro `HybridView` which is implemented in a native language
@@ -21,23 +16,22 @@ export interface HybridViewMethods {}
  *
  * All `HybridViews`s have a C++ Fabric View base with a backing Shadow Node.
  *
+ * - TypeScript Properties (`name: Type`) will be React Props
+ * - TypeScript Methods (`name(): Type`) will be Ref Methods
+ *
  * @example
  * ```tsx
- * export interface ImageProps extends HybridViewProps {
- *   source: string
- * }
- * export interface ImageMethods extends HybridViewMethods {
- *   takeScreenshot(): void
+ * export interface Camera extends HybridView {
+ *   zoom: number
+ *   flash: boolean
+ *   takePhoto(): Image
  * }
- * export type ImageView = HybridView<ImageProps, ImageMethods>
  * ```
  */
 export interface HybridView<
-  Props extends HybridViewProps,
-  Methods extends HybridViewMethods = {},
   Platforms extends ViewPlatformSpec = { ios: 'swift'; android: 'kotlin' },
-> {
-  readonly __tag?: HybridView<Props, Methods, Platforms> & never
+> extends HybridObject<Platforms> {
+  /* empty interface for now */
 }
 
 export * from './views/getHostComponent'