@qlover/create-app 0.12.0 → 1.0.1

package/dist/templates/react-app/__tests__/src/base/cases/RequestLogger.test.ts

@@ -10,17 +10,14 @@
  */
 
 import { MockLogger } from '@__mocks__/MockLogger';
+import {
+  ExecutorContextImpl,
+  type RequestAdapterFetchConfig,
+  type RequestAdapterResponse
+} from '@qlover/fe-corekit';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { RequestLogger } from '@/base/cases/RequestLogger';
-import type {
-  ApiCatchPluginConfig,
-  ApiCatchPluginResponse
-} from '@qlover/corekit-bridge';
-import type {
-  ExecutorContext,
-  RequestAdapterFetchConfig,
-  RequestAdapterResponse
-} from '@qlover/fe-corekit';
+import type { ApiCatchPluginResponse } from '@qlover/corekit-bridge';
 
 describe('RequestLogger', () => {
   let logger: MockLogger;
@@ -46,16 +43,11 @@ describe('RequestLogger', () => {
 
   describe('onBefore', () => {
     it('should log request details before execution', () => {
-      const context: ExecutorContext<RequestAdapterFetchConfig<unknown>> = {
-        parameters: {
-          method: 'GET',
-          url: 'https://api.example.com/data',
-          headers: { 'Content-Type': 'application/json' }
-        },
-        returnValue: undefined,
-        hooksRuntimes: {}
-      };
-
+      const context = new ExecutorContextImpl({
+        method: 'GET',
+        url: 'https://api.example.com/data',
+        headers: { 'Content-Type': 'application/json' }
+      });
       requestLogger.onBefore(context);
 
       expect(logger.log).toHaveBeenCalledWith(
@@ -70,17 +62,12 @@ describe('RequestLogger', () => {
   describe('onSuccess', () => {
     it('should log successful response', async () => {
       const response = { data: { id: 1 }, status: 200 };
-      const context: ExecutorContext<
-        RequestAdapterFetchConfig & ApiCatchPluginConfig
-      > = {
-        parameters: {
-          method: 'POST',
-          url: 'https://api.example.com/create',
-          headers: { 'Content-Type': 'application/json' }
-        },
-        returnValue: response,
-        hooksRuntimes: {}
-      };
+      const context = new ExecutorContextImpl({
+        method: 'POST',
+        url: 'https://api.example.com/create',
+        headers: { 'Content-Type': 'application/json' }
+      });
+      context.setReturnValue(response);
 
       await requestLogger.onSuccess(context);
 
@@ -111,17 +98,12 @@ describe('RequestLogger', () => {
         response: new Response(),
         apiCatchResult: apiError
       };
-      const context: ExecutorContext<
-        RequestAdapterFetchConfig & ApiCatchPluginConfig
-      > = {
-        parameters: {
-          method: 'GET',
-          url: 'https://api.example.com/error',
-          headers: {}
-        },
-        returnValue: response,
-        hooksRuntimes: {}
-      };
+      const context = new ExecutorContextImpl({
+        method: 'GET',
+        url: 'https://api.example.com/error',
+        headers: {}
+      });
+      context.setReturnValue(response);
 
       await requestLogger.onSuccess(context);
 
@@ -137,16 +119,12 @@ describe('RequestLogger', () => {
   describe('onError', () => {
     it('should log request error', () => {
       const error = new Error('Network error');
-      const context: ExecutorContext<RequestAdapterFetchConfig> = {
-        parameters: {
-          method: 'PUT',
-          url: 'https://api.example.com/update',
-          headers: {}
-        },
-        error,
-        returnValue: undefined,
-        hooksRuntimes: {}
-      };
+      const context = new ExecutorContextImpl({
+        method: 'PUT',
+        url: 'https://api.example.com/update',
+        headers: {}
+      });
+      context.setError(error);
 
       requestLogger.onError(context);
 

package/dist/templates/react-app/__tests__/src/core/bootstraps/BootstrapClient.test.ts

@@ -19,7 +19,6 @@ import type {
   IOCContainerInterface,
   IOCFunctionInterface
 } from '@qlover/corekit-bridge';
-import type { ExecutorPlugin } from '@qlover/fe-corekit';
 
 describe('BootstrapClient', () => {
   describe('bootstrap start flow', () => {
@@ -98,18 +97,19 @@ describe('BootstrapClient', () => {
     });
 
     it('should handle bootstrap UserApiBootstarp', async () => {
-      const mockUserService: ExecutorPlugin = {
-        pluginName: 'TestUserService',
-        onBefore: vi.fn().mockResolvedValue(undefined)
+      const mockOnExec = vi.fn().mockResolvedValue(undefined);
+      const mockUserBootstrap: BootstrapExecutorPlugin = {
+        pluginName: 'TestUserBootstrap',
+        onExec: mockOnExec
       };
       // 将 mock 函数提取出来，以便验证是否被调用
       const mockRegister = vi
         .fn()
         .mockImplementationOnce(
           (
-            ioc: IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface>
+            _ioc: IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface>
           ) => {
-            return [ioc.get(I.UserServiceInterface)];
+            return [mockUserBootstrap];
           }
         );
 
@@ -121,20 +121,6 @@ describe('BootstrapClient', () => {
         root: mockRoot,
         bootHref: mockRoot.location.href,
         ioc: testIOC,
-        iocRegister: {
-          register: vi
-            .fn()
-            .mockImplementationOnce(
-              (
-                ioc: IOCFunctionInterface<
-                  IOCIdentifierMap,
-                  IOCContainerInterface
-                >
-              ) => {
-                ioc.bind(I.UserServiceInterface, mockUserService as any);
-              }
-            )
-        },
         RegistryClass: TestBootstrapsRegistry
       };
 
@@ -142,12 +128,8 @@ describe('BootstrapClient', () => {
       const ioc = testIOC.getIoc();
       expect(ioc).toBeDefined();
 
-      const userService = ioc!.get(I.UserServiceInterface);
-
-      expect(userService).toBeDefined();
-      expect(userService).toEqual(mockUserService);
-      expect(userService.pluginName).toBe('TestUserService');
-      expect(userService.onBefore).toBeCalled();
+      expect(mockRegister).toBeCalled();
+      expect(mockOnExec).toBeCalled();
     });
   });
 });

package/dist/templates/react-app/__tests__/src/main.test.tsx

@@ -1,9 +1,9 @@
 import { BootstrapClient } from '@/core/bootstraps/BootstrapClient';
 
-// Mock BootstrapApp
+// Mock BootstrapApp - must return a resolved promise to prevent hanging
 vi.mock('@/core/bootstraps/BootstrapClient', () => ({
   BootstrapClient: {
-    main: vi.fn()
+    main: vi.fn().mockResolvedValue({})
   }
 }));
 

package/dist/templates/react-app/config/IOCIdentifier.ts

@@ -81,7 +81,7 @@ export interface IOCIdentifierMap {
   [IOCIdentifier.RouteServiceInterface]: RouteService;
   [IOCIdentifier.UserServiceInterface]: UserService;
   [IOCIdentifier.I18nKeyErrorPlugin]: I18nKeyErrorPlugin;
-  [IOCIdentifier.FeApiCommonPlugin]: CorekitBridge.RequestCommonPlugin;
+  [IOCIdentifier.FeApiCommonPlugin]: FeCorekit.RequestPlugin;
   [IOCIdentifier.ApiMockPlugin]: CorekitBridge.ApiMockPlugin;
   [IOCIdentifier.ApiCatchPlugin]: CorekitBridge.ApiCatchPlugin;
   [IOCIdentifier.ThemeService]: CorekitBridge.ThemeService;

package/dist/templates/react-app/docs/en/test-guide.md

@@ -652,7 +652,7 @@ describe('TypeSafetyTests', () => {
 
   it('should infer correct return types', () => {
     const result = getData();
-    
+
     // Verify return type
     expectTypeOf(result).toEqualTypeOf<{ id: number; name: string }>();
     expectTypeOf(result).not.toEqualTypeOf<{ id: string; name: string }>();
@@ -682,7 +682,7 @@ describe('Generic Type Tests', () => {
     }
 
     const storage = new Storage<User>();
-    
+
     // Verify generic type
     expectTypeOf(storage.store).parameter(0).toMatchTypeOf<User>();
     expectTypeOf(storage.store).returns.toMatchTypeOf<User>();
@@ -755,7 +755,7 @@ describe('Type Narrowing Tests', () => {
     }
 
     const value: unknown = 'test';
-    
+
     if (isString(value)) {
       // Within this scope, value should be narrowed to string type
       expectTypeOf(value).toEqualTypeOf<string>();
@@ -763,7 +763,7 @@ describe('Type Narrowing Tests', () => {
   });
 
   it('should validate discriminated unions', () => {
-    type Shape = 
+    type Shape =
       | { kind: 'circle'; radius: number }
       | { kind: 'rectangle'; width: number; height: number };
 
@@ -812,7 +812,7 @@ describe('Combined Runtime and Type Tests', () => {
 describe('Type Inference Tests', () => {
   it('should infer types correctly', () => {
     const data = { id: 1, name: 'John' };
-    
+
     // Verify inferred type
     expectTypeOf(data).toEqualTypeOf<{ id: number; name: string }>();
     expectTypeOf(data.id).toEqualTypeOf<number>();

package/dist/templates/react-app/docs/zh/test-guide.md

@@ -652,7 +652,7 @@ describe('TypeSafetyTests', () => {
 
   it('should infer correct return types', () => {
     const result = getData();
-    
+
     // 验证返回值类型
     expectTypeOf(result).toEqualTypeOf<{ id: number; name: string }>();
     expectTypeOf(result).not.toEqualTypeOf<{ id: string; name: string }>();
@@ -682,7 +682,7 @@ describe('Generic Type Tests', () => {
     }
 
     const storage = new Storage<User>();
-    
+
     // 验证泛型类型
     expectTypeOf(storage.store).parameter(0).toMatchTypeOf<User>();
     expectTypeOf(storage.store).returns.toMatchTypeOf<User>();
@@ -755,7 +755,7 @@ describe('Type Narrowing Tests', () => {
     }
 
     const value: unknown = 'test';
-    
+
     if (isString(value)) {
       // 在此作用域内，value 应该被窄化为 string 类型
       expectTypeOf(value).toEqualTypeOf<string>();
@@ -763,7 +763,7 @@ describe('Type Narrowing Tests', () => {
   });
 
   it('should validate discriminated unions', () => {
-    type Shape = 
+    type Shape =
       | { kind: 'circle'; radius: number }
       | { kind: 'rectangle'; width: number; height: number };
 
@@ -812,7 +812,7 @@ describe('Combined Runtime and Type Tests', () => {
 describe('Type Inference Tests', () => {
   it('should infer types correctly', () => {
     const data = { id: 1, name: 'John' };
-    
+
     // 验证推断的类型
     expectTypeOf(data).toEqualTypeOf<{ id: number; name: string }>();
     expectTypeOf(data.id).toEqualTypeOf<number>();

package/dist/templates/react-app/package.json

@@ -52,7 +52,8 @@
     "test:e2e:chromium": "playwright test --project=chromium",
     "test:e2e:firefox": "playwright test --project=firefox",
     "test:e2e:webkit": "playwright test --project=webkit",
-    "test:e2e:report": "playwright show-report playwright-report"
+    "test:e2e:report": "playwright show-report playwright-report",
+    "type-check": "tsc --build"
   },
   "dependencies": {
     "@brain-toolkit/antd-blocks": "^0.0.1",

package/dist/templates/react-app/src/base/apis/AiApi.ts

@@ -1,22 +1,30 @@
 import { IOCIdentifier } from '@config/IOCIdentifier';
+import { type BootstrapExecutorPlugin } from '@qlover/corekit-bridge';
 import {
-  type BootstrapExecutorPlugin,
-  RequestCommonPlugin
-} from '@qlover/corekit-bridge';
-import {
-  FetchURLPlugin,
+  LifecycleExecutor,
   RequestAdapterFetch,
-  RequestScheduler
+  RequestExecutor,
+  RequestPlugin,
+  ResponsePlugin
 } from '@qlover/fe-corekit';
 import { RequestLogger } from '../cases/RequestLogger';
 import type { AppConfig } from '../cases/AppConfig';
+import type {
+  ExecutorContextInterface,
+  RequestAdapterFetchConfig
+} from '@qlover/fe-corekit';
 
 const apiApiAdapter = new RequestAdapterFetch({
   responseType: 'json'
 });
 
 // 使用 RequestScheduler
-const apiApi = new RequestScheduler(apiApiAdapter);
+const apiApi = new RequestExecutor(
+  apiApiAdapter,
+  new LifecycleExecutor<
+    ExecutorContextInterface<RequestAdapterFetchConfig, unknown>
+  >()
+);
 
 // 直接使用 adapter
 // const apiApi = apiApiAdapter;
@@ -29,15 +37,15 @@ export const AiApiBootstarp: BootstrapExecutorPlugin = {
     // dynamic set baseURL
     apiApiAdapter.config.baseURL = appConfig.aiApiBaseUrl;
 
-    apiApiAdapter.usePlugin(new FetchURLPlugin());
-    apiApiAdapter.usePlugin(
-      new RequestCommonPlugin({
+    apiApi.use(
+      new RequestPlugin({
         tokenPrefix: appConfig.aiApiTokenPrefix,
         token: appConfig.aiApiToken
       })
     );
-    apiApiAdapter.usePlugin(ioc.get(IOCIdentifier.ApiMockPlugin));
-    apiApiAdapter.usePlugin(ioc.get(RequestLogger));
+    apiApi.use(ioc.get(ResponsePlugin));
+    apiApi.use(ioc.get(IOCIdentifier.ApiMockPlugin));
+    apiApi.use(ioc.get(RequestLogger));
   }
 };
 

package/dist/templates/react-app/src/base/apis/feApi/FeApi.ts

@@ -1,17 +1,26 @@
-import { RequestAdapterFetch, RequestScheduler } from '@qlover/fe-corekit';
+import {
+  ExecutorContextInterface,
+  LifecycleExecutor,
+  RequestAdapterFetch,
+  RequestExecutor
+} from '@qlover/fe-corekit';
 import { inject, injectable } from 'inversify';
 import { FeApiAdapter } from './FeApiAdapter';
 import { FeApiConfig } from './FeApiBootstarp';
 import { FeApiGetIpInfo } from './FeApiType';
 
 @injectable()
-export class FeApi extends RequestScheduler<FeApiConfig> {
+export class FeApi extends RequestExecutor<
+  FeApiConfig,
+  ExecutorContextInterface<FeApiConfig>
+> {
   constructor(@inject(FeApiAdapter) adapter: RequestAdapterFetch) {
-    super(adapter);
+    super(
+      adapter,
+      new LifecycleExecutor<ExecutorContextInterface<FeApiConfig, unknown>>()
+    );
   }
 
-  public stop(_config: FeApiConfig): void {}
-
   public async getIpInfo(): Promise<FeApiGetIpInfo['response']> {
     return this.get('http://ip-api.com/json/') as unknown as Promise<
       FeApiGetIpInfo['response']

package/dist/templates/react-app/src/base/apis/feApi/FeApiBootstarp.ts

@@ -1,18 +1,25 @@
-import { IOCIdentifier } from '@config/IOCIdentifier';
+import { I } from '@config/IOCIdentifier';
 import {
   type BootstrapContext,
   type BootstrapExecutorPlugin,
   type ApiMockPluginConfig,
   ApiPickDataPlugin
 } from '@qlover/corekit-bridge';
-import { FetchURLPlugin } from '@qlover/fe-corekit';
+import {
+  RequestPlugin,
+  ResponsePlugin,
+  type RequestAdapterConfig,
+  type RequestAdapterResponse
+} from '@qlover/fe-corekit';
+import type { AppConfig } from '@/base/cases/AppConfig';
 import { RequestLogger } from '@/base/cases/RequestLogger';
+import type { UserService } from '@/base/services/UserService';
 import { FeApi } from './FeApi';
-import type {
-  RequestAdapterConfig,
-  RequestAdapterResponse,
-  RequestTransactionInterface
-} from '@qlover/fe-corekit';
+
+export interface RequestTransactionInterface<Request, Response> {
+  request: Request;
+  response: Response;
+}
 
 /**
  * FeApiConfig
@@ -22,8 +29,8 @@ import type {
  *
  * extends:
  */
-export interface FeApiConfig<Request = unknown>
-  extends RequestAdapterConfig<Request>, ApiMockPluginConfig {}
+export type FeApiConfig<Request = unknown> = RequestAdapterConfig<Request> &
+  ApiMockPluginConfig & {};
 
 /**
  * FeApiResponse
@@ -63,11 +70,17 @@ export class FeApiBootstarp implements BootstrapExecutorPlugin {
    * @override
    */
   public onBefore({ parameters: { ioc } }: BootstrapContext): void {
+    const appConfig = ioc.get<AppConfig>(I.AppConfig);
     ioc
       .get<FeApi>(FeApi)
-      .usePlugin(new FetchURLPlugin())
-      .usePlugin(ioc.get(IOCIdentifier.FeApiCommonPlugin))
-      .usePlugin(ioc.get(RequestLogger))
-      .usePlugin(ioc.get(ApiPickDataPlugin));
+      .use(
+        new RequestPlugin({
+          tokenPrefix: appConfig.openAiTokenPrefix,
+          token: () => ioc.get<UserService>(I.UserServiceInterface).getToken()
+        })
+      )
+      .use(ioc.get(ResponsePlugin))
+      .use(ioc.get(RequestLogger))
+      .use(ioc.get(ApiPickDataPlugin));
   }
 }

package/dist/templates/react-app/src/base/apis/userApi/UserApi.ts

@@ -1,11 +1,15 @@
 import { RES_NO_TOKEN } from '@config/Identifier';
 import {
-  FetchAbortPlugin,
-  RequestAdapterFetch,
-  RequestTransaction
+  Aborter,
+  AborterConfig,
+  type AborterInterface,
+  ExecutorContextInterface,
+  ExecutorError,
+  LifecycleExecutor,
+  type RequestAdapterInterface,
+  RequestExecutor
 } from '@qlover/fe-corekit';
 import { inject, injectable } from 'inversify';
-import { AppError } from '@/base/cases/AppError';
 import { UserApiAdapter } from './UserApiAdapter';
 import { UserApiConfig } from './UserApiBootstarp';
 import {
@@ -17,10 +21,7 @@ import {
   UserInfo,
   UserCredential
 } from './UserApiType';
-import type {
-  UserAuthStoreInterface,
-  UserServiceGateway
-} from '@qlover/corekit-bridge';
+import type { UserServiceGateway } from '@qlover/corekit-bridge';
 
 /**
  * UserApi
@@ -31,27 +32,20 @@ import type {
  */
 @injectable()
 export class UserApi
-  extends RequestTransaction<UserApiConfig>
+  extends RequestExecutor<
+    UserApiConfig,
+    ExecutorContextInterface<UserApiConfig>
+  >
   implements UserServiceGateway<UserInfo, UserCredential>
 {
-  protected store: UserAuthStoreInterface<UserInfo> | null = null;
-
   constructor(
-    @inject(FetchAbortPlugin) protected abortPlugin: FetchAbortPlugin,
-    @inject(UserApiAdapter) adapter: RequestAdapterFetch
+    @inject(Aborter) protected abortPlugin: AborterInterface<AborterConfig>,
+    @inject(UserApiAdapter) adapter: RequestAdapterInterface<UserApiConfig>
   ) {
-    super(adapter);
-  }
-
-  public getStore(): UserAuthStoreInterface<UserInfo> | null {
-    return this.store;
-  }
-
-  /**
-   * @param store
-   */
-  public setStore(store: UserAuthStoreInterface<UserInfo>): void {
-    this.store = store;
+    super(
+      adapter,
+      new LifecycleExecutor<ExecutorContextInterface<UserApiConfig, unknown>>()
+    );
   }
 
   public stop(request: UserApiConfig): Promise<void> | void {
@@ -59,7 +53,7 @@ export class UserApi
   }
 
   public async getRandomUser(): Promise<GetIpInfoTransaction['response']> {
-    return this.request<GetIpInfoTransaction>({
+    return this.request({
       url: 'https://randomuser.me/api/',
       method: 'GET',
       disabledMock: true
@@ -69,7 +63,7 @@ export class UserApi
   public async testApiCatchResult(): Promise<
     UserApiTestApiCatchResultTransaction['response']
   > {
-    return this.request<UserApiTestApiCatchResultTransaction>({
+    return this.request({
       url: 'https://randomuser.me/api/?_name=ApiCatchResult',
       method: 'GET',
       disabledMock: true,
@@ -85,17 +79,17 @@ export class UserApi
   public async login(
     params: UserApiLoginTransaction['data']
   ): Promise<UserCredential> {
-    const response = await this.post<UserApiLoginTransaction>(
-      '/api/login',
-      params
-    );
+    const response = await this.post<
+      UserApiLoginTransaction['response'],
+      UserApiLoginTransaction['data']
+    >('/api/login', params);
 
     if (response.apiCatchResult) {
       throw response.apiCatchResult;
     }
 
     if (!response.data.token) {
-      throw new AppError(RES_NO_TOKEN);
+      throw new ExecutorError(RES_NO_TOKEN);
     }
 
     return response.data;
@@ -134,8 +128,10 @@ export class UserApi
    * @returns
    */
   public async getUserInfo(_credential?: UserCredential): Promise<UserInfo> {
-    const response =
-      await this.get<UserApiGetUserInfoTransaction>('/api/userinfo');
+    const response = await this.get<
+      UserApiGetUserInfoTransaction['response'],
+      UserApiGetUserInfoTransaction['data']
+    >('/api/userinfo');
 
     if (response.apiCatchResult) {
       throw response.apiCatchResult;

package/dist/templates/react-app/src/base/apis/userApi/UserApiBootstarp.ts

@@ -6,15 +6,19 @@ import {
   type ApiCatchPluginConfig,
   type ApiCatchPluginResponse
 } from '@qlover/corekit-bridge';
-import { FetchAbortPlugin, FetchURLPlugin } from '@qlover/fe-corekit';
+import {
+  Aborter,
+  AborterPlugin,
+  RequestPlugin,
+  ResponsePlugin,
+  type AborterConfig,
+  type RequestAdapterConfig,
+  type RequestAdapterResponse
+} from '@qlover/fe-corekit';
+import { RequestLanguages } from '@/base/cases/RequestLanguages';
 import { RequestLogger } from '@/base/cases/RequestLogger';
 import { UserApi } from './UserApi';
-import { RequestLanguages } from '../../cases/RequestLanguages';
-import type {
-  RequestAdapterConfig,
-  RequestAdapterResponse,
-  RequestTransactionInterface
-} from '@qlover/fe-corekit';
+import type { RequestTransactionInterface } from '../feApi/FeApiBootstarp';
 
 /**
  * UserApiConfig
@@ -30,7 +34,8 @@ export interface UserApiConfig<Request = unknown>
   extends
     RequestAdapterConfig<Request>,
     ApiMockPluginOptions,
-    ApiCatchPluginConfig {}
+    ApiCatchPluginConfig,
+    AborterConfig {}
 
 /**
  * UserApiResponse
@@ -70,14 +75,12 @@ export class UserApiBootstarp implements BootstrapExecutorPlugin {
   public onBefore({ parameters: { ioc } }: BootstrapContext): void {
     ioc
       .get<UserApi>(UserApi)
-      .usePlugin(new FetchURLPlugin())
-      .usePlugin(ioc.get(IOCIdentifier.FeApiCommonPlugin))
-      .usePlugin(
-        new RequestLanguages(ioc.get(IOCIdentifier.I18nServiceInterface))
-      )
-      .usePlugin(ioc.get(IOCIdentifier.ApiMockPlugin))
-      .usePlugin(ioc.get(RequestLogger))
-      .usePlugin(ioc.get(FetchAbortPlugin))
-      .usePlugin(ioc.get(IOCIdentifier.ApiCatchPlugin));
+      .use(new RequestPlugin())
+      .use(ioc.get(ResponsePlugin))
+      .use(new AborterPlugin(ioc.get(Aborter)))
+      .use(new RequestLanguages(ioc.get(IOCIdentifier.I18nServiceInterface)))
+      .use(ioc.get(IOCIdentifier.ApiMockPlugin))
+      .use(ioc.get(IOCIdentifier.ApiCatchPlugin))
+      .use(ioc.get(RequestLogger));
   }
 }