fix: try to fix problem with missing typings of withPageViewModel HOC

Author: js2me

src/hoc/with-page-view-model.tsx

@@ -1,14 +1,38 @@
-import { ViewModelHocConfig, withViewModel } from 'mobx-vm-entities';
-import { Class } from 'mobx-vm-entities/utils/types';
+import {
+  AnyViewModel,
+  ViewModelHocConfig,
+  ViewModelInputProps,
+  ViewModelProps,
+  withViewModel,
+} from 'mobx-vm-entities';
+import { AnyObject, Class } from 'mobx-vm-entities/utils/types';
+import { ComponentType, ReactNode } from 'react';
 
-import type { PageViewModel } from '../page-view-model';
+import type { AnyPageViewModel } from '../page-view-model';
 
-export const withPageViewModel = <VM extends PageViewModel<any, any>>(
-  model: Class<VM>,
+export type ComponentWithPageViewModel<
+  TViewModel extends AnyViewModel,
+  TComponentOriginProps extends AnyObject = ViewModelProps<TViewModel>,
+> = (
+  props: Omit<TComponentOriginProps, 'model'> &
+    Omit<ViewModelInputProps<TViewModel>, 'payload'> & {
+      params: ViewModelInputProps<TViewModel>['payload'];
+    },
+) => ReactNode;
+
+export function withPageViewModel<TViewModel extends AnyPageViewModel>(
+  model: Class<TViewModel>,
+  config?: ViewModelHocConfig<TViewModel>,
+): <TComponentOriginProps extends AnyObject = ViewModelProps<TViewModel>>(
+  Component?: ComponentType<TComponentOriginProps & ViewModelProps<TViewModel>>,
+) => ComponentWithPageViewModel<TViewModel, TComponentOriginProps>;
+
+export function withPageViewModel<TViewModel extends AnyPageViewModel>(
+  model: Class<TViewModel>,
   config?: ViewModelHocConfig<any>,
-) => {
+) {
   return withViewModel(model, {
     ...config,
     getPayload: config?.getPayload ?? ((props) => props.params),
   });
-};
+}

src/page-view-model/index.ts

@@ -1,2 +1,3 @@
 export * from './page-view-model';
 export * from './page-view-model.impl';
+export * from './page-view-model.types';

src/page-view-model/page-view-model.types.ts

@@ -0,0 +1,3 @@
+import { PageViewModel } from './page-view-model';
+
+export type AnyPageViewModel = PageViewModel<any, any>;