@rxdrag/website-lib-core 0.0.127 → 0.0.129

package/src/entify/lib/queryProductCategories.ts

@@ -1,59 +1,59 @@
-import { ProductCategory, ProductCategoryBoolExp, ProductCategoryOrderBy, ProductCategoryDistinctExp, ProductCategoryFields, ProductCategoryQueryOptions, ProductFields, ProductQueryOptions, PublishableStatus } from "@rxdrag/rxcms-models";
-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) {
-
-  const result = await queryEntityList<ProductCategory, ProductCategoryBoolExp, ProductCategoryOrderBy, ProductCategoryDistinctExp>(
-    new ProductCategoryQueryOptions(
-      [
-        ProductCategoryFields.id,
-        ProductCategoryFields.name,
-        ProductCategoryFields.slug,
-        ProductCategoryFields.description,
-      ],
-      {
-        where: {
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-        orderBy: [
-          { [ProductCategoryFields.seqValue]: "asc" }
-        ]
-      }
-    )
-      .parent()
-      .products(
-        new ProductQueryOptions(
-          [ProductFields.id, ProductFields.title, ProductFields.slug],
-          {
-            where: {
-              showInNavMenu: {
-                "_eq": true
-              },
-              [ProductFields.status]: {
-                "_eq": PublishableStatus.published
-              }
-            },
-            orderBy: [
-              { [ProductFields.seqValue]: "asc" }
-            ]
-          },
-        )
-      ),
-    envVariables
-  );
-  const typedResult = result as ListResult<TProductCategory> | undefined;
-
-  if (!typedResult) {
-    return undefined;
-  }
-
-  return listToTree(typedResult.items || []);
-}
+import { ProductCategory, ProductCategoryBoolExp, ProductCategoryOrderBy, ProductCategoryDistinctExp, ProductCategoryFields, ProductCategoryQueryOptions, ProductFields, ProductQueryOptions, PublishableStatus } from "@rxdrag/rxcms-models";
+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, langAbbr: string) {
+
+  const result = await queryEntityList<ProductCategory, ProductCategoryBoolExp, ProductCategoryOrderBy, ProductCategoryDistinctExp>(
+    new ProductCategoryQueryOptions(
+      [
+        ProductCategoryFields.id,
+        ProductCategoryFields.name,
+        ProductCategoryFields.slug,
+        ProductCategoryFields.description,
+      ],
+      {
+        where: {
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+        },
+        orderBy: [
+          { [ProductCategoryFields.seqValue]: "asc" }
+        ]
+      }
+    )
+      .parent()
+      .products(
+        new ProductQueryOptions(
+          [ProductFields.id, ProductFields.title, ProductFields.slug],
+          {
+            where: {
+              showInNavMenu: {
+                "_eq": true
+              },
+              [ProductFields.status]: {
+                "_eq": PublishableStatus.published
+              }
+            },
+            orderBy: [
+              { [ProductFields.seqValue]: "asc" }
+            ]
+          },
+        )
+      ),
+    envVariables
+  );
+  const typedResult = result as ListResult<TProductCategory> | undefined;
+
+  if (!typedResult) {
+    return undefined;
+  }
+
+  return listToTree(typedResult.items || []);
+}

package/src/entify/lib/queryProducts.ts

@@ -1,144 +1,145 @@
-import {
-  Product,
-  ProductBoolExp,
-  ProductOrderBy,
-  ProductDistinctExp,
-  ProductFields,
-  ProductQueryOptions,
-  PublishableStatus,
-  ProductAssciations,
-  ProductCategory,
-  ProductCategoryBoolExp,
-  ProductCategoryOrderBy,
-  ProductCategoryDistinctExp,
-  ProductCategoryFields,
-  ProductCategoryQueryOptions,
-  TagFields,
-} from "@rxdrag/rxcms-models";
-import { ListConditions } from "./queryPosts";
-import { queryEntityList } from "./queryEntityList";
-import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
-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,
-  imageSize: ImageSize | undefined,
-  envVariables: EnvVariables,
-  addonFields?: (keyof Product)[]
-) {
-  const {
-    category: categorySlug,
-    page = 1,
-    pageSize = 10,
-    orderBy,
-  } = conditions;
-
-  let where = {};
-  if (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,
-        ]
-      ).children([ProductCategoryFields.id])),
-      envVariables
-    );
-    if (category) {
-      const categoryIds = collectCategoryIds(
-        category as unknown as CategoryNode
-      );
-      where = {
-        [ProductAssciations.category]: {
-          id: {
-            _in: categoryIds,
-          },
-        },
-      };
-    }
-
-  }
-
-  // 默认查询字段
-  const defaultFields = [
-    ProductFields.id,
-    ProductFields.slug,
-    ProductFields.title,
-    ProductFields.shortTitle,
-    ProductFields.description,
-    ProductFields.seqValue,
-    ProductFields.updatedAt,
-  ];
-
-  // 使用指定的字段或默认字段
-  const fields = [...defaultFields, ...(addonFields || [])];
-
-  const queryOptions = new ProductQueryOptions(fields, {
-    offset: (page - 1) * pageSize,
-    limit: pageSize,
-    where: {
-      [ProductFields.status]: {
-        _eq: PublishableStatus.published,
-      },
-      lang: {
-        abbr: {
-          _eq: envVariables.language,
-        },
-      },
-      _or: [
-        {
-          [ProductFields.isDeleted]: {
-            _eq: false,
-          },
-        },
-        {
-          [ProductFields.isDeleted]: {
-            _isNull: true,
-          },
-        },
-      ],
-      ...where,
-    },
-    orderBy: orderBy || [
-      { [ProductFields.seqValue]: "asc" },
-      { [ProductFields.updatedAt]: "desc" },
-    ],
-  }).tags([TagFields.id, TagFields.name, TagFields.color]);
-
-  // 只有在不指定字段或需要查询媒体时才添加媒体查询
-  if (!addonFields || !addonFields.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,
+  ProductCategory,
+  ProductCategoryBoolExp,
+  ProductCategoryOrderBy,
+  ProductCategoryDistinctExp,
+  ProductCategoryFields,
+  ProductCategoryQueryOptions,
+  TagFields,
+} from "@rxdrag/rxcms-models";
+import { ListConditions } from "./queryPosts";
+import { queryEntityList } from "./queryEntityList";
+import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
+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,
+  imageSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  addonFields: (keyof Product)[] | undefined,
+  langAbbr: string
+) {
+  const {
+    category: categorySlug,
+    page = 1,
+    pageSize = 10,
+    orderBy,
+  } = conditions;
+
+  let where = {};
+  if (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,
+        ]
+      ).children([ProductCategoryFields.id])),
+      envVariables
+    );
+    if (category) {
+      const categoryIds = collectCategoryIds(
+        category as unknown as CategoryNode
+      );
+      where = {
+        [ProductAssciations.category]: {
+          id: {
+            _in: categoryIds,
+          },
+        },
+      };
+    }
+
+  }
+
+  // 默认查询字段
+  const defaultFields = [
+    ProductFields.id,
+    ProductFields.slug,
+    ProductFields.title,
+    ProductFields.shortTitle,
+    ProductFields.description,
+    ProductFields.seqValue,
+    ProductFields.updatedAt,
+  ];
+
+  // 使用指定的字段或默认字段
+  const fields = [...defaultFields, ...(addonFields || [])];
+
+  const queryOptions = new ProductQueryOptions(fields, {
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    where: {
+      [ProductFields.status]: {
+        _eq: PublishableStatus.published,
+      },
+      lang: {
+        abbr: {
+          _eq: langAbbr,
+        },
+      },
+      _or: [
+        {
+          [ProductFields.isDeleted]: {
+            _eq: false,
+          },
+        },
+        {
+          [ProductFields.isDeleted]: {
+            _isNull: true,
+          },
+        },
+      ],
+      ...where,
+    },
+    orderBy: orderBy || [
+      { [ProductFields.seqValue]: "asc" },
+      { [ProductFields.updatedAt]: "desc" },
+    ],
+  }).tags([TagFields.id, TagFields.name, TagFields.color]);
+
+  // 只有在不指定字段或需要查询媒体时才添加媒体查询
+  if (!addonFields || !addonFields.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/queryProductsInMenu.ts

@@ -1,45 +1,45 @@
-import {
-  ProductFields,
-  ProductQueryOptions,
-  PublishableStatus,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { EnvVariables } from "../types";
-import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
-
-export async function queryProductsInMenu(envVariables: EnvVariables) {
-  const result = await queryEntityList(
-    new ProductQueryOptions(
-      [ProductFields.id, ProductFields.slug, ProductFields.title],
-      {
-        where: {
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-          _or: [
-            {
-              [ProductFields.isDeleted]: {
-                _eq: false,
-              },
-            },
-            {
-              [ProductFields.isDeleted]: {
-                _isNull: true,
-              },
-            },
-          ],
-          showInNavMenu: {
-            _eq: true,
-          },
-          [ProductFields.status]: {
-            _eq: PublishableStatus.published,
-          },
-        },
-      }
-    ).mediaPivots(newQueryProductsMediaOptions()),
-    envVariables
-  );
-  return result;
-}
+import {
+  ProductFields,
+  ProductQueryOptions,
+  PublishableStatus,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { EnvVariables } from "../types";
+import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
+
+export async function queryProductsInMenu(envVariables: EnvVariables, langAbbr: string) {
+  const result = await queryEntityList(
+    new ProductQueryOptions(
+      [ProductFields.id, ProductFields.slug, ProductFields.title],
+      {
+        where: {
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+          _or: [
+            {
+              [ProductFields.isDeleted]: {
+                _eq: false,
+              },
+            },
+            {
+              [ProductFields.isDeleted]: {
+                _isNull: true,
+              },
+            },
+          ],
+          showInNavMenu: {
+            _eq: true,
+          },
+          [ProductFields.status]: {
+            _eq: PublishableStatus.published,
+          },
+        },
+      }
+    ).mediaPivots(newQueryProductsMediaOptions()),
+    envVariables
+  );
+  return result;
+}

package/src/entify/lib/queryTagCategories.ts

@@ -1,58 +1,58 @@
-import {
-  TagCategory,
-  TagCategoryBoolExp,
-  TagCategoryOrderBy,
-  TagCategoryDistinctExp,
-  TagCategoryFields,
-  TagCategoryQueryOptions,
-  TagQueryOptions,
-  TagFields,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables } from "../types";
-import { TTagCategory } from "../view-model";
-import { listToTree } from "./listToTree";
-
-export async function queryTagCategories(envVariables: EnvVariables) {
-  const result = await queryEntityList<
-    TagCategory,
-    TagCategoryBoolExp,
-    TagCategoryOrderBy,
-    TagCategoryDistinctExp
-  >(
-    new TagCategoryQueryOptions(
-      [
-        TagCategoryFields.id,
-        TagCategoryFields.name,
-      ],
-      {
-        where: {
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-        orderBy: [{ [TagCategoryFields.name]: "asc" }],
-      }
-    )
-      .parent()
-      .tags(
-        new TagQueryOptions(
-          [TagFields.id, TagFields.name, TagFields.color],
-          {
-            orderBy: [{ [TagFields.createdAt]: "desc" }],
-          }
-        )
-      ),
-    envVariables
-  );
-  const typedResult = result as ListResult<TTagCategory> | undefined;
-
-  if (!typedResult) {
-    return undefined;
-  }
-
-  return listToTree(typedResult.items || []);
-}
+import {
+  TagCategory,
+  TagCategoryBoolExp,
+  TagCategoryOrderBy,
+  TagCategoryDistinctExp,
+  TagCategoryFields,
+  TagCategoryQueryOptions,
+  TagQueryOptions,
+  TagFields,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { ListResult } from "@rxdrag/entify-lib";
+import { EnvVariables } from "../types";
+import { TTagCategory } from "../view-model";
+import { listToTree } from "./listToTree";
+
+export async function queryTagCategories(envVariables: EnvVariables, langAbbr: string) {
+  const result = await queryEntityList<
+    TagCategory,
+    TagCategoryBoolExp,
+    TagCategoryOrderBy,
+    TagCategoryDistinctExp
+  >(
+    new TagCategoryQueryOptions(
+      [
+        TagCategoryFields.id,
+        TagCategoryFields.name,
+      ],
+      {
+        where: {
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+        },
+        orderBy: [{ [TagCategoryFields.name]: "asc" }],
+      }
+    )
+      .parent()
+      .tags(
+        new TagQueryOptions(
+          [TagFields.id, TagFields.name, TagFields.color],
+          {
+            orderBy: [{ [TagFields.createdAt]: "desc" }],
+          }
+        )
+      ),
+    envVariables
+  );
+  const typedResult = result as ListResult<TTagCategory> | undefined;
+
+  if (!typedResult) {
+    return undefined;
+  }
+
+  return listToTree(typedResult.items || []);
+}