@qlover/create-app 0.9.0 → 0.10.1

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

@@ -14,8 +14,8 @@ import { RequestStatusCatcher } from '@/base/cases/RequestStatusCatcher';
 import type { IocRegisterOptions } from '@/base/port/IOCInterface';
 import type { UserServiceInterface } from '@/base/port/UserServiceInterface';
 import { I18nService } from '@/base/services/I18nService';
-import { ProcesserExecutor } from '@/base/services/ProcesserExecutor';
 import { RouteService } from '@/base/services/RouteService';
+import { UserGatewayPlugin } from '@/base/services/UserGatewayPlugin';
 import { UserService } from '@/base/services/UserService';
 import { ExecutorPageBridge } from '@/uikit/bridges/ExecutorPageBridge';
 import { JSONStoragePageBridge } from '@/uikit/bridges/JSONStoragePageBridge';
@@ -28,7 +28,6 @@ import type {
   IOCContainerInterface,
   IOCRegisterInterface
 } from '@qlover/corekit-bridge';
-import type { SyncStorageInterface } from '@qlover/fe-corekit';
 import type { LoggerInterface } from '@qlover/logger';
 
 export class ClientIOCRegister
@@ -71,30 +70,34 @@ export class ClientIOCRegister
    */
   protected registerImplement(ioc: IOCContainerInterface): void {
     ioc.bind(I.I18nServiceInterface, new I18nService(this.options.pathname));
-    ioc.bind(
-      I.RouteServiceInterface,
-      new RouteService(
-        ioc.get(NavigateBridge),
-        ioc.get(I.I18nServiceInterface),
-        {
-          routes: useLocaleRoutes ? baseRoutes : baseNoLocaleRoutes,
-          logger: ioc.get(I.Logger),
-          hasLocalRoutes: useLocaleRoutes,
-          routerPrefix: routerPrefix
-        }
-      )
+
+    const routeService = new RouteService(
+      ioc.get(NavigateBridge),
+      ioc.get(I.I18nServiceInterface),
+      {
+        routes: useLocaleRoutes ? baseRoutes : baseNoLocaleRoutes,
+        logger: ioc.get(I.Logger),
+        hasLocalRoutes: useLocaleRoutes,
+        routerPrefix: routerPrefix
+      }
     );
+    ioc.bind(I.RouteServiceInterface, routeService);
     ioc.bind(
       I.ThemeService,
       new ThemeService({
         ...(themeConfig as unknown as ThemeServiceProps),
-        storage: ioc.get<SyncStorageInterface<string, string>>(I.LocalStorage)
+        storage: ioc.get(I.LocalStorage)
       })
     );
 
     ioc.bind(I.I18nKeyErrorPlugin, ioc.get(I18nKeyErrorPlugin));
-    ioc.bind(I.ProcesserExecutorInterface, ioc.get(ProcesserExecutor));
-    ioc.bind(I.UserServiceInterface, ioc.get(UserService));
+
+    ioc.bind(
+      I.UserServiceInterface,
+      ioc
+        .get<UserServiceInterface>(UserService)
+        .use(new UserGatewayPlugin(routeService))
+    );
     ioc.bind(I.RequestCatcherInterface, ioc.get(RequestStatusCatcher));
     ioc.bind(I.ExecutorPageBridgeInterface, ioc.get(ExecutorPageBridge));
     ioc.bind(I.JSONStoragePageInterface, ioc.get(JSONStoragePageBridge));
@@ -111,7 +114,10 @@ export class ClientIOCRegister
       token: () =>
         ioc.get<UserServiceInterface>(I.UserServiceInterface).getToken()
     });
-    const apiMockPlugin = new ApiMockPlugin(mockDataJson, logger);
+    const apiMockPlugin = new ApiMockPlugin({
+      mockData: mockDataJson,
+      logger: logger
+    });
     const apiCatchPlugin = new ApiCatchPlugin(
       logger,
       ioc.get(RequestStatusCatcher)

package/dist/templates/react-app/src/core/globals.ts

@@ -1,17 +1,13 @@
 // ! global variables, don't import any dependencies and don't have side effects
 import { loggerStyles } from '@config/common';
-import {
-  ColorFormatter,
-  ConsoleHandler,
-  CookieStorage,
-  Logger
-} from '@qlover/corekit-bridge';
+import { ColorFormatter, CookieStorage } from '@qlover/corekit-bridge';
 import {
   Base64Serializer,
   JSONSerializer,
   ObjectStorage,
   SyncStorage
 } from '@qlover/fe-corekit';
+import { Logger, ConsoleHandler } from '@qlover/logger';
 import { AppConfig } from '@/base/cases/AppConfig';
 import { DialogHandler } from '@/base/cases/DialogHandler';
 import type { SyncStorageInterface } from '@qlover/fe-corekit';
@@ -37,11 +33,14 @@ export const JSON = new JSONSerializer();
 /**
  * Override localStorage to use the global local storage
  */
-export const localStorage = new SyncStorage(new ObjectStorage(), [
-  JSON,
-  new Base64Serializer(),
-  window.localStorage as unknown as SyncStorageInterface<string>
-]);
+export const localStorage = new SyncStorage<string>(
+  new ObjectStorage(),
+  [
+    JSON,
+    appConfig.isProduction ? new Base64Serializer() : undefined,
+    window.localStorage as unknown as SyncStorageInterface<string>
+  ].filter(Boolean) as any[]
+);
 
 export const localStorageEncrypt = localStorage;
 

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

@@ -4,7 +4,7 @@ import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import App from './App.tsx';
 import { BootstrapClient } from './core/bootstraps/BootstrapClient';
-import { clientIOC } from './core/clientIoc/ClientIOC.ts';
+import { clientIOC } from './core/clientIoc/ClientIOC';
 
 BootstrapClient.main({
   root: window,

package/dist/templates/react-app/src/pages/auth/Layout.tsx

@@ -1,18 +1,18 @@
 import { useStore } from '@brain-toolkit/react-kit/hooks/useStore';
 import { IOCIdentifier } from '@config/IOCIdentifier';
 import { Navigate, Outlet } from 'react-router-dom';
-import { useI18nGuard } from '@/uikit/hooks/useI18nGuard';
 import { useIOC } from '@/uikit/hooks/useIOC';
+import { useRouterI18nGuard } from '@/uikit/hooks/useRouterI18nGuard';
 import { BaseHeader } from '../../uikit/components/BaseHeader';
 
 export default function Layout() {
   const userService = useIOC(IOCIdentifier.UserServiceInterface);
-  useStore(userService.store);
+  const state = useStore(userService.getStore());
 
-  useI18nGuard();
+  useRouterI18nGuard();
 
   // If user is authenticated, redirect to home page
-  if (userService.isAuthenticated()) {
+  if (userService.isAuthenticated() && userService.isUserInfo(state.result)) {
     return <Navigate data-testid="Layout" to="/" replace />;
   }
 

package/dist/templates/react-app/src/pages/auth/RegisterPage.tsx

@@ -3,7 +3,7 @@ import { register18n } from '@config/i18n/register18n';
 import { IOCIdentifier } from '@config/IOCIdentifier';
 import { Form, Input, Button, Checkbox } from 'antd';
 import { useState } from 'react';
-import type { RegisterFormData } from '@/base/services/UserService';
+import type { RegisterFormData } from '@/base/apis/userApi/UserApiType';
 import { useI18nInterface } from '@/uikit/hooks/useI18nInterface';
 import { useIOC } from '@/uikit/hooks/useIOC';
 

package/dist/templates/react-app/src/pages/base/Layout.tsx

@@ -1,10 +1,10 @@
 import { Outlet } from 'react-router-dom';
-import { ProcessExecutorProvider } from '@/uikit/components/ProcessExecutorProvider';
+import { BaseLayoutProvider } from '@/uikit/components/BaseLayoutProvider';
 import { BaseHeader } from '../../uikit/components/BaseHeader';
 
 export default function Layout() {
   return (
-    <ProcessExecutorProvider data-testid="Layout">
+    <BaseLayoutProvider data-testid="Layout">
       <div
         data-testid="basic-layout"
         className="text-base min-h-screen bg-primary"
@@ -15,6 +15,6 @@ export default function Layout() {
           <Outlet />
         </div>
       </div>
-    </ProcessExecutorProvider>
+    </BaseLayoutProvider>
   );
 }

package/dist/templates/react-app/src/uikit/components/BaseLayoutProvider.tsx

@@ -0,0 +1,44 @@
+import { useStore } from '@brain-toolkit/react-kit';
+import { I } from '@config/IOCIdentifier';
+import { BaseLayoutService } from '@/base/services/BaseLayoutService';
+import { Loading } from './Loading';
+import { useIOC } from '../hooks/useIOC';
+import { useNavigateBridge } from '../hooks/useNavigateBridge';
+import { useRouterI18nGuard } from '../hooks/useRouterI18nGuard';
+import { useStrictEffect } from '../hooks/useStrictEffect';
+
+/**
+ * BaseLayoutProvider
+ *
+ * /pages/base/Layout.tsx 布局组件的服务提供者
+ *
+ * - 验证用户信息渲染组件，如果用户未登录则渲染 loading
+ *
+ * @param children - The children to render
+ * @returns
+ */
+export function BaseLayoutProvider({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  const ioc = useIOC();
+  const baseLayoutService = ioc(BaseLayoutService);
+  const userService = ioc(I.UserServiceInterface);
+
+  useStore(userService.getStore());
+
+  useRouterI18nGuard();
+
+  useNavigateBridge();
+
+  useStrictEffect(() => {
+    baseLayoutService.use(ioc(I.I18nKeyErrorPlugin)).starup(ioc);
+  }, []);
+
+  if (!userService.isAuthenticated()) {
+    return <Loading data-testid="BaseLayoutProviderLoading" fullscreen />;
+  }
+
+  return children;
+}

package/dist/templates/react-app/src/uikit/components/LogoutButton.tsx

@@ -29,9 +29,7 @@ export function LogoutButton() {
         'data-testid': 'LogoutButton-CancelButton'
       },
       content: tContent,
-      onOk: () => {
-        userService.logout();
-      }
+      onOk: () => userService.logout()
     });
   }, [tTitle, tContent]);
 

package/dist/templates/react-app/src/uikit/hooks/useNavigateBridge.ts

@@ -3,6 +3,15 @@ import { useNavigate } from 'react-router-dom';
 import { useIOC } from './useIOC';
 import { NavigateBridge } from '../bridges/NavigateBridge';
 
+/**
+ * 使用 navigate 桥接
+ *
+ * 将 navigate 桥接到 NavigateBridge 中
+ *
+ * 这样就可以在服务层使用 navigate 了， 比如在某个service中需要跳转页面，就可以使用 navigateBridge.getUIBridge() 来跳转
+ *
+ * **但是它需要在 RouterProvider 中使用**
+ */
 export function useNavigateBridge() {
   const navigate = useNavigate();
   const navigateBridge = useIOC(NavigateBridge);

package/dist/templates/react-app/src/uikit/hooks/{useI18nGuard.ts → useRouterI18nGuard.ts}

@@ -5,13 +5,16 @@ import type { LocaleType } from '@config/i18n/i18nConfig';
 import { useIOC } from './useIOC';
 
 /**
- * Language Guard
+ * 国际化路由国际化守卫
  *
- * if language not found, redirect to 404 page
+ * 比如: 开启了 `@config/common 中useLocaleRoutes` 为 `true` 时，
+ *
+ * 访问 `/login` 则会自动重定向到 `/en/login`, 其中 en 为默认语言可配置
+ *
+ * 或者访问一个不支持的语言，则会自动重定向到 `/en/404`
  *
- * TODO: if language not found, use default language
  */
-export function useI18nGuard() {
+export function useRouterI18nGuard() {
   const { lng } = useParams<{ lng: LocaleType }>();
   const { pathname } = useLocation();
   const navigate = useNavigate();

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

@@ -32,5 +32,5 @@
     }
   },
   "include": ["src", "config"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["**/**/node_modules", "**/**dist"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlover/create-app",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "Create a new app with a single command",
   "private": false,
   "type": "module",
@@ -33,12 +33,12 @@
     "ignore": "^7.0.3",
     "lodash": "^4.17.21",
     "ora": "^8.1.1",
-    "@qlover/logger": "0.2.0"
+    "@qlover/logger": "0.3.0"
   },
   "dependencies": {
     "commander": "^13.1.0",
     "inquirer": "^12.3.2",
-    "@qlover/scripts-context": "1.1.4"
+    "@qlover/scripts-context": "1.2.0"
   },
   "scripts": {
     "lint": "eslint src --fix",

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

@@ -1,102 +0,0 @@
-/**
- * AppError test suite
- *
- * Coverage:
- * 1. constructor       - Constructor initialization with different source types
- * 2. inheritance      - Verify inheritance from ExecutorError
- * 3. error properties - Verify error properties are set correctly
- */
-
-import { ExecutorError } from '@qlover/fe-corekit';
-import { describe, it, expect } from 'vitest';
-import { AppError } from '@/base/cases/AppError';
-
-describe('AppError', () => {
-  describe('constructor', () => {
-    it('should create instance with id only', () => {
-      const error = new AppError('TEST_ERROR');
-      expect(error).toBeInstanceOf(AppError);
-      expect(error).toBeInstanceOf(ExecutorError);
-      expect(error).toBeInstanceOf(Error);
-      expect(error.id).toBe('TEST_ERROR');
-      expect(error.message).toBe('TEST_ERROR');
-      expect(error.source).toBeUndefined();
-    });
-
-    it('should create instance with string source', () => {
-      const source = 'Test error message';
-      const error = new AppError('TEST_ERROR', source);
-      expect(error.id).toBe('TEST_ERROR');
-      expect(error.message).toBe(source);
-      expect(error.source).toBe(source);
-    });
-
-    it('should create instance with Error source', () => {
-      const source = new Error('Original error');
-      const error = new AppError('TEST_ERROR', source);
-      expect(error.id).toBe('TEST_ERROR');
-      expect(error.message).toBe('Original error');
-      expect(error.source).toBe(source);
-    });
-  });
-
-  describe('error properties', () => {
-    it('should have correct error type', () => {
-      const error = new AppError('TEST_ERROR');
-      expect(error.id).toBe('TEST_ERROR');
-    });
-
-    it('should maintain id property', () => {
-      const error = new AppError('TEST_ERROR');
-      Object.defineProperty(error, 'id', { value: 'NEW_ID' });
-      expect(error.id).toBe('NEW_ID');
-    });
-
-    it('should maintain source property', () => {
-      const source = 'source';
-      const error = new AppError('TEST_ERROR', source);
-      Object.defineProperty(error, 'source', { value: 'new source' });
-      expect(error.source).toBe('new source');
-    });
-  });
-
-  describe('error handling', () => {
-    it('should work in try-catch block', () => {
-      expect(() => {
-        throw new AppError('TEST_ERROR');
-      }).toThrow(AppError);
-    });
-
-    it('should preserve stack trace', () => {
-      const error = new AppError('TEST_ERROR');
-      expect(error.stack).toBeDefined();
-      expect(error.stack).toContain('AppError.test.ts');
-    });
-
-    it('should handle nested errors', () => {
-      const originalError = new Error('Original error');
-      const wrappedError = new AppError('WRAPPED_ERROR', originalError);
-      expect(wrappedError.source).toBe(originalError);
-      expect(wrappedError.message).toBe('Original error');
-    });
-  });
-
-  describe('error message formatting', () => {
-    it('should use id as message when source is undefined', () => {
-      const error = new AppError('TEST_ERROR');
-      expect(error.message).toBe('TEST_ERROR');
-    });
-
-    it('should use source message when source is Error', () => {
-      const source = new Error('Source error message');
-      const error = new AppError('TEST_ERROR', source);
-      expect(error.message).toBe('Source error message');
-    });
-
-    it('should use source string when source is string', () => {
-      const source = 'Source error message';
-      const error = new AppError('TEST_ERROR', source);
-      expect(error.message).toBe('Source error message');
-    });
-  });
-});

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

@@ -1,61 +0,0 @@
-import { readFileSync, existsSync } from 'fs';
-import { join } from 'path';
-
-describe('main.tsx Integration Tests', () => {
-  beforeAll(() => {
-    // Setup test environment
-    if (!document.getElementById('root')) {
-      const rootElement = document.createElement('div');
-      rootElement.id = 'root';
-      document.body.appendChild(rootElement);
-    }
-  });
-
-  afterAll(() => {
-    // Clean up DOM
-    const rootElement = document.getElementById('root');
-    if (rootElement) {
-      rootElement.remove();
-    }
-  });
-
-  beforeEach(() => {
-    // Clean up root element content
-    const rootElement = document.getElementById('root');
-    if (rootElement) {
-      rootElement.innerHTML = '';
-    }
-  });
-
-  it('should have main.tsx file', () => {
-    // Test if file exists
-    const mainPath = join(process.cwd(), 'src/main.tsx');
-    expect(existsSync(mainPath)).toBe(true);
-  });
-
-  it('should have main.tsx with correct structure', () => {
-    // Test file content structure
-    const mainPath = join(process.cwd(), 'src/main.tsx');
-    const content = readFileSync(mainPath, 'utf-8');
-
-    // Check if it contains necessary imports
-    expect(content).toContain('import');
-    expect(content).toContain('BootstrapClient');
-    expect(content).toContain('createRoot');
-  });
-
-  it('should have App.tsx file', () => {
-    // Test if App.tsx file exists
-    const appPath = join(process.cwd(), 'src/App.tsx');
-    expect(existsSync(appPath)).toBe(true);
-  });
-
-  it('should have BootstrapClient.ts file', () => {
-    // Test if BootstrapClient.ts file exists
-    const bootstrapPath = join(
-      process.cwd(),
-      'src/core/bootstraps/BootstrapClient.ts'
-    );
-    expect(existsSync(bootstrapPath)).toBe(true);
-  });
-});

package/dist/templates/react-app/src/base/services/ProcesserExecutor.ts

@@ -1,57 +0,0 @@
-import { IOCIdentifier } from '@config/IOCIdentifier';
-import {
-  AsyncExecutor,
-  ExecutorContext,
-  ExecutorPlugin
-} from '@qlover/fe-corekit';
-import { injectable, inject } from 'inversify';
-import type { ProcesserExecutorInterface } from '../port/ProcesserExecutorInterface';
-import type { RouteServiceInterface } from '../port/RouteServiceInterface';
-import type { BootstrapContextValue } from '@qlover/corekit-bridge';
-import type { LoggerInterface } from '@qlover/logger';
-
-@injectable()
-export class ProcesserExecutor implements ProcesserExecutorInterface {
-  pluginName = 'ProcesserExecutor';
-  protected executor: AsyncExecutor = new AsyncExecutor();
-
-  constructor(
-    @inject(IOCIdentifier.Logger) protected logger: LoggerInterface,
-    @inject(IOCIdentifier.RouteServiceInterface)
-    protected routeService: RouteServiceInterface
-  ) {}
-
-  /**
-   * @override
-   */
-  onBefore({
-    parameters: { ioc }
-  }: ExecutorContext<BootstrapContextValue>): void | Promise<void> {
-    this.use(ioc.get(IOCIdentifier.I18nKeyErrorPlugin));
-    this.use(ioc.get(IOCIdentifier.UserServiceInterface));
-  }
-
-  use(plugin: ExecutorPlugin): this {
-    this.executor.use(plugin);
-    return this;
-  }
-
-  handler(): Promise<{ success: boolean }> {
-    return Promise.resolve({
-      success: true
-    });
-  }
-
-  async starup(): Promise<unknown> {
-    this.logger.info('PageProcesser startup');
-
-    try {
-      const result = await this.executor.exec(this.handler);
-      return result;
-    } catch (err) {
-      this.logger.error('PageProcesser init failed', err);
-
-      this.routeService.gotoLogin();
-    }
-  }
-}

package/dist/templates/react-app/src/uikit/components/ProcessExecutorProvider.tsx

@@ -1,28 +0,0 @@
-import { IOCIdentifier } from '@config/IOCIdentifier';
-import { UserAuthProvider } from './UserAuthProvider';
-import { useI18nGuard } from '../hooks/useI18nGuard';
-import { useIOC } from '../hooks/useIOC';
-import { useNavigateBridge } from '../hooks/useNavigateBridge';
-import { useStrictEffect } from '../hooks/useStrictEffect';
-
-export function ProcessExecutorProvider({
-  children
-}: {
-  children: React.ReactNode;
-}) {
-  const processerExecutor = useIOC(IOCIdentifier.ProcesserExecutorInterface);
-
-  useI18nGuard();
-
-  useNavigateBridge();
-
-  useStrictEffect(() => {
-    processerExecutor.starup();
-  }, []);
-
-  return (
-    <UserAuthProvider data-testid="ProcessExecutorProvider">
-      {children}
-    </UserAuthProvider>
-  );
-}

package/dist/templates/react-app/src/uikit/components/UserAuthProvider.tsx

@@ -1,16 +0,0 @@
-import { useStore } from '@brain-toolkit/react-kit/hooks/useStore';
-import { IOCIdentifier } from '@config/IOCIdentifier';
-import { Loading } from './Loading';
-import { useIOC } from '../hooks/useIOC';
-
-export function UserAuthProvider({ children }: { children: React.ReactNode }) {
-  const userService = useIOC(IOCIdentifier.UserServiceInterface);
-
-  useStore(userService.store);
-
-  if (!userService.isAuthenticated()) {
-    return <Loading data-testid="UserAuthProvider" fullscreen />;
-  }
-
-  return children;
-}