style: type change

Author: hubert

packages/module-loader/src/createLoader.ts

@@ -13,7 +13,7 @@ import type { ModuleLoader, GetResolver } from './types';
  * @param options.resolver remote module resolver, default to umd resolver
  * @param options.container container to append script, default is append to body in client side
  */
-export function createLoader<Context = any>(
+export function createLoader<Props extends Record<string, any> = any, Context = any>(
   options: {
     resolver?: GetResolver<Context>;
     container?: string | ((proxy: Context) => Element);
@@ -24,8 +24,8 @@ export function createLoader<Context = any>(
     window.VueDemi = VueDemi;
   }
 
-  const _resolver = options.resolver?.(options.container) ?? getUmdResolver(options.container as any);
-  const loader: ModuleLoader = VueDemi.markRaw({
+  const _resolver = options.resolver?.(options.container) ?? (getUmdResolver(options.container as any) as any);
+  const loader: ModuleLoader<Props, Context> = VueDemi.markRaw({
     install(app) {
       // this allows calling registerSubModules() outside of a component setup after
       setActiveLoader(loader);

packages/module-loader/src/register.ts

@@ -26,7 +26,7 @@ let activeLoader: ModuleLoader | undefined;
 /**
  * Global options
  */
-const loaderOptions: ModuleLoaderOptions = {
+const loaderOptions: ModuleLoaderOptions<any> = {
   sync: false,
 };
 
@@ -58,7 +58,7 @@ export const getActiveLoader = () => (getCurrentInstance() && inject(ModuleLoade
  * Set ModuleLoader options
  * @param options Options
  */
-export function setOptions(options: ModuleLoaderOptions) {
+export function setOptions<Props extends Record<string, any>>(options: ModuleLoaderOptions<Props>) {
   Object.assign(loaderOptions, options);
 }
 
@@ -154,7 +154,7 @@ export function registerSubModules(config: RegistrableModule | RegistrableModule
       /**
        * Start module loader
        */
-      start: (options?: Pick<ModuleLoaderOptions, 'loading' | 'register'> & { router?: Router }) =>
+      start: (options?: Pick<ModuleLoaderOptions<any>, 'loading' | 'register'> & { router?: Router }) =>
         execute(loader!._moduleLoader, subModuleConfigs, Object.assign({}, loaderOptions, options), loader!._a),
     };
 
@@ -168,7 +168,7 @@ export function registerSubModules(config: RegistrableModule | RegistrableModule
     async function execute(
       moduleLoader: ModuleLoader['_moduleLoader'],
       subModuleConfigs: InnerRegisterSubModule[],
-      options: ModuleLoaderOptions & { router?: Router },
+      options: ModuleLoaderOptions<any> & { router?: Router },
       app?: App,
     ) {
       // 加载模块

packages/module-loader/src/types.ts

@@ -1,18 +1,18 @@
 import type { App, Vue2, Component } from 'vue-demi';
 
-export interface ModuleLoader<Props extends Record<string, any> = {}, Context = any> {
+export interface ModuleLoader<Props extends Record<string, any> = any, Context = any> {
   /**
    * Alias of export setModuleLoaderOptions
    */
-  setOptions: (options: ModuleLoaderOptions<Props>) => ModuleLoader;
+  setOptions: (options: ModuleLoaderOptions<Props>) => ModuleLoader<Props, Context>;
   /**
    * Alias of export addErrorHandler
    */
-  addErrorHandler: (handler: ErrorHandler) => ModuleLoader;
+  addErrorHandler: (handler: ErrorHandler) => ModuleLoader<Props, Context>;
   /**
    * Alias of export removeErrorHandler
    */
-  removeErrorHandler: (handler: ErrorHandler) => ModuleLoader;
+  removeErrorHandler: (handler: ErrorHandler) => ModuleLoader<Props, Context>;
   /**
    * Resolver
    */
@@ -57,7 +57,7 @@ export interface RegisterProperties {
 /**
  * Main module loader typings
  */
-export type ModuleLoaderOptions<Props extends Record<string, any> = {}> = {
+export type ModuleLoaderOptions<Props extends Record<string, any>> = {
   /**
    * Use sync mode to load submodules
    * @default false