@rxdrag/website-lib-core 0.0.6 → 0.0.8

package/src/entify/IEntify.ts

@@ -0,0 +1,91 @@
+import { IQueryOptions, ListResult } from "@rxdrag/entify-hooks";
+import { TSize } from "./types";
+import { ListConditions } from "./lib";
+import { TPost, TPostCategory, TProduct, TProductCategory, TUser } from "./view-model";
+import { Lang, Theme } from "@rxdrag/rxcms-models";
+
+export type PostsOptions = {
+  category?: string;
+  coverSize?: TSize | undefined;
+  page: number;
+  pageSize: number;
+};
+
+export type PostPatinateOptions = {
+  pageSize: number;
+  category?: string;
+};
+
+export interface IEntify {
+  queryEntityList<
+    T,
+    WhereExp = unknown,
+    OrderBy = unknown,
+    DistinctExp = unknown
+  >(
+    options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
+    //用于生成静态网站时使用，预览测试也可以用
+    staticKey?: string
+  ): Promise<ListResult<unknown> | undefined>;
+
+  getTheme(): Promise<Theme | undefined>;
+
+  getLangs(): Promise<Lang[] | undefined>;
+
+  getFeaturedProducts(count?: number): Promise<TProduct[] | undefined>;
+
+  getLatestPosts(count?: number): Promise<TPost[] | undefined>;
+
+  getPosts(options: PostsOptions): Promise<TPost[] | undefined>;
+
+  getPostListPaths(options: PostPatinateOptions): Promise<unknown>;
+
+  getPostPaths(): Promise<unknown>;
+
+  getPostBySlug(slug: string, coverSize: TSize | undefined): Promise<unknown>;
+
+  getPostSlugs(): Promise<Array<string | undefined>>;
+
+  getPostCategories(): Promise<TPostCategory[] | undefined>;
+
+  getPostCategoryBySlug(slug: string): Promise<TPostCategory | undefined>;
+
+  getProducts(
+    conditions: ListConditions,
+    imageSize: TSize | undefined
+  ): Promise<TProduct[] | undefined>;
+
+  getProductListPaths(options: {
+    category?: string;
+    pageSize: number;
+  }): Promise<unknown>;
+
+  getCategoredProductListPaths(): Promise<unknown>;
+
+  getCategoredPostListPaths(): Promise<unknown>;
+
+  getProductBySlug(
+    slug: string,
+    imageSize: TSize | 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>;
+
+  searchProducts(keyword: string): Promise<ListResult<TProduct> | undefined>;
+
+  getUserPaths(): Promise<unknown>;
+
+  createPagination(totalItems: number, pageSize: number): unknown;
+}

package/src/entify/index.ts

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

package/src/entify/lib/newQueryProductOptions.ts

@@ -10,7 +10,6 @@ import {
   ProductRelatedPivotQueryOptions,
   ProductCategoryFields,
 } from "@rxdrag/rxcms-models";
-import { OrderBy } from "@rxdrag/entify-hooks";
 import { TSize } from "../types";
 import { newPageMetaOptions } from "./newPageMetaOptions";
 
@@ -33,7 +32,7 @@ function creatProductMediaOptions(imagSize?: TSize) {
     {
       orderBy: [
         {
-          [MediaOnProductFields.seqValue]: OrderBy.asc,
+          [MediaOnProductFields.seqValue]: "asc",
         },
       ],
     }
@@ -60,7 +59,7 @@ export function newQueryProductOptions(imagSize?: TSize) {
       new AttachmentOnProductQueryOptions(undefined, {
         orderBy: [
           {
-            [AttachmentOnProductFields.seqValue]: OrderBy.asc,
+            [AttachmentOnProductFields.seqValue]: "asc",
           },
         ],
       }).attachment(

package/src/entify/lib/newQueryProductsMediaOptions.ts

@@ -1,26 +1,27 @@
-import { OrderBy } from "@rxdrag/entify-hooks";
-import { MediaOnProductQueryOptions, MediaOnProductFields, MediaQueryOptions } from "@rxdrag/rxcms-models";
+import {
+  MediaOnProductQueryOptions,
+  MediaOnProductFields,
+  MediaQueryOptions,
+} from "@rxdrag/rxcms-models";
 import { TSize } from "../types";
 
-export function newQueryProductsMediaOptions(imageSize?: TSize | undefined,) {
+export function newQueryProductsMediaOptions(imageSize?: TSize | undefined) {
   return new MediaOnProductQueryOptions(
-    [
-      MediaOnProductFields.seqValue,
-      MediaOnProductFields.altText,
-    ],
+    [MediaOnProductFields.seqValue, MediaOnProductFields.altText],
     {
       orderBy: [
         {
-          [MediaOnProductFields.seqValue]: OrderBy.asc,
-        }
-      ]
+          [MediaOnProductFields.seqValue]: "asc",
+        },
+      ],
     }
   ).media(
-    new MediaQueryOptions().file(
-      ["thumbnail(width:400, height:320)",
-        "url",
-        imageSize ? `resize(width:${imageSize.width}, height:${imageSize.height})` : "resize(width:500, height:400)"
-      ]
-    )
-  )
-}
+    new MediaQueryOptions().file([
+      "thumbnail(width:400, height:320)",
+      "url",
+      imageSize
+        ? `resize(width:${imageSize.width}, height:${imageSize.height})`
+        : "resize(width:500, height:400)",
+    ])
+  );
+}

package/src/entify/lib/queryAllProducts.ts

@@ -1,6 +1,14 @@
-import { Product, ProductBoolExp, ProductDistinctExp, ProductFields, ProductOrderBy, ProductQueryOptions, PublishableStatus } from "@rxdrag/rxcms-models";
+import {
+  Product,
+  ProductBoolExp,
+  ProductDistinctExp,
+  ProductFields,
+  ProductOrderBy,
+  ProductQueryOptions,
+  PublishableStatus,
+} from "@rxdrag/rxcms-models";
 import { EnvVariables } from "../types";
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import { TProduct } from "../view-model";
 import { queryEntityList } from "./queryEntityList";
 
@@ -13,7 +21,7 @@ export async function queryAllProducts(envVariables: EnvVariables) {
           _eq: PublishableStatus.published,
         },
       },
-      orderBy: [{ [ProductFields.seqValue]: OrderBy.asc }],
+      orderBy: [{ [ProductFields.seqValue]: "asc" }],
     }
   );
 

package/src/entify/lib/queryFeaturedProducts.ts

@@ -9,7 +9,7 @@ import {
 import { queryEntityList } from "./queryEntityList";
 import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
 import { EnvVariables } from "../types";
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import { TProduct } from "../view-model";
 
 export async function queryFeaturedProducts(
@@ -38,10 +38,10 @@ export async function queryFeaturedProducts(
             _eq: true,
           },
         },
-        orderBy: [{ [ProductFields.seqValue]: OrderBy.asc }],
+        orderBy: [{ [ProductFields.seqValue]: "asc" }],
       }
     ).mediaPivots(newQueryProductsMediaOptions()),
     envVariables
   );
-  return result as ListResult<TProduct> | undefined;
+  return (result as ListResult<TProduct> | undefined)?.items;
 }

package/src/entify/lib/queryLatestPosts.ts

@@ -38,7 +38,7 @@ export async function queryLatestPosts(
         orderBy: [
           {
             //暂时按照更新时间排序
-            updatedAt: OrderBy.desc,
+            updatedAt: "desc",
           },
         ],
         where: {
@@ -61,5 +61,5 @@ export async function queryLatestPosts(
       ),
     envVariables
   );
-  return result as ListResult<TPost> | undefined;
+  return (result as ListResult<TPost> | undefined)?.items;
 }

package/src/entify/lib/queryOneTheme.ts

@@ -66,7 +66,7 @@ export async function queryOneTheme(envVariables: EnvVariables) {
           ThemeConfigFields.mobile,
           ThemeConfigFields.tel,
           ThemeConfigFields.wechat,
-          ThemeConfigFields.websiteName,
+          //ThemeConfigFields.websiteName,
         ]).contactAvatar(new MediaQueryOptions().file(["thumbnail"]))
       )
       .lang(langFields)

package/src/entify/lib/queryPostCategories.ts

@@ -11,7 +11,7 @@ import {
   PostFields,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import { EnvVariables } from "../types";
 import { TPostCategory } from "../view-model";
 
@@ -30,7 +30,7 @@ export async function queryPostCategories(envVariables: EnvVariables) {
         PostCategoryFields.description,
       ],
       {
-        orderBy: [{ [PostCategoryFields.seqValue]: OrderBy.asc }],
+        orderBy: [{ [PostCategoryFields.seqValue]: "asc" }],
       }
     ).posts(
       new PostQueryOptions([PostFields.id, PostFields.title, PostFields.slug], {
@@ -39,7 +39,7 @@ export async function queryPostCategories(envVariables: EnvVariables) {
             _eq: PublishableStatus.published,
           },
         },
-        orderBy: [{ [ProductFields.seqValue]: OrderBy.asc }],
+        orderBy: [{ [ProductFields.seqValue]: "asc" }],
       })
     ),
     envVariables

package/src/entify/lib/queryPostSlugs.ts

@@ -8,7 +8,7 @@ import {
   PublishableStatus,
 } from "@rxdrag/rxcms-models";
 import { EnvVariables } from "../types";
-import { OrderBy, ListResult } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import { TPost } from "../view-model";
 import { queryEntityList } from "./queryEntityList";
 
@@ -19,7 +19,7 @@ export async function queryPostSlugs(envVariables: EnvVariables) {
         _eq: PublishableStatus.published,
       },
     },
-    orderBy: [{ [PostFields.seqValue]: OrderBy.asc }],
+    orderBy: [{ [PostFields.seqValue]: "asc" }],
   });
 
   const result = await queryEntityList<

package/src/entify/lib/queryPosts.ts

@@ -1,92 +1,92 @@
-import { Post, PostBoolExp, PostOrderBy, PostDistinctExp, PostFields, PublishableStatus, PostAssciations, PostQueryOptions, MediaQueryOptions, UserQueryOptions, UserFields } from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
-import { EnvVariables, TSize } from "../types";
-import { TPost } from "../view-model";
-
-export interface ListConditions {
-  category?: string;//category slug
-  page?: number;
-  pageSize: number;
-}
-
-export async function queryPosts(
-  conditions: ListConditions, 
-  coverSize: TSize | undefined, 
-  envVariables: EnvVariables,
-  selectFields?: (keyof Post)[]
-) {
-  const { category: categorySlug, page = 1, pageSize } = conditions;
-
-  let where = {}
-  if (categorySlug) {
-    where = {
-      [PostAssciations.category]: {
-        slug: {
-          "_eq": categorySlug
-        }
-      },
-    }
-  }
-
-  // 默认查询字段
-  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
-        },
-        ...where,
-      },
-      orderBy: [
-        {
-          [PostFields.createdAt]: OrderBy.desc
-        }
-      ]
-    }
-  );
-
-  // 只有在需要查询封面图时才添加封面图查询
-  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().file(["thumbnail"]))
-    );
-  }
-
-  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 } from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { ListResult } from "@rxdrag/entify-hooks";
+import { EnvVariables, TSize } from "../types";
+import { TPost } from "../view-model";
+
+export interface ListConditions {
+  category?: string;//category slug
+  page?: number;
+  pageSize: number;
+}
+
+export async function queryPosts(
+  conditions: ListConditions, 
+  coverSize: TSize | undefined, 
+  envVariables: EnvVariables,
+  selectFields?: (keyof Post)[]
+) {
+  const { category: categorySlug, page = 1, pageSize } = conditions;
+
+  let where = {}
+  if (categorySlug) {
+    where = {
+      [PostAssciations.category]: {
+        slug: {
+          "_eq": categorySlug
+        }
+      },
+    }
+  }
+
+  // 默认查询字段
+  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
+        },
+        ...where,
+      },
+      orderBy: [
+        {
+          [PostFields.createdAt]: "desc"
+        }
+      ]
+    }
+  );
+
+  // 只有在需要查询封面图时才添加封面图查询
+  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().file(["thumbnail"]))
+    );
+  }
+
+  const result = await queryEntityList<Post, PostBoolExp, PostOrderBy, PostDistinctExp>(
+    queryOptions,
+    envVariables
+  );
+  
+  return result as ListResult<TPost> | undefined;
+}

package/src/entify/lib/queryProductCategories.ts

@@ -1,6 +1,6 @@
 import { ProductCategory, ProductCategoryBoolExp, ProductCategoryOrderBy, ProductCategoryDistinctExp, ProductCategoryFields, ProductCategoryQueryOptions, ProductFields, ProductQueryOptions, PublishableStatus } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import { EnvVariables } from "../types";
 import { TProductCategory } from "../view-model";
 
@@ -16,7 +16,7 @@ export async function queryProductCategories(envVariables: EnvVariables) {
       ],
       {
         orderBy: [
-          { [ProductCategoryFields.seqValue]: OrderBy.asc }
+          { [ProductCategoryFields.seqValue]: "asc" }
         ]
       }
     )
@@ -33,7 +33,7 @@ export async function queryProductCategories(envVariables: EnvVariables) {
               }
             },
             orderBy: [
-              { [ProductFields.seqValue]: OrderBy.asc }
+              { [ProductFields.seqValue]: "asc" }
             ]
           },
         )

package/src/entify/lib/queryProducts.ts

@@ -1,69 +1,69 @@
-import { Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp, ProductFields, ProductQueryOptions, PublishableStatus, ProductAssciations } from "@rxdrag/rxcms-models";
-import { ListConditions } from "./queryPosts";
-import { queryEntityList } from "./queryEntityList";
-import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
-import { EnvVariables, TSize } from "../types";
-import { TProduct } from "../view-model";
-
-export async function queryProducts(
-  conditions: ListConditions, 
-  imageSize: TSize | undefined, 
-  envVariables: EnvVariables,
-  selectFields?: (keyof Product)[]
-) {
-  const { category: categorySlug, page = 1, pageSize = 10 } = conditions;
-
-  let where = {}
-  if (categorySlug) {
-    where = {
-      [ProductAssciations.category]: {
-        slug: {
-          "_eq": categorySlug
-        }
-      },
-    }
-  }
-
-  // 默认查询字段
-  const defaultFields = [
-    ProductFields.id,
-    ProductFields.slug,
-    ProductFields.title,
-    ProductFields.shortTitle,
-    ProductFields.description,
-  ];
-
-  // 使用指定的字段或默认字段
-  const fields = selectFields || defaultFields;
-
-  const queryOptions = new ProductQueryOptions(
-    fields,
-    {
-      offset: (page - 1) * pageSize,
-      limit: pageSize,
-      where: {
-        [ProductFields.status]: {
-          "_eq": PublishableStatus.published
-        },
-        ...where,
-      },
-      orderBy: [
-        { [ProductFields.seqValue]: OrderBy.asc }
-      ]
-    }
-  );
-
-  // 只有在不指定字段或需要查询媒体时才添加媒体查询
-  if (!selectFields || !selectFields.includes('slug' as keyof Product)) {
-    queryOptions.mediaPivots(
-      newQueryProductsMediaOptions(imageSize)
-    );
-  }
-
-  const result = await queryEntityList<Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp>(
-    queryOptions,
-    envVariables
-  );
-  return result as ListResult<TProduct> | undefined;
-}
+import { Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp, ProductFields, ProductQueryOptions, PublishableStatus, ProductAssciations } from "@rxdrag/rxcms-models";
+import { ListConditions } from "./queryPosts";
+import { queryEntityList } from "./queryEntityList";
+import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
+import { ListResult } from "@rxdrag/entify-hooks";
+import { EnvVariables, TSize } from "../types";
+import { TProduct } from "../view-model";
+
+export async function queryProducts(
+  conditions: ListConditions, 
+  imageSize: TSize | undefined, 
+  envVariables: EnvVariables,
+  selectFields?: (keyof Product)[]
+) {
+  const { category: categorySlug, page = 1, pageSize = 10 } = conditions;
+
+  let where = {}
+  if (categorySlug) {
+    where = {
+      [ProductAssciations.category]: {
+        slug: {
+          "_eq": categorySlug
+        }
+      },
+    }
+  }
+
+  // 默认查询字段
+  const defaultFields = [
+    ProductFields.id,
+    ProductFields.slug,
+    ProductFields.title,
+    ProductFields.shortTitle,
+    ProductFields.description,
+  ];
+
+  // 使用指定的字段或默认字段
+  const fields = selectFields || defaultFields;
+
+  const queryOptions = new ProductQueryOptions(
+    fields,
+    {
+      offset: (page - 1) * pageSize,
+      limit: pageSize,
+      where: {
+        [ProductFields.status]: {
+          "_eq": PublishableStatus.published
+        },
+        ...where,
+      },
+      orderBy: [
+        { [ProductFields.seqValue]: "asc" }
+      ]
+    }
+  );
+
+  // 只有在不指定字段或需要查询媒体时才添加媒体查询
+  if (!selectFields || !selectFields.includes('slug' as keyof Product)) {
+    queryOptions.mediaPivots(
+      newQueryProductsMediaOptions(imageSize)
+    );
+  }
+
+  const result = await queryEntityList<Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp>(
+    queryOptions,
+    envVariables
+  );
+  return result as ListResult<TProduct> | undefined;
+}

package/src/entify/lib/queryUserPosts.ts

@@ -1,4 +1,4 @@
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import {
   PostBoolExp,
   PostOrderBy,
@@ -46,7 +46,7 @@ export async function queryUserPosts(
         orderBy: [
           {
             //暂时按照更新时间排序
-            updatedAt: OrderBy.desc,
+            updatedAt: "desc",
           },
         ],
         where: {