@rxdrag/website-lib-core 0.0.127 → 0.0.129

package/src/entify/lib/queryTags.ts

@@ -1,57 +1,57 @@
-import {
-  Tag,
-  TagBoolExp,
-  TagOrderBy,
-  TagDistinctExp,
-  TagFields,
-  TagQueryOptions,
-  TagAssciations,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables } from "../types";
-import { TTag } from "../view-model";
-
-export async function queryTags(envVariables: EnvVariables, categoryId?: string) {
-  const whereCondition: TagBoolExp = {
-    lang: {
-      abbr: {
-        _eq: envVariables.language,
-      },
-    },
-  };
-
-  if (categoryId) {
-    whereCondition[TagAssciations.category] = {
-      id: { _eq: categoryId },
-    };
-  }
-
-  const result = await queryEntityList<
-    Tag,
-    TagBoolExp,
-    TagOrderBy,
-    TagDistinctExp
-  >(
-    new TagQueryOptions(
-      [
-        TagFields.id,
-        TagFields.name,
-        TagFields.color,
-      ],
-      {
-        where: whereCondition,
-        orderBy: [{ [TagFields.name]: "asc" }],
-      }
-    ).category(),
-    envVariables
-  );
-
-  const typedResult = result as ListResult<TTag> | undefined;
-
-  if (!typedResult) {
-    return undefined;
-  }
-
-  return typedResult.items;
-}
+import {
+  Tag,
+  TagBoolExp,
+  TagOrderBy,
+  TagDistinctExp,
+  TagFields,
+  TagQueryOptions,
+  TagAssciations,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { ListResult } from "@rxdrag/entify-lib";
+import { EnvVariables } from "../types";
+import { TTag } from "../view-model";
+
+export async function queryTags(envVariables: EnvVariables, categoryId: string | undefined, langAbbr: string) {
+  const whereCondition: TagBoolExp = {
+    lang: {
+      abbr: {
+        _eq: langAbbr,
+      },
+    },
+  };
+
+  if (categoryId) {
+    whereCondition[TagAssciations.category] = {
+      id: { _eq: categoryId },
+    };
+  }
+
+  const result = await queryEntityList<
+    Tag,
+    TagBoolExp,
+    TagOrderBy,
+    TagDistinctExp
+  >(
+    new TagQueryOptions(
+      [
+        TagFields.id,
+        TagFields.name,
+        TagFields.color,
+      ],
+      {
+        where: whereCondition,
+        orderBy: [{ [TagFields.name]: "asc" }],
+      }
+    ).category(),
+    envVariables
+  );
+
+  const typedResult = result as ListResult<TTag> | undefined;
+
+  if (!typedResult) {
+    return undefined;
+  }
+
+  return typedResult.items;
+}

package/src/entify/lib/queryUserIds.ts

@@ -1,24 +1,24 @@
-import { ListResult } from "@rxdrag/entify-lib";
-import {
-  User,
-  UserBoolExp,
-  UserDistinctExp,
-  UserFields,
-  UserOrderBy,
-  UserQueryOptions,
-} from "@rxdrag/rxcms-models";
-import { EnvVariables } from "../types";
-import { TUser } from "../view-model";
-import { queryEntityList } from "./queryEntityList";
-
-export async function queryUserIds(envVariables: EnvVariables) {
-  const queryOptions = new UserQueryOptions([UserFields.id]);
-
-  const result = await queryEntityList<
-    User,
-    UserBoolExp,
-    UserOrderBy,
-    UserDistinctExp
-  >(queryOptions, envVariables);
-  return result as ListResult<TUser> | undefined;
-}
+import { ListResult } from "@rxdrag/entify-lib";
+import {
+  User,
+  UserBoolExp,
+  UserDistinctExp,
+  UserFields,
+  UserOrderBy,
+  UserQueryOptions,
+} from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { TUser } from "../view-model";
+import { queryEntityList } from "./queryEntityList";
+
+export async function queryUserIds(envVariables: EnvVariables) {
+  const queryOptions = new UserQueryOptions([UserFields.id]);
+
+  const result = await queryEntityList<
+    User,
+    UserBoolExp,
+    UserOrderBy,
+    UserDistinctExp
+  >(queryOptions, envVariables);
+  return result as ListResult<TUser> | undefined;
+}

package/src/entify/lib/queryUserPosts.ts

@@ -1,79 +1,80 @@
-import { ListResult } from "@rxdrag/entify-lib";
-import {
-  PostBoolExp,
-  PostOrderBy,
-  PostDistinctExp,
-  PostFields,
-  Post,
-  PostQueryOptions,
-  MediaQueryOptions,
-  PublishableStatus,
-  PostAssciations,
-} from "@rxdrag/rxcms-models";
-import { queryEntityList } from "./queryEntityList";
-import { EnvVariables } from "../types";
-import { TPost } from "../view-model";
-
-export type UserPostsCondition = {
-  userId: string;
-  page?: number;
-  pageSize?: number;
-};
-
-export async function queryUserPosts(
-  pagination: UserPostsCondition,
-  envVariables: EnvVariables
-) {
-  const { userId, page = 1, pageSize = 1000 } = pagination;
-  const result = await queryEntityList<
-    Post,
-    PostBoolExp,
-    PostOrderBy,
-    PostDistinctExp
-  >(
-    new PostQueryOptions(
-      [
-        PostFields.id,
-        PostFields.slug,
-        PostFields.title,
-        PostFields.description,
-        PostFields.createdAt,
-        PostFields.updatedAt,
-      ],
-      {
-        offset: (page - 1) * pageSize,
-        limit: pageSize,
-        orderBy: [
-          {
-            //暂时按照更新时间排序
-            updatedAt: "desc",
-          },
-        ],
-        where: {
-          [PostFields.status]: {
-            _eq: PublishableStatus.published,
-          },
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-          [PostAssciations.author]: {
-            id: {
-              _eq: userId,
-            },
-          },
-        },
-      }
-    )
-      .cover(
-        new MediaQueryOptions().file([
-          "thumbnail",
-          "resize(width:480, height:180)",
-        ])
-      )
-      .setNoQuery(!userId),
-    envVariables
-  );
-  return result as ListResult<TPost> | undefined;
-}
+import { ListResult } from "@rxdrag/entify-lib";
+import {
+  PostBoolExp,
+  PostOrderBy,
+  PostDistinctExp,
+  PostFields,
+  Post,
+  PostQueryOptions,
+  MediaQueryOptions,
+  PublishableStatus,
+  PostAssciations,
+} from "@rxdrag/rxcms-models";
+import { queryEntityList } from "./queryEntityList";
+import { EnvVariables } from "../types";
+import { TPost } from "../view-model";
+
+export type UserPostsCondition = {
+  userId: string;
+  page?: number;
+  pageSize?: number;
+};
+
+export async function queryUserPosts(
+  conditions: UserPostsCondition,
+  envVariables: EnvVariables,
+  langAbbr: string
+) {
+  const { userId, page = 1, pageSize = 1000 } = conditions;
+  const result = await queryEntityList<
+    Post,
+    PostBoolExp,
+    PostOrderBy,
+    PostDistinctExp
+  >(
+    new PostQueryOptions(
+      [
+        PostFields.id,
+        PostFields.slug,
+        PostFields.title,
+        PostFields.description,
+        PostFields.createdAt,
+        PostFields.updatedAt,
+      ],
+      {
+        offset: (page - 1) * pageSize,
+        limit: pageSize,
+        orderBy: [
+          {
+            //暂时按照更新时间排序
+            updatedAt: "desc",
+          },
+        ],
+        where: {
+          [PostFields.status]: {
+            _eq: PublishableStatus.published,
+          },
+          lang: {
+            abbr: {
+              _eq: langAbbr,
+            },
+          },
+          [PostAssciations.author]: {
+            id: {
+              _eq: userId,
+            },
+          },
+        },
+      }
+    )
+      .cover(
+        new MediaQueryOptions().file([
+          "thumbnail",
+          "resize(width:480, height:180)",
+        ])
+      )
+      .setNoQuery(!userId),
+    envVariables
+  );
+  return result as ListResult<TPost> | undefined;
+}

package/src/entify/lib/queryWebSiteSettings.ts

@@ -1,28 +1,28 @@
-import {
-  WebsiteSettings,
-  WebsiteSettingsBoolExp,
-  WebsiteSettingsOrderBy,
-  WebsiteSettingsDistinctExp,
-  WebsiteSettingsFields,
-  WebsiteSettingsQueryOptions,
-} from "@rxdrag/rxcms-models";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-
-export async function queryWebSiteSettings(envVariables: EnvVariables) {
-  const result = await queryOneEntity<
-    WebsiteSettings,
-    WebsiteSettingsBoolExp,
-    WebsiteSettingsOrderBy,
-    WebsiteSettingsDistinctExp
-  >(
-    new WebsiteSettingsQueryOptions([
-      WebsiteSettingsFields.noticeEmail,
-      WebsiteSettingsFields.smtpConfig,
-      WebsiteSettingsFields.replyToEmail,
-      WebsiteSettingsFields.useCustomizedSmtp,
-    ]),
-    envVariables
-  );
-  return result;
-}
+import {
+  WebsiteSettings,
+  WebsiteSettingsBoolExp,
+  WebsiteSettingsOrderBy,
+  WebsiteSettingsDistinctExp,
+  WebsiteSettingsFields,
+  WebsiteSettingsQueryOptions,
+} from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+
+export async function queryWebSiteSettings(envVariables: EnvVariables) {
+  const result = await queryOneEntity<
+    WebsiteSettings,
+    WebsiteSettingsBoolExp,
+    WebsiteSettingsOrderBy,
+    WebsiteSettingsDistinctExp
+  >(
+    new WebsiteSettingsQueryOptions([
+      WebsiteSettingsFields.noticeEmail,
+      WebsiteSettingsFields.smtpConfig,
+      WebsiteSettingsFields.replyToEmail,
+      WebsiteSettingsFields.useCustomizedSmtp,
+    ]),
+    envVariables
+  );
+  return result;
+}

package/src/entify/lib/queryWebsite.ts

@@ -1,43 +1,43 @@
-import {
-  Website,
-  WebsiteBoolExp,
-  WebsiteOrderBy,
-  WebsiteDistinctExp,
-  WebsiteQueryOptions,
-  WebsiteFields,
-  LangFields,
-} from "@rxdrag/rxcms-models";
-import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables } from "../types";
-
-export async function queryWebsite(envVariables: EnvVariables) {
-  const website = await queryOneEntity<
-    Website,
-    WebsiteBoolExp,
-    WebsiteOrderBy,
-    WebsiteDistinctExp
-  >(
-    new WebsiteQueryOptions(
-      [WebsiteFields.id, WebsiteFields.name, WebsiteFields.title],
-      {
-        where: {
-          id: {
-            _eq: envVariables.websiteId,
-          },
-        },
-      }
-    )
-      .baseLang([
-        LangFields.id,
-        LangFields.abbr,
-        LangFields.localName,
-        LangFields.cnName,
-        LangFields.urlFragment,
-        LangFields.htmlLang,
-      ])
-      .setNoQuery(!envVariables.websiteId),
-    { ...envVariables, websiteId: undefined }
-  );
-
-  return website as Website | undefined;
-}
+import {
+  Website,
+  WebsiteBoolExp,
+  WebsiteOrderBy,
+  WebsiteDistinctExp,
+  WebsiteQueryOptions,
+  WebsiteFields,
+  LangFields,
+} from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+
+export async function queryWebsite(envVariables: EnvVariables) {
+  const website = await queryOneEntity<
+    Website,
+    WebsiteBoolExp,
+    WebsiteOrderBy,
+    WebsiteDistinctExp
+  >(
+    new WebsiteQueryOptions(
+      [WebsiteFields.id, WebsiteFields.name, WebsiteFields.title],
+      {
+        where: {
+          id: {
+            _eq: envVariables.websiteId,
+          },
+        },
+      }
+    )
+      .baseLang([
+        LangFields.id,
+        LangFields.abbr,
+        LangFields.localName,
+        LangFields.cnName,
+        LangFields.urlFragment,
+        LangFields.htmlLang,
+      ])
+      .setNoQuery(!envVariables.websiteId),
+    { ...envVariables, websiteId: undefined }
+  );
+
+  return website as Website | undefined;
+}

package/src/entify/lib/sendEmail.ts

@@ -1,8 +1,8 @@
-import { IEmail } from "@rxdrag/entify-lib";
-import { createEntifyClient } from "./createEntifyClient";
-import { EnvVariables } from "../types";
-
-export async function sendEmail(email: IEmail, envVariables: EnvVariables) {
-  const client = createEntifyClient(envVariables);
-  return await client.sendEmail(email);
+import { IEmail } from "@rxdrag/entify-lib";
+import { createEntifyClient } from "./createEntifyClient";
+import { EnvVariables } from "../types";
+
+export async function sendEmail(email: IEmail, envVariables: EnvVariables) {
+  const client = createEntifyClient(envVariables);
+  return await client.sendEmail(email);
 }

package/src/entify/lib/toQueryOptions.ts

@@ -1,20 +1,20 @@
-import { IEntity, IQueryOptions } from "@rxdrag/entify-lib";
-import { ICustomizedDataSource } from "../types";
-import { QueryOptions } from "@rxdrag/rxcms-models";
-
-export function toQueryOptions(dataSource: ICustomizedDataSource): IQueryOptions<IEntity> {
-  const { entity, pageSize, where, orderBy, fields } = dataSource;
-  if (!entity) {
-    throw new Error("entity is required in dataSource");
-  }
-  const queryOptions = new QueryOptions(
-    entity,
-    fields ? ["id", fields] : ["id"],
-    {
-      where,
-      orderBy,
-      limit: pageSize,
-    }
-  );
-  return queryOptions as unknown as IQueryOptions<IEntity>;
+import { IEntity, IQueryOptions } from "@rxdrag/entify-lib";
+import { ICustomizedDataSource } from "../types";
+import { QueryOptions } from "@rxdrag/rxcms-models";
+
+export function toQueryOptions(dataSource: ICustomizedDataSource): IQueryOptions<IEntity> {
+  const { entity, pageSize, where, orderBy, fields } = dataSource;
+  if (!entity) {
+    throw new Error("entity is required in dataSource");
+  }
+  const queryOptions = new QueryOptions(
+    entity,
+    fields ? ["id", fields] : ["id"],
+    {
+      where,
+      orderBy,
+      limit: pageSize,
+    }
+  );
+  return queryOptions as unknown as IQueryOptions<IEntity>;
 }

package/src/entify/lib/upsertEntity.ts

@@ -1,9 +1,9 @@
-import { EnvVariables } from "../types";
-import { createEntifyClient } from "./createEntifyClient";
-
-export async function upsertEntity<Input = object>(entityName: string, object: Input, envVariables: EnvVariables) {
-  const client = createEntifyClient(envVariables);
-
-
-  return await client.upsertEntity(entityName, object);
+import { EnvVariables } from "../types";
+import { createEntifyClient } from "./createEntifyClient";
+
+export async function upsertEntity<Input = object>(entityName: string, object: Input, envVariables: EnvVariables) {
+  const client = createEntifyClient(envVariables);
+
+
+  return await client.upsertEntity(entityName, object);
 }

package/src/entify/types/index.ts

@@ -1,2 +1,2 @@
-export * from "./utils";
+export * from "./utils";
 export * from "./variables";

package/src/entify/types/utils.ts

@@ -1,7 +1,12 @@
-import { ImageSizes } from "@rxdrag/rxcms-models";
-import { EnvVariables } from "./variables";
-//astro传递上下文用
-export type Locals = {
-  env: EnvVariables;
-  imageSizes: ImageSizes;
+import { ImageSizes, Lang, Website } from "@rxdrag/rxcms-models";
+import { EnvVariables } from "./variables";
+//astro传递上下文用
+export type Locals = {
+  env: EnvVariables;
+  imageSizes: ImageSizes;
+  // 语言相关信息（由中间件下发）
+  currentLangAbbr?: string;
+  currentHtmlLang?: string;
+  langs?: Lang[];
+  website?: Website;
 };

package/src/entify/types/variables.ts

@@ -2,5 +2,4 @@ export type EnvVariables = {
   websiteId?: string;
   entifyServerUrl?: string;
   entifyGuestToken?: string;
-  language?: string;
 };