@rxdrag/website-lib-core 0.0.127 → 0.0.128

package/src/entify/lib/newQueryPostOptions.ts

@@ -1,45 +1,42 @@
-import {
-  PostQueryOptions,
-  PostFields,
-  UserQueryOptions,
-  UserFields,
-  MediaQueryOptions,
-  PostCategoryFields,
-  ImageSize,
-  TagFields,
-} from "@rxdrag/rxcms-models";
-
-import { newPageMetaOptions } from "./newPageMetaOptions";
-
-//查询一个产品的参数，不带条件
-export function newQueryOnePostOptions(coverSize?: ImageSize) {
-  const coverFields = ["thumbnail", "url"];
-  if (coverSize?.width && coverSize?.height) {
-    coverFields.push(
-      `resize(width:${coverSize.width}, height:${coverSize.height})`
-    );
-  }
-  return new PostQueryOptions([
-    PostFields.id,
-    PostFields.slug,
-    PostFields.title,
-    PostFields.content,
-    PostFields.extends,
-  ])
-    .author(
-      new UserQueryOptions([
-        UserFields.id,
-        UserFields.name,
-        UserFields.position,
-        UserFields.email,
-      ]).avatar(new MediaQueryOptions().file(["thumbnail"]))
-    )
-    .cover(new MediaQueryOptions().file(coverFields))
-    .meta(newPageMetaOptions())
-    .category([
-      PostCategoryFields.id,
-      PostCategoryFields.slug,
-      PostCategoryFields.name,
-    ])
-    .tags([TagFields.id, TagFields.name, TagFields.color]);
-}
+import {
+  PostQueryOptions,
+  PostFields,
+  UserQueryOptions,
+  UserFields,
+  MediaQueryOptions,
+  PostCategoryFields,
+  ImageSize,
+  TagFields,
+} from "@rxdrag/rxcms-models";
+
+//查询一个产品的参数，不带条件
+export function newQueryOnePostOptions(coverSize?: ImageSize) {
+  const coverFields = ["thumbnail", "url"];
+  if (coverSize?.width && coverSize?.height) {
+    coverFields.push(
+      `resize(width:${coverSize.width}, height:${coverSize.height})`
+    );
+  }
+  return new PostQueryOptions([
+    PostFields.id,
+    PostFields.slug,
+    PostFields.title,
+    PostFields.content,
+    PostFields.extends,
+  ])
+    .author(
+      new UserQueryOptions([
+        UserFields.id,
+        UserFields.name,
+        UserFields.position,
+        UserFields.email,
+      ]).avatar(new MediaQueryOptions().file(["thumbnail"]))
+    )
+    .cover(new MediaQueryOptions().file(coverFields))
+    .category([
+      PostCategoryFields.id,
+      PostCategoryFields.slug,
+      PostCategoryFields.name,
+    ])
+    .tags([TagFields.id, TagFields.name, TagFields.color]);
+}

package/src/entify/lib/newQueryProductOptions.ts

@@ -1,98 +1,96 @@
-import {
-  ProductQueryOptions,
-  ProductFields,
-  MediaQueryOptions,
-  MediaFields,
-  MediaOnProductQueryOptions,
-  MediaOnProductFields,
-  AttachmentOnProductQueryOptions,
-  AttachmentOnProductFields,
-  ProductCategoryFields,
-  ProductRelatedPivotQueryOptions,
-  ImageSize,
-  TagFields,
-} from "@rxdrag/rxcms-models";
-import { newPageMetaOptions } from "./newPageMetaOptions";
-
-function creatProductMediaOptions(imagSize?: ImageSize) {
-  const imageFields = ["thumbnail(width:400, height:320)", "url", "original"];
-  if (imagSize?.width && imagSize?.height) {
-    imageFields.push(
-      `resize(width:${imagSize.width}, height:${imagSize.height})`
-    );
-  } else {
-    imageFields.push(`resize(width:800, height:600)`);
-  }
-
-  return new MediaOnProductQueryOptions(
-    [
-      MediaOnProductFields.id,
-      MediaOnProductFields.seqValue,
-      MediaOnProductFields.altText,
-    ],
-    {
-      orderBy: [
-        {
-          [MediaOnProductFields.seqValue]: "asc",
-        },
-      ],
-    }
-  ).media(new MediaQueryOptions().mediaType().description().file(imageFields));
-}
-
-export function newQueryProductOptions(imagSize?: ImageSize) {
-  return new ProductQueryOptions([
-    ProductFields.id,
-    ProductFields.title,
-    ProductFields.shortTitle,
-    ProductFields.slug,
-    ProductFields.externalVideoUrl,
-    ProductFields.content,
-    ProductFields.content2,
-    ProductFields.content3,
-    ProductFields.extends,
-    ProductFields.description,
-    ProductFields.features,
-    ProductFields.relatedSlugs,
-  ])
-    .meta(newPageMetaOptions())
-    .mediaPivots(creatProductMediaOptions(imagSize))
-    .attachmentPivots(
-      new AttachmentOnProductQueryOptions(undefined, {
-        orderBy: [
-          {
-            [AttachmentOnProductFields.seqValue]: "asc",
-          },
-        ],
-      }).attachment(
-        new MediaQueryOptions([
-          MediaFields.id,
-          MediaFields.mediaRef,
-          MediaFields.description,
-          MediaFields.name,
-          MediaFields.extName,
-          MediaFields.mediaType,
-        ]).file(["url"])
-      )
-    )
-    .relatedPivots(
-      new ProductRelatedPivotQueryOptions([ProductFields.id]).product(
-        new ProductQueryOptions(
-          [ProductFields.id, ProductFields.slug, ProductFields.title],
-          {
-            orderBy: [
-              {
-                [ProductFields.id]: "asc",
-              },
-            ],
-          }
-        ).mediaPivots(creatProductMediaOptions(imagSize))
-      )
-    )
-    .category([
-      ProductCategoryFields.id,
-      ProductCategoryFields.slug,
-      ProductCategoryFields.name,
-    ])
-    .tags([TagFields.id, TagFields.name, TagFields.color]);
-}
+import {
+  ProductQueryOptions,
+  ProductFields,
+  MediaQueryOptions,
+  MediaFields,
+  MediaOnProductQueryOptions,
+  MediaOnProductFields,
+  AttachmentOnProductQueryOptions,
+  AttachmentOnProductFields,
+  ProductCategoryFields,
+  ProductRelatedPivotQueryOptions,
+  ImageSize,
+  TagFields,
+} from "@rxdrag/rxcms-models";
+
+function creatProductMediaOptions(imagSize?: ImageSize) {
+  const imageFields = ["thumbnail(width:400, height:320)", "url", "original"];
+  if (imagSize?.width && imagSize?.height) {
+    imageFields.push(
+      `resize(width:${imagSize.width}, height:${imagSize.height})`
+    );
+  } else {
+    imageFields.push(`resize(width:800, height:600)`);
+  }
+
+  return new MediaOnProductQueryOptions(
+    [
+      MediaOnProductFields.id,
+      MediaOnProductFields.seqValue,
+      MediaOnProductFields.altText,
+    ],
+    {
+      orderBy: [
+        {
+          [MediaOnProductFields.seqValue]: "asc",
+        },
+      ],
+    }
+  ).media(new MediaQueryOptions().mediaType().description().file(imageFields));
+}
+
+export function newQueryProductOptions(imagSize?: ImageSize) {
+  return new ProductQueryOptions([
+    ProductFields.id,
+    ProductFields.title,
+    ProductFields.shortTitle,
+    ProductFields.slug,
+    ProductFields.externalVideoUrl,
+    ProductFields.content,
+    ProductFields.content2,
+    ProductFields.content3,
+    ProductFields.extends,
+    ProductFields.description,
+    ProductFields.features,
+    ProductFields.relatedSlugs,
+  ])
+    .mediaPivots(creatProductMediaOptions(imagSize))
+    .attachmentPivots(
+      new AttachmentOnProductQueryOptions(undefined, {
+        orderBy: [
+          {
+            [AttachmentOnProductFields.seqValue]: "asc",
+          },
+        ],
+      }).attachment(
+        new MediaQueryOptions([
+          MediaFields.id,
+          MediaFields.mediaRef,
+          MediaFields.description,
+          MediaFields.name,
+          MediaFields.extName,
+          MediaFields.mediaType,
+        ]).file(["url"])
+      )
+    )
+    .relatedPivots(
+      new ProductRelatedPivotQueryOptions([ProductFields.id]).product(
+        new ProductQueryOptions(
+          [ProductFields.id, ProductFields.slug, ProductFields.title],
+          {
+            orderBy: [
+              {
+                [ProductFields.id]: "asc",
+              },
+            ],
+          }
+        ).mediaPivots(creatProductMediaOptions(imagSize))
+      )
+    )
+    .category([
+      ProductCategoryFields.id,
+      ProductCategoryFields.slug,
+      ProductCategoryFields.name,
+    ])
+    .tags([TagFields.id, TagFields.name, TagFields.color]);
+}

package/src/entify/lib/newQueryProductsMediaOptions.ts

@@ -1,28 +1,28 @@
-import {
-  MediaOnProductQueryOptions,
-  MediaOnProductFields,
-  MediaQueryOptions,
-  ImageSize,
-  MediaFields,
-} from "@rxdrag/rxcms-models";
-
-export function newQueryProductsMediaOptions(imageSize?: ImageSize | undefined) {
-  return new MediaOnProductQueryOptions(
-    [MediaOnProductFields.seqValue, MediaOnProductFields.altText],
-    {
-      orderBy: [
-        {
-          [MediaOnProductFields.seqValue]: "asc",
-        },
-      ],
-    }
-  ).media(
-    new MediaQueryOptions([MediaFields.id, MediaFields.mediaType, MediaFields.mediaRef]).file([
-      "thumbnail(width:400, height:320)",
-      "url",
-      imageSize
-        ? `resize(width:${imageSize.width}, height:${imageSize.height})`
-        : "resize(width:500, height:400)",
-    ])
-  );
-}
+import {
+  MediaOnProductQueryOptions,
+  MediaOnProductFields,
+  MediaQueryOptions,
+  ImageSize,
+  MediaFields,
+} from "@rxdrag/rxcms-models";
+
+export function newQueryProductsMediaOptions(imageSize?: ImageSize | undefined) {
+  return new MediaOnProductQueryOptions(
+    [MediaOnProductFields.seqValue, MediaOnProductFields.altText],
+    {
+      orderBy: [
+        {
+          [MediaOnProductFields.seqValue]: "asc",
+        },
+      ],
+    }
+  ).media(
+    new MediaQueryOptions([MediaFields.id, MediaFields.mediaType, MediaFields.mediaRef]).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,40 +1,40 @@
-import {
-  Product,
-  ProductBoolExp,
-  ProductDistinctExp,
-  ProductFields,
-  ProductOrderBy,
-  ProductQueryOptions,
-  PublishableStatus,
-} from "@rxdrag/rxcms-models";
-import { EnvVariables } from "../types";
-import { ListResult } from "@rxdrag/entify-lib";
-import { TProduct } from "../view-model";
-import { queryEntityList } from "./queryEntityList";
-
-export async function queryAllProducts(envVariables: EnvVariables) {
-  const queryOptions = new ProductQueryOptions(
-    [ProductFields.id, ProductFields.slug],
-    {
-      where: {
-        [ProductFields.status]: {
-          _eq: PublishableStatus.published,
-        },
-        lang: {
-          abbr: {
-            _eq: envVariables.language,
-          },
-        },
-      },
-      orderBy: [{ [ProductFields.seqValue]: "asc" }],
-    }
-  );
-
-  const result = await queryEntityList<
-    Product,
-    ProductBoolExp,
-    ProductOrderBy,
-    ProductDistinctExp
-  >(queryOptions, envVariables);
-  return result as ListResult<TProduct> | undefined;
-}
+import {
+  Product,
+  ProductBoolExp,
+  ProductDistinctExp,
+  ProductFields,
+  ProductOrderBy,
+  ProductQueryOptions,
+  PublishableStatus,
+} from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { ListResult } from "@rxdrag/entify-lib";
+import { TProduct } from "../view-model";
+import { queryEntityList } from "./queryEntityList";
+
+export async function queryAllProducts(envVariables: EnvVariables, langAbbr: string) {
+  const queryOptions = new ProductQueryOptions(
+    [ProductFields.id, ProductFields.slug],
+    {
+      where: {
+        [ProductFields.status]: {
+          _eq: PublishableStatus.published,
+        },
+        lang: {
+          abbr: {
+            _eq: langAbbr,
+          },
+        },
+      },
+      orderBy: [{ [ProductFields.seqValue]: "asc" }],
+    }
+  );
+
+  const result = await queryEntityList<
+    Product,
+    ProductBoolExp,
+    ProductOrderBy,
+    ProductDistinctExp
+  >(queryOptions, envVariables);
+  return result as ListResult<TProduct> | undefined;
+}

package/src/entify/lib/queryBulletin.ts

@@ -1,17 +1,29 @@
-import { BulletinBoolExp, BulletinDistinctExp, BulletinOrderBy, BulletinQueryOptions, BulletinFields, Bulletin } from "@rxdrag/rxcms-models";
-import { EnvVariables } from "../types";
-import { queryOneEntity } from "./queryOneEntity";
-
-export const queryBulletin = async (
-  envVariables: EnvVariables) => {
-
-  const bulletin = await queryOneEntity<Bulletin, BulletinBoolExp, BulletinOrderBy, BulletinDistinctExp>(
-    new BulletinQueryOptions([
-      BulletinFields.id,
-      BulletinFields.title,
-      BulletinFields.content,
-    ]),
-    envVariables
-  );
-  return bulletin;
+import { BulletinBoolExp, BulletinDistinctExp, BulletinOrderBy, BulletinQueryOptions, BulletinFields, Bulletin } from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { queryOneEntity } from "./queryOneEntity";
+
+export const queryBulletin = async (
+  envVariables: EnvVariables,
+  langAbbr: string
+) => {
+  const bulletin = await queryOneEntity<Bulletin, BulletinBoolExp, BulletinOrderBy, BulletinDistinctExp>(
+    new BulletinQueryOptions(
+      [
+        BulletinFields.id,
+        BulletinFields.title,
+        BulletinFields.content,
+      ],
+      {
+        where: {
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+        },
+      }
+    ),
+    envVariables
+  );
+  return bulletin;
 };

package/src/entify/lib/queryEntityList.ts

@@ -1,42 +1,42 @@
-import { IQueryOptions, ListResult } from "@rxdrag/entify-lib";
-import { createEntifyClient } from "./createEntifyClient";
-import { EnvVariables } from "../types";
-import { Post, PostCategoryEntityName, PostEntityName, Product, ProductCategoryEntityName, ProductEntityName, UserEntityName } from "@rxdrag/rxcms-models";
-import { postCategoriesToViewModel, postListToViewModel, productCategoriesToViewModel, productListToViewModel, userListToViewModel } from "../view-model";
-
-export async function queryEntityList<T, WhereExp = unknown, OrderBy = unknown, DistinctExp = unknown>(
-  options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
-  envVariables: EnvVariables,
-) {
-  const client = createEntifyClient(envVariables);
-
-  const result = await client.enityList<T, WhereExp, OrderBy, DistinctExp>(
-    !envVariables.websiteId
-      ? options
-      : options.setQueryArgs(
-        {
-          ...options.getQueryArgs(),
-          where: {
-            website: {
-              id: { "_eq": envVariables.websiteId }
-            },
-            ...options.getQueryArgs()?.where
-          } as WhereExp
-        }
-      )
-  );
-
-  switch (options.entityName) {
-    case ProductEntityName:
-      return productListToViewModel(result as ListResult<Product> | undefined);
-    case PostEntityName:
-      return postListToViewModel(result as ListResult<Post> | undefined);
-    case ProductCategoryEntityName:
-      return productCategoriesToViewModel(result as ListResult<Product> | undefined);
-    case PostCategoryEntityName:
-      return postCategoriesToViewModel(result as ListResult<Post> | undefined);
-    case UserEntityName:
-      return userListToViewModel(result as ListResult<Post> | undefined);
-  }
-  return result;
+import { IQueryOptions, ListResult } from "@rxdrag/entify-lib";
+import { createEntifyClient } from "./createEntifyClient";
+import { EnvVariables } from "../types";
+import { Post, PostCategoryEntityName, PostEntityName, Product, ProductCategoryEntityName, ProductEntityName, UserEntityName } from "@rxdrag/rxcms-models";
+import { postCategoriesToViewModel, postListToViewModel, productCategoriesToViewModel, productListToViewModel, userListToViewModel } from "../view-model";
+
+export async function queryEntityList<T, WhereExp = unknown, OrderBy = unknown, DistinctExp = unknown>(
+  options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
+  envVariables: EnvVariables,
+) {
+  const client = createEntifyClient(envVariables);
+
+  const result = await client.enityList<T, WhereExp, OrderBy, DistinctExp>(
+    !envVariables.websiteId
+      ? options
+      : options.setQueryArgs(
+        {
+          ...options.getQueryArgs(),
+          where: {
+            website: {
+              id: { "_eq": envVariables.websiteId }
+            },
+            ...options.getQueryArgs()?.where
+          } as WhereExp
+        }
+      )
+  );
+
+  switch (options.entityName) {
+    case ProductEntityName:
+      return productListToViewModel(result as ListResult<Product> | undefined);
+    case PostEntityName:
+      return postListToViewModel(result as ListResult<Post> | undefined);
+    case ProductCategoryEntityName:
+      return productCategoriesToViewModel(result as ListResult<Product> | undefined);
+    case PostCategoryEntityName:
+      return postCategoriesToViewModel(result as ListResult<Post> | undefined);
+    case UserEntityName:
+      return userListToViewModel(result as ListResult<Post> | undefined);
+  }
+  return result;
 }