@rxdrag/website-lib-core 0.0.127 → 0.0.128

package/src/entify/IEntify.ts

@@ -1,177 +1,151 @@
-import { IQueryOptions, ListResult } from "@rxdrag/entify-lib";
-import { ListConditions, UploadOptions, UploadSession } from "./lib";
-import {
-  TPost,
-  TPostCategory,
-  TProduct,
-  TProductCategory,
-  TTag,
-  TTagCategory,
-  TUser,
-} from "./view-model";
-import {
-  Bulletin,
-  ImageSize,
-  ImageSizes,
-  Lang,
-  Media,
-  Page,
-  PageType,
-  Product,
-  SearchIndex,
-  SvgIcon,
-  ThemeBranch,
-  Website,
-  WebsitePart,
-} from "@rxdrag/rxcms-models";
-import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
-import { FileFieldType, ImageResize } from "../astro";
-
-export type PostsOptions = {
-  category?: string;
-  coverSize?: ImageSize | undefined;
-  page: number;
-  pageSize: number;
-};
-
-export type PostPatinateOptions = {
-  pageSize: number;
-  category?: string;
-};
-
-export interface IEntify {
-  //从配置文件注入到这里面，供组件使用
-  setImageSizes(imageSizes: ImageSizes): void;
-  getImageSizes(): ImageSizes;
-  getLang(): string;
-  queryEntityList<
-    T,
-    WhereExp = unknown,
-    OrderBy = unknown,
-    DistinctExp = unknown
-  >(
-    options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
-    //用于生成静态网站时使用，预览测试也可以用
-    staticKey?: string
-  ): Promise<ListResult<unknown> | undefined>;
-
-  queryOneEntity<T extends WebsitePart = WebsitePart>(options: IQueryOptions<T, WebsitePartBoolExp>): Promise<T | undefined>;
-
-  getWebsite(): Promise<Website | undefined>;
-
-  getTheme(): Promise<ThemeBranch | undefined>;
-
-  getLangs(): Promise<Lang[] | undefined>;
-
-  getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined>;
-
-  getIcon(name: string | undefined | null): Promise<SvgIcon | undefined>;
-
-  getBulletin(): Promise<Bulletin | undefined | null>
-
-  getFeaturedProducts(
-    count?: number,
-    imageSize?: ImageSize,
-    addonFields?: (keyof Product)[]
-  ): Promise<TProduct[] | undefined>;
-
-  getLatestPosts(
-    count?: number,
-    coverSize?: ImageSize
-  ): Promise<TPost[] | undefined>;
-
-  getPosts(options: PostsOptions): Promise<TPost[] | undefined>;
-
-  getHomePage(): Promise<Page | undefined>;
-
-  getPostPage(): Promise<Page | undefined>;
-
-  getPostListPage(): Promise<Page | undefined>;
-
-  getPostCategoryPage(): Promise<Page | undefined>;
-
-  getProductPage(): Promise<Page | undefined>;
-
-  getProductListPage(): Promise<Page | undefined>;
-
-  getProductCategoryPage(): Promise<Page | undefined>;
-
-  getSearchPage(): Promise<Page | undefined>;
-
-  getProfilePage(): Promise<Page | undefined>;
-
-  getThanksPage(): Promise<Page | undefined>;
-
-  get404Page(): Promise<Page | undefined>;
-
-  getErrorPage(): Promise<Page | undefined>;
-
-  getPageBySlug(slug: string): Promise<Page | undefined>;
-
-  getPageByType(pageType: PageType): Promise<Page | undefined>;
-
-  getPostListPaths(options: PostPatinateOptions): Promise<unknown>;
-
-  getPostPaths(): Promise<unknown>;
-
-  getPostBySlug(
-    slug: string,
-    coverSize: ImageSize | undefined
-  ): Promise<TPost | undefined>;
-
-  getPostSlugs(): Promise<Array<string | undefined>>;
-
-  getPostCategories(): Promise<TPostCategory[] | undefined>;
-
-  getPostCategoryBySlug(slug: string): Promise<TPostCategory | undefined>;
-
-  getTagCategories(): Promise<TTagCategory[] | undefined>;
-
-  getTags(categoryId?: string): Promise<TTag[] | undefined>;
-
-  getProducts(
-    conditions: ListConditions,
-    imageSize: ImageSize | undefined,
-    addonFields?: (keyof Product)[]
-  ): Promise<TProduct[] | undefined>;
-
-  getProductListPaths(options: {
-    category?: string;
-    pageSize: number;
-  }): Promise<unknown>;
-
-  getCategoredProductListPaths(): Promise<unknown>;
-
-  getCategoredPostListPaths(): Promise<unknown>;
-
-  getProductBySlug(
-    slug: string,
-    imageSize: ImageSize | undefined
-  ): Promise<TProduct | undefined>;
-
-  getProductPaths(): Promise<unknown>;
-
-  getProductSlugs(): Promise<Array<string | undefined>>;
-
-  getProductIds(): Promise<Array<string | null | undefined>>;
-
-  getProductCategories(): Promise<TProductCategory[] | undefined>;
-
-  getProductCategoryBySlug(slug: string): Promise<TProductCategory | undefined>;
-
-  getOneUser(id: string): Promise<TUser | undefined>;
-
-  getUserPosts(userId: string): Promise<TPost[] | undefined>;
-
-  fulltextSearch(
-    keyword: string,
-    imageSize: ImageSize | undefined
-  ): Promise<ListResult<SearchIndex> | undefined>;
-
-  getUserPaths(): Promise<unknown>;
-
-  createPagination(totalItems: number, pageSize: number): unknown;
-
-  createUploadCredentials(options: UploadOptions): Promise<UploadSession | null>;
-
-}
+import { IQueryOptions, ListResult } from "@rxdrag/entify-lib";
+import { ListConditions, UploadOptions, UploadSession } from "./lib";
+import {
+  TPost,
+  TPostCategory,
+  TProduct,
+  TProductCategory,
+  TTag,
+  TTagCategory,
+  TUser,
+} from "./view-model";
+import {
+  Bulletin,
+  ImageSize,
+  ImageSizes,
+  Lang,
+  Media,
+  Product,
+  SearchIndex,
+  ThemeBranch,
+  Website,
+  WebsitePart,
+} from "@rxdrag/rxcms-models";
+import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
+import { FileFieldType, ImageResize } from "../astro";
+
+export type PostsOptions = {
+  category?: string;
+  coverSize?: ImageSize | undefined;
+  page: number;
+  pageSize: number;
+};
+
+export type PostPatinateOptions = {
+  pageSize: number;
+  category?: string;
+};
+
+export interface IEntify {
+  //从配置文件注入到这里面，供组件使用
+  setImageSizes(imageSizes: ImageSizes): void;
+  getImageSizes(): ImageSizes;
+  queryEntityList<
+    T,
+    WhereExp = unknown,
+    OrderBy = unknown,
+    DistinctExp = unknown
+  >(
+    options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
+    //用于生成静态网站时使用，预览测试也可以用
+    staticKey?: string
+  ): Promise<ListResult<unknown> | undefined>;
+
+  queryOneEntity<T extends WebsitePart = WebsitePart>(options: IQueryOptions<T, WebsitePartBoolExp>): Promise<T | undefined>;
+
+  getWebsite(): Promise<Website | undefined>;
+
+  getTheme(): Promise<ThemeBranch | undefined>;
+
+  getLangs(): Promise<Lang[] | undefined>;
+
+  /**
+   * 设置当前语言，必须在调用其他需要语言的方法之前设置
+   * @param langAbbr 语言缩写，如 "en-US" 或 "zh-CN"
+   */
+  setLangAbbr(langAbbr: string): void;
+
+  getBaseLang(): Promise<Lang | undefined>;
+
+  getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined>;
+
+  getBulletin(): Promise<Bulletin | undefined | null>
+
+  getFeaturedProducts(
+    count: number | undefined,
+    imageSize: ImageSize | undefined,
+    addonFields: (keyof Product)[] | undefined
+  ): Promise<TProduct[] | undefined>;
+
+  getLatestPosts(
+    count: number | undefined,
+    coverSize: ImageSize | undefined
+  ): Promise<TPost[] | undefined>;
+
+  getPosts(options: PostsOptions): Promise<TPost[] | undefined>;
+
+  getPostListPaths(options: PostPatinateOptions): Promise<unknown>;
+
+  getPostPaths(): Promise<unknown>;
+
+  getPostBySlug(
+    slug: string,
+    coverSize: ImageSize | undefined
+  ): Promise<TPost | undefined>;
+
+  getPostSlugs(): Promise<Array<string | undefined>>;
+
+  getPostCategories(): Promise<TPostCategory[] | undefined>;
+
+  getPostCategoryBySlug(slug: string): Promise<TPostCategory | undefined>;
+
+  getTagCategories(): Promise<TTagCategory[] | undefined>;
+
+  getTags(categoryId: string | undefined): Promise<TTag[] | undefined>;
+
+  getProducts(
+    conditions: ListConditions,
+    imageSize: ImageSize | undefined,
+    addonFields: (keyof Product)[] | undefined
+  ): Promise<TProduct[] | undefined>;
+
+  getProductListPaths(options: {
+    category?: string;
+    pageSize: number;
+  }): Promise<unknown>;
+
+  getCategoredProductListPaths(): Promise<unknown>;
+
+  getCategoredPostListPaths(): Promise<unknown>;
+
+  getProductBySlug(
+    slug: string,
+    imageSize: ImageSize | undefined
+  ): Promise<TProduct | undefined>;
+
+  getProductPaths(): Promise<unknown>;
+
+  getProductSlugs(): Promise<Array<string | undefined>>;
+
+  getProductIds(): Promise<Array<string | null | undefined>>;
+
+  getProductCategories(): Promise<TProductCategory[] | undefined>;
+
+  getProductCategoryBySlug(slug: string): Promise<TProductCategory | undefined>;
+
+  getOneUser(id: string): Promise<TUser | undefined>;
+
+  getUserPosts(userId: string): Promise<TPost[] | undefined>;
+
+  fulltextSearch(
+    keyword: string,
+    imageSize: ImageSize | undefined
+  ): Promise<ListResult<SearchIndex> | undefined>;
+
+  getUserPaths(): Promise<unknown>;
+
+  createPagination(totalItems: number, pageSize: number): unknown;
+
+  createUploadCredentials(options: UploadOptions): Promise<UploadSession | null>;
+
+}

package/src/entify/index.ts

@@ -1,5 +1,5 @@
-export * from "./lib";
-export * from "./Entify";
-export * from "./types";
-export * from "./IEntify";
+export * from "./lib";
+export * from "./Entify";
+export * from "./types";
+export * from "./IEntify";
 export * from "./view-model";

package/src/entify/lib/collectCategoryIds.ts

@@ -1,20 +1,20 @@
-export interface CategoryNode {
-  id?: string | null;
-  children?: CategoryNode[];
-}
-
-export function collectCategoryIds(category: CategoryNode): string[] {
-  const ids: string[] = [];
-  if (category.id) ids.push(category.id);
-
-  const traverse = (node: CategoryNode) => {
-    if (node.children) {
-      node.children.forEach((child) => {
-        if (child.id) ids.push(child.id);
-        traverse(child);
-      });
-    }
-  };
-  traverse(category);
-  return ids;
-}
+export interface CategoryNode {
+  id?: string | null;
+  children?: CategoryNode[];
+}
+
+export function collectCategoryIds(category: CategoryNode): string[] {
+  const ids: string[] = [];
+  if (category.id) ids.push(category.id);
+
+  const traverse = (node: CategoryNode) => {
+    if (node.children) {
+      node.children.forEach((child) => {
+        if (child.id) ids.push(child.id);
+        traverse(child);
+      });
+    }
+  };
+  traverse(category);
+  return ids;
+}

package/src/entify/lib/fulltextSearch.ts

@@ -1,62 +1,63 @@
-import {
-  PublishableStatus,
-  SearchIndex,
-  SearchIndexBoolExp,
-  SearchIndexOrderBy,
-  SearchIndexDistinctExp,
-  SearchIndexQueryOptions,
-  SearchIndexFields,
-  MediaQueryOptions,
-  ImageSize,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables } from "../types";
-
-export async function fulltextSearch(
-  keyword: string,
-  imageSize: ImageSize | undefined,
-  envVariables: EnvVariables
-) {
-
-  const queryOptions = new SearchIndexQueryOptions(
-    [
-      SearchIndexFields.id,
-      SearchIndexFields.title,
-      SearchIndexFields.summary,
-      SearchIndexFields.sourceId,
-      SearchIndexFields.sourceType,
-      SearchIndexFields.sourceLang,
-      SearchIndexFields.sourceSlug,
-    ],
-    {
-      limit: 100,
-      where: {
-        sourceLang: {
-          _eq: envVariables.language,
-        },
-        [SearchIndexFields.sourceStatus]: {
-          _eq: PublishableStatus.published,
-        },
-        content: {
-          _match: keyword?.toLocaleLowerCase(),
-        },
-      }
-    }
-  ).media(new MediaQueryOptions().file([
-    "thumbnail(width:400, height:320)",
-    "url",
-    imageSize
-      ? `resize(width:${imageSize.width}, height:${imageSize.height})`
-      : "resize(width:500, height:400)",
-  ])).setNoQuery(!keyword);
-
-  const result = await queryEntityList<
-    SearchIndex,
-    SearchIndexBoolExp,
-    SearchIndexOrderBy,
-    SearchIndexDistinctExp
-  >(queryOptions, envVariables);
-
-  return result as ListResult<SearchIndex> | undefined;
-}
+import {
+  PublishableStatus,
+  SearchIndex,
+  SearchIndexBoolExp,
+  SearchIndexOrderBy,
+  SearchIndexDistinctExp,
+  SearchIndexQueryOptions,
+  SearchIndexFields,
+  MediaQueryOptions,
+  ImageSize,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { ListResult } from "@rxdrag/entify-lib";
+import { EnvVariables } from "../types";
+
+export async function fulltextSearch(
+  keyword: string,
+  imageSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  langAbbr: string
+) {
+
+  const queryOptions = new SearchIndexQueryOptions(
+    [
+      SearchIndexFields.id,
+      SearchIndexFields.title,
+      SearchIndexFields.summary,
+      SearchIndexFields.sourceId,
+      SearchIndexFields.sourceType,
+      SearchIndexFields.sourceLang,
+      SearchIndexFields.sourceSlug,
+    ],
+    {
+      limit: 100,
+      where: {
+        sourceLang: {
+          _eq: langAbbr,
+        },
+        [SearchIndexFields.sourceStatus]: {
+          _eq: PublishableStatus.published,
+        },
+        content: {
+          _match: keyword?.toLocaleLowerCase(),
+        },
+      }
+    }
+  ).media(new MediaQueryOptions().file([
+    "thumbnail(width:400, height:320)",
+    "url",
+    imageSize
+      ? `resize(width:${imageSize.width}, height:${imageSize.height})`
+      : "resize(width:500, height:400)",
+  ])).setNoQuery(!keyword);
+
+  const result = await queryEntityList<
+    SearchIndex,
+    SearchIndexBoolExp,
+    SearchIndexOrderBy,
+    SearchIndexDistinctExp
+  >(queryOptions, envVariables);
+
+  return result as ListResult<SearchIndex> | undefined;
+}

package/src/entify/lib/langFields.ts

@@ -1,14 +1,14 @@
-import { LangFields } from "@rxdrag/rxcms-models";
-
-export const langFields = [
-  LangFields.id,
-  LangFields.abbr,
-  LangFields.circleIcon,
-  LangFields.cnName,
-  LangFields.enName,
-  LangFields.localName,
-  LangFields.icon,
-  LangFields.htmlLang,
-  //TODO 用枚举有时会出空值
-  "urlFragment" as LangFields.urlFragment,
-];
+import { LangFields } from "@rxdrag/rxcms-models";
+
+export const langFields = [
+  LangFields.id,
+  LangFields.abbr,
+  LangFields.circleIcon,
+  LangFields.cnName,
+  LangFields.enName,
+  LangFields.localName,
+  LangFields.icon,
+  LangFields.htmlLang,
+  //TODO 用枚举有时会出空值
+  "urlFragment" as LangFields.urlFragment,
+];

package/src/entify/lib/listToTree.ts

@@ -1,23 +1,23 @@
-export function listToTree<
-  T extends { id?: string | null; parent?: { id?: string | null } | null }
->(items: T[]): (T & { children: T[] })[] {
-  const nodeMap = new Map<string, T & { children: T[] }>();
-
-  items.forEach((item) => {
-    if (item.id) {
-      nodeMap.set(item.id, { ...item, children: [] });
-    }
-  });
-
-  const tree: (T & { children: T[] })[] = [];
-
-  nodeMap.forEach((node) => {
-    if (node.parent?.id && nodeMap.has(node.parent.id)) {
-      nodeMap.get(node.parent.id)!.children.push(node);
-    } else {
-      tree.push(node);
-    }
-  });
-
-  return tree;
-}
+export function listToTree<
+  T extends { id?: string | null; parent?: { id?: string | null } | null }
+>(items: T[]): (T & { children: T[] })[] {
+  const nodeMap = new Map<string, T & { children: T[] }>();
+
+  items.forEach((item) => {
+    if (item.id) {
+      nodeMap.set(item.id, { ...item, children: [] });
+    }
+  });
+
+  const tree: (T & { children: T[] })[] = [];
+
+  nodeMap.forEach((node) => {
+    if (node.parent?.id && nodeMap.has(node.parent.id)) {
+      nodeMap.get(node.parent.id)!.children.push(node);
+    } else {
+      tree.push(node);
+    }
+  });
+
+  return tree;
+}

package/src/entify/lib/newAvatarQueryOptions.ts

@@ -1,5 +1,5 @@
-import { MediaQueryOptions } from "@rxdrag/rxcms-models";
-
-export function newAvatarQueryOptions(){
-  return new MediaQueryOptions().file(["thumbnail", "url"])
+import { MediaQueryOptions } from "@rxdrag/rxcms-models";
+
+export function newAvatarQueryOptions(){
+  return new MediaQueryOptions().file(["thumbnail", "url"])
 }

package/src/entify/lib/newOgImageQueryOptions.ts

@@ -1,6 +1,6 @@
-import { MediaQueryOptions } from "@rxdrag/rxcms-models";
-
-// ogImage查询参数，目的是为了共享resize参数
-export function newOgImageQueryOptions(){
-  return new MediaQueryOptions().file(["resize(width:1200, height:630)", "url"])
+import { MediaQueryOptions } from "@rxdrag/rxcms-models";
+
+// ogImage查询参数，目的是为了共享resize参数
+export function newOgImageQueryOptions(){
+  return new MediaQueryOptions().file(["resize(width:1200, height:630)", "url"])
 }