@qlover/create-app 0.10.1 → 0.10.3

package/dist/templates/next-app/src/server/repositorys/LocalesRepository.ts

@@ -10,7 +10,7 @@ import {
   localesSchema,
   type LocalesSchema
 } from '@migrations/schema/LocalesSchema';
-import { I } from '@config/IOCIdentifier';
+import { SupabaseBridge } from '../SupabaseBridge';
 import type {
   LocalesRepositoryInterface,
   UpsertResult
@@ -18,16 +18,19 @@ import type {
 
 @injectable()
 export class LocalesRepository implements LocalesRepositoryInterface {
-  readonly name = 'next_app_locales';
+  public readonly name = 'next_app_locales';
 
   protected safeFields = Object.keys(localesSchema.shape);
 
   constructor(
-    @inject(I.DBBridgeInterface) protected dbBridge: DBBridgeInterface,
+    @inject(SupabaseBridge) protected dbBridge: DBBridgeInterface,
     @inject(Datetime) protected datetime: Datetime
   ) {}
 
-  async getAll(): Promise<LocalesSchema[]> {
+  /**
+   * @override
+   */
+  public async getAll(): Promise<LocalesSchema[]> {
     const result = await this.dbBridge.get({
       table: this.name,
       fields: this.safeFields
@@ -35,7 +38,10 @@ export class LocalesRepository implements LocalesRepositoryInterface {
     return (result.data as LocalesSchema[]) || [];
   }
 
-  async getLocales(
+  /**
+   * @override
+   */
+  public async getLocales(
     localeName: string,
     orderBy?: BridgeOrderBy
   ): Promise<LocalesSchema[]> {
@@ -49,7 +55,10 @@ export class LocalesRepository implements LocalesRepositoryInterface {
     return data && data.length > 0 ? data : [];
   }
 
-  async add(params: LocalesSchema): Promise<LocalesSchema[] | null> {
+  /**
+   * @override
+   */
+  public async add(params: LocalesSchema): Promise<LocalesSchema[] | null> {
     const now = this.datetime.timestampz();
     const data = {
       ...params,
@@ -66,10 +75,19 @@ export class LocalesRepository implements LocalesRepositoryInterface {
     return (result.data as LocalesSchema[]) || null;
   }
 
-  async updateById(
+  /**
+   * @override
+   */
+  public async updateById(
     id: number,
     params: Partial<Omit<LocalesSchema, 'id' | 'created_at'>>
   ): Promise<void> {
+    if (!id || typeof id !== 'number') {
+      throw new Error(
+        'ID is required and must be a number for updateById operation'
+      );
+    }
+
     const data = {
       ...params,
       updated_at: this.datetime.timestampz()
@@ -83,7 +101,10 @@ export class LocalesRepository implements LocalesRepositoryInterface {
     });
   }
 
-  async pagination<T = LocalesSchema>(params: {
+  /**
+   * @override
+   */
+  public async pagination<T = LocalesSchema>(params: {
     page: number;
     pageSize: number;
     orderBy?: BridgeOrderBy;
@@ -106,13 +127,14 @@ export class LocalesRepository implements LocalesRepositoryInterface {
 
   /**
    * batch upsert data, support chunk processing and concurrency control
+   * @override
    * @param data - data to upsert
    * @param options - options
    * @param options.chunkSize - chunk size, default 100
    * @param options.concurrency - concurrency, default 3
    * @returns UpsertResult - contains success/failure details with returned data
    */
-  async upsert(
+  public async upsert(
     data: Partial<LocalesSchema>[],
     options?: {
       chunkSize?: number;

package/dist/templates/next-app/src/server/repositorys/UserRepository.ts

@@ -8,7 +8,7 @@ import type { UserRepositoryInterface } from '../port/UserRepositoryInterface';
 
 @injectable()
 export class UserRepository implements UserRepositoryInterface {
-  readonly name = 'fe_users';
+  public readonly name = 'fe_users';
 
   protected safeFields = [
     'created_at',
@@ -25,14 +25,17 @@ export class UserRepository implements UserRepositoryInterface {
     @inject(I.DBBridgeInterface) protected dbBridge: DBBridgeInterface
   ) {}
 
-  getAll(): Promise<unknown> {
+  /**
+   * @override
+   */
+  public getAll(): Promise<unknown> {
     return this.dbBridge.get({ table: this.name });
   }
 
   /**
    * @override
    */
-  async getUserByEmail(email: string): Promise<UserSchema | null> {
+  public async getUserByEmail(email: string): Promise<UserSchema | null> {
     const result = await this.dbBridge.get({
       table: this.name,
       where: [['email', '=', email]]
@@ -48,7 +51,7 @@ export class UserRepository implements UserRepositoryInterface {
   /**
    * @override
    */
-  async add(params: {
+  public async add(params: {
     email: string;
     password: string;
   }): Promise<UserSchema[] | null> {
@@ -64,7 +67,10 @@ export class UserRepository implements UserRepositoryInterface {
     return result.data as UserSchema[];
   }
 
-  async updateById(
+  /**
+   * @override
+   */
+  public async updateById(
     id: number,
     params: Partial<Omit<UserSchema, 'id' | 'created_at'>>
   ): Promise<void> {
@@ -75,7 +81,10 @@ export class UserRepository implements UserRepositoryInterface {
     });
   }
 
-  async pagination<UserSchema>(params: {
+  /**
+   * @override
+   */
+  public async pagination<UserSchema>(params: {
     page: number;
     pageSize: number;
   }): Promise<PaginationInterface<UserSchema>> {

package/dist/templates/next-app/src/server/services/AIService.ts

@@ -21,7 +21,9 @@ export class AIService {
     });
   }
 
-  async completions(messages: ChatCompletionMessageParam[]): Promise<unknown> {
+  public async completions(
+    messages: ChatCompletionMessageParam[]
+  ): Promise<unknown> {
     const url = `${this.baseUrl}/chat/completions`;
 
     const response = await fetch(url, {

package/dist/templates/next-app/src/server/services/AdminAuthPlugin.ts

@@ -5,9 +5,12 @@ import type { BootstrapExecutorPlugin } from '@qlover/corekit-bridge';
 import type { ExecutorContext } from '@qlover/fe-corekit';
 
 export class AdminAuthPlugin implements BootstrapExecutorPlugin {
-  pluginName = 'AdminAuthPlugin';
+  public pluginName = 'AdminAuthPlugin';
 
-  async onBefore(
+  /**
+   * @override
+   */
+  public async onBefore(
     context: ExecutorContext<BootstrapServerContextValue>
   ): Promise<void> {
     const { IOC } = context.parameters;

package/dist/templates/next-app/src/{base → server}/services/AdminLocalesService.ts

@@ -1,9 +1,9 @@
 import { ResourceStore } from '@qlover/corekit-bridge';
 import { inject, injectable } from 'inversify';
+import { ResourceState } from '@/base/cases/ResourceState';
+import { AdminLocalesApi } from '@/base/services/adminApi/AdminLocalesApi';
 import { ResourceService } from '@/base/services/ResourceService';
 import type { LocalesSchema } from '@migrations/schema/LocalesSchema';
-import { AdminLocalesApi } from './adminApi/AdminLocalesApi';
-import { ResourceState } from '../cases/ResourceState';
 
 @injectable()
 export class AdminLocalesService extends ResourceService<

package/dist/templates/next-app/src/server/services/ApiLocaleService.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify';
+import { omit } from 'lodash';
 import { revalidateTag } from 'next/cache';
 import type { LocalesSchema } from '@migrations/schema/LocalesSchema';
 import type { LocaleType } from '@config/i18n';
@@ -20,6 +21,12 @@ export type ImportLocalesData = {
   };
 };
 
+export type GetLocalesParams = {
+  page: number;
+  pageSize: number;
+  orderBy?: BridgeOrderBy;
+};
+
 @injectable()
 export class ApiLocaleService {
   constructor(
@@ -27,7 +34,7 @@ export class ApiLocaleService {
     protected localesRepository: LocalesRepositoryInterface
   ) {}
 
-  async getLocalesJson(
+  public async getLocalesJson(
     localeName: string,
     orderBy?: BridgeOrderBy
   ): Promise<Record<string, string>> {
@@ -45,11 +52,9 @@ export class ApiLocaleService {
     );
   }
 
-  async getLocales(params: {
-    page: number;
-    pageSize: number;
-    orderBy?: BridgeOrderBy;
-  }): Promise<PaginationInterface<LocalesSchema>> {
+  public async getLocales(
+    params: GetLocalesParams
+  ): Promise<PaginationInterface<LocalesSchema>> {
     return this.localesRepository.pagination({
       page: params.page,
       pageSize: params.pageSize,
@@ -57,30 +62,36 @@ export class ApiLocaleService {
     });
   }
 
-  async update(data: Partial<LocalesSchema>): Promise<void> {
+  public async update(data: Partial<LocalesSchema>): Promise<void> {
+    if (!data.id || typeof data.id !== 'number') {
+      throw new Error(
+        'ID is required and must be a number for update operation'
+      );
+    }
+
     await this.localesRepository.updateById(
-      data.id!,
-      data as Omit<LocalesSchema, 'id' | 'created_at'>
+      data.id,
+      omit(data, ['id', 'created_at'])
     );
 
     // 清除所有支持的语言的缓存
     const revalidatePromises = i18nConfig.supportedLngs.map(async (locale) => {
-      await revalidateTag(`i18n-${locale}`);
+      await revalidateTag(`i18n-${locale}`, 'default');
     });
     await Promise.all(revalidatePromises);
   }
 
-  async create(data: Partial<LocalesSchema>): Promise<void> {
+  public async create(data: Partial<LocalesSchema>): Promise<void> {
     await this.localesRepository.add(data as LocalesSchema);
 
     // 清除所有支持的语言的缓存
     const revalidatePromises = i18nConfig.supportedLngs.map(async (locale) => {
-      await revalidateTag(`i18n-${locale}`);
+      await revalidateTag(`i18n-${locale}`, 'default');
     });
     await Promise.all(revalidatePromises);
   }
 
-  async importLocales(data: ImportLocalesData): Promise<UpsertResult> {
+  public async importLocales(data: ImportLocalesData): Promise<UpsertResult> {
     const { namespace = 'common', values } = data;
 
     const result: Record<string, Record<string, string>> = {};
@@ -94,6 +105,10 @@ export class ApiLocaleService {
         result[key]!['value'] = key;
         result[key]![locale] = value;
 
+        if (locale === i18nConfig.fallbackLng) {
+          result[key]!['description'] = value;
+        }
+
         const { namespace: namespace2 } = splitI18nKey(key);
         result[key]!['namespace'] = namespace2 || namespace;
       });
@@ -111,7 +126,7 @@ export class ApiLocaleService {
     if (upsertResult.successCount > 0) {
       const revalidatePromises = i18nConfig.supportedLngs.map(
         async (locale) => {
-          await revalidateTag(`i18n-${locale}`);
+          await revalidateTag(`i18n-${locale}`, 'default');
         }
       );
       await Promise.all(revalidatePromises);

package/dist/templates/next-app/src/server/services/ApiUserService.ts

@@ -2,7 +2,10 @@ import { inject, injectable } from 'inversify';
 import type { PaginationInterface } from '@/server/port/PaginationInterface';
 import type { UserSchema } from '@migrations/schema/UserSchema';
 import { UserRepository } from '../repositorys/UserRepository';
-import { PaginationValidator } from '../validators/PaginationValidator';
+import {
+  type PaginationParams,
+  PaginationValidator
+} from '../validators/PaginationValidator';
 import type { UserRepositoryInterface } from '../port/UserRepositoryInterface';
 import type { ValidatorInterface } from '../port/ValidatorInterface';
 
@@ -12,10 +15,10 @@ export class ApiUserService {
     @inject(UserRepository)
     protected userRepository: UserRepositoryInterface,
     @inject(PaginationValidator)
-    protected paginationValidator: ValidatorInterface
+    protected paginationValidator: ValidatorInterface<PaginationParams>
   ) {}
 
-  async getUsers(params: {
+  public async getUsers(params: {
     page: number;
     pageSize: number;
   }): Promise<PaginationInterface<UserSchema>> {

package/dist/templates/next-app/src/server/services/UserService.ts

@@ -31,7 +31,10 @@ export class UserService implements UserServiceInterface {
     protected credentialToken: CrentialTokenInterface<UserCredentialTokenValue>
   ) {}
 
-  async register(params: {
+  /**
+   * @override
+   */
+  public async register(params: {
     email: string;
     password: string;
   }): Promise<UserSchema> {
@@ -54,7 +57,10 @@ export class UserService implements UserServiceInterface {
     return omit(target, 'password') as UserSchema;
   }
 
-  async login(params: {
+  /**
+   * @override
+   */
+  public async login(params: {
     email: string;
     password: string;
   }): Promise<UserSchema> {
@@ -81,7 +87,10 @@ export class UserService implements UserServiceInterface {
     });
   }
 
-  async logout(): Promise<void> {
+  /**
+   * @override
+   */
+  public async logout(): Promise<void> {
     const auth = await this.userAuth.getAuth();
 
     if (!auth) {

package/dist/templates/next-app/src/server/validators/LocalesValidator.ts

@@ -11,8 +11,13 @@ import {
 import type { ExtendedExecutorError } from './ExtendedExecutorError';
 import type { ImportLocalesData } from '../services/ApiLocaleService';
 
-export class LocalesValidator implements ValidatorInterface {
-  validate(data: unknown): void | ValidationFaildResult {
+export class LocalesValidator implements ValidatorInterface<
+  Omit<LocalesSchema, 'id' | 'created_at' | 'updated_at'>
+> {
+  /**
+   * @override
+   */
+  public validate(data: unknown): void | ValidationFaildResult {
     if (typeof data !== 'object' || data === null) {
       return {
         path: ['form'],
@@ -29,7 +34,10 @@ export class LocalesValidator implements ValidatorInterface {
     }
   }
 
-  getThrow(
+  /**
+   * @override
+   */
+  public getThrow(
     data: unknown
   ): Omit<LocalesSchema, 'id' | 'created_at' | 'updated_at'> {
     const result = this.validate(data);
@@ -44,8 +52,11 @@ export class LocalesValidator implements ValidatorInterface {
   }
 }
 
-export class LocalesImportValidator implements ValidatorInterface {
-  getHasAnyFilesLocale(
+export class LocalesImportValidator implements ValidatorInterface<ImportLocalesData> {
+  /**
+   * @override
+   */
+  public getHasAnyFilesLocale(
     values: FormData
   ): { language: LocaleType; value: FormDataEntryValue }[] {
     const hasAnyFilesLocale = [];
@@ -58,7 +69,10 @@ export class LocalesImportValidator implements ValidatorInterface {
     return hasAnyFilesLocale;
   }
 
-  async validate(data: {
+  /**
+   * @override
+   */
+  public async validate(data: {
     namespace?: string;
     values: unknown;
   }): Promise<void | ValidationFaildResult> {
@@ -99,7 +113,10 @@ export class LocalesImportValidator implements ValidatorInterface {
     }
   }
 
-  async getThrow(data: {
+  /**
+   * @override
+   */
+  public async getThrow(data: {
     namespace?: string;
     values: unknown;
   }): Promise<ImportLocalesData> {

package/dist/templates/next-app/src/server/validators/LoginValidator.ts

@@ -26,22 +26,31 @@ const passwordSchema = z
   .max(50, { message: V_PASSWORD_MAX_LENGTH })
   .regex(/^\S+$/, { message: V_PASSWORD_SPECIAL_CHARS });
 
-export class LoginValidator implements ValidatorInterface {
-  validateEmail(data: unknown): void | ValidationFaildResult {
+export class LoginValidator implements ValidatorInterface<LoginValidatorData> {
+  /**
+   * @override
+   */
+  public validateEmail(data: unknown): void | ValidationFaildResult {
     const emailResult = emailSchema.safeParse(data);
     if (!emailResult.success) {
       return emailResult.error.issues[0];
     }
   }
 
-  validatePassword(data: unknown): void | ValidationFaildResult {
+  /**
+   * @override
+   */
+  public validatePassword(data: unknown): void | ValidationFaildResult {
     const passwordResult = passwordSchema.safeParse(data);
     if (!passwordResult.success) {
       return passwordResult.error.issues[0];
     }
   }
 
-  validate(data: unknown): void | ValidationFaildResult {
+  /**
+   * @override
+   */
+  public validate(data: unknown): void | ValidationFaildResult {
     if (typeof data !== 'object' || data === null) {
       return {
         path: ['form'],
@@ -62,7 +71,10 @@ export class LoginValidator implements ValidatorInterface {
     }
   }
 
-  getThrow(data: unknown): LoginValidatorData {
+  /**
+   * @override
+   */
+  public getThrow(data: unknown): LoginValidatorData {
     const result = this.validate(data);
 
     if (result == null) {

package/dist/templates/next-app/src/server/validators/PaginationValidator.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import type { PaginationInterface } from '@/server/port/PaginationInterface';
 import { API_PAGE_INVALID } from '@config/Identifier';
 import {
   type ValidationFaildResult,
@@ -22,10 +21,19 @@ const paginationSchema = z.object({
   order: z.string().optional().default('0')
 });
 
-export class PaginationValidator implements ValidatorInterface {
+export type PaginationParams = {
+  page: number;
+  pageSize: number;
+  orders?: BridgeOrderBy;
+};
+
+export class PaginationValidator implements ValidatorInterface<PaginationParams> {
   protected defaultPageSize = 10;
 
-  validate(data: unknown): void | ValidationFaildResult {
+  /**
+   * @override
+   */
+  public validate(data: unknown): void | ValidationFaildResult {
     if (typeof data !== 'object' || data === null) {
       return {
         path: ['form'],
@@ -39,12 +47,10 @@ export class PaginationValidator implements ValidatorInterface {
     }
   }
 
-  getThrow(data: unknown): Pick<
-    PaginationInterface<unknown>,
-    'page' | 'pageSize'
-  > & {
-    orders: BridgeOrderBy;
-  } {
+  /**
+   * @override
+   */
+  public getThrow<T>(data: unknown): T {
     const result = paginationSchema.safeParse(data);
     if (!result.success) {
       throw new Error(result.error.issues[0].message);
@@ -58,7 +64,7 @@ export class PaginationValidator implements ValidatorInterface {
       orders: [
         result.data.orderBy || 'updated_at',
         order == '0' || order == '1' ? (+order as 0 | 1) : 0
-      ]
-    };
+      ] as BridgeOrderBy
+    } as T;
   }
 }

package/dist/templates/next-app/src/styles/css/antd-themes/_common/_default.css

@@ -277,48 +277,4 @@ html,
     --fe-layout-light-trigger-bg: rgb(var(--color-bg-base));
     --fe-layout-light-trigger-color: rgb(var(--text-primary));
   }
-
-  /* 滚动条样式变量 */
-  --fe-scrollbar-size: 6px;
-  --fe-scrollbar-thumb-bg: rgba(15 23 42 / 0.2);
-  --fe-scrollbar-thumb-hover-bg: rgba(15 23 42 / 0.3);
-  --fe-scrollbar-track-bg: transparent;
-
-  /* 滚动条样式 */
-  ::-webkit-scrollbar {
-    width: var(--fe-scrollbar-size);
-    height: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-track {
-    background: var(--fe-scrollbar-track-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: var(--fe-scrollbar-thumb-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb:hover {
-    background: var(--fe-scrollbar-thumb-hover-bg);
-  }
-
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-
-  /* 可选的细滚动条样式 */
-  .scrollbar-thin {
-    --fe-scrollbar-size: 4px;
-  }
-
-  /* 隐藏滚动条但保持可滚动 */
-  .scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
 }

package/dist/templates/next-app/src/styles/css/antd-themes/_common/dark.css

@@ -230,48 +230,4 @@
     --fe-layout-light-trigger-bg: rgb(30 41 59);
     --fe-layout-light-trigger-color: rgb(var(--text-primary));
   }
-
-  /* 滚动条样式变量 */
-  --fe-scrollbar-size: 6px;
-  --fe-scrollbar-thumb-bg: rgba(255 255 255 / 0.2);
-  --fe-scrollbar-thumb-hover-bg: rgba(255 255 255 / 0.3);
-  --fe-scrollbar-track-bg: transparent;
-
-  /* 滚动条样式 */
-  ::-webkit-scrollbar {
-    width: var(--fe-scrollbar-size);
-    height: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-track {
-    background: var(--fe-scrollbar-track-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: var(--fe-scrollbar-thumb-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb:hover {
-    background: var(--fe-scrollbar-thumb-hover-bg);
-  }
-
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-
-  /* 可选的细滚动条样式 */
-  .scrollbar-thin {
-    --fe-scrollbar-size: 4px;
-  }
-
-  /* 隐藏滚动条但保持可滚动 */
-  .scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
 }

package/dist/templates/next-app/src/styles/css/antd-themes/_common/pink.css

@@ -243,48 +243,4 @@
     --fe-layout-light-trigger-bg: var(--ant-color-bg-container);
     --fe-layout-light-trigger-color: var(--ant-color-text);
   }
-
-  /* 滚动条样式变量 */
-  --fe-scrollbar-size: 6px;
-  --fe-scrollbar-thumb-bg: rgba(244 114 182 / 0.3);
-  --fe-scrollbar-thumb-hover-bg: rgba(244 114 182 / 0.4);
-  --fe-scrollbar-track-bg: transparent;
-
-  /* 滚动条样式 */
-  ::-webkit-scrollbar {
-    width: var(--fe-scrollbar-size);
-    height: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-track {
-    background: var(--fe-scrollbar-track-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: var(--fe-scrollbar-thumb-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb:hover {
-    background: var(--fe-scrollbar-thumb-hover-bg);
-  }
-
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-
-  /* 可选的细滚动条样式 */
-  .scrollbar-thin {
-    --fe-scrollbar-size: 4px;
-  }
-
-  /* 隐藏滚动条但保持可滚动 */
-  .scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
 }