@rxdrag/website-lib-core 0.0.127 → 0.0.129

package/src/entify/lib/queryPostCategories.ts

@@ -1,67 +1,67 @@
-import {
-  PostCategory,
-  PostCategoryBoolExp,
-  PostCategoryOrderBy,
-  PostCategoryDistinctExp,
-  PostCategoryFields,
-  PostCategoryQueryOptions,
-  ProductFields,
-  PublishableStatus,
-  PostQueryOptions,
-  PostFields,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables } from "../types";
-import { TPostCategory } from "../view-model";
-import { listToTree } from "./listToTree";
-
-export async function queryPostCategories(envVariables: EnvVariables) {
-  const result = await queryEntityList<
-    PostCategory,
-    PostCategoryBoolExp,
-    PostCategoryOrderBy,
-    PostCategoryDistinctExp
-  >(
-    new PostCategoryQueryOptions(
-      [
-        PostCategoryFields.id,
-        PostCategoryFields.name,
-        PostCategoryFields.slug,
-        PostCategoryFields.description,
-      ],
-      {
-        where: {
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-        orderBy: [{ [PostCategoryFields.seqValue]: "asc" }],
-      }
-    )
-      .parent()
-      .posts(
-        new PostQueryOptions(
-          [PostFields.id, PostFields.title, PostFields.slug],
-          {
-            where: {
-              [PostFields.status]: {
-                _eq: PublishableStatus.published,
-              },
-            },
-            orderBy: [{ [ProductFields.seqValue]: "asc" }],
-          }
-        )
-      ),
-    envVariables
-  );
-  const typedResult = result as ListResult<TPostCategory> | undefined;
-
-  if (!typedResult) {
-    return undefined;
-  }
-
-  return listToTree(typedResult.items || []);
-}
+import {
+  PostCategory,
+  PostCategoryBoolExp,
+  PostCategoryOrderBy,
+  PostCategoryDistinctExp,
+  PostCategoryFields,
+  PostCategoryQueryOptions,
+  ProductFields,
+  PublishableStatus,
+  PostQueryOptions,
+  PostFields,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { ListResult } from "@rxdrag/entify-lib";
+import { EnvVariables } from "../types";
+import { TPostCategory } from "../view-model";
+import { listToTree } from "./listToTree";
+
+export async function queryPostCategories(envVariables: EnvVariables, langAbbr: string) {
+  const result = await queryEntityList<
+    PostCategory,
+    PostCategoryBoolExp,
+    PostCategoryOrderBy,
+    PostCategoryDistinctExp
+  >(
+    new PostCategoryQueryOptions(
+      [
+        PostCategoryFields.id,
+        PostCategoryFields.name,
+        PostCategoryFields.slug,
+        PostCategoryFields.description,
+      ],
+      {
+        where: {
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+        },
+        orderBy: [{ [PostCategoryFields.seqValue]: "asc" }],
+      }
+    )
+      .parent()
+      .posts(
+        new PostQueryOptions(
+          [PostFields.id, PostFields.title, PostFields.slug],
+          {
+            where: {
+              [PostFields.status]: {
+                _eq: PublishableStatus.published,
+              },
+            },
+            orderBy: [{ [ProductFields.seqValue]: "asc" }],
+          }
+        )
+      ),
+    envVariables
+  );
+  const typedResult = result as ListResult<TPostCategory> | undefined;
+
+  if (!typedResult) {
+    return undefined;
+  }
+
+  return listToTree(typedResult.items || []);
+}

package/src/entify/lib/queryPostSlugs.ts

@@ -1,37 +1,37 @@
-import {
-  Post,
-  PostBoolExp,
-  PostDistinctExp,
-  PostFields,
-  PostOrderBy,
-  PostQueryOptions,
-  PublishableStatus,
-} from "@rxdrag/rxcms-models";
-import { EnvVariables } from "../types";
-import { ListResult } from "@rxdrag/entify-lib";
-import { TPost } from "../view-model";
-import { queryEntityList } from "./queryEntityList";
-
-export async function queryPostSlugs(envVariables: EnvVariables) {
-  const queryOptions = new PostQueryOptions([PostFields.id, PostFields.slug], {
-    where: {
-      [PostFields.status]: {
-        _eq: PublishableStatus.published,
-      },
-      lang: {
-        abbr: {
-          _eq: envVariables.language,
-        },
-      },
-    },
-    orderBy: [{ [PostFields.seqValue]: "asc" }],
-  });
-
-  const result = await queryEntityList<
-    Post,
-    PostBoolExp,
-    PostOrderBy,
-    PostDistinctExp
-  >(queryOptions, envVariables);
-  return result as ListResult<TPost> | undefined;
-}
+import {
+  Post,
+  PostBoolExp,
+  PostDistinctExp,
+  PostFields,
+  PostOrderBy,
+  PostQueryOptions,
+  PublishableStatus,
+} from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { ListResult } from "@rxdrag/entify-lib";
+import { TPost } from "../view-model";
+import { queryEntityList } from "./queryEntityList";
+
+export async function queryPostSlugs(envVariables: EnvVariables, langAbbr: string) {
+  const queryOptions = new PostQueryOptions([PostFields.id, PostFields.slug], {
+    where: {
+      [PostFields.status]: {
+        _eq: PublishableStatus.published,
+      },
+      lang: {
+        abbr: {
+          _eq: langAbbr,
+        },
+      },
+    },
+    orderBy: [{ [PostFields.seqValue]: "asc" }],
+  });
+
+  const result = await queryEntityList<
+    Post,
+    PostBoolExp,
+    PostOrderBy,
+    PostDistinctExp
+  >(queryOptions, envVariables);
+  return result as ListResult<TPost> | undefined;
+}

package/src/entify/lib/queryPosts.ts

@@ -1,174 +1,175 @@
-import {
-  Post,
-  PostBoolExp,
-  PostOrderBy,
-  PostDistinctExp,
-  PostFields,
-  PublishableStatus,
-  PostAssciations,
-  PostQueryOptions,
-  MediaQueryOptions,
-  UserQueryOptions,
-  UserFields,
-  ProductOrderBy,
-  ImageSize,
-  PostCategoryFields,
-  MediaFields,
-  PostCategory,
-  PostCategoryBoolExp,
-  PostCategoryOrderBy,
-  PostCategoryDistinctExp,
-  PostCategoryQueryOptions,
-  TagFields,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables } from "../types";
-import { TPost } from "../view-model";
-import { queryOneEntity } from "./queryOneEntity";
-import { CategoryNode, collectCategoryIds } from "./collectCategoryIds";
-
-export interface ListConditions {
-  category?: string; //category slug
-  page?: number;
-  pageSize: number;
-  orderBy?: ProductOrderBy[];
-}
-
-export async function queryPosts(
-  conditions: ListConditions,
-  coverSize: ImageSize | undefined,
-  envVariables: EnvVariables,
-  selectFields?: (keyof Post)[]
-) {
-  const { category: categorySlug, page = 1, pageSize } = conditions;
-
-  let where = {};
-  if (categorySlug) {
-    // 查询分类及其子分类
-    const category = await queryOneEntity<
-      PostCategory,
-      PostCategoryBoolExp,
-      PostCategoryOrderBy,
-      PostCategoryDistinctExp
-    >(
-      new PostCategoryQueryOptions(
-        [PostCategoryFields.id, PostCategoryFields.slug],
-        {
-          where: {
-            slug: {
-              _eq: categorySlug,
-            },
-          },
-        }
-      )
-        // 支持三级结构
-        .children(
-          new PostCategoryQueryOptions([
-            PostCategoryFields.id,
-            PostCategoryFields.slug,
-          ]).children([PostCategoryFields.id])
-        ),
-      envVariables
-    );
-
-    if (category) {
-      const categoryIds = collectCategoryIds(
-        category as unknown as CategoryNode
-      );
-      where = {
-        [PostAssciations.category]: {
-          id: {
-            _in: categoryIds,
-          },
-        },
-      };
-    }
-  }
-
-  // 默认查询字段
-  const defaultFields = [
-    PostFields.id,
-    PostFields.title,
-    PostFields.slug,
-    PostFields.description,
-    PostFields.status,
-    PostFields.updatedAt,
-    PostFields.createdAt,
-    PostFields.publishedAt,
-  ];
-
-  // 使用指定的字段或默认字段
-  const fields = selectFields || defaultFields;
-
-  const queryOptions = new PostQueryOptions(fields, {
-    offset: (page - 1) * pageSize,
-    limit: pageSize,
-    where: {
-      [PostFields.status]: {
-        _eq: PublishableStatus.published,
-      },
-      lang: {
-        abbr: {
-          _eq: envVariables.language,
-        },
-      },
-      _or: [
-        {
-          [PostFields.isDeleted]: {
-            _eq: false,
-          },
-        },
-        {
-          [PostFields.isDeleted]: {
-            _isNull: true,
-          },
-        },
-      ],
-      ...where,
-    },
-    orderBy: [
-      {
-        [PostFields.pinToTop]: "desc",
-      },
-      {
-        [PostFields.seqValue]: "asc",
-      },
-      {
-        [PostFields.updatedAt]: "desc",
-      },
-    ],
-  }).category([PostCategoryFields.id, PostCategoryFields.name, PostCategoryFields.slug])
-    .tags([TagFields.id, TagFields.name, TagFields.color]);
-
-  // 只有在需要查询封面图时才添加封面图查询
-  if (!selectFields || selectFields.includes("cover" as keyof Post)) {
-    queryOptions.cover(
-      new MediaQueryOptions().file([
-        "thumbnail",
-        coverSize
-          ? `resize(width:${coverSize.width}, height:${coverSize.height})`
-          : "resize(width:480, height:180)",
-      ])
-    );
-  }
-
-  // 只有在需要查询作者时才添加作者查询
-  if (!selectFields || selectFields.includes("author" as keyof Post)) {
-    queryOptions.author(
-      new UserQueryOptions([UserFields.id, UserFields.name]).avatar(
-        new MediaQueryOptions([MediaFields.id, MediaFields.mediaType, MediaFields.mediaRef])
-          .file(["thumbnail", "original"])
-      )
-    );
-  }
-
-  const result = await queryEntityList<
-    Post,
-    PostBoolExp,
-    PostOrderBy,
-    PostDistinctExp
-  >(queryOptions, envVariables);
-
-  return result as ListResult<TPost> | undefined;
-}
+import {
+  Post,
+  PostBoolExp,
+  PostOrderBy,
+  PostDistinctExp,
+  PostFields,
+  PublishableStatus,
+  PostAssciations,
+  PostQueryOptions,
+  MediaQueryOptions,
+  UserQueryOptions,
+  UserFields,
+  ProductOrderBy,
+  ImageSize,
+  PostCategoryFields,
+  MediaFields,
+  PostCategory,
+  PostCategoryBoolExp,
+  PostCategoryOrderBy,
+  PostCategoryDistinctExp,
+  PostCategoryQueryOptions,
+  TagFields,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { ListResult } from "@rxdrag/entify-lib";
+import { EnvVariables } from "../types";
+import { TPost } from "../view-model";
+import { queryOneEntity } from "./queryOneEntity";
+import { CategoryNode, collectCategoryIds } from "./collectCategoryIds";
+
+export interface ListConditions {
+  category?: string; //category slug
+  page?: number;
+  pageSize: number;
+  orderBy?: ProductOrderBy[];
+}
+
+export async function queryPosts(
+  conditions: ListConditions,
+  coverSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  langAbbr: string,
+  addonFields?: (keyof Post)[]
+) {
+  const { category: categorySlug, page = 1, pageSize } = conditions;
+
+  let where = {};
+  if (categorySlug) {
+    // 查询分类及其子分类
+    const category = await queryOneEntity<
+      PostCategory,
+      PostCategoryBoolExp,
+      PostCategoryOrderBy,
+      PostCategoryDistinctExp
+    >(
+      new PostCategoryQueryOptions(
+        [PostCategoryFields.id, PostCategoryFields.slug],
+        {
+          where: {
+            slug: {
+              _eq: categorySlug,
+            },
+          },
+        }
+      )
+        // 支持三级结构
+        .children(
+          new PostCategoryQueryOptions([
+            PostCategoryFields.id,
+            PostCategoryFields.slug,
+          ]).children([PostCategoryFields.id])
+        ),
+      envVariables
+    );
+
+    if (category) {
+      const categoryIds = collectCategoryIds(
+        category as unknown as CategoryNode
+      );
+      where = {
+        [PostAssciations.category]: {
+          id: {
+            _in: categoryIds,
+          },
+        },
+      };
+    }
+  }
+
+  // 默认查询字段
+  const defaultFields = [
+    PostFields.id,
+    PostFields.title,
+    PostFields.slug,
+    PostFields.description,
+    PostFields.status,
+    PostFields.updatedAt,
+    PostFields.createdAt,
+    PostFields.publishedAt,
+  ];
+
+  // 使用指定的字段或默认字段
+  const fields = addonFields || defaultFields;
+
+  const queryOptions = new PostQueryOptions(fields, {
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    where: {
+      [PostFields.status]: {
+        _eq: PublishableStatus.published,
+      },
+      lang: {
+        abbr: {
+          _eq: langAbbr,
+        },
+      },
+      _or: [
+        {
+          [PostFields.isDeleted]: {
+            _eq: false,
+          },
+        },
+        {
+          [PostFields.isDeleted]: {
+            _isNull: true,
+          },
+        },
+      ],
+      ...where,
+    },
+    orderBy: [
+      {
+        [PostFields.pinToTop]: "desc",
+      },
+      {
+        [PostFields.seqValue]: "asc",
+      },
+      {
+        [PostFields.updatedAt]: "desc",
+      },
+    ],
+  }).category([PostCategoryFields.id, PostCategoryFields.name, PostCategoryFields.slug])
+    .tags([TagFields.id, TagFields.name, TagFields.color]);
+
+  // 只有在需要查询封面图时才添加封面图查询
+  if (!addonFields || addonFields.includes("cover" as keyof Post)) {
+    queryOptions.cover(
+      new MediaQueryOptions().file([
+        "thumbnail",
+        coverSize
+          ? `resize(width:${coverSize.width}, height:${coverSize.height})`
+          : "resize(width:480, height:180)",
+      ])
+    );
+  }
+
+  // 只有在需要查询作者时才添加作者查询
+  if (!addonFields || addonFields.includes("author" as keyof Post)) {
+    queryOptions.author(
+      new UserQueryOptions([UserFields.id, UserFields.name]).avatar(
+        new MediaQueryOptions([MediaFields.id, MediaFields.mediaType, MediaFields.mediaRef])
+          .file(["thumbnail", "original"])
+      )
+    );
+  }
+
+  const result = await queryEntityList<
+    Post,
+    PostBoolExp,
+    PostOrderBy,
+    PostDistinctExp
+  >(queryOptions, envVariables);
+
+  return result as ListResult<TPost> | undefined;
+}