fix(server): add generic for function createGetModulesMethod

core-ds · Aug 27, 2024 · c9224a9 · c9224a9
1 parent 20c87ea
commit c9224a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/arui-scripts-server/src/modules/create-get-modules-method.ts b/packages/arui-scripts-server/src/modules/create-get-modules-method.ts
@@ -5,16 +5,16 @@ import { getAppManifest, readAssetsManifest } from '../read-assets-manifest';
 
 import { ModulesConfig } from './types';
 
-export function createGetModulesMethod<FrameworkParams extends unknown[] = []>(
-    modules: ModulesConfig<FrameworkParams>,
+export function createGetModulesMethod<FrameworkParams extends unknown[] = [], GetResourcesParams = void>(
+    modules: ModulesConfig<FrameworkParams, GetResourcesParams>,
 ) {
     const assets: Record<string, Awaited<ReturnType<typeof readAssetsManifest>>> = {};
 
     return {
         method: 'POST',
         path: '/api/getModuleResources',
         handler: async (
-            getResourcesRequest: GetResourcesRequest,
+            getResourcesRequest: GetResourcesRequest<GetResourcesParams>,
             ...params: FrameworkParams
         ): Promise<ModuleResources> => {
             const appManifest = await getAppManifest();

diff --git a/packages/arui-scripts-server/src/modules/types.ts b/packages/arui-scripts-server/src/modules/types.ts
@@ -4,15 +4,15 @@ import type {
     MountMode,
 } from '@alfalab/scripts-modules';
 
-export type ModuleDescriptor<FrameworkParams extends unknown[] = []> = {
+export type ModuleDescriptor<FrameworkParams extends unknown[] = [], GetResourcesParams = void> = {
     mountMode: MountMode;
     version?: string;
     getModuleState: (
-        getResourcesRequest: GetResourcesRequest,
+        getResourcesRequest: GetResourcesRequest<GetResourcesParams>,
         ...params: FrameworkParams
     ) => Promise<GetModuleStateResult>;
 };
 
-export type ModulesConfig<FrameworkParams extends unknown[] = []> = {
-    [moduleId: string]: ModuleDescriptor<FrameworkParams>;
+export type ModulesConfig<FrameworkParams extends unknown[] = [], GetResourcesParams = void> = {
+    [moduleId: string]: ModuleDescriptor<FrameworkParams, GetResourcesParams>;
 };