@rxdrag/website-lib-core 0.0.83 → 0.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.83",
+  "version": "0.0.86",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -25,8 +25,8 @@
     "eslint": "^7.32.0",
     "typescript": "^5",
     "@rxdrag/slate-preview": "1.2.61",
-    "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/tsconfig": "0.2.0"
+    "@rxdrag/tsconfig": "0.2.0",
+    "@rxdrag/eslint-config-custom": "0.2.12"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",

package/src/entify/Entify.ts

@@ -48,6 +48,19 @@ export class Entify implements IEntify {
 
   private constructor(protected envVariables: EnvVariables, protected imageSizes: ImageSizes) { }
 
+  private flattenTree<T>(nodes: T[] | undefined): T[] {
+    if (!nodes) return [];
+    let result: T[] = [];
+    for (const node of nodes) {
+      result.push(node);
+      const children = (node as { children?: T[] }).children;
+      if (children && children.length > 0) {
+        result = result.concat(this.flattenTree(children));
+      }
+    }
+    return result;
+  }
+
   public static getInstance(envVariables: EnvVariables, imageSizes: ImageSizes): Entify {
     if (!Entify.instance) {
       Entify.instance = new Entify(envVariables, imageSizes);
@@ -238,7 +251,7 @@ export class Entify implements IEntify {
   }
 
   public async getPostCategories() {
-    return (await queryPostCategories(this.envVariables))?.items;
+    return await queryPostCategories(this.envVariables);
   }
 
   public async getPostCategoryBySlug(slug: string) {
@@ -277,7 +290,8 @@ export class Entify implements IEntify {
 
   public async getCategoredProductListPaths() {
     // 获取所有产品分类
-    const categories = await this.getProductCategories();
+    const categoryTree = await this.getProductCategories();
+    const categories = this.flattenTree(categoryTree);
 
     // 为每个分类生成路径
     const paths = [];
@@ -335,14 +349,14 @@ export class Entify implements IEntify {
   }
 
   /**
-   * TODO:未调试
    * 获取所有文章分类的分页路径
    * 用于生成静态页面
    * @returns 所有文章分类的分页路径
    */
   public async getCategoredPostListPaths() {
     // 获取所有文章分类
-    const categories = await this.getPostCategories();
+    const categoryTree = await this.getPostCategories();
+    const categories = this.flattenTree(categoryTree);
 
     // 为每个分类生成路径
     const paths = [];
@@ -433,7 +447,7 @@ export class Entify implements IEntify {
   }
 
   public async getProductCategories() {
-    return (await queryProductCategories(this.envVariables))?.items;
+    return await queryProductCategories(this.envVariables);
   }
 
   public async getProductCategoryBySlug(slug: string) {

package/src/entify/lib/collectCategoryIds.ts

@@ -0,0 +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;
+}

package/src/entify/lib/index.ts

@@ -27,4 +27,6 @@ export * from "./queryWebSiteSettings";
 export * from "./upsertEntity";
 export * from "./fulltextSearch";
 export * from "./sendEmail";
-export * from "./createUploadCredentials";
+export * from "./createUploadCredentials";
+export * from "./listToTree";
+export * from "./collectCategoryIds";

package/src/entify/lib/listToTree.ts

@@ -0,0 +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;
+}

package/src/entify/lib/queryPostCategories.ts

@@ -14,6 +14,7 @@ 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<
@@ -39,17 +40,28 @@ export async function queryPostCategories(envVariables: EnvVariables) {
         },
         orderBy: [{ [PostCategoryFields.seqValue]: "asc" }],
       }
-    ).posts(
-      new PostQueryOptions([PostFields.id, PostFields.title, PostFields.slug], {
-        where: {
-          [PostFields.status]: {
-            _eq: PublishableStatus.published,
-          },
-        },
-        orderBy: [{ [ProductFields.seqValue]: "asc" }],
-      })
-    ),
+    )
+      .parent()
+      .posts(
+        new PostQueryOptions(
+          [PostFields.id, PostFields.title, PostFields.slug],
+          {
+            where: {
+              [PostFields.status]: {
+                _eq: PublishableStatus.published,
+              },
+            },
+            orderBy: [{ [ProductFields.seqValue]: "asc" }],
+          }
+        )
+      ),
     envVariables
   );
-  return result as ListResult<TPostCategory> | undefined;
+  const typedResult = result as ListResult<TPostCategory> | undefined;
+
+  if (!typedResult) {
+    return undefined;
+  }
+
+  return listToTree(typedResult.items || []);
 }

package/src/entify/lib/queryPosts.ts

@@ -14,11 +14,18 @@ import {
   ImageSize,
   PostCategoryFields,
   MediaFields,
+  PostCategory,
+  PostCategoryBoolExp,
+  PostCategoryOrderBy,
+  PostCategoryDistinctExp,
+  PostCategoryQueryOptions,
 } 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
@@ -37,13 +44,45 @@ export async function queryPosts(
 
   let where = {};
   if (categorySlug) {
-    where = {
-      [PostAssciations.category]: {
-        slug: {
-          _eq: 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([])
+        ),
+      envVariables
+    );
+
+    if (category) {
+      const categoryIds = collectCategoryIds(
+        category as unknown as CategoryNode
+      );
+      where = {
+        [PostAssciations.category]: {
+          id: {
+            _in: categoryIds,
+          },
         },
-      },
-    };
+      };
+    }
   }
 
   // 默认查询字段

package/src/entify/lib/queryProductCategories.ts

@@ -3,6 +3,7 @@ import { queryEntityList } from "./queryEntityList";
 import { ListResult } from "@rxdrag/entify-lib";
 import { EnvVariables } from "../types";
 import { TProductCategory } from "../view-model";
+import { listToTree } from "./listToTree";
 
 export async function queryProductCategories(envVariables: EnvVariables) {
 
@@ -27,6 +28,7 @@ export async function queryProductCategories(envVariables: EnvVariables) {
         ]
       }
     )
+      .parent()
       .products(
         new ProductQueryOptions(
           [ProductFields.id, ProductFields.title, ProductFields.slug],
@@ -47,5 +49,11 @@ export async function queryProductCategories(envVariables: EnvVariables) {
       ),
     envVariables
   );
-  return result as ListResult<TProductCategory> | undefined;
+  const typedResult = result as ListResult<TProductCategory> | undefined;
+
+  if (!typedResult) {
+    return undefined;
+  }
+
+  return listToTree(typedResult.items || []);
 }

package/src/entify/lib/queryProducts.ts

@@ -7,6 +7,12 @@ import {
   ProductQueryOptions,
   PublishableStatus,
   ProductAssciations,
+  ProductCategory,
+  ProductCategoryBoolExp,
+  ProductCategoryOrderBy,
+  ProductCategoryDistinctExp,
+  ProductCategoryFields,
+  ProductCategoryQueryOptions,
 } from "@rxdrag/rxcms-models";
 import { ListConditions } from "./queryPosts";
 import { queryEntityList } from "./queryEntityList";
@@ -15,6 +21,8 @@ import { ListResult } from "@rxdrag/entify-lib";
 import { EnvVariables } from "../types";
 import { TProduct } from "../view-model";
 import { ImageSize } from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { CategoryNode, collectCategoryIds } from "./collectCategoryIds";
 
 export async function queryProducts(
   conditions: ListConditions,
@@ -31,13 +39,54 @@ export async function queryProducts(
 
   let where = {};
   if (categorySlug) {
-    where = {
-      [ProductAssciations.category]: {
-        slug: {
-          _eq: categorySlug,
+    //先查询分类以及其子分类
+    const category = await queryOneEntity<
+      ProductCategory,
+      ProductCategoryBoolExp,
+      ProductCategoryOrderBy,
+      ProductCategoryDistinctExp
+    >(
+      new ProductCategoryQueryOptions(
+        [
+          ProductCategoryFields.id,
+          ProductCategoryFields.slug,
+        ],
+        {
+          where: {
+            slug: {
+              _eq: categorySlug,
+            },
+          },
+        }
+        //支持三级结构
+      ).children(new ProductCategoryQueryOptions(
+        [
+          ProductCategoryFields.id,
+          ProductCategoryFields.slug,
+        ],
+        {
+          where: {
+            slug: {
+              _eq: categorySlug,
+            },
+          },
+        }
+      ).children([])),
+      envVariables
+    );
+    if (category) {
+      const categoryIds = collectCategoryIds(
+        category as unknown as CategoryNode
+      );
+      where = {
+        [ProductAssciations.category]: {
+          id: {
+            _in: categoryIds,
+          },
         },
-      },
-    };
+      };
+    }
+
   }
 
   // 默认查询字段