@rxdrag/website-lib-core 0.0.127 → 0.0.129

package/src/entify/Entify.ts

@@ -33,18 +33,12 @@ import { queryWebsite } from "./lib/queryWebsite";
 import {
   ImageSize,
   ImageSizes,
-  Media,
-  Page,
-  PageType,
   Product,
   WebsitePart,
   WebsitePartBoolExp,
 } from "@rxdrag/rxcms-models";
-import { queryPageBySlug } from "./lib/queryPageBySlug";
-import { queryPageByType } from "./lib/queryPageByType";
 import { queryOneMedia } from "./lib/queryOneMedia";
-import { DEFAULT_LARGE, DEFAULT_MEDIUM, DEFAULT_SAMLL, DEFUALT_HEIGHT, DEFUALT_WIDTH, FileFieldType, ImageResize } from "../astro/media";
-import { queryOneIcon } from "./lib/queryOneIcon";
+import { FileFieldType, ImageResize } from "../astro/media";
 import { queryBulletin } from "./lib/queryBulletin";
 
 export class Entify implements IEntify {
@@ -64,13 +58,63 @@ export class Entify implements IEntify {
     return result;
   }
 
-  public static getInstance(envVariables: EnvVariables, imageSizes: ImageSizes): Entify {
+  /**
+   * 获取 Entify 单例实例（无参数，获取已创建的实例）
+   */
+  public static getInstance(): Entify;
+  /**
+   * 获取 Entify 单例实例（带参数，创建或更新实例）
+   */
+  public static getInstance(envVariables: EnvVariables, imageSizes: ImageSizes): Entify;
+  public static getInstance(envVariables?: EnvVariables, imageSizes?: ImageSizes): Entify {
+    // 无参数调用：获取已创建的实例
+    if (envVariables === undefined && imageSizes === undefined) {
+      if (!Entify.instance) {
+        throw new Error(
+          'Entify instance not initialized. Please call getInstance(envVariables, imageSizes) first.'
+        );
+      }
+      return Entify.instance;
+    }
+    
+    // 有参数调用：创建或更新实例
     if (!Entify.instance) {
-      Entify.instance = new Entify(envVariables, imageSizes);
+      Entify.instance = new Entify(envVariables!, imageSizes!);
+    } else {
+      Entify.instance.envVariables = envVariables!;
+      Entify.instance.imageSizes = imageSizes!;
     }
     return Entify.instance;
   }
 
+  private currentLangAbbr?: string;
+
+  /**
+   * 设置当前语言
+   */
+  public setLangAbbr(langAbbr: string): void {
+    this.currentLangAbbr = langAbbr;
+  }
+
+  /**
+   * 获取当前设置的语言缩写
+   */
+  public getLang(): string {
+    return this.ensureLangAbbr();
+  }
+
+  /**
+   * 获取当前语言，如果未设置则抛出异常
+   */
+  private ensureLangAbbr(): string {
+    if (!this.currentLangAbbr) {
+      throw new Error(
+        'langAbbr is not set. Please call setLangAbbr() before using language-dependent methods.'
+      );
+    }
+    return this.currentLangAbbr;
+  }
+
   public setImageSizes(imageSizes: ImageSizes): void {
     this.imageSizes = imageSizes;
   }
@@ -100,10 +144,6 @@ export class Entify implements IEntify {
     );
   }
 
-  public getLang() {
-    return this.envVariables.language || "en-US";
-  }
-
   public async getWebsite() {
     return queryWebsite(this.envVariables);
   }
@@ -116,39 +156,28 @@ export class Entify implements IEntify {
     return (await queryLangs(this.envVariables))?.items;
   }
 
-  public async getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined> {
-    const fields: string[] = []
-    switch (fileField) {
-      case "resize":
-        fields.push(`resize(width: ${resize?.width || DEFUALT_WIDTH}, height: ${resize?.height || DEFUALT_HEIGHT})`)
-        break;
-      case "small":
-        fields.push(`small(width: ${this.imageSizes.small?.width || DEFAULT_SAMLL.width}, height: ${this.imageSizes.small?.height || DEFAULT_SAMLL.height})`)
-        break;
-      case "medium":
-        fields.push(`medium(width: ${this.imageSizes.medium?.width || DEFAULT_MEDIUM.width}, height: ${this.imageSizes.medium?.height || DEFAULT_MEDIUM.height})`)
-        break;
-      case "large":
-        fields.push(`large(width: ${this.imageSizes.large?.width || DEFAULT_LARGE.width}, height: ${this.imageSizes.large?.height || DEFAULT_LARGE.height})`)
-        break;
-    }
-    return await queryOneMedia(ref, fields, this.envVariables);
+  public async getBaseLang() {
+    const website = await this.getWebsite();
+    return website?.baseLang;
   }
 
-  public async getIcon(name: string | undefined | null) {
-    return await queryOneIcon(name, this.envVariables);
+  public async getMedia(ref: string | undefined | null, fileField: FileFieldType = 'thumbnail', resize?: ImageResize) {
+    const fields = [fileField];
+    return await queryOneMedia(ref, fields, this.envVariables);
   }
 
   public async getBulletin() {
-    return await queryBulletin(this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    return await queryBulletin(this.envVariables, langAbbr);
   }
 
 
   public async getFeaturedProducts(
-    count?: number,
-    imageSize?: ImageSize,
-    addonFields?: (keyof Product)[]
+    count: number | undefined,
+    imageSize: ImageSize | undefined,
+    addonFields: (keyof Product)[] | undefined
   ) {
+    const langAbbr = this.ensureLangAbbr();
     if (!imageSize) {
       imageSize = this.imageSizes?.productThumbnial;
     }
@@ -156,76 +185,38 @@ export class Entify implements IEntify {
       count,
       imageSize,
       this.envVariables,
-      addonFields
+      addonFields,
+      langAbbr
     );
   }
 
-  public async getLatestPosts(count?: number, coverSize?: ImageSize) {
+  public async getLatestPosts(count: number | undefined, coverSize: ImageSize | undefined) {
+    const langAbbr = this.ensureLangAbbr();
     if (!coverSize) {
       coverSize = this.imageSizes?.postThumbnial;
     }
-    return await queryLatestPosts(count, coverSize, this.envVariables);
+    return await queryLatestPosts(count, coverSize, this.envVariables, langAbbr);
   }
 
-  public async getHomePage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.Home);
-  }
-  public async getPostPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.Post);
-  }
-  public async getPostListPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.PostList);
-  }
-  public async getPostCategoryPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.PostCategory);
-  }
-  public async getProductPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.Product);
-  }
-  public async getProductListPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.ProductList);
-  }
-  public async getProductCategoryPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.ProductCategory);
-  }
-  public async getSearchPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.SearchList);
-  }
-  public async getProfilePage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.Profile);
-  }
-  public async getThanksPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.Thanks);
-  }
-  public async get404Page(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.Page404);
-  }
-  public async getErrorPage(): Promise<Page | undefined> {
-    return await this.getPageByType(PageType.PageError);
-  }
-  public async getPageBySlug(slug: string): Promise<Page | undefined> {
-    return await queryPageBySlug(slug, this.envVariables);
-  }
-
-  public async getPageByType(pageType: PageType): Promise<Page | undefined> {
-    return await queryPageByType(pageType, this.envVariables);
-  }
 
   public async getPosts(options: PostsOptions) {
+    const langAbbr = this.ensureLangAbbr();
     const { category, coverSize, page, pageSize } = options;
     const conditions: ListConditions = { category, page, pageSize };
-    const result = await queryPosts(conditions, coverSize, this.envVariables);
+    const result = await queryPosts(conditions, coverSize, this.envVariables, langAbbr);
     return result?.items;
   }
 
   public async getPostListPaths(options: PostPatinateOptions) {
+    const langAbbr = this.ensureLangAbbr();
     const { category, pageSize } = options;
     // 获取总文章数据，只需要获取总数
     // TODO: 目前数据查询有点重复，后续要结合后端优化
     const postsData = await queryPosts(
       { category, page: 1, pageSize: 10 },
       undefined,
-      this.envVariables
+      this.envVariables,
+      langAbbr
     );
 
     const totalItems = postsData?.total ?? 0;
@@ -245,10 +236,11 @@ export class Entify implements IEntify {
   }
 
   public async getPostBySlug(slug: string, coverSize: ImageSize | undefined) {
+    const langAbbr = this.ensureLangAbbr();
     if (!coverSize) {
       coverSize = this.imageSizes.post;
     }
-    return await queryOnePostBySlug(slug, coverSize, this.envVariables);
+    return await queryOnePostBySlug(slug, coverSize, this.envVariables, langAbbr);
   }
 
   /**
@@ -256,38 +248,44 @@ export class Entify implements IEntify {
    * 对于大量文章，这个方法会进行优化，只获取 slug 字段
    */
   public async getPostSlugs() {
+    const langAbbr = this.ensureLangAbbr();
     // 只获取 slug 字段，减少数据传输量
-    const result = await queryPostSlugs(this.envVariables);
+    const result = await queryPostSlugs(this.envVariables, langAbbr);
 
     return result?.items?.map((post) => post.slug) || [];
   }
 
   public async getPostCategories() {
-    return await queryPostCategories(this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    return await queryPostCategories(this.envVariables, langAbbr);
   }
 
   public async getPostCategoryBySlug(slug: string) {
-    return await queryOnePostCategoryBySlug(slug, this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    return await queryOnePostCategoryBySlug(slug, this.envVariables, langAbbr);
   }
 
   public async getTagCategories() {
-    return await queryTagCategories(this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    return await queryTagCategories(this.envVariables, langAbbr);
   }
 
-  public async getTags(categoryId?: string) {
-    return await queryTags(this.envVariables, categoryId);
+  public async getTags(categoryId: string | undefined) {
+    const langAbbr = this.ensureLangAbbr();
+    return await queryTags(this.envVariables, categoryId, langAbbr);
   }
 
   public async getProducts(
     conditions: ListConditions,
     imageSize: ImageSize | undefined,
-    addonFields?: (keyof Product)[]
+    addonFields?: (keyof Product)[] | undefined
   ) {
+    const langAbbr = this.ensureLangAbbr();
     if (!imageSize) {
       imageSize = this.imageSizes.productThumbnial;
     }
     return (
-      await queryProducts(conditions, imageSize, this.envVariables, addonFields)
+      await queryProducts(conditions, imageSize, this.envVariables, addonFields, langAbbr)
     )?.items;
   }
 
@@ -295,12 +293,15 @@ export class Entify implements IEntify {
     category?: string;
     pageSize: number;
   }) {
+    const langAbbr = this.ensureLangAbbr();
     const { category, pageSize } = options;
     // 获取总产品数据，只需要获取总数
     const productsData = await queryProducts(
       { category, page: 1, pageSize: 10 },
       undefined,
-      this.envVariables
+      this.envVariables,
+      undefined,
+      langAbbr
     );
 
     const totalItems = productsData?.total ?? 0;
@@ -309,6 +310,7 @@ export class Entify implements IEntify {
   }
 
   public async getCategoredProductListPaths() {
+    const langAbbr = this.ensureLangAbbr();
     // 获取所有产品分类
     const categoryTree = await this.getProductCategories();
     const categories = this.flattenTree(categoryTree);
@@ -374,6 +376,7 @@ export class Entify implements IEntify {
    * @returns 所有文章分类的分页路径
    */
   public async getCategoredPostListPaths() {
+    const langAbbr = this.ensureLangAbbr();
     // 获取所有文章分类
     const categoryTree = await this.getPostCategories();
     const categories = this.flattenTree(categoryTree);
@@ -434,10 +437,11 @@ export class Entify implements IEntify {
   }
 
   public async getProductBySlug(slug: string, imageSize: ImageSize | undefined) {
+    const langAbbr = this.ensureLangAbbr();
     if (!imageSize) {
       imageSize = this.imageSizes.product;
     }
-    return await queryOneProductBySlug(slug, imageSize, this.envVariables);
+    return await queryOneProductBySlug(slug, imageSize, this.envVariables, langAbbr);
   }
 
   public async getProductPaths() {
@@ -456,22 +460,26 @@ export class Entify implements IEntify {
    * 对于大量产品，这个方法会进行优化，只获取 slug 字段
    */
   public async getProductSlugs() {
+    const langAbbr = this.ensureLangAbbr();
     // 只获取 slug 字段，减少数据传输量
-    const result = await queryAllProducts(this.envVariables);
+    const result = await queryAllProducts(this.envVariables, langAbbr);
     return result?.items?.map((product) => product.slug) || [];
   }
 
   public async getProductIds() {
-    const result = await queryAllProducts(this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    const result = await queryAllProducts(this.envVariables, langAbbr);
     return result?.items?.map((product) => product.id) || [];
   }
 
   public async getProductCategories() {
-    return await queryProductCategories(this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    return await queryProductCategories(this.envVariables, langAbbr);
   }
 
   public async getProductCategoryBySlug(slug: string) {
-    return await queryOneProductCategoryBySlug(slug, this.envVariables);
+    const langAbbr = this.ensureLangAbbr();
+    return await queryOneProductCategoryBySlug(slug, this.envVariables, langAbbr);
   }
 
   public async getOneUser(id: string) {
@@ -479,14 +487,16 @@ export class Entify implements IEntify {
   }
 
   public async getUserPosts(userId: string) {
-    return (await queryUserPosts({ userId }, this.envVariables))?.items;
+    const langAbbr = this.ensureLangAbbr();
+    return (await queryUserPosts({ userId }, this.envVariables, langAbbr))?.items;
   }
 
   public async fulltextSearch(keyword: string, imageSize: ImageSize | undefined) {
+    const langAbbr = this.ensureLangAbbr();
     if (!imageSize) {
       imageSize = this.imageSizes.postThumbnial;
     }
-    return await fulltextSearch(keyword, imageSize, this.envVariables);
+    return await fulltextSearch(keyword, imageSize, this.envVariables, langAbbr);
   }
 
   public async getUserPaths() {