@rxdrag/website-lib-core 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,9 +24,9 @@
     "@types/react-dom": "^18.2.7",
     "eslint": "^7.32.0",
     "typescript": "^5",
-    "@rxdrag/entify-hooks": "0.2.42",
+    "@rxdrag/entify-hooks": "0.2.43",
+    "@rxdrag/slate-preview": "1.2.56",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/slate-preview": "1.2.55",
     "@rxdrag/tsconfig": "0.2.0"
   },
   "dependencies": {
@@ -35,7 +35,7 @@
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@rxdrag/rxcms-models": "0.3.48"
+    "@rxdrag/rxcms-models": "0.3.49"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/component-logic/modal.ts

@@ -1,4 +1,9 @@
-import { DATA_OPENABLE, DATA_OPENABLE_ROLE, OpenAble } from "../controller";
+import {
+  DATA_OPENABLE,
+  DATA_OPENABLE_ROLE,
+  DATA_POPUP_CTA,
+  OpenAble,
+} from "../controller";
 import { HTMLElementsWithChildren, IMotionProps } from "./motion";
 
 export type ModalTriggerProps = IMotionProps & {
@@ -28,9 +33,13 @@ export function getModalPanelDataAttrs(openableKey?: string) {
   };
 }
 
-export function getModalTriggerDataAttrs(openableKey?: string) {
+export function getModalTriggerDataAttrs(
+  openableKey: string | undefined,
+  callToAction?: string
+) {
   return {
     [DATA_OPENABLE]: openableKey,
     [DATA_OPENABLE_ROLE]: OpenAble.ModalTrigger,
+    [DATA_POPUP_CTA]: callToAction,
   };
 }

package/src/controller/OpenableController.ts

@@ -9,6 +9,7 @@ import {
   OpenAble,
   EVENT_SELECT,
   EVENT_UNSELECT,
+  DATA_POPUP_CTA,
 } from "./consts";
 import { applyInitialState } from "./applyInitialState";
 
@@ -130,6 +131,7 @@ export class OpenableController {
   constructor(protected doc: Document | undefined) {}
   protected unmountHandlers: (() => void)[] = [];
   protected eventBus = new EventBus();
+  public lastCta?: string | null;
 
   mount() {
     this.unmount();
@@ -152,6 +154,9 @@ export class OpenableController {
       // 查找 Modal 容器
       const modalContainer = this.getOpenableContainer(openableKey);
       if (modalContainer) {
+        if (target.getAttribute(DATA_POPUP_CTA)) {
+          this.lastCta = target.getAttribute(DATA_POPUP_CTA);
+        }
         modalContainer.classList.add("open");
         this.eventBus.emit(EVENT_OPEN, { key: openableKey, target });
       } else {

package/src/controller/PageLoader.ts

@@ -94,7 +94,7 @@ export class PageLoader implements IPageLoader {
       if (typeof window !== "undefined") {
         // 在客户端环境中
         this.doc.addEventListener("astro:page-load", handleEvent, {
-          once: true,
+          //once: true,
         });
         // 只监听页面转场事件
         this.doc.addEventListener("astro:after-swap", handleEvent);

package/src/entify/Entify.ts

@@ -23,6 +23,10 @@ import { queryAllProducts } from "./lib/queryAllProducts";
 import { queryPostSlugs } from "./lib/queryPostSlugs";
 import { queryUserIds } from "./lib/queryUserIds";
 import { IEntify, PostPatinateOptions, PostsOptions } from "./IEntify";
+import { queryWebsite } from "./lib/queryWebsite";
+import { Page, PageType } from "@rxdrag/rxcms-models";
+import { queryPageBySlug } from "./lib/queryPageBySlug";
+import { queryPageByType } from "./lib/queryPageByType";
 
 export class Entify implements IEntify {
   private static instance: Entify | null = null;
@@ -48,6 +52,14 @@ export class Entify implements IEntify {
     );
   }
 
+  public getLang() {
+    return this.envVariables.language || "en-US";
+  }
+
+  public async getWebsite() {
+    return queryWebsite(this.envVariables);
+  }
+
   public async getTheme() {
     return await queryOneTheme(this.envVariables);
   }
@@ -64,6 +76,50 @@ export class Entify implements IEntify {
     return await queryLatestPosts(count, this.envVariables);
   }
 
+  public async getHomePage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.Home);
+  }
+  public async getPostPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.Post);
+  }
+  public async getPostListPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.PostList);
+  }
+  public async getPostCategoryPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.PostCategory);
+  }
+  public async getProductPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.Product);
+  }
+  public async getProductListPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.ProductList);
+  }
+  public async getProductCategoryPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.ProductCategory);
+  }
+  public async getSearchPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.SearchList);
+  }
+  public async getProfilePage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.Profile);
+  }
+  public async getThanksPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.Thanks);
+  }
+  public async get404Page(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.Page404);
+  }
+  public async getErrorPage(): Promise<Page | undefined> {
+    return await this.getPageByType(PageType.PageError);
+  }
+  public async getPageBySlug(slug: string): Promise<Page | undefined> {
+    return await queryPageBySlug(slug, this.envVariables);
+  }
+
+  public async getPageByType(pageType: PageType): Promise<Page | undefined> {
+    return await queryPageByType(pageType, this.envVariables);
+  }
+
   public async getPosts(options: PostsOptions) {
     const { category, coverSize, page, pageSize } = options;
     const conditions: ListConditions = { category, page, pageSize };

package/src/entify/IEntify.ts

@@ -1,8 +1,14 @@
 import { IQueryOptions, ListResult } from "@rxdrag/entify-hooks";
 import { TSize } from "./types";
 import { ListConditions } from "./lib";
-import { TPost, TPostCategory, TProduct, TProductCategory, TUser } from "./view-model";
-import { Lang, Theme } from "@rxdrag/rxcms-models";
+import {
+  TPost,
+  TPostCategory,
+  TProduct,
+  TProductCategory,
+  TUser,
+} from "./view-model";
+import { Lang, Page, PageType, Theme, Website } from "@rxdrag/rxcms-models";
 
 export type PostsOptions = {
   category?: string;
@@ -17,6 +23,7 @@ export type PostPatinateOptions = {
 };
 
 export interface IEntify {
+  getLang(): string;
   queryEntityList<
     T,
     WhereExp = unknown,
@@ -28,6 +35,8 @@ export interface IEntify {
     staticKey?: string
   ): Promise<ListResult<unknown> | undefined>;
 
+  getWebsite(): Promise<Website | undefined>;
+
   getTheme(): Promise<Theme | undefined>;
 
   getLangs(): Promise<Lang[] | undefined>;
@@ -38,11 +47,42 @@ export interface IEntify {
 
   getPosts(options: PostsOptions): Promise<TPost[] | undefined>;
 
+  getHomePage(): Promise<Page | undefined>;
+
+  getPostPage(): Promise<Page | undefined>;
+
+  getPostListPage(): Promise<Page | undefined>;
+
+  getPostCategoryPage(): Promise<Page | undefined>;
+
+  getProductPage(): Promise<Page | undefined>;
+
+  getProductListPage(): Promise<Page | undefined>;
+
+  getProductCategoryPage(): Promise<Page | undefined>;
+
+  getSearchPage(): Promise<Page | undefined>;
+
+  getProfilePage(): Promise<Page | undefined>;
+
+  getThanksPage(): Promise<Page | undefined>;
+
+  get404Page(): Promise<Page | undefined>;
+
+  getErrorPage(): Promise<Page | undefined>;
+
+  getPageBySlug(slug: string): Promise<Page | undefined>;
+
+  getPageByType(pageType: PageType): Promise<Page | undefined>;
+
   getPostListPaths(options: PostPatinateOptions): Promise<unknown>;
 
   getPostPaths(): Promise<unknown>;
 
-  getPostBySlug(slug: string, coverSize: TSize | undefined): Promise<TPost | undefined>;
+  getPostBySlug(
+    slug: string,
+    coverSize: TSize | undefined
+  ): Promise<TPost | undefined>;
 
   getPostSlugs(): Promise<Array<string | undefined>>;
 

package/src/entify/lib/langFields.ts

@@ -9,4 +9,6 @@ export const langFields = [
   LangFields.localName,
   LangFields.icon,
   LangFields.htmlLang,
+  //TODO 用枚举有时会出空值
+  "urlFragment" as LangFields.urlFragment,
 ];

package/src/entify/lib/newPageMetaOptions.ts

@@ -1,8 +1,8 @@
-import { PageMetaQueryOptions, PageMetaFields, MediaQueryOptions, MediaFields } from "@rxdrag/rxcms-models";
+import { PageMetaQueryOptions, PageMetaFields } from "@rxdrag/rxcms-models";
 import { newOgImageQueryOptions } from "./newOgImageQueryOptions";
 
 export function newPageMetaOptions() {
-  return  new PageMetaQueryOptions([
+  return new PageMetaQueryOptions([
     PageMetaFields.id,
     PageMetaFields.seoTitle,
     PageMetaFields.seoKeywords,
@@ -14,7 +14,5 @@ export function newPageMetaOptions() {
     PageMetaFields.ogSiteName,
     PageMetaFields.xCard,
     PageMetaFields.xSite,
-  ]).ogImage(
-    newOgImageQueryOptions()
-  )
-}
+  ]).ogImage(newOgImageQueryOptions());
+}

package/src/entify/lib/newQueryPageOptions.ts

@@ -0,0 +1,14 @@
+import {
+  PageQueryOptions,
+  PageFields,
+} from "@rxdrag/rxcms-models";
+import { newPageMetaOptions } from "./newPageMetaOptions";
+
+//查询一个产品的参数，不带条件
+export function newQueryPageOptions() {
+  return new PageQueryOptions([
+    PageFields.id,
+    PageFields.slug,
+    PageFields.title,
+  ]).meta(newPageMetaOptions());
+}

package/src/entify/lib/queryAllProducts.ts

@@ -20,6 +20,11 @@ export async function queryAllProducts(envVariables: EnvVariables) {
         [ProductFields.status]: {
           _eq: PublishableStatus.published,
         },
+        lang: {
+          abbr: {
+            _eq: envVariables.language,
+          },
+        },
       },
       orderBy: [{ [ProductFields.seqValue]: "asc" }],
     }

package/src/entify/lib/queryFeaturedProducts.ts

@@ -37,6 +37,11 @@ export async function queryFeaturedProducts(
           featured: {
             _eq: true,
           },
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
         },
         orderBy: [{ [ProductFields.seqValue]: "asc" }],
       }

package/src/entify/lib/queryLangs.ts

@@ -4,12 +4,12 @@ import {
   LangDistinctExp,
   LangOrderBy,
   LangQueryOptions,
-  LangFields,
   LangAssciations,
 } from "@rxdrag/rxcms-models";
 import { ListResult } from "@rxdrag/entify-hooks";
 import { EnvVariables } from "../types";
 import { createEntifyClient } from "./createEntifyClient";
+import { langFields } from "./langFields";
 
 export async function queryLangs(envVariables: EnvVariables) {
   const client = createEntifyClient(envVariables);
@@ -20,28 +20,15 @@ export async function queryLangs(envVariables: EnvVariables) {
     LangOrderBy,
     LangDistinctExp
   >(
-    new LangQueryOptions(
-      [
-        LangFields.id,
-        LangFields.abbr,
-        LangFields.circleIcon,
-        LangFields.cnName,
-        LangFields.enName,
-        LangFields.localName,
-        LangFields.icon,
-        LangFields.htmlLang,
-      ],
-      {
-        where: {
-          [LangAssciations.websites]: {
-            id: {
-              _eq: envVariables.websiteId,
-            },
+    new LangQueryOptions(langFields, {
+      where: {
+        [LangAssciations.websites]: {
+          id: {
+            _eq: envVariables.websiteId,
           },
         },
-      }
-    ).setNoQuery(!envVariables.websiteId)
+      },
+    }).setNoQuery(!envVariables.websiteId)
   );
-
   return result as ListResult<Lang> | undefined;
 }

package/src/entify/lib/queryLatestPosts.ts

@@ -1,4 +1,4 @@
-import { ListResult, OrderBy } from "@rxdrag/entify-hooks";
+import { ListResult } from "@rxdrag/entify-hooks";
 import {
   PostBoolExp,
   PostOrderBy,
@@ -45,6 +45,11 @@ export async function queryLatestPosts(
           [PostFields.status]: {
             _eq: PublishableStatus.published,
           },
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
         },
       }
     )

package/src/entify/lib/queryOnePostBySlug.ts

@@ -1,20 +1,37 @@
-import { Post, PostBoolExp, PostOrderBy, PostDistinctExp } from "@rxdrag/rxcms-models";
+import {
+  Post,
+  PostBoolExp,
+  PostOrderBy,
+  PostDistinctExp,
+} from "@rxdrag/rxcms-models";
 import { newQueryOnePostOptions } from "./newQueryPostOptions";
 import { queryOneEntity } from "./queryOneEntity";
 import { EnvVariables, TSize } from "../types";
 import { TPost } from "../view-model";
 
-export async function queryOnePostBySlug(slug: string, coverSize: TSize | undefined, envVariables: EnvVariables) {
-
-  const post = await queryOneEntity<Post, PostBoolExp, PostOrderBy, PostDistinctExp>(
-    newQueryOnePostOptions(coverSize)
-      .setQueryArgs({
-        where: {
-          slug: {
-            "_eq": slug
+export async function queryOnePostBySlug(
+  slug: string,
+  coverSize: TSize | 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;

package/src/entify/lib/queryOnePostCategoryBySlug.ts

@@ -20,6 +20,11 @@ export async function queryOnePostCategoryBySlug(slug: string, envVariables: Env
           slug: {
             "_eq": slug
           },
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
         },
       }
     ),

package/src/entify/lib/queryOneProductBySlug.ts

@@ -26,6 +26,11 @@ export async function queryOneProductBySlug(
         slug: {
           _eq: slug,
         },
+        lang: {
+          abbr: {
+            _eq: envVariables.language,
+          },
+        },
       },
     }),
     envVariables
@@ -54,9 +59,14 @@ export async function queryOneProductBySlug(
       envVariables
     );
 
-    tProduct.related = result?.items?.map((pro) => productToViewModel(pro)) as
-      | TProduct[]
-      | undefined;
+    const relatedProducts = result?.items?.map((pro) =>
+      productToViewModel(pro)
+    ) as TProduct[] | undefined;
+
+    //重新排序后赋值
+    tProduct.related = product?.relatedSlugs.map((slug) =>
+      relatedProducts?.find((p) => p.slug === slug)
+    ) as TProduct[] | undefined;
   }
 
   return tProduct;

package/src/entify/lib/queryOneProductCategoryBySlug.ts

@@ -1,11 +1,25 @@
-import { ProductCategory, ProductCategoryBoolExp, ProductCategoryOrderBy, ProductCategoryDistinctExp, ProductCategoryQueryOptions, ProductCategoryFields } from "@rxdrag/rxcms-models";
+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>(
+export async function queryOneProductCategoryBySlug(
+  slug: string,
+  envVariables: EnvVariables
+) {
+  const productCategory = await queryOneEntity<
+    ProductCategory,
+    ProductCategoryBoolExp,
+    ProductCategoryOrderBy,
+    ProductCategoryDistinctExp
+  >(
     new ProductCategoryQueryOptions(
       [
         ProductCategoryFields.id,
@@ -18,7 +32,12 @@ export async function queryOneProductCategoryBySlug(slug: string, envVariables:
       {
         where: {
           slug: {
-            "_eq": slug
+            _eq: slug,
+          },
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
           },
         },
       }

package/src/entify/lib/queryOneTheme.ts

@@ -60,7 +60,8 @@ export async function queryOneTheme(envVariables: EnvVariables) {
           ThemeConfigFields.mobile,
           ThemeConfigFields.tel,
           ThemeConfigFields.wechat,
-          //ThemeConfigFields.websiteName,
+          ThemeConfigFields.domain,
+           //ThemeConfigFields.websiteName,
         ]).contactAvatar(new MediaQueryOptions().file(["thumbnail"]))
       )
       .lang(langFields)

package/src/entify/lib/queryPageBySlug.ts

@@ -0,0 +1,43 @@
+import {
+  Page,
+  PageBoolExp,
+  PageOrderBy,
+  PageDistinctExp,
+} from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+import { newQueryPageOptions } from "./newQueryPageOptions";
+
+export async function queryPageBySlug(
+  slug: string,
+  envVariables: EnvVariables
+) {
+  const post = await queryOneEntity<
+    Page,
+    PageBoolExp,
+    PageOrderBy,
+    PageDistinctExp
+  >(
+    newQueryPageOptions().setQueryArgs({
+      where: {
+        slug: {
+          _eq: slug,
+        },
+        theme: {
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
+          website: {
+            id: {
+              _eq: envVariables.websiteId,
+            },
+          },
+        },
+      },
+    }),
+    { ...envVariables, websiteId: undefined }
+  );
+  return post as Page | undefined;
+}

package/src/entify/lib/queryPageByType.ts

@@ -0,0 +1,44 @@
+import {
+  Page,
+  PageBoolExp,
+  PageOrderBy,
+  PageDistinctExp,
+  PageType,
+} from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+import { newQueryPageOptions } from "./newQueryPageOptions";
+
+export async function queryPageByType(
+  pageType: PageType,
+  envVariables: EnvVariables
+) {
+  const post = await queryOneEntity<
+    Page,
+    PageBoolExp,
+    PageOrderBy,
+    PageDistinctExp
+  >(
+    newQueryPageOptions().setQueryArgs({
+      where: {
+        pageType: {
+          _eq: pageType,
+        },
+        theme: {
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
+          website: {
+            id: {
+              _eq: envVariables.websiteId,
+            },
+          },
+        },
+      },
+    }),
+    { ...envVariables, websiteId: undefined }
+  );
+  return post as Page | undefined;
+}

package/src/entify/lib/queryPostCategories.ts

@@ -30,6 +30,13 @@ export async function queryPostCategories(envVariables: EnvVariables) {
         PostCategoryFields.description,
       ],
       {
+        where: {
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
+        },
         orderBy: [{ [PostCategoryFields.seqValue]: "asc" }],
       }
     ).posts(

package/src/entify/lib/queryPostSlugs.ts

@@ -18,6 +18,11 @@ export async function queryPostSlugs(envVariables: EnvVariables) {
       [PostFields.status]: {
         _eq: PublishableStatus.published,
       },
+      lang: {
+        abbr: {
+          _eq: envVariables.language,
+        },
+      },
     },
     orderBy: [{ [PostFields.seqValue]: "asc" }],
   });