@rxdrag/website-lib-core 0.0.83 → 0.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,9 +24,9 @@
     "@types/react-dom": "^19.1.0",
     "eslint": "^7.32.0",
     "typescript": "^5",
-    "@rxdrag/slate-preview": "1.2.61",
+    "@rxdrag/tsconfig": "0.2.0",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/tsconfig": "0.2.0"
+    "@rxdrag/slate-preview": "1.2.61"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",
@@ -36,8 +36,8 @@
     "lodash-es": "^4.17.21",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@rxdrag/entify-lib": "0.0.23",
-    "@rxdrag/rxcms-models": "0.3.94"
+    "@rxdrag/rxcms-models": "0.3.94",
+    "@rxdrag/entify-lib": "0.0.23"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/entify/Entify.ts

@@ -238,7 +238,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) {
@@ -433,7 +433,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/index.ts

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

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/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 || []);
 }