@qlover/create-app 0.7.7 → 0.7.8

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

@@ -0,0 +1,35 @@
+import { inject, injectable } from 'inversify';
+import { NavigateBridge } from './NavigateBridge';
+import type { RouterInterface, RouterPathname } from '../port/RouterInterface';
+import type { UIBridgeInterface } from '@qlover/corekit-bridge';
+import type { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
+
+@injectable()
+export class RouterService implements RouterInterface {
+  protected locale: string = '';
+
+  constructor(
+    @inject(NavigateBridge)
+    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));
+  }
+
+  gotoHome(): void {
+    this.goto('/');
+  }
+
+  setLocale(locale: string): void {
+    this.locale = locale;
+  }
+
+  getLocale(): string {
+    return this.locale;
+  }
+}

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

@@ -0,0 +1,17 @@
+import { cookies } from 'next/headers';
+import { I } from '@config/IOCIdentifier';
+import type { ServerAuthInterface } from '../port/ServerAuthInterface';
+import type { ServerInterface } from '../port/ServerInterface';
+
+export class ServerAuth implements ServerAuthInterface {
+  constructor(protected server: ServerInterface) {}
+
+  async hasAuth(): Promise<boolean> {
+    const cookieStore = await cookies();
+    const appConfig = this.server.getIOC(I.AppConfig);
+
+    const token = cookieStore.get(appConfig.userTokenKey);
+
+    return !!token;
+  }
+}

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

@@ -0,0 +1,27 @@
+import { ExecutorError, type ExecutorContext } from '@qlover/fe-corekit';
+import { SERVER_AUTH_ERROR } from '@config/Identifier';
+import type { BootstrapServerContextValue } from '@/core/bootstraps/BootstrapServer';
+import type { BootstrapExecutorPlugin } from '@qlover/corekit-bridge';
+
+export class ServerErrorHandler implements BootstrapExecutorPlugin {
+  pluginName = 'ServerErrorHandler';
+
+  onError(
+    context: ExecutorContext<BootstrapServerContextValue>
+  ): ExecutorError | void {
+    const { parameters, error } = context;
+    const { messages } = parameters;
+
+    if (error instanceof Error) {
+      const messageId = error.message;
+
+      if (messageId === SERVER_AUTH_ERROR) {
+        const message = messages[messageId];
+
+        if (message) {
+          return new ExecutorError(messageId, message);
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,24 @@
+import type {
+  EnvConfigInterface,
+  IOCContainerInterface,
+  IOCFunctionInterface
+} from '@qlover/corekit-bridge';
+
+/**
+ * IOC register options
+ */
+export type IocRegisterOptions = {
+  /**
+   * The app config
+   */
+  appConfig: EnvConfigInterface;
+};
+
+export interface IOCInterface<
+  IdentifierMap,
+  IOCContainer extends IOCContainerInterface
+> {
+  create(
+    options: IocRegisterOptions
+  ): IOCFunctionInterface<IdentifierMap, IOCContainer>;
+}

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

@@ -0,0 +1,11 @@
+import type { PageI18nInterface } from '@config/i18n';
+
+export interface ParamsHandlerInterface {
+  getLocale(defaultLocale?: string): string;
+  getI18nWithNotFound(): string;
+  getI18nMessages(): Promise<Record<string, string>>;
+  getI18nInterface<T extends PageI18nInterface>(
+    i18nInterface: T,
+    namespace?: string
+  ): Promise<T>;
+}

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

@@ -0,0 +1,11 @@
+import type { redirect } from '@/i18n/routing';
+export type RouterPathname = Parameters<typeof redirect>[0]['href'];
+
+export interface RouterInterface {
+  gotoHome(): void;
+  goto(href: RouterPathname): void;
+
+  getLocale(): string;
+
+  setLocale(locale: string): void;
+}

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

@@ -0,0 +1,3 @@
+export interface ServerAuthInterface {
+  hasAuth(): Promise<boolean>;
+}

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

@@ -0,0 +1,12 @@
+import {
+  type IOCContainerInterface,
+  type IOCFunctionInterface
+} from '@qlover/corekit-bridge';
+import { type IOCIdentifierMapServer } from '@config/IOCIdentifier';
+
+export interface ServerInterface {
+  getIOC(): IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>;
+  getIOC<T extends keyof IOCIdentifierMapServer>(
+    identifier: T
+  ): IOCIdentifierMapServer[T];
+}

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

@@ -0,0 +1,9 @@
+import type { PageWithParams } from '@/base/cases/PageParams';
+
+export interface PageParamsProps extends PageWithParams {
+  searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
+}
+
+export interface PageLayoutProps extends PageWithParams {
+  children: React.ReactNode;
+}

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

@@ -1,18 +1,12 @@
-import { Bootstrap, createIOCFunction } from '@qlover/corekit-bridge';
+import { Bootstrap } from '@qlover/corekit-bridge';
 import { isObject } from 'lodash';
 import { browserGlobalsName } from '@config/common';
-import { InversifyContainer } from '@/base/cases/InversifyContainer';
 import { BootstrapsRegistry } from './BootstrapsRegistry';
 import * as globals from '../globals';
-import { appConfig } from '../globals';
-import { IocRegisterImpl } from '../IocRegisterImpl';
-import type { IOCContainer } from '../IOC';
 import type { IOCIdentifierMap } from '@config/IOCIdentifier';
 import type {
-  EnvConfigInterface,
   IOCContainerInterface,
-  IOCFunctionInterface,
-  IOCManagerInterface
+  IOCFunctionInterface
 } from '@qlover/corekit-bridge';
 
 export type BootstrapAppArgs = {
@@ -31,37 +25,6 @@ export type BootstrapAppArgs = {
 };
 
 export class BootstrapClient {
-  private static _ioc: IOCFunctionInterface<
-    IOCIdentifierMap,
-    IOCContainerInterface
-  > | null = null;
-
-  static createSingletonIOC(): IOCFunctionInterface<
-    IOCIdentifierMap,
-    IOCContainerInterface
-  > {
-    if (BootstrapClient._ioc) {
-      return BootstrapClient._ioc;
-    }
-
-    BootstrapClient._ioc = createIOCFunction<IOCIdentifierMap>(
-      /**
-       * If not inversify, you can use any IOC container,
-       * then replace the InversifyContainer with your own IOC container
-       */
-      new InversifyContainer()
-    );
-
-    new IocRegisterImpl({
-      appConfig: appConfig as EnvConfigInterface
-    }).register(
-      BootstrapClient._ioc.implemention as IOCContainer,
-      BootstrapClient._ioc as IOCManagerInterface<IOCContainer>
-    );
-
-    return BootstrapClient._ioc;
-  }
-
   static async main(args: BootstrapAppArgs): Promise<BootstrapAppArgs> {
     const { root, IOC } = args;
 

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

@@ -0,0 +1,78 @@
+import {
+  type BootstrapContextValue,
+  type BootstrapExecutorPlugin,
+  type IOCContainerInterface,
+  type IOCFunctionInterface,
+  type LoggerInterface
+} from '@qlover/corekit-bridge';
+import { AsyncExecutor, type ExecutorPlugin } from '@qlover/fe-corekit';
+import { I, type IOCIdentifierMapServer } from '@config/IOCIdentifier';
+import type { ServerInterface } from '@/base/port/ServerInterface';
+import { ServerIOC } from '../serverIoc/ServerIOC';
+
+export interface BootstrapServerResult {
+  locale: string;
+  messages: Record<string, string>;
+}
+
+export interface BootstrapServerContextValue extends BootstrapContextValue {
+  locale: string;
+  messages: Record<string, string>;
+}
+
+export class BootstrapServer implements ServerInterface {
+  protected executor: AsyncExecutor;
+  protected root: Record<string, unknown> = {};
+  protected IOC: IOCFunctionInterface<
+    IOCIdentifierMapServer,
+    IOCContainerInterface
+  >;
+  readonly logger: LoggerInterface;
+
+  constructor() {
+    const serverIOC = ServerIOC.create();
+    const ioc = serverIOC.create();
+    const logger = ioc(I.Logger);
+
+    this.executor = new AsyncExecutor();
+    this.IOC = ioc;
+    this.logger = logger;
+  }
+
+  getIOC(): IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>;
+  getIOC<T extends keyof IOCIdentifierMapServer>(
+    identifier: T
+  ): IOCIdentifierMapServer[T];
+  getIOC(
+    identifier?: keyof IOCIdentifierMapServer
+  ):
+    | IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>
+    | IOCIdentifierMapServer[keyof IOCIdentifierMapServer] {
+    if (identifier === undefined) {
+      return this.IOC;
+    }
+    return this.IOC(identifier);
+  }
+
+  /**
+   * @override
+   */
+  use(
+    plugin:
+      | BootstrapExecutorPlugin
+      | BootstrapExecutorPlugin[]
+      | ((
+          ioc: IOCFunctionInterface<
+            IOCIdentifierMapServer,
+            IOCContainerInterface
+          >
+        ) => BootstrapExecutorPlugin)
+  ): this {
+    if (typeof plugin === 'function') {
+      plugin = plugin(this.IOC);
+    }
+
+    this.executor.use(plugin as ExecutorPlugin<unknown>);
+    return this;
+  }
+}

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

@@ -0,0 +1,37 @@
+import {
+  createIOCFunction,
+  type IOCContainerInterface,
+  type IOCFunctionInterface
+} from '@qlover/corekit-bridge';
+import { InversifyContainer } from '@/base/cases/InversifyContainer';
+import type { IOCInterface } from '@/base/port/IOCInterface';
+import { ClientIOCRegister } from './ClientIOCRegister';
+import { appConfig } from '../globals';
+import type { IOCIdentifierMap } from '@config/IOCIdentifier';
+
+export class ClientIOC
+  implements IOCInterface<IOCIdentifierMap, IOCContainerInterface>
+{
+  protected ioc: IOCFunctionInterface<
+    IOCIdentifierMap,
+    IOCContainerInterface
+  > | null = null;
+
+  create(): IOCFunctionInterface<IOCIdentifierMap, IOCContainerInterface> {
+    if (this.ioc) {
+      return this.ioc;
+    }
+
+    this.ioc = createIOCFunction<IOCIdentifierMap>(new InversifyContainer());
+
+    const register = new ClientIOCRegister({
+      appConfig: appConfig
+    });
+
+    register.register(this.ioc.implemention!, this.ioc);
+
+    return this.ioc;
+  }
+}
+
+export const clientIOC = new ClientIOC();

package/dist/templates/next-app/src/core/{IocRegisterImpl.ts → clientIoc/ClientIOCRegister.ts}

@@ -1,10 +1,18 @@
 import { IOCIdentifier as I } from '@config/IOCIdentifier';
+import { RouterService } from '@/base/cases/RouterService';
+import type { IocRegisterOptions } from '@/base/port/IOCInterface';
 import { I18nService } from '@/base/services/I18nService';
-import { logger, JSON } from './globals';
-import type { IOCContainer, IOCRegister, IocRegisterOptions } from './IOC';
-import type { IOCManagerInterface } from '@qlover/corekit-bridge';
+import { UserService } from '@/base/services/UserService';
+import { dialogHandler, logger, JSON } from '../globals';
+import type {
+  IOCContainerInterface,
+  IOCManagerInterface,
+  IOCRegisterInterface
+} from '@qlover/corekit-bridge';
 
-export class IocRegisterImpl implements IOCRegister {
+export class ClientIOCRegister
+  implements IOCRegisterInterface<IOCContainerInterface, IocRegisterOptions>
+{
   constructor(protected options: IocRegisterOptions) {}
 
   /**
@@ -14,13 +22,13 @@ export class IocRegisterImpl implements IOCRegister {
    *
    * @param ioc - IOC container
    */
-  protected registerGlobals(ioc: IOCContainer): void {
+  protected registerGlobals(ioc: IOCContainerInterface): void {
     const { appConfig } = this.options;
     ioc.bind(I.JSONSerializer, JSON);
     ioc.bind(I.Logger, logger);
     ioc.bind(I.AppConfig, appConfig);
     // ioc.bind(I.EnvConfigInterface, appConfig);
-    // ioc.bind(I.DialogHandler, dialogHandler);
+    ioc.bind(I.DialogHandler, dialogHandler);
     // ioc.bind(I.UIDialogInterface, dialogHandler);
     // ioc.bind(I.AntdStaticApiInterface, dialogHandler);
     // ioc.bind(I.LocalStorage, globals.localStorage);
@@ -38,20 +46,9 @@ export class IocRegisterImpl implements IOCRegister {
    *
    * @param ioc
    */
-  protected registerImplement(ioc: IOCContainer): void {
+  protected registerImplement(ioc: IOCContainerInterface): void {
     ioc.bind(I.I18nServiceInterface, new I18nService());
-    // ioc.bind(
-    //   I.RouteServiceInterface,
-    //   new RouteService(
-    //     ioc.get(NavigateBridge),
-    //     ioc.get(I.I18nServiceInterface),
-    //     {
-    //       routes: useLocaleRoutes ? baseRoutes : baseNoLocaleRoutes,
-    //       logger: ioc.get(I.Logger),
-    //       hasLocalRoutes: useLocaleRoutes
-    //     }
-    //   )
-    // );
+    ioc.bind(I.RouterServiceInterface, ioc.get(RouterService));
     // ioc.bind(
     //   I.ThemeService,
     //   new ThemeService({
@@ -61,14 +58,14 @@ export class IocRegisterImpl implements IOCRegister {
     // );
     // 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(UserService));
     // ioc.bind(I.RequestCatcherInterface, ioc.get(RequestStatusCatcher));
     // ioc.bind(I.ExecutorPageBridgeInterface, ioc.get(ExecutorPageBridge));
     // ioc.bind(I.JSONStoragePageInterface, ioc.get(JSONStoragePageBridge));
     // ioc.bind(I.RequestPageBridgeInterface, ioc.get(RequestPageBridge));
   }
 
-  protected registerCommon(_ioc: IOCContainer): void {
+  protected registerCommon(_ioc: IOCContainerInterface): void {
     // const { appConfig } = this.options;
     // const logger = ioc.get(I.Logger);
     // const feApiRequestCommonPlugin = new RequestCommonPlugin({
@@ -90,8 +87,8 @@ export class IocRegisterImpl implements IOCRegister {
    * @override
    */
   register(
-    ioc: IOCContainer,
-    _manager: IOCManagerInterface<IOCContainer>
+    ioc: IOCContainerInterface,
+    _manager: IOCManagerInterface<IOCContainerInterface>
   ): void {
     this.registerGlobals(ioc);
     this.registerCommon(ioc);

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

@@ -3,9 +3,12 @@ import { ColorFormatter, ConsoleHandler, Logger } from '@qlover/corekit-bridge';
 import { JSONSerializer } from '@qlover/fe-corekit';
 import { loggerStyles } from '@config/common';
 import { AppConfig } from '@/base/cases/AppConfig';
+import { DialogHandler } from '@/base/cases/DialogHandler';
 
 export const appConfig = new AppConfig();
 
+export const dialogHandler = new DialogHandler();
+
 /**
  * Global logger
  */

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

@@ -0,0 +1,52 @@
+import {
+  createIOCFunction,
+  type IOCContainerInterface,
+  type IOCFunctionInterface
+} from '@qlover/corekit-bridge';
+import { AppConfig } from '@/base/cases/AppConfig';
+import { InversifyContainer } from '@/base/cases/InversifyContainer';
+import type { IOCInterface } from '@/base/port/IOCInterface';
+import { ServerIOCRegister } from './ServerIOCRegister';
+import type { IOCIdentifierMapServer } from '@config/IOCIdentifier';
+
+export class ServerIOC
+  implements IOCInterface<IOCIdentifierMapServer, IOCContainerInterface>
+{
+  static instance: ServerIOC | null = null;
+
+  protected ioc: IOCFunctionInterface<
+    IOCIdentifierMapServer,
+    IOCContainerInterface
+  > | null = null;
+
+  static create(): ServerIOC {
+    if (this.instance) {
+      return this.instance;
+    }
+
+    this.instance = new ServerIOC();
+
+    return this.instance;
+  }
+
+  create(): IOCFunctionInterface<
+    IOCIdentifierMapServer,
+    IOCContainerInterface
+  > {
+    if (this.ioc) {
+      return this.ioc;
+    }
+
+    this.ioc = createIOCFunction<IOCIdentifierMapServer>(
+      new InversifyContainer()
+    );
+
+    const register = new ServerIOCRegister({
+      appConfig: new AppConfig()
+    });
+
+    register.register(this.ioc.implemention!, this.ioc);
+
+    return this.ioc;
+  }
+}

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

@@ -0,0 +1,63 @@
+import {
+  ConsoleHandler,
+  Logger,
+  TimestampFormatter,
+  type IOCContainerInterface,
+  type IOCManagerInterface,
+  type IOCRegisterInterface
+} from '@qlover/corekit-bridge';
+import { IOCIdentifier as I } from '@config/IOCIdentifier';
+import type { IocRegisterOptions } from '@/base/port/IOCInterface';
+
+export class ServerIOCRegister
+  implements IOCRegisterInterface<IOCContainerInterface, IocRegisterOptions>
+{
+  constructor(protected options: IocRegisterOptions) {}
+
+  /**
+   * Register globals
+   *
+   * 一般用于注册全局
+   *
+   * @param ioc - IOC container
+   */
+  protected registerGlobals(ioc: IOCContainerInterface): void {
+    const { appConfig } = this.options;
+    ioc.bind(I.AppConfig, appConfig);
+    ioc.bind(
+      I.Logger,
+      new Logger({
+        handlers: new ConsoleHandler(
+          new TimestampFormatter({
+            localeOptions: {
+              year: '2-digit',
+              month: '2-digit',
+              day: '2-digit',
+              hour: '2-digit',
+              minute: '2-digit',
+              second: '2-digit'
+            }
+          })
+        ),
+        silent: false,
+        level: appConfig.env === 'development' ? 'debug' : 'info'
+      })
+    );
+  }
+
+  protected registerImplement(_ioc: IOCContainerInterface): void {}
+
+  protected registerCommon(_ioc: IOCContainerInterface): void {}
+
+  /**
+   * @override
+   */
+  register(
+    ioc: IOCContainerInterface,
+    _manager: IOCManagerInterface<IOCContainerInterface>
+  ): void {
+    this.registerGlobals(ioc);
+    this.registerCommon(ioc);
+    this.registerImplement(ioc);
+  }
+}

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

@@ -16,7 +16,6 @@ export default getRequestConfig(async ({ requestLocale }) => {
   // Dynamically import the translation messages for the selected locale
   return {
     locale,
-    messages: (await import(`../../public/locales/${locale}/common.json`))
-      .default
+    messages: (await import(`../../public/locales/${locale}.json`)).default
   };
 });

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

@@ -19,9 +19,9 @@ export const routing = defineRouting({
       en: '/',
       zh: '/'
     },
-    '/about': {
-      en: '/about',
-      zh: '/about'
+    '/login': {
+      en: '/login',
+      zh: '/login'
     }
   }
 });

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

@@ -15,8 +15,11 @@ export const config = {
   matcher: [
     '/', // Match the root path explicitly
 
-    // Match all paths except for API routes, Next.js internals, static assets, favicon, and sitemap.xml
-    // This prevents middleware from rewriting or interfering with these special paths
-    '/((?!api|_next/static|_next/image|icon|favicon.ico|sitemap.xml|sitemap-0.xml).*)'
+    // Match all paths except for:
+    // - API routes
+    // - 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).*)'
   ]
 };

package/dist/templates/next-app/src/uikit/components/BaseHeader.tsx

@@ -1,12 +1,15 @@
 'use client';
 
 import Link from 'next/link';
-import { AppConfig } from '@/base/cases/AppConfig';
-import { IOC } from '@/core/IOC';
+import { IOCIdentifier } from '@config/IOCIdentifier';
+import { useIOC } from '@/uikit/hook/useIOC';
 import { LanguageSwitcher } from './LanguageSwitcher';
+import { LogoutButton } from './LogoutButton';
 import { ThemeSwitcher } from './ThemeSwitcher';
 
-export function BaseHeader() {
+export function BaseHeader(props: { showLogoutButton?: boolean }) {
+  const { showLogoutButton } = props;
+  const appConfig = useIOC(IOCIdentifier.AppConfig);
   return (
     <header
       data-testid="base-header"
@@ -28,13 +31,15 @@ export function BaseHeader() {
               data-testid="base-header-app-name"
               className="ml-2 text-lg font-semibold text-text"
             >
-              {IOC(AppConfig).appName}
+              {appConfig.appName}
             </span>
           </Link>
         </div>
         <div className="flex items-center gap-4">
           <LanguageSwitcher />
           <ThemeSwitcher />
+
+          {showLogoutButton && <LogoutButton />}
         </div>
       </div>
     </header>

package/dist/templates/next-app/src/uikit/components/BootstrapsProvider.tsx

@@ -1,11 +1,23 @@
 'use client';
 import '@ant-design/v5-patch-for-react-19';
+import { useRouter } from 'next/navigation';
+import { useLocale } from 'next-intl';
 import { useEffect } from 'react';
+import { I } from '@config/IOCIdentifier';
+import { NavigateBridge } from '@/base/cases/NavigateBridge';
 import { BootstrapClient } from '@/core/bootstraps/BootstrapClient';
+import { clientIOC } from '@/core/clientIoc/ClientIOC';
 import { IOCContext } from '../context/IOCContext';
 
 export function BootstrapsProvider(props: { children: React.ReactNode }) {
-  const IOC = BootstrapClient.createSingletonIOC();
+  const IOC = clientIOC.create();
+  const locale = useLocale();
+  const router = useRouter();
+
+  useEffect(() => {
+    IOC(I.RouterServiceInterface).setLocale(locale);
+    IOC(NavigateBridge).setUIBridge(router);
+  }, [locale, router, IOC]);
 
   useEffect(() => {
     if (typeof window !== 'undefined') {