@rxdrag/website-lib-core 0.0.126 → 0.0.128

package/src/entify/lib/queryFeaturedProducts.ts

@@ -1,68 +1,69 @@
-import {
-  Product,
-  ProductBoolExp,
-  ProductOrderBy,
-  ProductDistinctExp,
-  ProductFields,
-  ProductQueryOptions,
-  ImageSize,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
-import { EnvVariables } from "../types";
-import { ListResult } from "@rxdrag/entify-lib";
-import { TProduct } from "../view-model";
-
-export async function queryFeaturedProducts(
-  count: number = 8,
-  imageSize: ImageSize | undefined,
-  envVariables: EnvVariables,
-  addonFields?: (keyof Product)[]
-) {
-  const result = await queryEntityList<
-    Product,
-    ProductBoolExp,
-    ProductOrderBy,
-    ProductDistinctExp
-  >(
-    new ProductQueryOptions(
-      [
-        ProductFields.id,
-        ProductFields.slug,
-        ProductFields.title,
-        ProductFields.shortTitle,
-        ProductFields.description,
-        ...(addonFields || []),
-      ],
-      {
-        offset: 0,
-        limit: count,
-        where: {
-          featured: {
-            _eq: true,
-          },
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-          _or: [
-            {
-              [ProductFields.isDeleted]: {
-                _eq: false,
-              },
-            },
-            {
-              [ProductFields.isDeleted]: {
-                _isNull: true,
-              },
-            },
-          ],
-        },
-        orderBy: [{ [ProductFields.seqValue]: "asc" }],
-      }
-    ).mediaPivots(newQueryProductsMediaOptions(imageSize)),
-    envVariables
-  );
-  return (result as ListResult<TProduct> | undefined)?.items;
-}
+import {
+  Product,
+  ProductBoolExp,
+  ProductOrderBy,
+  ProductDistinctExp,
+  ProductFields,
+  ProductQueryOptions,
+  ImageSize,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
+import { EnvVariables } from "../types";
+import { ListResult } from "@rxdrag/entify-lib";
+import { TProduct } from "../view-model";
+
+export async function queryFeaturedProducts(
+  count: number | undefined = 3,
+  imageSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  addonFields: (keyof Product)[] | undefined,
+  langAbbr: string
+) {
+  const result = await queryEntityList<
+    Product,
+    ProductBoolExp,
+    ProductOrderBy,
+    ProductDistinctExp
+  >(
+    new ProductQueryOptions(
+      [
+        ProductFields.id,
+        ProductFields.slug,
+        ProductFields.title,
+        ProductFields.shortTitle,
+        ProductFields.description,
+        ...(addonFields || []),
+      ],
+      {
+        offset: 0,
+        limit: count,
+        where: {
+          featured: {
+            _eq: true,
+          },
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+          _or: [
+            {
+              [ProductFields.isDeleted]: {
+                _eq: false,
+              },
+            },
+            {
+              [ProductFields.isDeleted]: {
+                _isNull: true,
+              },
+            },
+          ],
+        },
+        orderBy: [{ [ProductFields.seqValue]: "asc" }],
+      }
+    ).mediaPivots(newQueryProductsMediaOptions(imageSize)),
+    envVariables
+  );
+  return (result as ListResult<TProduct> | undefined)?.items;
+}

package/src/entify/lib/queryLangs.ts

@@ -1,60 +1,36 @@
-import {
-  Lang,
-  LangBoolExp,
-  LangDistinctExp,
-  LangOrderBy,
-  LangQueryOptions,
-  LangAssciations,
-  ThemeBranchQueryOptions,
-  ThemeBranchFields,
-  ThemeConfigFields,
-  ThemeBranchAssciations,
-} from "@rxdrag/rxcms-models";
-import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables } from "../types";
-import { createEntifyClient } from "./createEntifyClient";
-import { langFields } from "./langFields";
-
-export async function queryLangs(envVariables: EnvVariables) {
-  const client = createEntifyClient(envVariables);
-
-  const result = await client.enityList<
-    Lang,
-    LangBoolExp,
-    LangOrderBy,
-    LangDistinctExp
-  >(
-    new LangQueryOptions(langFields, {
-      where: {
-        [LangAssciations.websites]: {
-          id: {
-            _eq: envVariables.websiteId,
-          },
-        },
-      },
-    })
-      .themes(
-        new ThemeBranchQueryOptions([ThemeBranchFields.id, ThemeBranchFields.name], {
-          where: {
-            [ThemeBranchAssciations.website]: {
-              id: {
-                _eq: envVariables.websiteId,
-              },
-            },
-          },
-        }).config([
-          ThemeConfigFields.id,
-          ThemeConfigFields.address,
-          ThemeConfigFields.contact,
-          ThemeConfigFields.email,
-          ThemeConfigFields.fax,
-          ThemeConfigFields.mobile,
-          ThemeConfigFields.tel,
-          ThemeConfigFields.wechat,
-          ThemeConfigFields.domain,
-        ])
-      )
-      .setNoQuery(!envVariables.websiteId)
-  );
-  return result as ListResult<Lang> | undefined;
-}
+import {
+  Lang,
+  LangBoolExp,
+  LangDistinctExp,
+  LangOrderBy,
+  LangQueryOptions,
+  LangAssciations,
+} from "@rxdrag/rxcms-models";
+import { ListResult } from "@rxdrag/entify-lib";
+import { EnvVariables } from "../types";
+import { createEntifyClient } from "./createEntifyClient";
+import { langFields } from "./langFields";
+
+export async function queryLangs(envVariables: EnvVariables) {
+  const client = createEntifyClient(envVariables);
+
+  // 新架构：一个 Website 对应一个 ThemeBranch，不再按语言区分
+  // Lang 和 ThemeBranch 之间不再有直接关联关系
+  const result = await client.enityList<
+    Lang,
+    LangBoolExp,
+    LangOrderBy,
+    LangDistinctExp
+  >(
+    new LangQueryOptions(langFields, {
+      where: {
+        [LangAssciations.websites]: {
+          id: {
+            _eq: envVariables.websiteId,
+          },
+        },
+      },
+    }).setNoQuery(!envVariables.websiteId)
+  );
+  return result as ListResult<Lang> | undefined;
+}

package/src/entify/lib/queryLatestPosts.ts

@@ -1,91 +1,92 @@
-import { ListResult } from "@rxdrag/entify-lib";
-import {
-  PostBoolExp,
-  PostOrderBy,
-  PostDistinctExp,
-  PostFields,
-  Post,
-  PostQueryOptions,
-  MediaQueryOptions,
-  UserQueryOptions,
-  UserFields,
-  PublishableStatus,
-  PostCategoryFields,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { EnvVariables } from "../types";
-import { TPost } from "../view-model";
-import { ImageSize } from "@rxdrag/rxcms-models";
-
-export async function queryLatestPosts(
-  count: number = 2,
-  coverSize: ImageSize | undefined,
-  envVariables: EnvVariables
-) {
-  const result = await queryEntityList<
-    Post,
-    PostBoolExp,
-    PostOrderBy,
-    PostDistinctExp
-  >(
-    new PostQueryOptions(
-      [
-        PostFields.id,
-        PostFields.slug,
-        PostFields.title,
-        PostFields.description,
-      ],
-      {
-        offset: 0,
-        limit: count,
-        orderBy: [
-          {
-            //暂时按照更新时间排序
-            updatedAt: "desc",
-          },
-        ],
-        where: {
-          [PostFields.status]: {
-            _eq: PublishableStatus.published,
-          },
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-          _or: [
-            {
-              [PostFields.isDeleted]: {
-                _eq: false,
-              },
-            },
-            {
-              [PostFields.isDeleted]: {
-                _isNull: true,
-              },
-            },
-          ],
-        },
-      }
-    )
-      .category([
-        PostCategoryFields.id,
-        PostCategoryFields.slug,
-        PostCategoryFields.name,
-      ])
-      .cover(
-        new MediaQueryOptions().file([
-          "thumbnail",
-          `resize(width:${coverSize?.width || 480}, height:${coverSize?.height || 180
-          })`,
-        ])
-      )
-      .author(
-        new UserQueryOptions([UserFields.id, UserFields.name]).avatar(
-          new MediaQueryOptions().file(["thumbnail"])
-        )
-      ),
-    envVariables
-  );
-  return (result as ListResult<TPost> | undefined)?.items;
-}
+import { ListResult } from "@rxdrag/entify-lib";
+import {
+  PostBoolExp,
+  PostOrderBy,
+  PostDistinctExp,
+  PostFields,
+  Post,
+  PostQueryOptions,
+  MediaQueryOptions,
+  UserQueryOptions,
+  UserFields,
+  PublishableStatus,
+  PostCategoryFields,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { EnvVariables } from "../types";
+import { TPost } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
+
+export async function queryLatestPosts(
+  count: number | undefined = 3,
+  coverSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  langAbbr: string
+) {
+  const result = await queryEntityList<
+    Post,
+    PostBoolExp,
+    PostOrderBy,
+    PostDistinctExp
+  >(
+    new PostQueryOptions(
+      [
+        PostFields.id,
+        PostFields.slug,
+        PostFields.title,
+        PostFields.description,
+      ],
+      {
+        offset: 0,
+        limit: count,
+        orderBy: [
+          {
+            //暂时按照更新时间排序
+            updatedAt: "desc",
+          },
+        ],
+        where: {
+          [PostFields.status]: {
+            _eq: PublishableStatus.published,
+          },
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+          _or: [
+            {
+              [PostFields.isDeleted]: {
+                _eq: false,
+              },
+            },
+            {
+              [PostFields.isDeleted]: {
+                _isNull: true,
+              },
+            },
+          ],
+        },
+      }
+    )
+      .category([
+        PostCategoryFields.id,
+        PostCategoryFields.slug,
+        PostCategoryFields.name,
+      ])
+      .cover(
+        new MediaQueryOptions().file([
+          "thumbnail",
+          `resize(width:${coverSize?.width || 480}, height:${coverSize?.height || 180
+          })`,
+        ])
+      )
+      .author(
+        new UserQueryOptions([UserFields.id, UserFields.name]).avatar(
+          new MediaQueryOptions().file(["thumbnail"])
+        )
+      ),
+    envVariables
+  );
+  return (result as ListResult<TPost> | undefined)?.items;
+}

package/src/entify/lib/queryOneEntity.ts

@@ -1,63 +1,63 @@
-import { IQueryOptions } from "@rxdrag/entify-lib";
-import { createEntifyClient } from "./createEntifyClient";
-import {
-  PostCategoryEntityName,
-  PostEntityName,
-  ProductCategoryEntityName,
-  ProductEntityName,
-  UserEntityName,
-  WebsitePart,
-  WebsiteSettingsEntityName,
-} from "@rxdrag/rxcms-models";
-import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
-import { EnvVariables } from "../types";
-import {
-  postCategoryToViewModel,
-  postToViewModel,
-  productCategoryToViewModel,
-  productToViewModel,
-  userToViewModel,
-  websiteSettingsToViewModel,
-} from "../view-model";
-
-export async function queryOneEntity<
-  T extends WebsitePart = WebsitePart,
-  WhereExp extends WebsitePartBoolExp = WebsitePartBoolExp,
-  OrderBy = unknown,
-  DistinctExp = unknown
->(
-  options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
-  envVariables: EnvVariables
-) {
-  const client = createEntifyClient(envVariables);
-  const result = await client.oneEntity<T, WhereExp, OrderBy, DistinctExp>(
-    !envVariables.websiteId
-      ? options
-      : options.setQueryArgs({
-          ...options.getQueryArgs(),
-          where: {
-            website: {
-              id: { _eq: envVariables.websiteId },
-            },
-            ...options.getQueryArgs()?.where,
-          } as unknown as WhereExp,
-        })
-  );
-
-  switch (options.entityName) {
-    case ProductEntityName:
-      return productToViewModel(result) as T | undefined;
-    case PostEntityName:
-      return postToViewModel(result) as T | undefined;
-    case ProductCategoryEntityName:
-      return productCategoryToViewModel(result) as T | undefined;
-    case PostCategoryEntityName:
-      return postCategoryToViewModel(result) as T | undefined;
-    case UserEntityName:
-      return userToViewModel(result) as T | undefined;
-    case WebsiteSettingsEntityName:
-      return websiteSettingsToViewModel(result) as T | undefined;
-  }
-
-  return result as T | undefined;
-}
+import { IQueryOptions } from "@rxdrag/entify-lib";
+import { createEntifyClient } from "./createEntifyClient";
+import {
+  PostCategoryEntityName,
+  PostEntityName,
+  ProductCategoryEntityName,
+  ProductEntityName,
+  UserEntityName,
+  WebsitePart,
+  WebsiteSettingsEntityName,
+} from "@rxdrag/rxcms-models";
+import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
+import { EnvVariables } from "../types";
+import {
+  postCategoryToViewModel,
+  postToViewModel,
+  productCategoryToViewModel,
+  productToViewModel,
+  userToViewModel,
+  websiteSettingsToViewModel,
+} from "../view-model";
+
+export async function queryOneEntity<
+  T extends WebsitePart = WebsitePart,
+  WhereExp extends WebsitePartBoolExp = WebsitePartBoolExp,
+  OrderBy = unknown,
+  DistinctExp = unknown
+>(
+  options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
+  envVariables: EnvVariables
+) {
+  const client = createEntifyClient(envVariables);
+  const result = await client.oneEntity<T, WhereExp, OrderBy, DistinctExp>(
+    !envVariables.websiteId
+      ? options
+      : options.setQueryArgs({
+          ...options.getQueryArgs(),
+          where: {
+            website: {
+              id: { _eq: envVariables.websiteId },
+            },
+            ...options.getQueryArgs()?.where,
+          } as unknown as WhereExp,
+        })
+  );
+
+  switch (options.entityName) {
+    case ProductEntityName:
+      return productToViewModel(result) as T | undefined;
+    case PostEntityName:
+      return postToViewModel(result) as T | undefined;
+    case ProductCategoryEntityName:
+      return productCategoryToViewModel(result) as T | undefined;
+    case PostCategoryEntityName:
+      return postCategoryToViewModel(result) as T | undefined;
+    case UserEntityName:
+      return userToViewModel(result) as T | undefined;
+    case WebsiteSettingsEntityName:
+      return websiteSettingsToViewModel(result) as T | undefined;
+  }
+
+  return result as T | undefined;
+}

package/src/entify/lib/queryOneMedia.ts

@@ -1,28 +1,28 @@
-import { Media, MediaBoolExp, MediaDistinctExp, MediaFields, MediaOrderBy, MediaQueryOptions } from "@rxdrag/rxcms-models";
-import { EnvVariables } from "../types";
-import { queryOneEntity } from "./queryOneEntity";
-export const queryOneMedia = async (
-  ref: string | undefined | null,
-  fields: string[] | undefined,
-  envVariables: EnvVariables) => {
-
-  const media = await queryOneEntity<Media, MediaBoolExp, MediaOrderBy, MediaDistinctExp>(
-    new MediaQueryOptions([
-      MediaFields.id,
-      MediaFields.mediaRef,
-      MediaFields.mediaType,
-      MediaFields.storageType,
-    ], {
-      where: {
-        mediaRef: {
-          "_eq": ref || ""
-        }
-      }
-    })
-      .file(["original", "thumbnail", ...(fields || [])])
-      .setNoQuery(!ref)
-    ,
-    envVariables
-  );
-  return media;
+import { Media, MediaBoolExp, MediaDistinctExp, MediaFields, MediaOrderBy, MediaQueryOptions } from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { queryOneEntity } from "./queryOneEntity";
+export const queryOneMedia = async (
+  ref: string | undefined | null,
+  fields: string[] | undefined,
+  envVariables: EnvVariables) => {
+
+  const media = await queryOneEntity<Media, MediaBoolExp, MediaOrderBy, MediaDistinctExp>(
+    new MediaQueryOptions([
+      MediaFields.id,
+      MediaFields.mediaRef,
+      MediaFields.mediaType,
+      MediaFields.storageType,
+    ], {
+      where: {
+        mediaRef: {
+          "_eq": ref || ""
+        }
+      }
+    })
+      .file(["original", "thumbnail", ...(fields || [])])
+      .setNoQuery(!ref)
+    ,
+    envVariables
+  );
+  return media;
 };

package/src/entify/lib/queryOnePostById.ts

@@ -1,21 +1,21 @@
-import { Post, PostBoolExp, PostOrderBy, PostDistinctExp } from "@rxdrag/rxcms-models";
-import { newQueryOnePostOptions } from "./newQueryPostOptions";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-
-export async function queryOnePostById(id: string, envVariables: EnvVariables) {
-
-  const post = await queryOneEntity<Post, PostBoolExp, PostOrderBy, PostDistinctExp>(
-    newQueryOnePostOptions()
-      .setQueryArgs({
-        where: {
-          id: {
-            "_eq": id
-          }
-        }
-      })
-    ,
-    envVariables
-  );
-  return post;
-}
+import { Post, PostBoolExp, PostOrderBy, PostDistinctExp } from "@rxdrag/rxcms-models";
+import { newQueryOnePostOptions } from "./newQueryPostOptions";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+
+export async function queryOnePostById(id: string, envVariables: EnvVariables) {
+
+  const post = await queryOneEntity<Post, PostBoolExp, PostOrderBy, PostDistinctExp>(
+    newQueryOnePostOptions()
+      .setQueryArgs({
+        where: {
+          id: {
+            "_eq": id
+          }
+        }
+      })
+    ,
+    envVariables
+  );
+  return post;
+}