@rxdrag/website-lib-core 0.0.69 → 0.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.69",
+  "version": "0.0.70",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -25,8 +25,8 @@
     "eslint": "^7.32.0",
     "typescript": "^5",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/slate-preview": "1.2.58",
-    "@rxdrag/tsconfig": "0.2.0"
+    "@rxdrag/tsconfig": "0.2.0",
+    "@rxdrag/slate-preview": "1.2.58"
   },
   "dependencies": {
     "clsx": "^2.1.0",
@@ -35,8 +35,8 @@
     "lodash-es": "^4.17.21",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@rxdrag/entify-lib": "0.0.20",
-    "@rxdrag/rxcms-models": "0.3.91"
+    "@rxdrag/entify-lib": "0.0.21",
+    "@rxdrag/rxcms-models": "0.3.92"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/astro/media.ts

@@ -1,5 +1,4 @@
 import { ImageSizes, Media } from "@rxdrag/rxcms-models";
-import { ImgHTMLAttributes } from "react";
 
 export type FileFieldType =
   | "thumbnail"
@@ -53,15 +52,13 @@ export const DEFAULT_POST_THUMBNAIL_IMAGE_SIZE: ImageResize = {
 };
 
 //TODO：以后还要加transform参数
-export type ImageProps = ImgHTMLAttributes<HTMLImageElement> & {
+export type ImageProps = {
   className?: string;
-  mediaId?: string;
+  mediaRef?: string;
   //默认original
   fileField?: FileFieldType;
   resize?: ImageResize;
   children?: React.ReactNode;
-  //为导出代码方便，如果设置了src，显示的时候可以忽略mediaId等
-  src?: string;
 };
 
 export const transformMeidaFields = (

package/src/entify/Entify.ts

@@ -41,6 +41,7 @@ import {
 import { queryPageBySlug } from "./lib/queryPageBySlug";
 import { queryPageByType } from "./lib/queryPageByType";
 import { queryOneMedia } from "./lib/queryOneMedia";
+import { DEFAULT_LARGE, DEFAULT_MEDIUM, DEFAULT_SAMLL, DEFUALT_HEIGHT, DEFUALT_WIDTH, FileFieldType, ImageResize } from "../astro/media";
 
 export class Entify implements IEntify {
   private static instance: Entify | null = null;
@@ -99,8 +100,23 @@ export class Entify implements IEntify {
     return (await queryLangs(this.envVariables))?.items;
   }
 
-  public async getMedia(ref: string | undefined | null): Promise<Media | undefined> {
-    return await queryOneMedia(ref, this.envVariables);
+  public async getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined> {
+    const fields: string[] = []
+    switch (fileField) {
+      case "resize":
+        fields.push(`resize(width: ${resize?.width || DEFUALT_WIDTH}, height: ${resize?.height || DEFUALT_HEIGHT})`)
+        break;
+      case "small":
+        fields.push(`small(width: ${this.imageSizes.small?.width || DEFAULT_SAMLL.width}, height: ${this.imageSizes.small?.height || DEFAULT_SAMLL.height})`)
+        break;
+      case "medium":
+        fields.push(`medium(width: ${this.imageSizes.medium?.width || DEFAULT_MEDIUM.width}, height: ${this.imageSizes.medium?.height || DEFAULT_MEDIUM.height})`)
+        break;
+      case "large":
+        fields.push(`large(width: ${this.imageSizes.large?.width || DEFAULT_LARGE.width}, height: ${this.imageSizes.large?.height || DEFAULT_LARGE.height})`)
+        break;
+    }
+    return await queryOneMedia(ref, fields, this.envVariables);
   }
 
   public async getFeaturedProducts(

package/src/entify/IEntify.ts

@@ -21,6 +21,7 @@ import {
   WebsitePart,
 } from "@rxdrag/rxcms-models";
 import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
+import { FileFieldType, ImageResize } from "../astro";
 
 export type PostsOptions = {
   category?: string;
@@ -58,7 +59,7 @@ export interface IEntify {
 
   getLangs(): Promise<Lang[] | undefined>;
 
-  getMedia(ref: string | undefined | null): Promise<Media | undefined>;
+  getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined>;
 
   getFeaturedProducts(
     count?: number,

package/src/entify/lib/queryOneMedia.ts

@@ -1,8 +1,11 @@
 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) => {
 
-export const queryOneMedia = async (ref: string | undefined | null, envVariables: EnvVariables) => {
   const media = await queryOneEntity<Media, MediaBoolExp, MediaOrderBy, MediaDistinctExp>(
     new MediaQueryOptions([
       MediaFields.id,
@@ -16,7 +19,7 @@ export const queryOneMedia = async (ref: string | undefined | null, envVariables
         }
       }
     })
-      .file(["original", "thumbnail"])
+      .file(["original", "thumbnail", ...(fields || [])])
       .setNoQuery(!ref)
     ,
     envVariables