@qlover/create-app 0.10.1 → 0.10.2

package/dist/templates/next-app/src/app/api/user/logout/route.ts

@@ -1,27 +1,8 @@
-import { ExecutorError } from '@qlover/fe-corekit';
-import { NextResponse } from 'next/server';
-import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
-import { AppErrorApi } from '@/server/AppErrorApi';
-import { AppSuccessApi } from '@/server/AppSuccessApi';
-import type { UserServiceInterface } from '@/server/port/UserServiceInterface';
-import { UserService } from '@/server/services/UserService';
+import { UserController } from '@/server/controllers/UserController';
+import { NextApiServer } from '@/server/NextApiServer';
 
 export async function POST() {
-  const server = new BootstrapServer();
-
-  const result = await server.execNoError(async ({ parameters: { IOC } }) => {
-    const userService: UserServiceInterface = IOC(UserService);
-
-    await userService.logout();
-
-    return true;
-  });
-
-  if (result instanceof ExecutorError) {
-    return NextResponse.json(new AppErrorApi(result.id, result.message), {
-      status: 400
-    });
-  }
-
-  return NextResponse.json(new AppSuccessApi(result));
+  return await new NextApiServer().runWithJson(
+    async ({ parameters: { IOC } }) => IOC(UserController).logout()
+  );
 }

package/dist/templates/next-app/src/app/api/user/register/route.ts

@@ -1,50 +1,11 @@
-import { ExecutorError } from '@qlover/fe-corekit';
-import { NextResponse } from 'next/server';
-import { StringEncryptor } from '@/base/cases/StringEncryptor';
-import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
-import { AppErrorApi } from '@/server/AppErrorApi';
-import { AppSuccessApi } from '@/server/AppSuccessApi';
-import type { UserServiceInterface } from '@/server/port/UserServiceInterface';
-import { UserService } from '@/server/services/UserService';
-import { LoginValidator } from '@/server/validators/LoginValidator';
+import { UserController } from '@/server/controllers/UserController';
+import { NextApiServer } from '@/server/NextApiServer';
 import type { NextRequest } from 'next/server';
 
 export async function POST(req: NextRequest) {
-  const server = new BootstrapServer();
+  const requestBody = await req.json();
 
-  const result = await server.execNoError(async ({ parameters: { IOC } }) => {
-    const requestBody = await req.json();
-
-    try {
-      if (requestBody.password) {
-        requestBody.password = IOC(StringEncryptor).decrypt(
-          requestBody.password
-        );
-      }
-    } catch {
-      throw new ExecutorError(
-        'encrypt_password_failed',
-        'Encrypt password failed'
-      );
-    }
-
-    const body = IOC(LoginValidator).getThrow(requestBody);
-
-    const userService: UserServiceInterface = IOC(UserService);
-
-    const user = await userService.register({
-      email: body.email,
-      password: body.password
-    });
-
-    return user;
-  });
-
-  if (result instanceof ExecutorError) {
-    return NextResponse.json(new AppErrorApi(result.id, result.message), {
-      status: 400
-    });
-  }
-
-  return NextResponse.json(new AppSuccessApi(result));
+  return await new NextApiServer().runWithJson(
+    async ({ parameters: { IOC } }) => IOC(UserController).register(requestBody)
+  );
 }

package/dist/templates/next-app/src/app/manifest.ts

@@ -0,0 +1,16 @@
+import { getTranslations } from 'next-intl/server';
+import { routing } from '@/i18n/routing';
+import { COMMON_MANIFEST_NAME } from '@config/Identifier';
+import type { MetadataRoute } from 'next';
+
+export default async function manifest(): Promise<MetadataRoute.Manifest> {
+  const t = await getTranslations({
+    locale: routing.defaultLocale
+  });
+
+  return {
+    name: t(COMMON_MANIFEST_NAME),
+    start_url: '/',
+    theme_color: '#101E33'
+  };
+}

package/dist/templates/next-app/src/app/robots.txt

@@ -0,0 +1,2 @@
+User-Agent: *
+Allow: *

package/dist/templates/next-app/src/base/cases/NavigateBridge.ts

@@ -1,16 +1,26 @@
-import { injectable } from 'inversify';
+import { inject, injectable } from 'inversify';
+import type { useRouter } from '@/i18n/routing';
+import { I } from '@config/IOCIdentifier';
 import type { UIBridgeInterface } from '@qlover/corekit-bridge';
-import type { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
+import type { LoggerInterface } from '@qlover/logger';
+
+type AppRouterInstance = ReturnType<typeof useRouter>;
 
 @injectable()
 export class NavigateBridge implements UIBridgeInterface<AppRouterInstance> {
   protected navigate: AppRouterInstance | null = null;
 
+  constructor(@inject(I.Logger) protected logger: LoggerInterface) {}
+
   setUIBridge(ui: AppRouterInstance): void {
     this.navigate = ui;
   }
 
   getUIBridge(): AppRouterInstance | null {
+    if (!this.navigate) {
+      this.logger.debug('NavigateBridge this.navigate is not set');
+    }
+
     return this.navigate;
   }
 }

package/dist/templates/next-app/src/base/cases/RouterService.ts

@@ -13,12 +13,8 @@ export class RouterService implements RouterInterface {
     protected uiBridge: UIBridgeInterface<AppRouterInstance>
   ) {}
 
-  protected padLocaleHref(href: RouterPathname): string {
-    return `/${this.locale}${href === '/' ? '' : href}`;
-  }
-
   goto(href: RouterPathname): void {
-    this.uiBridge.getUIBridge()?.push(this.padLocaleHref(href));
+    this.uiBridge.getUIBridge()?.push(href as string);
   }
 
   gotoHome(): void {
@@ -29,6 +25,10 @@ export class RouterService implements RouterInterface {
     this.goto('/login');
   }
 
+  replaceHome(): void {
+    this.uiBridge.getUIBridge()?.replace('/');
+  }
+
   setLocale(locale: string): void {
     this.locale = locale;
   }

package/dist/templates/next-app/src/base/port/AppApiInterface.ts

@@ -12,3 +12,25 @@ export interface AppApiSuccessInterface<T = unknown> {
 export type AppApiResult<T = unknown> =
   | AppApiErrorInterface
   | AppApiSuccessInterface<T>;
+
+export function isAppApiSuccessInterface(
+  result: unknown
+): result is AppApiSuccessInterface {
+  return (
+    typeof result === 'object' &&
+    result !== null &&
+    'success' in result &&
+    result.success === true
+  );
+}
+
+export function isAppApiErrorInterface(
+  result: unknown
+): result is AppApiErrorInterface {
+  return (
+    typeof result === 'object' &&
+    result !== null &&
+    'success' in result &&
+    result.success === false
+  );
+}

package/dist/templates/next-app/src/base/port/IOCInterface.ts

@@ -21,4 +21,13 @@ export interface IOCInterface<
   create(
     options: IocRegisterOptions
   ): IOCFunctionInterface<IdentifierMap, IOCContainer>;
+
+  /**
+   * 该方法主要用于在应用启动前注册所有依赖
+   *
+   * 因为ssr渲染的原因可能需要在一些特定的环境下注册一些依赖
+   *
+   * @param options - 注册选项
+   */
+  register(options?: IocRegisterOptions): void;
 }

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 lastTime = 0;
   static async main(args: BootstrapAppArgs): Promise<BootstrapAppArgs> {
-    const { root, IOC } = args;
+    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>;

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

@@ -41,7 +41,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,6 +21,14 @@ export class ClientIOC implements IOCInterface<
     IOCIdentifierMap,
     IOCContainerInterface
   > | null = null;
+  protected registers = 0;
+
+  constructor(
+    protected readonly iocRegister?: IOCRegisterInterface<
+      IOCContainerInterface,
+      IocRegisterOptions
+    >
+  ) {}
 
   create(): IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface> {
     if (this.ioc) {
@@ -25,13 +37,22 @@ export class ClientIOC implements IOCInterface<
 
     this.ioc = createIOCFunction<IOCIdentifierMap>(new InversifyContainer());
 
-    const register = new ClientIOCRegister({
-      appConfig: appConfig
-    });
+    return this.ioc;
+  }
+
+  register(options: IocRegisterOptions): void {
+    if (this.registers > 0) {
+      return;
+    }
+
+    if (!this.ioc) {
+      return;
+    }
 
-    register.register(this.ioc.implemention!, this.ioc);
+    logger.info('ClientIOC register');
+    new ClientIOCRegister(options).register(this.ioc.implemention!, this.ioc);
 
-    return 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 {
@@ -34,7 +36,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));
   }
 
   /**
@@ -87,7 +89,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';
 
@@ -15,6 +18,8 @@ export class ServerIOC implements IOCInterface<
 > {
   static instance: ServerIOC | null = null;
 
+  protected registers = 0;
+
   protected ioc: IOCFunctionInterface<
     IOCIdentifierMapServer,
     IOCContainerInterface
@@ -38,16 +43,29 @@ 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;
   }
+
+  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++;
+  }
 }

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

@@ -5,7 +5,7 @@ import {
 } from '@qlover/corekit-bridge';
 import { Logger, ConsoleHandler, TimestampFormatter } from '@qlover/logger';
 import type { IocRegisterOptions } from '@/base/port/IOCInterface';
-import { SupabaseBridge } from '@/server/sqlBridges/SupabaseBridge';
+import { SupabaseBridge } from '@/server/SupabaseBridge';
 import { IOCIdentifier as I } from '@config/IOCIdentifier';
 
 export class ServerIOCRegister implements IOCRegisterInterface<

package/dist/templates/next-app/src/i18n/loadMessages.ts

@@ -0,0 +1,103 @@
+import { useApiLocales } from '@config/common';
+
+/**
+ * 加载 i18n 消息的公共方法
+ * 支持从 API 加载或从 JSON 文件加载
+ *
+ * @param locale - 要加载的语言代码
+ * @param namespace - 可选的命名空间（单个字符串或字符串数组），如果提供则只返回该命名空间下的消息，保留命名空间前缀
+ * @returns Promise<Record<string, string>> 返回翻译消息对象
+ *
+ * @example
+ * ```ts
+ * // 加载所有消息
+ * const allMessages = await loadMessages('en');
+ *
+ * // 加载单个命名空间
+ * const commonMessages = await loadMessages('en', 'common');
+ *
+ * // 加载多个命名空间
+ * const messages = await loadMessages('en', ['common', 'page_home']);
+ * ```
+ */
+export async function loadMessages(
+  locale: string,
+  namespace?: string | string[]
+): Promise<Record<string, string>> {
+  let allMessages: Record<string, string>;
+
+  // 如果配置了使用 API 加载本地化数据
+  if (useApiLocales) {
+    try {
+      const app_host = process.env.APP_HOST;
+      const localeUrl = `${app_host}/api/locales/json?locale=${locale}`;
+      const response = await fetch(localeUrl);
+
+      if (!response.ok) {
+        throw new Error(
+          `Failed to fetch locale from API: ${response.statusText}`
+        );
+      }
+
+      allMessages = await response.json();
+    } catch (error) {
+      console.warn(`Failed to load locale from API for ${locale}`, error);
+      // 如果 API 加载失败，继续尝试从文件加载
+      allMessages = (await import(`../../public/locales/${locale}.json`))
+        .default;
+    }
+  } else {
+    allMessages = (await import(`../../public/locales/${locale}.json`)).default;
+  }
+
+  // 如果指定了命名空间，进行过滤
+  return filterMessagesByNamespace(allMessages, namespace);
+}
+
+/**
+ * 根据命名空间过滤消息，保留命名空间前缀
+ *
+ * @param messages - 所有消息对象
+ * @param namespace - 可选的命名空间（单个字符串或字符串数组），如果提供则只返回该命名空间下的消息，保留命名空间前缀
+ * @returns 过滤后的消息对象
+ *
+ * @example
+ * ```ts
+ * const allMessages = { "common:save": "Save", "common:cancel": "Cancel", "page_home:title": "Home" };
+ *
+ * // 单个命名空间
+ * const commonMessages = filterMessagesByNamespace(allMessages, "common");
+ * // 返回: { "common:save": "Save", "common:cancel": "Cancel" }
+ *
+ * // 多个命名空间
+ * const messages = filterMessagesByNamespace(allMessages, ["common", "page_home"]);
+ * // 返回: { "common:save": "Save", "common:cancel": "Cancel", "page_home:title": "Home" }
+ * ```
+ */
+export function filterMessagesByNamespace(
+  messages: Record<string, string>,
+  namespace?: string | string[]
+): Record<string, string> {
+  // 如果没有指定命名空间，返回所有消息
+  if (!namespace) {
+    return messages;
+  }
+
+  // 将单个字符串转换为数组，统一处理
+  const namespaces = Array.isArray(namespace) ? namespace : [namespace];
+  const filteredMessages: Record<string, string> = {};
+
+  // 遍历所有命名空间
+  for (const ns of namespaces) {
+    const namespacePrefix = `${ns}:`;
+
+    for (const [key, value] of Object.entries(messages)) {
+      if (key.startsWith(namespacePrefix)) {
+        // 保留完整的键名（包括命名空间前缀）
+        filteredMessages[key] = value;
+      }
+    }
+  }
+
+  return filteredMessages;
+}

package/dist/templates/next-app/src/i18n/request.ts

@@ -1,7 +1,7 @@
 // src/i18n/request.ts
 
 import { getRequestConfig } from 'next-intl/server';
-import { useApiLocales } from '@config/common';
+import { loadMessages } from './loadMessages';
 import { routing, type Locale } from './routing';
 
 // Export a function to configure next-intl on each request (server-side)
@@ -14,30 +14,11 @@ export default getRequestConfig(async ({ requestLocale }) => {
     locale = routing.defaultLocale;
   }
 
-  // use api locales
-  if (useApiLocales) {
-    const app_host = process.env.APP_HOST;
-    const localeUrl = `${app_host}/api/locales/json?locale=${locale}`;
-    const response = await fetch(localeUrl);
-    const data = await response.json();
-    return {
-      locale,
-      messages: data,
-      // 将 MISSING_MESSAGE 错误转换为警告
-      onError: (error) => {
-        if (error.message.includes('MISSING_MESSAGE')) {
-          console.warn(`[i18n] Missing translation: ${error.message}`);
-          return error.message; // 返回 key 作为 fallback 文本
-        }
-        throw error; // 其他错误仍然抛出
-      }
-    };
-  }
+  const messages = await loadMessages(locale);
 
-  // Dynamically import the translation messages for the selected locale
   return {
     locale,
-    messages: (await import(`../../public/locales/${locale}.json`)).default,
+    messages,
     // 将 MISSING_MESSAGE 错误转换为警告
     onError: (error) => {
       if (error.message.includes('MISSING_MESSAGE')) {