@rxdrag/website-lib-core 0.0.126 → 0.0.128

package/src/entify/lib/queryOnePostBySlug.ts

@@ -1,39 +1,40 @@
-import {
-  Post,
-  PostBoolExp,
-  PostOrderBy,
-  PostDistinctExp,
-} from "@rxdrag/rxcms-models";
-import { newQueryOnePostOptions } from "./newQueryPostOptions";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-import { TPost } from "../view-model";
-import { ImageSize } from "@rxdrag/rxcms-models";
-
-export async function queryOnePostBySlug(
-  slug: string,
-  coverSize: ImageSize | undefined,
-  envVariables: EnvVariables
-) {
-  const post = await queryOneEntity<
-    Post,
-    PostBoolExp,
-    PostOrderBy,
-    PostDistinctExp
-  >(
-    newQueryOnePostOptions(coverSize).setQueryArgs({
-      where: {
-        slug: {
-          _eq: slug,
-        },
-        lang: {
-          abbr: {
-            _eq: envVariables.language,
-          },
-        },
-      },
-    }),
-    envVariables
-  );
-  return post as TPost | undefined;
-}
+import {
+  Post,
+  PostBoolExp,
+  PostOrderBy,
+  PostDistinctExp,
+} from "@rxdrag/rxcms-models";
+import { newQueryOnePostOptions } from "./newQueryPostOptions";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+import { TPost } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
+
+export async function queryOnePostBySlug(
+  slug: string,
+  coverSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  langAbbr: string
+) {
+  const post = await queryOneEntity<
+    Post,
+    PostBoolExp,
+    PostOrderBy,
+    PostDistinctExp
+  >(
+    newQueryOnePostOptions(coverSize).setQueryArgs({
+      where: {
+        slug: {
+          _eq: slug,
+        },
+        lang: {
+          abbr: {
+            _eq: langAbbr,
+          },
+        },
+      },
+    }),
+    envVariables
+  );
+  return post as TPost | undefined;
+}

package/src/entify/lib/queryOnePostCategoryBySlug.ts

@@ -1,35 +1,35 @@
-import { ProductCategoryFields, PostCategory, PostCategoryBoolExp, PostCategoryDistinctExp, PostCategoryOrderBy, PostCategoryQueryOptions } from "@rxdrag/rxcms-models";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-import { TPostCategory } from "../view-model";
-
-export async function queryOnePostCategoryBySlug(slug: string, envVariables: EnvVariables) {
-
-  const postCategory = await queryOneEntity<PostCategory, PostCategoryBoolExp, PostCategoryOrderBy, PostCategoryDistinctExp>(
-    new PostCategoryQueryOptions(
-      [
-        ProductCategoryFields.id,
-        ProductCategoryFields.slug,
-        ProductCategoryFields.name,
-        ProductCategoryFields.seqValue,
-        ProductCategoryFields.description,
-        ProductCategoryFields.createdAt,
-      ],
-      {
-        where: {
-          slug: {
-            "_eq": slug
-          },
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-      }
-    ),
-    envVariables
-  );
-
-  return postCategory as TPostCategory | undefined;
-}
+import { ProductCategoryFields, PostCategory, PostCategoryBoolExp, PostCategoryDistinctExp, PostCategoryOrderBy, PostCategoryQueryOptions } from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+import { TPostCategory } from "../view-model";
+
+export async function queryOnePostCategoryBySlug(slug: string, envVariables: EnvVariables, langAbbr: string) {
+
+  const postCategory = await queryOneEntity<PostCategory, PostCategoryBoolExp, PostCategoryOrderBy, PostCategoryDistinctExp>(
+    new PostCategoryQueryOptions(
+      [
+        ProductCategoryFields.id,
+        ProductCategoryFields.slug,
+        ProductCategoryFields.name,
+        ProductCategoryFields.seqValue,
+        ProductCategoryFields.description,
+        ProductCategoryFields.createdAt,
+      ],
+      {
+        where: {
+          slug: {
+            "_eq": slug
+          },
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+        },
+      }
+    ),
+    envVariables
+  );
+
+  return postCategory as TPostCategory | undefined;
+}

package/src/entify/lib/queryOneProductById.ts

@@ -1,20 +1,20 @@
-import { Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp } from "@rxdrag/rxcms-models";
-import { newQueryProductOptions } from "./newQueryProductOptions";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-
-export async function queryOneProductById(id: string, envVariables: EnvVariables) {
-
-  const product = await queryOneEntity<Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp>(
-    newQueryProductOptions()
-      .setQueryArgs({
-        where: {
-          id: {
-            "_eq": id
-          }
-        }
-      }),
-    envVariables
-  );
-  return product;
-}
+import { Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp } from "@rxdrag/rxcms-models";
+import { newQueryProductOptions } from "./newQueryProductOptions";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+
+export async function queryOneProductById(id: string, envVariables: EnvVariables) {
+
+  const product = await queryOneEntity<Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp>(
+    newQueryProductOptions()
+      .setQueryArgs({
+        where: {
+          id: {
+            "_eq": id
+          }
+        }
+      }),
+    envVariables
+  );
+  return product;
+}

package/src/entify/lib/queryOneProductBySlug.ts

@@ -1,52 +1,53 @@
-import {
-  Product,
-  ProductBoolExp,
-  ProductOrderBy,
-  ProductDistinctExp,
-} from "@rxdrag/rxcms-models";
-import { newQueryProductOptions } from "./newQueryProductOptions";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-import { productToViewModel, TProduct } from "../view-model";
-import { ImageSize } from "@rxdrag/rxcms-models";
-
-export async function queryOneProductBySlug(
-  slug: string,
-  imageSize: ImageSize | undefined,
-  envVariables: EnvVariables
-) {
-  const product = await queryOneEntity<
-    Product,
-    ProductBoolExp,
-    ProductOrderBy,
-    ProductDistinctExp
-  >(
-    newQueryProductOptions(imageSize).setQueryArgs({
-      where: {
-        slug: {
-          _eq: slug,
-        },
-        lang: {
-          abbr: {
-            _eq: envVariables.language,
-          },
-        },
-      },
-    }),
-    envVariables
-  );
-
-  if (!product) {
-    return product;
-  }
-
-  const tProduct = productToViewModel(product)!;
-
-  if (product?.relatedPivots?.length) {
-    //重新排序后赋值
-    tProduct.related = product?.relatedPivots.map((pv) =>
-      productToViewModel(pv.product)
-    ) as TProduct[] | undefined;
-  }
-  return tProduct;
-}
+import {
+  Product,
+  ProductBoolExp,
+  ProductOrderBy,
+  ProductDistinctExp,
+} from "@rxdrag/rxcms-models";
+import { newQueryProductOptions } from "./newQueryProductOptions";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+import { productToViewModel, TProduct } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
+
+export async function queryOneProductBySlug(
+  slug: string,
+  imageSize: ImageSize | undefined,
+  envVariables: EnvVariables,
+  langAbbr: string
+) {
+  const product = await queryOneEntity<
+    Product,
+    ProductBoolExp,
+    ProductOrderBy,
+    ProductDistinctExp
+  >(
+    newQueryProductOptions(imageSize).setQueryArgs({
+      where: {
+        slug: {
+          _eq: slug,
+        },
+        lang: {
+          abbr: {
+            _eq: langAbbr,
+          },
+        },
+      },
+    }),
+    envVariables
+  );
+
+  if (!product) {
+    return product;
+  }
+
+  const tProduct = productToViewModel(product)!;
+
+  if (product?.relatedPivots?.length) {
+    //重新排序后赋值
+    tProduct.related = product?.relatedPivots.map((pv) =>
+      productToViewModel(pv.product)
+    ) as TProduct[] | undefined;
+  }
+  return tProduct;
+}

package/src/entify/lib/queryOneProductCategoryBySlug.ts

@@ -1,49 +1,50 @@
-import {
-  ProductCategory,
-  ProductCategoryBoolExp,
-  ProductCategoryOrderBy,
-  ProductCategoryDistinctExp,
-  ProductCategoryQueryOptions,
-  ProductCategoryFields,
-} from "@rxdrag/rxcms-models";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-import { TProductCategory } from "../view-model";
-
-export async function queryOneProductCategoryBySlug(
-  slug: string,
-  envVariables: EnvVariables
-) {
-  const productCategory = await queryOneEntity<
-    ProductCategory,
-    ProductCategoryBoolExp,
-    ProductCategoryOrderBy,
-    ProductCategoryDistinctExp
-  >(
-    new ProductCategoryQueryOptions(
-      [
-        ProductCategoryFields.id,
-        ProductCategoryFields.slug,
-        ProductCategoryFields.name,
-        ProductCategoryFields.seqValue,
-        ProductCategoryFields.description,
-        ProductCategoryFields.createdAt,
-      ],
-      {
-        where: {
-          slug: {
-            _eq: slug,
-          },
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-      }
-    ),
-    envVariables
-  );
-
-  return productCategory as TProductCategory | undefined;
-}
+import {
+  ProductCategory,
+  ProductCategoryBoolExp,
+  ProductCategoryOrderBy,
+  ProductCategoryDistinctExp,
+  ProductCategoryQueryOptions,
+  ProductCategoryFields,
+} from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+import { TProductCategory } from "../view-model";
+
+export async function queryOneProductCategoryBySlug(
+  slug: string,
+  envVariables: EnvVariables,
+  langAbbr: string
+) {
+  const productCategory = await queryOneEntity<
+    ProductCategory,
+    ProductCategoryBoolExp,
+    ProductCategoryOrderBy,
+    ProductCategoryDistinctExp
+  >(
+    new ProductCategoryQueryOptions(
+      [
+        ProductCategoryFields.id,
+        ProductCategoryFields.slug,
+        ProductCategoryFields.name,
+        ProductCategoryFields.seqValue,
+        ProductCategoryFields.description,
+        ProductCategoryFields.createdAt,
+      ],
+      {
+        where: {
+          slug: {
+            _eq: slug,
+          },
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+        },
+      }
+    ),
+    envVariables
+  );
+
+  return productCategory as TProductCategory | undefined;
+}

package/src/entify/lib/queryOneTheme.ts

@@ -1,72 +1,54 @@
-import {
-  ThemeBranch,
-  ThemeBranchBoolExp,
-  ThemeBranchOrderBy,
-  ThemeBranchDistinctExp,
-  ThemeBranchQueryOptions,
-  ThemeBranchFields,
-  ThemeConfigQueryOptions,
-  ThemeConfigFields,
-  MediaQueryOptions,
-} from "@rxdrag/rxcms-models";
-import { EnvVariables } from "../types";
-import { langFields } from "./langFields";
-import { queryOneEntity } from "./queryOneEntity";
-
-export async function queryOneTheme(envVariables: EnvVariables) {
-  return await queryOneEntity<
-    ThemeBranch,
-    ThemeBranchBoolExp,
-    ThemeBranchOrderBy,
-    ThemeBranchDistinctExp
-  >(
-    new ThemeBranchQueryOptions(
-      [ThemeBranchFields.id, ThemeBranchFields.name, ThemeBranchFields.settings],
-      {
-        where: {
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-      }
-    )
-      // .frame([
-      //   WebsiteFrameFields.id,
-      //   WebsiteFrameFields.content,
-      //   WebsiteFrameFields.settings,
-      //   WebsiteFrameFields.updatedAt,
-      //   WebsiteFrameFields.dataSource,
-      // ])
-      // .components([
-      //   FrontComponentFields.id,
-      //   FrontComponentFields.name,
-      //   FrontComponentFields.content,
-      //   FrontComponentFields.droppable,
-      //   FrontComponentFields.props,
-      //   FrontComponentFields.seqValue,
-      //   FrontComponentFields.slots,
-      //   FrontComponentFields.propsSchema,
-      //   FrontComponentFields.propsTest,
-      //   FrontComponentFields.title,
-      // ])
-      .config(
-        new ThemeConfigQueryOptions([
-          ThemeConfigFields.id,
-          ThemeConfigFields.address,
-          ThemeConfigFields.contact,
-          ThemeConfigFields.email,
-          ThemeConfigFields.fax,
-          ThemeConfigFields.mobile,
-          ThemeConfigFields.tel,
-          ThemeConfigFields.wechat,
-          ThemeConfigFields.domain,
-           //ThemeConfigFields.websiteName,
-        ]).contactAvatar(new MediaQueryOptions().file(["thumbnail"]))
-      )
-      .lang(langFields)
-      .setNoQuery(!envVariables.websiteId || !envVariables.language),
-    envVariables
-  );
-}
+import {
+  ThemeBranch,
+  ThemeBranchBoolExp,
+  ThemeBranchOrderBy,
+  ThemeBranchDistinctExp,
+  ThemeBranchQueryOptions,
+  ThemeBranchFields,
+} from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { langFields } from "./langFields";
+import { queryOneEntity } from "./queryOneEntity";
+
+export async function queryOneTheme(envVariables: EnvVariables) {
+  return await queryOneEntity<
+    ThemeBranch,
+    ThemeBranchBoolExp,
+    ThemeBranchOrderBy,
+    ThemeBranchDistinctExp
+  >(
+    new ThemeBranchQueryOptions(
+      [ThemeBranchFields.id, ThemeBranchFields.name, ThemeBranchFields.settings],
+      {
+        where: {
+          website: {
+            id: {
+              _eq: envVariables.websiteId,
+            },
+          },
+        },
+      }
+    )
+      // .frame([
+      //   WebsiteFrameFields.id,
+      //   WebsiteFrameFields.content,
+      //   WebsiteFrameFields.settings,
+      //   WebsiteFrameFields.updatedAt,
+      //   WebsiteFrameFields.dataSource,
+      // ])
+      // .components([
+      //   FrontComponentFields.id,
+      //   FrontComponentFields.name,
+      //   FrontComponentFields.content,
+      //   FrontComponentFields.droppable,
+      //   FrontComponentFields.props,
+      //   FrontComponentFields.seqValue,
+      //   FrontComponentFields.slots,
+      //   FrontComponentFields.propsSchema,
+      //   FrontComponentFields.propsTest,
+      //   FrontComponentFields.title,
+      // ])
+      .setNoQuery(!envVariables.websiteId),
+    envVariables
+  );
+}

package/src/entify/lib/queryOneUser.ts

@@ -1,38 +1,38 @@
-import { User, UserFields, UserQueryOptions, UserBoolExp, UserOrderBy, UserDistinctExp } from "@rxdrag/rxcms-models";
-import { queryOneEntity } from "./queryOneEntity";
-import { newAvatarQueryOptions } from "./newAvatarQueryOptions";
-import { EnvVariables } from "../types";
-import { TUser } from "../view-model";
-
-export async function queryOneUser(id: string, envVariables: EnvVariables) {
-
-  const user = await queryOneEntity<User, UserBoolExp, UserOrderBy, UserDistinctExp>(
-    new UserQueryOptions(
-      [
-        UserFields.id,
-        UserFields.name,
-        UserFields.position,
-        UserFields.email,
-        UserFields.summary,
-        UserFields.linkedIn,
-        UserFields.twitter,
-        UserFields.facebook,
-        UserFields.profile,
-      ],
-      {
-        where: {
-          id: {
-            "_eq": id
-          },
-        },
-      }
-    )
-      .avatar(
-        newAvatarQueryOptions()
-      )
-      .setNoQuery(!id),
-    { ...envVariables, websiteId: undefined }
-  );
-
-  return user as TUser | undefined;
-}
+import { User, UserFields, UserQueryOptions, UserBoolExp, UserOrderBy, UserDistinctExp } from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { newAvatarQueryOptions } from "./newAvatarQueryOptions";
+import { EnvVariables } from "../types";
+import { TUser } from "../view-model";
+
+export async function queryOneUser(id: string, envVariables: EnvVariables) {
+
+  const user = await queryOneEntity<User, UserBoolExp, UserOrderBy, UserDistinctExp>(
+    new UserQueryOptions(
+      [
+        UserFields.id,
+        UserFields.name,
+        UserFields.position,
+        UserFields.email,
+        UserFields.summary,
+        UserFields.linkedIn,
+        UserFields.twitter,
+        UserFields.facebook,
+        UserFields.profile,
+      ],
+      {
+        where: {
+          id: {
+            "_eq": id
+          },
+        },
+      }
+    )
+      .avatar(
+        newAvatarQueryOptions()
+      )
+      .setNoQuery(!id),
+    { ...envVariables, websiteId: undefined }
+  );
+
+  return user as TUser | undefined;
+}