@rxdrag/website-lib-core 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,9 +24,9 @@
     "@types/react-dom": "^18.2.7",
     "eslint": "^7.32.0",
     "typescript": "^5",
-    "@rxdrag/entify-hooks": "0.2.46",
-    "@rxdrag/slate-preview": "1.2.57",
     "@rxdrag/eslint-config-custom": "0.2.12",
+    "@rxdrag/slate-preview": "1.2.57",
+    "@rxdrag/entify-hooks": "0.2.48",
     "@rxdrag/tsconfig": "0.2.0"
   },
   "dependencies": {
@@ -35,7 +35,7 @@
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@rxdrag/rxcms-models": "0.3.54"
+    "@rxdrag/rxcms-models": "0.3.56"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/component-logic/link.ts

@@ -21,11 +21,11 @@ export function toHref(
   }
 
   if (type === "products") {
-    return `${productsSlug}/page/1`;
+    return `/${productsSlug}/page/1`;
   }
 
   if (type === "posts") {
-    return `${postsSlug}/page/1`;
+    return `/${postsSlug}/page/1`;
   }
 
   if (type === "page") {
@@ -33,11 +33,11 @@ export function toHref(
   }
 
   if (type === "post") {
-    return `${postsSlug}/${to}`;
+    return `/${postsSlug}/${to}`;
   }
 
   if (type === "product") {
-    return `${productsSlug}/${to}`;
+    return `/${productsSlug}/${to}`;
   }
 
   if (type === "user") {
@@ -45,11 +45,11 @@ export function toHref(
   }
 
   if (type === "product-category") {
-    return `${productsSlug}/categories/${to}/1`;
+    return `/${productsSlug}/categories/${to}/1`;
   }
 
   if (type === "post-category") {
-    return `${postsSlug}/categories/${to}/1`;
+    return `/${postsSlug}/categories/${to}/1`;
   }
 
   return `/${type}/${to}`;

package/src/entify/Entify.ts

@@ -24,7 +24,7 @@ import { queryPostSlugs } from "./lib/queryPostSlugs";
 import { queryUserIds } from "./lib/queryUserIds";
 import { IEntify, PostPatinateOptions, PostsOptions } from "./IEntify";
 import { queryWebsite } from "./lib/queryWebsite";
-import { Page, PageType } from "@rxdrag/rxcms-models";
+import { Page, PageType, Product } from "@rxdrag/rxcms-models";
 import { queryPageBySlug } from "./lib/queryPageBySlug";
 import { queryPageByType } from "./lib/queryPageByType";
 
@@ -68,8 +68,12 @@ export class Entify implements IEntify {
     return (await queryLangs(this.envVariables))?.items;
   }
 
-  public async getFeaturedProducts(count?: number, imageSize?: TSize) {
-    return await queryFeaturedProducts(count, imageSize, this.envVariables);
+  public async getFeaturedProducts(
+    count?: number,
+    imageSize?: TSize,
+    addonFields?: (keyof Product)[]
+  ) {
+    return await queryFeaturedProducts(count, imageSize, this.envVariables, addonFields);
   }
 
   public async getLatestPosts(count?: number, coverSize?: TSize) {
@@ -178,10 +182,12 @@ export class Entify implements IEntify {
 
   public async getProducts(
     conditions: ListConditions,
-    imageSize: TSize | undefined
+    imageSize: TSize | undefined,
+    addonFields?: (keyof Product)[]
   ) {
-    return (await queryProducts(conditions, imageSize, this.envVariables))
-      ?.items;
+    return (
+      await queryProducts(conditions, imageSize, this.envVariables, addonFields)
+    )?.items;
   }
 
   public async getProductListPaths(options: {
@@ -372,7 +378,7 @@ export class Entify implements IEntify {
   }
 
   public async fulltextSearch(keyword: string, imageSize: TSize | undefined) {
-    return await fulltextSearch(keyword, imageSize,this.envVariables);
+    return await fulltextSearch(keyword, imageSize, this.envVariables);
   }
 
   public async getUserPaths() {

package/src/entify/IEntify.ts

@@ -8,7 +8,7 @@ import {
   TProductCategory,
   TUser,
 } from "./view-model";
-import { Lang, Page, PageType, SearchIndex, Theme, Website } from "@rxdrag/rxcms-models";
+import { Lang, Page, PageType, Product, SearchIndex, Theme, Website } from "@rxdrag/rxcms-models";
 
 export type PostsOptions = {
   category?: string;
@@ -41,7 +41,7 @@ export interface IEntify {
 
   getLangs(): Promise<Lang[] | undefined>;
 
-  getFeaturedProducts(count?: number, imageSize?: TSize): Promise<TProduct[] | undefined>;
+  getFeaturedProducts(count?: number, imageSize?: TSize, addonFields?: (keyof Product)[]): Promise<TProduct[] | undefined>;
 
   getLatestPosts(count?: number, coverSize?: TSize): Promise<TPost[] | undefined>;
 
@@ -92,7 +92,8 @@ export interface IEntify {
 
   getProducts(
     conditions: ListConditions,
-    imageSize: TSize | undefined
+    imageSize: TSize | undefined,
+    addonFields?: (keyof Product)[]
   ): Promise<TProduct[] | undefined>;
 
   getProductListPaths(options: {

package/src/entify/lib/queryFeaturedProducts.ts

@@ -14,8 +14,9 @@ import { TProduct } from "../view-model";
 
 export async function queryFeaturedProducts(
   count: number = 8,
-  imageSize: TSize|undefined,
-  envVariables: EnvVariables
+  imageSize: TSize | undefined,
+  envVariables: EnvVariables,
+  addonFields?: (keyof Product)[]
 ) {
   const result = await queryEntityList<
     Product,
@@ -30,6 +31,7 @@ export async function queryFeaturedProducts(
         ProductFields.title,
         ProductFields.shortTitle,
         ProductFields.description,
+        ...(addonFields || []),
       ],
       {
         offset: 0,

package/src/entify/lib/queryProducts.ts

@@ -19,7 +19,7 @@ export async function queryProducts(
   conditions: ListConditions,
   imageSize: TSize | undefined,
   envVariables: EnvVariables,
-  selectFields?: (keyof Product)[]
+  addonFields?: (keyof Product)[]
 ) {
   const { category: categorySlug, page = 1, pageSize = 10 } = conditions;
 
@@ -44,7 +44,7 @@ export async function queryProducts(
   ];
 
   // 使用指定的字段或默认字段
-  const fields = selectFields || defaultFields;
+  const fields = [...defaultFields, ...(addonFields || [])];
 
   const queryOptions = new ProductQueryOptions(fields, {
     offset: (page - 1) * pageSize,
@@ -66,7 +66,7 @@ export async function queryProducts(
   });
 
   // 只有在不指定字段或需要查询媒体时才添加媒体查询
-  if (!selectFields || !selectFields.includes("slug" as keyof Product)) {
+  if (!addonFields || !addonFields.includes("slug" as keyof Product)) {
     queryOptions.mediaPivots(newQueryProductsMediaOptions(imageSize));
   }