@paroicms/server 1.87.3 → 1.88.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server",
-  "version": "1.87.3",
+  "version": "1.88.0",
   "description": "The ParoiCMS server",
   "keywords": [
     "cms",
@@ -22,12 +22,12 @@
     "start": "node dist/start.js | npm run _pino-pretty",
     "build": "npm run graphql:generate-types && npm run tsc",
     "tsc": "tsc",
-    "nodemon": "NODE_ENV=development nodemon --delay 1 --watch dist --watch config.json --watch site-schema-lib --watch 'sites/*/*.json' --watch '../../packages/[!bo-]*/dist/*' --watch '../../packages/[!bo-]*/dist-cjs/*' --watch '../../plugins/*/*-backend/dist/*' dist/start.js | npm run _pino-pretty",
+    "nodemon": "NODE_ENV=development nodemon --delay 1 --watch dist --watch config.json --watch site-schema-lib --watch 'sites/*/*.json' --watch '../../packages/[!bo-]*/dist/*' --watch '../../packages/[!bo-]*/dist-cjs/*' --watch '../../plugins/*/*backend/dist/*' dist/start.js | npm run _pino-pretty",
     "tsc:watch": "tsc --watch --preserveWatchOutput",
     "dev": "turbo dev",
     "clear": "rimraf dist/*",
     "test": "vitest",
-    "test:run": "vitest run",
+    "test:once": "vitest run",
     "_pino-pretty": "pino-pretty -U false -x 'stats:25' -X 'stats:grey' -t 'yyyy-mm-dd HH:MM:ss.l' -i 'hostname,pid,fqdn' -o '{if fqdn}[{fqdn}] {end}{msg}'",
     "graphql:generate-types": "npm run _graphql:generate-types && npm run _patch-graphql-types",
     "_graphql:generate-types": "graphql-codegen --config scripts/codegen.ts",
@@ -37,15 +37,15 @@
     "@apollo/server": "~4.11.3",
     "@aws-sdk/client-ses": "~3.731.1",
     "@paroi/data-formatters-lib": "~0.4.0",
-    "@paroicms/internal-anywhere-lib": "1.28.0",
-    "@paroicms/bo": "1.68.3",
-    "@paroicms/public-anywhere-lib": "0.22.0",
-    "@paroicms/public-server-lib": "0.33.0",
-    "@paroicms/server-database-media-storage": "1.18.5",
-    "@paroicms/server-image-cache-engine": "1.22.5",
-    "@paroicms/internal-server-lib": "1.15.5",
-    "@paroicms/server-text-cache-system": "1.15.1",
-    "@paroicms/connector": "0.33.1",
+    "@paroicms/internal-anywhere-lib": "1.29.0",
+    "@paroicms/bo": "1.69.0",
+    "@paroicms/public-anywhere-lib": "0.23.0",
+    "@paroicms/public-server-lib": "0.34.0",
+    "@paroicms/server-database-media-storage": "1.19.0",
+    "@paroicms/server-image-cache-engine": "1.23.0",
+    "@paroicms/internal-server-lib": "1.16.0",
+    "@paroicms/server-text-cache-system": "1.16.0",
+    "@paroicms/connector": "0.34.0",
     "@types/express": "~4.17.21",
     "bcrypt": "~5.1.1",
     "compression": "~1.7.5",
@@ -59,9 +59,8 @@
     "graphql-query-complexity": "~1.1.0",
     "html-minifier-terser": "~7.2.0",
     "jsonwebtoken": "~9.0.2",
-    "liquidjs": "~10.20.2",
-    "mime": "~4.0.6",
-    "mime-types": "~2.1.35",
+    "liquidjs": "~10.21.0",
+    "mime": "~4.0.7",
     "multer": "^1.4.5-lts.1",
     "passport": "~0.7.0",
     "passport-google-oauth20": "~2.0.0",

package/schema.graphql

@@ -10,7 +10,6 @@ type Query {
   document(id: ID!): Document!
   partsOf(documentId: ID!): [PartOrPlaceholder!]
   translationsOf(nodeId: ID!): [String!]!
-  getMediaByUid(mediaUid: String!): Media!
   media(handle: ID!): Media
   medias(handle: ID!): [Media!]!
   pagedNodelWraps(limit: Int!, orderBy: [OrderByItem!], parentNodelId: ID!, start: Int!): PagedNodelWraps!
@@ -22,9 +21,11 @@ type Query {
   nodelWrap(nodelId: ID!): NodelWrap!
   nodelWraps(parentNodelId: ID!): [NodelWrap!]!
   siteConstants: SiteConstants!
+  """A stringified `ReadFieldValues`"""
   fieldValues(nodelId: String!, fieldNames: [String!], preprocess: Boolean): String!
   fieldValuesOfList(parentNodelId: String!, listName: String, fieldNames: [String!], preprocess: Boolean): [FieldValuesOfList!]!
   siteFieldValues(language: String, fieldNames: [String!], preprocess: Boolean): String!
+  getUsedRawSizesByMedia(mediaId: ID!): [UsedRawSize!]!
 }
 
 type Account {
@@ -74,20 +75,9 @@ type Document {
   url: String!
 }
 
-type FTextImage {
-  displaySize: String!
-  realSize: String!
-}
-
-type FaviconThumb {
-  height: Int!
-  mediaType: String!
-  url: String!
-  width: Int!
-}
-
 type FieldValuesOfList {
   nodelId: String!
+  """A stringified `ReadFieldValues`"""
   fieldValues: String!
 }
 
@@ -106,14 +96,17 @@ type Node {
 }
 
 type Media {
-  attachedData: String
-  mediaType: String!
-  modifiedTs: DateTime!
-  originalName: String
-  thumbImage: ThumbImageProperties
-  uid: ID!
-  url: String!
-  weightB: Int!
+  """A stringified `MSourceMedia`"""
+  source: String!
+  """A stringified `MImageVariant`, when the source is an image"""
+  thumb: String
+}
+
+type ImageVariant {
+  """A stringified `MSourceImage`"""
+  source: String!
+  """A stringified `MImageVariant`"""
+  variant: String!
 }
 
 type PagedNodelWraps {
@@ -136,6 +129,7 @@ type Part {
   publishDate: DateTime
   language: String!
   scheduled: Boolean!
+  """A stringified `ReadFieldValues`"""
   fieldValues(fieldNames: [String!], preprocess: Boolean): String!
   parts: [PartOrPlaceholder!]
 }
@@ -157,8 +151,10 @@ type Plugin {
 }
 
 type PublicSiteConstants {
-  boFaviconThumb: FaviconThumb
-  faviconThumb: FaviconThumb
+  """A stringified `MImageVariant`"""
+  boFaviconThumb: String
+  """A stringified `MImageVariant`"""
+  faviconThumb: String
   languageWithLabels: [LanguageWithLabel!]!
   platformAuthUrl: String
   publicSiteUrl: String!
@@ -177,6 +173,7 @@ type NodelWrap {
   translatedInto: [String!]!
   breadcrumb: [BreadcrumbItem!]!
   document: Document
+  """A stringified `ReadFieldValues`"""
   fieldValues(fieldNames: [String!], preprocess: Boolean): String!
   node: Node!
   parts: [PartOrPlaceholder!]
@@ -201,27 +198,13 @@ type TermDocument {
 }
 
 type ThemeConf {
-  fTextImages: [FTextImage!]!
+  fTextImageResizeRules: [String!]!
   pixelRatio: Float!
 }
 
-type ThumbImageProperties {
-  height: Int!
-  mediaType: String!
-  originalHeight: Int!
-  originalLossless: Boolean
-  originalWidth: Int!
-  url: String!
-  width: Int!
-}
-
-type UsedImage {
-  displayHeight: Int!
-  displayWidth: Int!
-  mediaType: String!
-  realHeight: Int!
-  realWidth: Int!
-  url: String!
+type UsedRawSize {
+  rawResizeR: String!
+  rawSizeName: String!
 }
 
 type Mutation {
@@ -234,7 +217,7 @@ type Mutation {
   deleteDocument(nodelId: String!): Boolean!
   deleteNodeAndDocuments(nodelId: String!): Boolean!
   deleteMedia(handle: ID!): String!
-  deleteMediaFromGallery(handle: ID!, uid: ID!): String!
+  deleteMediaFromGallery(handle: ID!, mediaId: ID!): String!
   deletePart(
     """language:nodeId"""
     nodelId: ID!
@@ -250,10 +233,13 @@ type Mutation {
   setNodelReady(ready: Boolean!, nodelId: ID!): Boolean!
   setSiteFieldValues(language: String, values: String!): Boolean!
   updateAccount(accountId: ID!, values: UpdateAccountValues!): Account!
-  updateAttachedData(mediaUid: ID!, values: String!): Media!
+  """value parameter is a stringified `MLocalizedAttachedData`"""
+  updateMediaAttachedData(mediaId: ID!, language: String!, value: String): Boolean!
+  updateMediaPixelRatio(mediaId: ID!, pixelRatio: Float): Boolean!
   updateDocumentMeta(id: ID!, values: UpdateDocumentMetaValues!): Document!
   updateDocumentTitle(id: ID!, values: UpdateDocumentTitleValues!): Document!
-  useImage(input: UseImageInput!): UsedImage!
+  useBackOfficeImage(input: UseBackOfficeImageInput!): ImageVariant!
+  useFTextImage(input: UseFTextImageInput!): ImageVariant!
 }
 
 input AccountPreferencesValues {
@@ -286,7 +272,7 @@ input OrderByItem {
 
 input ReorderMediasInput {
   handle: ID!
-  mediaUids: [ID!]!
+  mediaIds: [ID!]!
 }
 
 input UpdateAccountValues {
@@ -304,7 +290,14 @@ input UpdateDocumentTitleValues {
   title: String
 }
 
-input UseImageInput {
-  imageSize: String!
-  uid: ID!
+input UseBackOfficeImageInput {
+  mediaId: ID!
+  resizeRule: String!
+  pixelRatio: Float
+  mediaType: String
+}
+
+input UseFTextImageInput {
+  mediaId: ID!
+  resizeRule: String!
 }

package/dist/bo-backend/media/media.d.ts

@@ -1,21 +0,0 @@
-import type { ImageSize } from "@paroicms/public-anywhere-lib";
-import { type ImageRef } from "@paroicms/server-image-cache-engine";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export interface RegisteredImageVariant {
-    url: string;
-    width: number;
-    height: number;
-    mediaType: string;
-}
-export declare function registerImageVariant(siteContext: Pick<SiteContext, "imageCache" | "siteUrl">, { imageRef, realSize, slug, autoCrop, versionedUrl, absoluteUrl, dependsOnUsedKey, originalName, }: {
-    imageRef: ImageRef;
-    realSize: ImageSize;
-    slug?: string;
-    autoCrop?: boolean;
-    versionedUrl: boolean;
-    absoluteUrl: boolean;
-    dependsOnUsedKey: string;
-    originalName?: string;
-}): Promise<RegisteredImageVariant>;
-export declare function createBoFaviconFrom(siteContext: SiteContext, binaryFile: Buffer): Promise<void>;
-export declare function toSvgRegisteredImageVariant(siteContext: Pick<SiteContext, "siteUrl">, imageRef: ImageRef, originalName?: string): RegisteredImageVariant;

package/dist/bo-backend/media/media.js

@@ -1,61 +0,0 @@
-import { makeUrlOfImageVariant, makeUrlOfMediaFile } from "@paroicms/public-server-lib";
-import { computeVariantSize, createDefaultBoFavicon, } from "@paroicms/server-image-cache-engine";
-import { getHandleOfSiteBoFavicon } from "../../common/media-handles.helpers.js";
-import { thumbRealSize } from "../../context.js";
-export async function registerImageVariant(siteContext, { imageRef, realSize, slug, autoCrop = false, versionedUrl, absoluteUrl, dependsOnUsedKey, originalName, }) {
-    if (imageRef.mediaType === "image/svg+xml") {
-        return toSvgRegisteredImageVariant(siteContext, imageRef, originalName);
-    }
-    const { width, height, variantName, mediaType, resourceVersion } = await siteContext.imageCache.makeImageAvailable({
-        imageRef,
-        imageSize: realSize,
-        autoCrop,
-        dependsOnUsedKey,
-        slug,
-    });
-    return {
-        url: makeUrlOfImageVariant(siteContext, {
-            mediaUid: imageRef.imageUid,
-            mediaType,
-            variantName,
-            resourceVersion: versionedUrl ? resourceVersion : undefined,
-            slug,
-            absoluteUrl,
-        }),
-        width,
-        height,
-        mediaType,
-    };
-}
-export async function createBoFaviconFrom(siteContext, binaryFile) {
-    const result = await createDefaultBoFavicon(binaryFile);
-    await siteContext.mediaStorage.addMedia({
-        binaryFile: result.binaryFile,
-        mediaType: result.mediaType,
-        weightB: result.weightB,
-        handle: getHandleOfSiteBoFavicon(),
-        originalName: "bo-favicon",
-        image: {
-            width: result.width,
-            height: result.height,
-            lossless: result.lossless,
-        },
-        replace: true,
-        nodeId: siteContext.siteIds.siteNodeId,
-    });
-}
-export function toSvgRegisteredImageVariant(siteContext, imageRef, originalName) {
-    const { width, height } = computeVariantSize({ imageRef, imageSize: thumbRealSize });
-    return {
-        url: makeUrlOfMediaFile(siteContext, {
-            absoluteUrl: true,
-            mediaType: imageRef.mediaType,
-            mediaUid: imageRef.imageUid,
-            originalName,
-        }),
-        width,
-        height,
-        mediaType: "image/svg+xml",
-    };
-}
-//# sourceMappingURL=media.js.map

package/dist/bo-backend/media/media.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../src/bo-backend/media/media.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAEL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUjD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwD,EACxD,EACE,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,YAAY,GAUb;IAED,IAAI,QAAQ,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;QAC3C,OAAO,2BAA2B,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,GAC9D,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ;QACR,SAAS,EAAE,QAAQ;QACnB,QAAQ;QACR,gBAAgB;QAChB,IAAI;KACL,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,qBAAqB,CAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS;YACT,WAAW;YACX,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC3D,IAAI;YACJ,WAAW;SACZ,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,WAAwB,EAAE,UAAkB;IACpF,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,wBAAwB,EAAE;QAClC,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE;YACL,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B;QACD,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;KACvC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,WAAyC,EACzC,QAAkB,EAClB,YAAqB;IAErB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;IACrF,OAAO;QACL,GAAG,EAAE,kBAAkB,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,YAAY;SACb,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS,EAAE,eAAe;KAC3B,CAAC;AACJ,CAAC"}

package/dist/rendered-site/liquidjs-filters/image-zoom-url.d.ts

@@ -1,6 +0,0 @@
-import type { Context } from "liquidjs";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function imageZoomUrlLiquidJsFilter(val: unknown, { ctx, siteContext }: {
-    ctx: Context;
-    siteContext: SiteContext;
-}): Promise<string>;

package/dist/rendered-site/liquidjs-filters/image-zoom-url.js

@@ -1,22 +0,0 @@
-import { strValOrUndef } from "@paroi/data-formatters-lib";
-import { applyRatioToImageSize } from "@paroicms/public-server-lib";
-import { makeTagCacheKeyForRendering } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
-import { makeImageAvailable } from "../../rendering-payload/make-image-available.js";
-export async function imageZoomUrlLiquidJsFilter(val, { ctx, siteContext }) {
-    const uid = strValOrUndef(val);
-    if (!uid)
-        return "";
-    const cacheKey = makeTagCacheKeyForRendering("imageZoomUrl", { tagParameters: uid });
-    const renderingContext = extractRenderingContext(ctx);
-    const cacheVal = renderingContext.getValueFromCache(cacheKey);
-    if (cacheVal.found)
-        return cacheVal.val;
-    const zoomImage = await makeImageAvailable(siteContext, renderingContext, {
-        imageSel: { uid },
-        size: applyRatioToImageSize("x1900x", siteContext.themeConf.pixelRatio),
-    });
-    renderingContext.setValueIntoCache(cacheKey, zoomImage.url);
-    return zoomImage.url;
-}
-//# sourceMappingURL=image-zoom-url.js.map

package/dist/rendered-site/liquidjs-filters/image-zoom-url.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"image-zoom-url.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/image-zoom-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAC3G,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAGrF,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,GAAY,EACZ,EAAE,GAAG,EAAE,WAAW,EAA8C;IAEhE,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IAEpB,MAAM,QAAQ,GAAG,2BAA2B,CAAC,cAAc,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IACrF,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC,GAAG,CAAC;IAExC,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,gBAAgB,EAAE;QACxE,QAAQ,EAAE,EAAE,GAAG,EAAE;QACjB,IAAI,EAAE,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC;KACxE,CAAC,CAAC;IAEH,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5D,OAAO,SAAS,CAAC,GAAG,CAAC;AACvB,CAAC"}