@qlover/create-app 0.10.0 → 0.10.2

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,21 +1,34 @@
 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, IOCContainerInterface>
-{
+export class ClientIOC implements IOCInterface<
+  IOCIdentifierMap,
+  IOCContainerInterface
+> {
   protected ioc: IOCFunctionInterface<
     IOCIdentifierMap,
     IOCContainerInterface
   > | null = null;
+  protected registers = 0;
+
+  constructor(
+    protected readonly iocRegister?: IOCRegisterInterface<
+      IOCContainerInterface,
+      IocRegisterOptions
+    >
+  ) {}
 
   create(): IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface> {
     if (this.ioc) {
@@ -24,13 +37,22 @@ export class ClientIOC
 
     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 {
@@ -10,9 +12,10 @@ import type {
   IOCRegisterInterface
 } from '@qlover/corekit-bridge';
 
-export class ClientIOCRegister
-  implements IOCRegisterInterface<IOCContainerInterface, IocRegisterOptions>
-{
+export class ClientIOCRegister implements IOCRegisterInterface<
+  IOCContainerInterface,
+  IocRegisterOptions
+> {
   constructor(protected options: IocRegisterOptions) {}
 
   /**
@@ -33,7 +36,7 @@ export class ClientIOCRegister
     // 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));
   }
 
   /**
@@ -86,7 +89,7 @@ export class ClientIOCRegister
   /**
    * @override
    */
-  register(
+  public register(
     ioc: IOCContainerInterface,
     _manager: IOCManagerInterface<IOCContainerInterface>
   ): void {

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

@@ -1,8 +1,9 @@
 import 'reflect-metadata';
 
 // ! global variables, don't import any dependencies and don't have side effects
-import { ColorFormatter, ConsoleHandler, Logger } from '@qlover/corekit-bridge';
+import { ColorFormatter } from '@qlover/corekit-bridge';
 import { JSONSerializer } from '@qlover/fe-corekit';
+import { Logger, ConsoleHandler } from '@qlover/logger';
 import { AppConfig } from '@/base/cases/AppConfig';
 import { DialogHandler } from '@/base/cases/DialogHandler';
 import { loggerStyles } from '@config/common';

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

@@ -5,15 +5,21 @@ 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';
 
-export class ServerIOC
-  implements IOCInterface<IOCIdentifierMapServer, IOCContainerInterface>
-{
+export class ServerIOC implements IOCInterface<
+  IOCIdentifierMapServer,
+  IOCContainerInterface
+> {
   static instance: ServerIOC | null = null;
 
+  protected registers = 0;
+
   protected ioc: IOCFunctionInterface<
     IOCIdentifierMapServer,
     IOCContainerInterface
@@ -37,16 +43,29 @@ export class ServerIOC
       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

@@ -1,18 +1,17 @@
 import {
-  ConsoleHandler,
-  Logger,
-  TimestampFormatter,
   type IOCContainerInterface,
   type IOCManagerInterface,
   type IOCRegisterInterface
 } 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<IOCContainerInterface, IocRegisterOptions>
-{
+export class ServerIOCRegister implements IOCRegisterInterface<
+  IOCContainerInterface,
+  IocRegisterOptions
+> {
   constructor(protected options: IocRegisterOptions) {}
 
   /**

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')) {

package/dist/templates/next-app/src/pages/[locale]/about.tsx

@@ -0,0 +1,61 @@
+import { useMemo } from 'react';
+import { PagesRouteParams } from '@/server/PagesRouteParams';
+import type { PagesRouteParamsType } from '@/server/PagesRouteParams';
+import { ClientSeo } from '@/uikit/components/ClientSeo';
+import { PagesRoutePage } from '@/uikit/components-pages/PagesRoutePage';
+import { useI18nInterface } from '@/uikit/hook/useI18nInterface';
+import { aboutI18n, i18nConfig } from '@config/i18n';
+import { COMMON_ADMIN_TITLE } from '@config/Identifier';
+import type { GetStaticPropsContext } from 'next';
+
+interface AboutProps {
+  messages: Record<string, string>;
+}
+
+const namespace = 'page_about';
+
+export default function About({}: AboutProps) {
+  const i18nInterface = useMemo(() => {
+    return {
+      ...aboutI18n,
+      adminTitle: COMMON_ADMIN_TITLE
+    };
+  }, []);
+  const seoMetadata = useI18nInterface(i18nInterface);
+
+  return (
+    <PagesRoutePage
+      data-testid="AboutPage"
+      tt={{ title: seoMetadata.title, adminTitle: seoMetadata.adminTitle }}
+      showAdminButton={false}
+    >
+      <ClientSeo i18nInterface={seoMetadata} />
+      <div data-testid="About" className="bg-primary h-screen">
+        {seoMetadata.title}
+      </div>
+    </PagesRoutePage>
+  );
+}
+
+export async function getStaticProps({
+  params
+}: GetStaticPropsContext<PagesRouteParamsType>) {
+  const pageParams = new PagesRouteParams(params);
+
+  const messages = await pageParams.getI18nMessages(namespace);
+
+  return {
+    props: {
+      messages
+    }
+  };
+}
+
+export async function getStaticPaths() {
+  return {
+    paths: i18nConfig.supportedLngs.map((locale) => ({
+      params: { locale }
+    })),
+    fallback: false
+  };
+}

package/dist/templates/next-app/src/pages/_app.tsx

@@ -0,0 +1,50 @@
+import dynamic from 'next/dynamic';
+import { withRouter } from 'next/router';
+import { NextIntlClientProvider } from 'next-intl';
+import '@/styles/css/index.css';
+import type { PagesRouterProps } from '@/base/types/PagesRouter';
+import { BootstrapsProvider } from '@/uikit/components/BootstrapsProvider';
+import { IOCProvider } from '@/uikit/components/IOCProvider';
+import { i18nConfig } from '@config/i18n';
+import { themeConfig } from '@config/theme';
+
+/**
+ * 动态导入 ClientRootProvider，禁用 SSR，确保只在客户端渲染
+ *
+ * 为什么需要禁用 SSR？
+ * 1. ClientRootProvider 内部使用了 AntdRegistry（来自 @ant-design/nextjs-registry），
+ *    该组件主要针对 App Router 设计，在 Pages Router 的 SSR 环境中可能存在兼容性问题
+ * 2. ClientRootProvider 使用了 useIOC() hook，该 hook 在服务端渲染时可能无法正常工作
+ * 3. ThemeProvider 和 AntdThemeProvider 可能依赖浏览器 API（如 localStorage、window 等），
+ *    在服务端渲染时会导致错误或页面一直处于加载状态
+ *
+ * 通过在 Pages Router 中使用 dynamic import 并设置 ssr: false，
+ * 可以确保 ClientRootProvider 只在客户端渲染，避免 SSR 相关的问题
+ */
+const ClientRootProvider = dynamic(
+  () =>
+    import('@/uikit/components/ClientRootProvider').then(
+      (mod) => mod.ClientRootProvider
+    ),
+  {
+    ssr: false
+  }
+);
+
+function App({ Component, pageProps, router }: PagesRouterProps) {
+  const locale = (router.query.locale as string) || i18nConfig.fallbackLng;
+
+  return (
+    <IOCProvider data-testid="IOCProvider">
+      <NextIntlClientProvider locale={locale} messages={pageProps.messages}>
+        <BootstrapsProvider>
+          <ClientRootProvider themeConfig={themeConfig}>
+            <Component {...pageProps} />
+          </ClientRootProvider>
+        </BootstrapsProvider>
+      </NextIntlClientProvider>
+    </IOCProvider>
+  );
+}
+
+export default withRouter(App);

package/dist/templates/next-app/src/pages/_document.tsx

@@ -0,0 +1,13 @@
+import { Html, Head, Main, NextScript } from 'next/document';
+
+export default function Document() {
+  return (
+    <Html data-testid="PagesRootLayout">
+      <Head />
+      <body>
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
+  );
+}

package/dist/templates/next-app/src/{middleware.ts → proxy.ts}

@@ -20,6 +20,7 @@ export const config = {
     // - Next.js internals (_next/*)
     // - Static files (*.svg, *.png, *.jpg, *.jpeg, *.gif, *.ico)
     // - Other static assets and special files
-    '/((?!api|_next|.*\\.(?:svg|png|jpg|jpeg|gif|ico)|favicon.ico|sitemap.xml|sitemap-0.xml).*)'
+    // - Manifest file (manifest.webmanifest)
+    '/((?!api|_next|.*\\.(?:svg|png|jpg|jpeg|gif|ico)|favicon.ico|sitemap.xml|sitemap-0.xml|manifest.webmanifest).*)'
   ]
 };