@qlover/create-app 0.10.1 → 0.10.3

package/dist/templates/next-app/src/base/services/UserService.ts

@@ -30,15 +30,24 @@ export class UserService
     });
   }
 
-  getToken(): string {
+  /**
+   * @override
+   */
+  public getToken(): string {
     return this.store.getCredential()?.credential_token ?? '';
   }
 
-  isUserInfo(value: unknown): value is UserSchema {
+  /**
+   * @override
+   */
+  public isUserInfo(value: unknown): value is UserSchema {
     return userSchema.safeParse(value).success;
   }
 
-  isUserCredential(value: unknown): value is UserCredential {
+  /**
+   * @override
+   */
+  public isUserCredential(value: unknown): value is UserCredential {
     return (
       isObject(value) &&
       'credential_token' in value &&

package/dist/templates/next-app/src/base/services/adminApi/AdminLocalesApi.ts

@@ -30,7 +30,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   /**
    * @override
    */
-  create(data: LocalesSchema): Promise<unknown> {
+  public create(data: LocalesSchema): Promise<unknown> {
     return this.client.request<AdminLocalesListTransaction>({
       url: '/admin/locales/create',
       method: 'POST',
@@ -41,7 +41,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   /**
    * @override
    */
-  remove(data: Partial<LocalesSchema>): Promise<unknown> {
+  public remove(data: Partial<LocalesSchema>): Promise<unknown> {
     return this.client.request<AdminLocalesListTransaction>({
       url: '/admin/locales',
       method: 'DELETE',
@@ -52,7 +52,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   /**
    * @override
    */
-  search(
+  public search(
     params: ResourceQuery
   ): Promise<AdminLocalesListTransaction['response']> {
     return this.client.request<AdminLocalesListTransaction>({
@@ -65,7 +65,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   /**
    * @override
    */
-  export(data: LocalesSchema): Promise<unknown> {
+  public export(data: LocalesSchema): Promise<unknown> {
     return this.client.request<AdminLocalesListTransaction>({
       url: '/admin/locales',
       method: 'GET',
@@ -76,7 +76,7 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
   /**
    * @override
    */
-  update(
+  public update(
     data: Partial<LocalesSchema>
   ): Promise<AdminLocalesUpdateTransaction['response']> {
     return this.client.request<AdminLocalesUpdateTransaction>({
@@ -86,7 +86,10 @@ export class AdminLocalesApi implements ResourceInterface<LocalesSchema> {
     });
   }
 
-  import(data: {
+  /**
+   * @override
+   */
+  public import(data: {
     [key in LocaleType]?: File;
   }): Promise<unknown> {
     const formdata = new FormData();

package/dist/templates/next-app/src/base/services/adminApi/AdminUserApi.ts

@@ -21,7 +21,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
     protected client: RequestTransaction<AppApiConfig>
   ) {}
 
-  async search(
+  /**
+   * @override
+   */
+  public async search(
     params: AdminUserListTransaction['request']
   ): Promise<AdminUserListTransaction['response']> {
     const response = await this.client.request<AdminUserListTransaction>({
@@ -33,7 +36,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
     return response;
   }
 
-  create(data: UserSchema): Promise<unknown> {
+  /**
+   * @override
+   */
+  public create(data: UserSchema): Promise<unknown> {
     return this.client.request<AdminUserListTransaction>({
       url: '/admin/users',
       method: 'POST',
@@ -41,7 +47,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
     });
   }
 
-  remove(data: UserSchema): Promise<unknown> {
+  /**
+   * @override
+   */
+  public remove(data: UserSchema): Promise<unknown> {
     return this.client.request<AdminUserListTransaction>({
       url: '/admin/users',
       method: 'DELETE',
@@ -49,7 +58,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
     });
   }
 
-  update(data: UserSchema): Promise<unknown> {
+  /**
+   * @override
+   */
+  public update(data: UserSchema): Promise<unknown> {
     return this.client.request<AdminUserListTransaction>({
       url: '/admin/users',
       method: 'PUT',
@@ -57,7 +69,10 @@ export class AdminUserApi implements ResourceInterface<UserSchema> {
     });
   }
 
-  export(data: UserSchema): Promise<unknown> {
+  /**
+   * @override
+   */
+  public export(data: UserSchema): Promise<unknown> {
     return this.client.request<AdminUserListTransaction>({
       url: '/admin/users',
       method: 'GET',

package/dist/templates/next-app/src/base/services/appApi/AppApiPlugin.ts

@@ -9,11 +9,14 @@ import type { AppApiConfig } from './AppApiRequester';
 import type { LoggerInterface } from '@qlover/logger';
 
 export class AppApiPlugin implements ExecutorPlugin {
-  readonly pluginName = 'AppApiPlugin';
+  public readonly pluginName = 'AppApiPlugin';
 
   constructor(protected logger: LoggerInterface) {}
 
-  isAppApiErrorInterface(value: unknown): value is AppApiErrorInterface {
+  /**
+   * @override
+   */
+  public isAppApiErrorInterface(value: unknown): value is AppApiErrorInterface {
     return (
       typeof value === 'object' &&
       value !== null &&
@@ -24,7 +27,12 @@ export class AppApiPlugin implements ExecutorPlugin {
     );
   }
 
-  onSuccess(context: ExecutorContext<AppApiConfig>): void | Promise<void> {
+  /**
+   * @override
+   */
+  public onSuccess(
+    context: ExecutorContext<AppApiConfig>
+  ): void | Promise<void> {
     const response = context.returnValue;
     const { parameters } = context;
 
@@ -40,7 +48,10 @@ export class AppApiPlugin implements ExecutorPlugin {
     }
   }
 
-  async onError(
+  /**
+   * @override
+   */
+  public async onError(
     context: ExecutorContext<AppApiConfig>
   ): Promise<ExecutorError | void> {
     const { error, parameters } = context;
@@ -66,6 +77,9 @@ export class AppApiPlugin implements ExecutorPlugin {
     }
   }
 
+  /**
+   * @override
+   */
   protected async getResponseJson(response: Response): Promise<unknown> {
     try {
       return await response.json();
@@ -74,6 +88,9 @@ export class AppApiPlugin implements ExecutorPlugin {
     }
   }
 
+  /**
+   * @override
+   */
   protected loggerError(config: AppApiConfig, error: unknown): void {
     this.logger.error(
       `%c[AppApi ${config.method} ${config.url}]%c - ${new Date().toLocaleString()}`,

package/dist/templates/next-app/src/base/services/appApi/AppUserApi.ts

@@ -23,7 +23,10 @@ export class AppUserApi implements AppUserApiInterface {
     protected client: RequestTransaction<AppApiConfig>
   ) {}
 
-  async login(
+  /**
+   * @override
+   */
+  public async login(
     params: UserApiLoginTransaction['data']
   ): Promise<UserApiLoginTransaction['response']> {
     const response = await this.client.request<UserApiLoginTransaction>({
@@ -36,7 +39,10 @@ export class AppUserApi implements AppUserApiInterface {
     return response;
   }
 
-  async register(
+  /**
+   * @override
+   */
+  public async register(
     params: UserApiRegisterTransaction['data']
   ): Promise<UserApiRegisterTransaction['response']> {
     const response = await this.client.request<UserApiRegisterTransaction>({
@@ -49,7 +55,10 @@ export class AppUserApi implements AppUserApiInterface {
     return response;
   }
 
-  async logout(
+  /**
+   * @override
+   */
+  public async logout(
     _params?: unknown
   ): Promise<UserApiLogoutTransaction['response']> {
     return await this.client.request<UserApiLogoutTransaction>({

package/dist/templates/next-app/src/base/services/appApi/AppUserApiBootstrap.ts

@@ -14,11 +14,16 @@ import type {
 import type { ExecutorContext, SerializerIneterface } from '@qlover/fe-corekit';
 
 export class AppUserApiBootstrap implements BootstrapExecutorPlugin {
-  readonly pluginName = 'AppUserApiBootstrap';
+  public readonly pluginName = 'AppUserApiBootstrap';
 
   constructor(protected serializer: SerializerIneterface) {}
 
-  onBefore({ parameters: { ioc } }: BootstrapContext): void | Promise<void> {
+  /**
+   * @override
+   */
+  public onBefore({
+    parameters: { ioc }
+  }: BootstrapContext): void | Promise<void> {
     const appUserApi = ioc.get<AppApiRequester>(AppApiRequester);
 
     appUserApi.usePlugin(new FetchURLPlugin());
@@ -32,6 +37,9 @@ export class AppUserApiBootstrap implements BootstrapExecutorPlugin {
     appUserApi.usePlugin(ioc.get(DialogErrorPlugin));
   }
 
+  /**
+   * @override
+   */
   protected requestDataSerializer(
     data: unknown,
     context: ExecutorContext<AppApiConfig>

package/dist/templates/next-app/src/base/types/{PageProps.ts → AppPageRouter.ts}

@@ -1,4 +1,7 @@
-import type { PageWithParams } from '@/server/PageParams';
+/**
+ * 该文件主要用于 /src/app 目录下页面路由的类型定义
+ */
+import type { PageWithParams } from '@/server/AppPageRouteParams';
 
 export interface PageParamsProps extends PageWithParams {
   searchParams: Promise<{ [key: string]: string | string[] | undefined }>;

package/dist/templates/next-app/src/base/types/PagesRouter.ts

@@ -0,0 +1,9 @@
+/**
+ * 该文件主要用于 /src/pages 目录下页面路由的类型定义
+ */
+import type { AppProps } from 'next/app';
+import type { NextRouter } from 'next/router';
+
+export type PagesRouterProps = AppProps & {
+  router: NextRouter;
+};

package/dist/templates/next-app/src/core/bootstraps/BootstrapClient.ts

@@ -1,13 +1,15 @@
 import 'reflect-metadata';
 import { Bootstrap } from '@qlover/corekit-bridge';
 import { isObject } from 'lodash';
+import type { IocRegisterOptions } from '@/base/port/IOCInterface';
 import { browserGlobalsName } from '@config/common';
 import type { IOCIdentifierMap } from '@config/IOCIdentifier';
 import { BootstrapsRegistry } from './BootstrapsRegistry';
 import * as globals from '../globals';
 import type {
   IOCContainerInterface,
-  IOCFunctionInterface
+  IOCFunctionInterface,
+  IOCRegisterInterface
 } from '@qlover/corekit-bridge';
 
 export type BootstrapAppArgs = {
@@ -23,23 +25,31 @@ export type BootstrapAppArgs = {
    * IOC容器
    */
   IOC: IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface>;
+
+  register?: IOCRegisterInterface<IOCContainerInterface, IocRegisterOptions>;
 };
 
 export class BootstrapClient {
-  static async main(args: BootstrapAppArgs): Promise<BootstrapAppArgs> {
-    const { root, IOC } = args;
+  public static lastTime = 0;
+  public static async main(args: BootstrapAppArgs): Promise<BootstrapAppArgs> {
+    const { logger, appConfig } = globals;
+
+    if (BootstrapClient.lastTime) {
+      return args;
+    }
+
+    const { root, IOC, register } = args;
 
     if (!isObject(root)) {
       throw new Error('root is not an object');
     }
 
-    const { logger, appConfig } = globals;
-
     const bootstrap = new Bootstrap({
       root,
       logger,
       ioc: {
-        manager: IOC
+        manager: IOC,
+        register: register
       },
       globalOptions: {
         sources: globals,
@@ -53,6 +63,10 @@ export class BootstrapClient {
       const bootstrapsRegistry = new BootstrapsRegistry(args);
 
       await bootstrap.use(bootstrapsRegistry.register()).start();
+
+      BootstrapClient.lastTime = Date.now();
+
+      logger.info('BootstrapClient starup success,', BootstrapClient.lastTime);
     } catch (error) {
       logger.error(`${appConfig.appName} starup error:`, error);
     }

package/dist/templates/next-app/src/core/bootstraps/BootstrapServer.ts

@@ -4,8 +4,7 @@ import {
   type BootstrapContextValue,
   type BootstrapExecutorPlugin,
   type IOCContainerInterface,
-  type IOCFunctionInterface,
-  type LoggerInterface
+  type IOCFunctionInterface
 } from '@qlover/corekit-bridge';
 import {
   AsyncExecutor,
@@ -16,6 +15,7 @@ import {
 import type { ServerInterface } from '@/server/port/ServerInterface';
 import { I, type IOCIdentifierMapServer } from '@config/IOCIdentifier';
 import { ServerIOC } from '../serverIoc/ServerIOC';
+import type { LoggerInterface } from '@qlover/logger';
 
 export interface BootstrapServerContextValue extends BootstrapContextValue {
   IOC: IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>;
@@ -28,7 +28,7 @@ export class BootstrapServer implements ServerInterface {
     IOCIdentifierMapServer,
     IOCContainerInterface
   >;
-  readonly logger: LoggerInterface;
+  public readonly logger: LoggerInterface;
 
   constructor() {
     const serverIOC = ServerIOC.create();
@@ -40,12 +40,27 @@ export class BootstrapServer implements ServerInterface {
     this.logger = logger;
   }
 
-  getIOC(): IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>;
-  getIOC<T extends keyof IOCIdentifierMapServer>(
+  /**
+   * @override
+   */
+  public getIOC(): IOCFunctionInterface<
+    IOCIdentifierMapServer,
+    IOCContainerInterface
+  >;
+  /**
+   * @override
+   */
+  public getIOC<T extends keyof IOCIdentifierMapServer>(
     identifier: T
   ): IOCIdentifierMapServer[T];
-  getIOC<T>(serviceIdentifier: ServiceIdentifier<T>): T;
-  getIOC<T extends keyof IOCIdentifierMapServer>(
+  /**
+   * @override
+   */
+  public getIOC<T>(serviceIdentifier: ServiceIdentifier<T>): T;
+  /**
+   * @override
+   */
+  public getIOC<T extends keyof IOCIdentifierMapServer>(
     identifier?: T
   ):
     | IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>
@@ -59,7 +74,7 @@ export class BootstrapServer implements ServerInterface {
   /**
    * @override
    */
-  use(
+  public use(
     plugin:
       | BootstrapExecutorPlugin
       | BootstrapExecutorPlugin[]
@@ -78,7 +93,10 @@ export class BootstrapServer implements ServerInterface {
     return this;
   }
 
-  execNoError<Result>(
+  /**
+   * @override
+   */
+  public execNoError<Result>(
     task?: PromiseTask<Result, BootstrapServerContextValue>
   ): Promise<Result | ExecutorError> {
     const context = {

package/dist/templates/next-app/src/core/bootstraps/BootstrapsRegistry.ts

@@ -14,15 +14,18 @@ import type {
 export class BootstrapsRegistry {
   constructor(protected args: BootstrapAppArgs) {}
 
-  get IOC(): IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface> {
+  public get IOC(): IOCFunctionInterface<
+    IOCIdentifierMap,
+    IOCContainerInterface
+  > {
     return this.args.IOC;
   }
 
-  get appConfig(): EnvConfigInterface {
+  public get appConfig(): EnvConfigInterface {
     return this.IOC(IOCIdentifier.AppConfig);
   }
 
-  register(): BootstrapExecutorPlugin[] {
+  public register(): BootstrapExecutorPlugin[] {
     const IOC = this.IOC;
 
     const i18nService = IOC(IOCIdentifier.I18nServiceInterface);
@@ -41,7 +44,6 @@ export class BootstrapsRegistry {
     }
 
     bootstrapList.push(IocIdentifierTest);
-    // TODO: 需要使用到
 
     return bootstrapList;
   }

package/dist/templates/next-app/src/core/clientIoc/ClientIOC.ts

@@ -1,13 +1,17 @@
 import {
   createIOCFunction,
   type IOCContainerInterface,
-  type IOCFunctionInterface
+  type IOCFunctionInterface,
+  type IOCRegisterInterface
 } from '@qlover/corekit-bridge';
 import { InversifyContainer } from '@/base/cases/InversifyContainer';
-import type { IOCInterface } from '@/base/port/IOCInterface';
+import type {
+  IOCInterface,
+  IocRegisterOptions
+} from '@/base/port/IOCInterface';
 import type { IOCIdentifierMap } from '@config/IOCIdentifier';
 import { ClientIOCRegister } from './ClientIOCRegister';
-import { appConfig } from '../globals';
+import { logger } from '../globals';
 
 export class ClientIOC implements IOCInterface<
   IOCIdentifierMap,
@@ -17,21 +21,47 @@ export class ClientIOC implements IOCInterface<
     IOCIdentifierMap,
     IOCContainerInterface
   > | null = null;
+  protected registers = 0;
 
-  create(): IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface> {
+  constructor(
+    protected readonly iocRegister?: IOCRegisterInterface<
+      IOCContainerInterface,
+      IocRegisterOptions
+    >
+  ) {}
+
+  /**
+   * @override
+   */
+  public create(): IOCFunctionInterface<
+    IOCIdentifierMap,
+    IOCContainerInterface
+  > {
     if (this.ioc) {
       return this.ioc;
     }
 
     this.ioc = createIOCFunction<IOCIdentifierMap>(new InversifyContainer());
 
-    const register = new ClientIOCRegister({
-      appConfig: appConfig
-    });
+    return this.ioc;
+  }
+
+  /**
+   * @override
+   */
+  public register(options: IocRegisterOptions): void {
+    if (this.registers > 0) {
+      return;
+    }
 
-    register.register(this.ioc.implemention!, this.ioc);
+    if (!this.ioc) {
+      return;
+    }
 
-    return this.ioc;
+    logger.info('ClientIOC register');
+    new ClientIOCRegister(options).register(this.ioc.implemention!, this.ioc);
+
+    this.registers++;
   }
 }
 

package/dist/templates/next-app/src/core/clientIoc/ClientIOCRegister.ts

@@ -1,7 +1,9 @@
+import { CookieStorage } from '@qlover/corekit-bridge';
 import { RouterService } from '@/base/cases/RouterService';
 import type { IocRegisterOptions } from '@/base/port/IOCInterface';
 import { I18nService } from '@/base/services/I18nService';
 import { UserService } from '@/base/services/UserService';
+import { cookiesConfig } from '@config/cookies';
 import { IOCIdentifier as I } from '@config/IOCIdentifier';
 import { dialogHandler, logger, JSON } from '../globals';
 import type {
@@ -21,6 +23,7 @@ export class ClientIOCRegister implements IOCRegisterInterface<
    *
    * 一般用于注册全局
    *
+   * @override
    * @param ioc - IOC container
    */
   protected registerGlobals(ioc: IOCContainerInterface): void {
@@ -34,7 +37,7 @@ export class ClientIOCRegister implements IOCRegisterInterface<
     // ioc.bind(I.AntdStaticApiInterface, dialogHandler);
     // ioc.bind(I.LocalStorage, globals.localStorage);
     // ioc.bind(I.LocalStorageEncrypt, localStorageEncrypt);
-    // ioc.bind(I.CookieStorage, globals.cookieStorage);
+    ioc.bind(I.CookieStorage, new CookieStorage(cookiesConfig));
   }
 
   /**
@@ -45,6 +48,7 @@ export class ClientIOCRegister implements IOCRegisterInterface<
    * - 国际化服务
    * - 主题服务
    *
+   * @override
    * @param ioc
    */
   protected registerImplement(ioc: IOCContainerInterface): void {
@@ -66,6 +70,9 @@ export class ClientIOCRegister implements IOCRegisterInterface<
     // ioc.bind(I.RequestPageBridgeInterface, ioc.get(RequestPageBridge));
   }
 
+  /**
+   * @override
+   */
   protected registerCommon(_ioc: IOCContainerInterface): void {
     // const { appConfig } = this.options;
     // const logger = ioc.get(I.Logger);
@@ -87,7 +94,7 @@ export class ClientIOCRegister implements IOCRegisterInterface<
   /**
    * @override
    */
-  register(
+  public register(
     ioc: IOCContainerInterface,
     _manager: IOCManagerInterface<IOCContainerInterface>
   ): void {

package/dist/templates/next-app/src/core/serverIoc/ServerIOC.ts

@@ -5,7 +5,10 @@ import {
 } from '@qlover/corekit-bridge';
 import { AppConfig } from '@/base/cases/AppConfig';
 import { InversifyContainer } from '@/base/cases/InversifyContainer';
-import type { IOCInterface } from '@/base/port/IOCInterface';
+import type {
+  IOCInterface,
+  IocRegisterOptions
+} from '@/base/port/IOCInterface';
 import type { IOCIdentifierMapServer } from '@config/IOCIdentifier';
 import { ServerIOCRegister } from './ServerIOCRegister';
 
@@ -13,14 +16,19 @@ export class ServerIOC implements IOCInterface<
   IOCIdentifierMapServer,
   IOCContainerInterface
 > {
-  static instance: ServerIOC | null = null;
+  public static instance: ServerIOC | null = null;
+
+  protected registers = 0;
 
   protected ioc: IOCFunctionInterface<
     IOCIdentifierMapServer,
     IOCContainerInterface
   > | null = null;
 
-  static create(): ServerIOC {
+  /**
+   * @override
+   */
+  public static create(): ServerIOC {
     if (this.instance) {
       return this.instance;
     }
@@ -30,7 +38,10 @@ export class ServerIOC implements IOCInterface<
     return this.instance;
   }
 
-  create(): IOCFunctionInterface<
+  /**
+   * @override
+   */
+  public create(): IOCFunctionInterface<
     IOCIdentifierMapServer,
     IOCContainerInterface
   > {
@@ -38,16 +49,32 @@ export class ServerIOC implements IOCInterface<
       return this.ioc;
     }
 
-    this.ioc = createIOCFunction<IOCIdentifierMapServer>(
-      new InversifyContainer()
-    );
+    this.ioc = createIOCFunction(new InversifyContainer());
 
-    const register = new ServerIOCRegister({
+    // 注册默认依赖
+    this.register({
       appConfig: new AppConfig()
     });
 
-    register.register(this.ioc.implemention!, this.ioc);
-
     return this.ioc;
   }
+
+  /**
+   * @override
+   */
+  public register(options: IocRegisterOptions): void {
+    if (this.registers > 0) {
+      console.debug('ServerIOC: ioc already registered');
+      return;
+    }
+
+    if (!this.ioc) {
+      console.debug('ServerIOC: ioc not initialized');
+      return;
+    }
+
+    new ServerIOCRegister(options).register(this.ioc.implemention!, this.ioc);
+
+    this.registers++;
+  }
 }