npm - @paroicms/server - Versions diffs - 1.81.1 → 1.83.0 - Mend

@paroicms/server 1.81.1 → 1.83.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (118) hide show

package/dist/public-api/public-api-rendering.js CHANGED Viewed

@@ -4,13 +4,13 @@ import { serveTextFromCacheOr } from "../common/serve-text-or.js";
 import { makeCacheDependencyKey, makeCacheKey } from "../common/text-cache.js";
 import { trackerReportToMessage } from "../common/tracker-report.js";
 import { renderLiquidTemplate } from "../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
-import { createRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { createRenderingContext, } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { createDocPayloadDrop } from "../public-payload/create-doc-drop.js";
 import { getListOfDocValues } from "../public-payload/doc-values.queries.js";
 import { makeSitePayload } from "../public-payload/site-payload.js";
 import { searchText } from "./search-text/search-text.queries.js";
 export async function renderChildPartials(siteContext, httpContext, options) {
-    const { params, parentDocumentId, labeledByTermId } = options;
+    const { params, parentDocumentId, labeledBy } = options;
     const cacheKey = makeCacheKey(siteContext.logger, {
         kind: "api",
         url: httpContext.req.relativeUrl,
@@ -21,13 +21,17 @@ export async function renderChildPartials(siteContext, httpContext, options) {
         contentType: "text/plain; charset=utf-8",
     });
     if (!(await serveOr.serveFromCache())) {
-        const { html, dependencyKeys } = await renderChildDocuments(siteContext, tracker, {
+        const renderingContext = await createRenderingContext(siteContext, {
+            tracker,
+            cacheKey,
+            dependencyKey: makeCacheDependencyKey({ documentId: parentDocumentId, relation: "children" }),
+        });
+        const { html, dependencyKeys } = await renderChildDocuments(siteContext, renderingContext, {
             parentId: parentDocumentId,
             limit: nbVal(params.limit),
             offset: nbVal(params.offset),
             templateName: params.templateName,
-            cacheKey,
-            labeledByTermId: labeledByTermId,
+            labeledBy,
         });
         await serveOr.putInCacheAndServe(html, dependencyKeys);
     }
@@ -45,30 +49,29 @@ export async function renderSearchPartials(siteContext, httpContext, options) {
         contentType: "application/json",
     });
     if (!(await serveOr.serveFromCache())) {
-        const { result, dependencyKeys } = await searchAndRender(siteContext, tracker, {
+        const renderingContext = await createRenderingContext(siteContext, {
+            tracker,
+            cacheKey,
+            dependencyKey: makeCacheDependencyKey({ global: "all" }),
+        });
+        const { result, dependencyKeys } = await searchAndRender(siteContext, renderingContext, {
             language,
             words,
             limit: nbVal(limit),
             start: nbVal(start),
             templateName,
-            cacheKey,
         });
         const content = JSON.stringify(result);
         await serveOr.putInCacheAndServe(content, dependencyKeys);
     }
     siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${httpContext.req.relativeUrl}`));
 }
-async function renderChildDocuments(siteContext, tracker, options) {
+async function renderChildDocuments(siteContext, renderingContext, options) {
     const { parentId: parentDocumentId, templateName } = options;
-    const docs = await getListOfDocValues(siteContext, tracker, {
+    const docs = await getListOfDocValues(siteContext, renderingContext, {
         ...options,
         documentKind: "regular",
     });
-    const renderingContext = await createRenderingContext(siteContext, {
-        tracker,
-        cacheKey: options.cacheKey,
-        dependencyKey: makeCacheDependencyKey({ documentId: parentDocumentId, relation: "children" }),
-    });
     const result = [];
     for (const row of docs) {
         const payload = {
@@ -86,13 +89,9 @@ async function renderChildDocuments(siteContext, tracker, options) {
         dependencyKeys: renderingContext.getDependencyKeys(),
     };
 }
-async function searchAndRender(siteContext, tracker, options) {
+async function searchAndRender(siteContext, renderingContext, options) {
     const { language, templateName } = options;
     const { rows, total } = await searchText(siteContext, { ...options, onlyPublished: true });
-    const renderingContext = await createRenderingContext(siteContext, {
-        cacheKey: options.cacheKey,
-        tracker,
-    });
     const htmlList = [];
     for (const row of rows) {
         const payload = {

package/dist/public-api/public-api-rendering.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"public-api-rendering.js","sourceRoot":"","sources":["../../src/public-api/public-api-rendering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,~~EAAgB~~,aAAa,EAAE,MAAM,+BAA+B,CAAC;~~AAG5E~~,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,~~EAAE~~,sBAAsB,~~EAAE~~,MAAM,2DAA2D,CAAC;~~AACnG~~,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGpE,OAAO,EAA0B,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAE1F,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,WAA0B,EAC1B,OAIC;IAED,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,~~eAAe~~,EAAE,GAAG,OAAO,CAAC;~~IAC9D~~,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE;QAChD,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW;KACjC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE;QACtE,QAAQ;QACR,WAAW,EAAE,2BAA2B;KACzC,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,~~OAAO~~,EAAE;~~YAChF~~,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;YAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;YAC5B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,~~QAAQ~~;~~YACR~~,~~eAAe,EAAE,eAAe;SACjC,~~CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CAAC,MAAM,CAAC,KAAK,CACtB,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CACnF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,WAA0B,EAC1B,OAMC;IAED,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE;QAChD,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW;KACjC,CAAC,CAAC;~~IACH~~,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE;QACtE,QAAQ;QACR,WAAW,EAAE,kBAAkB;KAChC,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,~~OAAO~~,EAAE;~~YAC7E~~,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;YACnB,YAAY;~~YACZ~~,~~QAAQ;SACT,~~CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEvC,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,WAAW,CAAC,MAAM,CAAC,KAAK,CACtB,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CACnF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,WAAwB,EACxB,~~OAAgB~~,~~EAChB~~,~~OAOC~~;IAED,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,~~OAAO~~,EAAE;~~QAC1D~~,GAAG,OAAO;QACV,YAAY,EAAE,SAAS;KACxB,CAAC,CAAC;IAEH,MAAM,~~gBAAgB,GAAG,~~MAAM,~~sBAAsB,CAAC,WAAW,EAAE;QACjE,OAAO;QACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,aAAa,EAAE,sBAAsB,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;KAC9F,CAAC,CAAC;IACH,MAAM,MAAM,~~GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,CAAC;YAC/E,GAAG,EAAE,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE,GAAG,CAAC;SAC9D,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,OAAO;YACP,aAAa,EAAE,CAAC,YAAY,YAAY,gBAAgB,CAAC;SAC1D,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;KACrD,CAAC;AACJ,CAAC;~~AAOD~~,KAAK,UAAU,eAAe,CAC5B,WAAwB,EACxB,~~OAAgB~~,~~EAChB~~,OAA+B;IAE/B,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;~~IAC3F~~,MAAM,~~gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACjE,~~QAAQ,~~EAAE,OAAO,CAAC,QAAQ;QAC1B,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,QAAQ,~~GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;YAC9D,GAAG,EAAE,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE,GAAG,CAAC;SAC9D,CAAC;QAEF,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,SAAS,CAAC;QAEzF,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,OAAO;YACP,aAAa,EAAE,CAAC,YAAY,KAAK,SAAS,CAAC;SAC5C,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,KAAK;SACN;QACD,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;KACrD,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"public-api-rendering.js","sourceRoot":"","sources":["../../src/public-api/public-api-rendering.ts"],"names":[],"mappings":"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"}

package/dist/public-api/search-text/search-text.queries.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { OrderByItem } from "../../bo-backend/nodel/nodel.queries.js";
-import type { DocValues } from "../../public-payload/public-payload.types.js";
+import type { TpDocValues } from "../../public-payload/public-payload.types.js";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface SearchTextOptions {
     language: string;
@@ -10,6 +10,6 @@ export interface SearchTextOptions {
     orderBy?: OrderByItem[];
 }
 export declare function searchText(siteContext: SiteContext, options: SearchTextOptions): Promise<{
-    rows: DocValues[];
+    rows: TpDocValues[];
     total: number;
 }>;

package/dist/public-payload/breadcrumb.queries.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-import type { BreadcrumbItem } from "./public-payload.types.js";
-export declare function getPublicBreadcrumb(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<BreadcrumbItem[]>;
+import type { TpBreadcrumbItem } from "./public-payload.types.js";
+export declare function getPublicBreadcrumb(siteContext: SiteContext, renderingContext: RenderingContext, documentId: ParsedNodelId): Promise<TpBreadcrumbItem[]>;

package/dist/public-payload/breadcrumb.queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAI3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,MAAM,MAAM,~~GAAqB~~,EAAE,CAAC;~~IACpC~~,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAI3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/public-payload/create-doc-drop.d.ts CHANGED Viewed

@@ -3,9 +3,9 @@ import { type DropInst } from "../liquidjs-tools/liquidjs-drop.js";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
 import type * as publicPayload from "./public-payload.types.js";
-export declare function createDocPayloadDrop(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.DocValues, options?: {
+export declare function createDocPayloadDrop(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.TpDocValues, options?: {
     url?: string;
     fieldNames?: string[];
     kind?: "routingDocument" | "regularDocument" | "term";
     extraValues?: Obj;
-}): DropInst<publicPayload.DocPayload>;
+}): DropInst<publicPayload.TpDocPayload>;

package/dist/public-payload/create-doc-drop.js CHANGED Viewed

@@ -4,10 +4,9 @@ import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
 import { toAbsoluteUrl } from "@paroicms/public-server-lib";
 import { getSiteFieldValue } from "../bo-backend/fields/load-fields.queries.js";
 import { getHandleOfSiteField } from "../common/media-handles.helpers.js";
-import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { truncExcerptToWord } from "../helpers/excerpt.helpers.js";
 import { getNodeTypeLabel } from "../helpers/label-translator.helper.js";
-import { createLiquidJsDrop, loadOrFromRenderingCache, makeDropCacheKeyForRendering, } from "../liquidjs-tools/liquidjs-drop.js";
+import { createLiquidJsDrop, loadOrFromRenderingCache, } from "../liquidjs-tools/liquidjs-drop.js";
 import { getFeaturedImageOf } from "../public-site/helpers/medias.helpers.js";
 import { getUrlOfDocument } from "../public-site/public-route/make-url.js";
 import { getPublicBreadcrumb } from "./breadcrumb.queries.js";
@@ -18,7 +17,6 @@ import { getSiblingDocuments } from "./get-siblings.queries.js";
 import { loadDefaultImage } from "./load-default-image.js";
 import { countPartsOf, formatListOfPartValues, keyOfParentPartData, loadPartsOf, } from "./parts.queries.js";
 import { toPublicRoutingDocumentNodelIds } from "./site-payload.js";
-import { loadLabeledByTerms } from "./taxonomies.queries.js";
 import { loadTranslationsAsDrops } from "./translations.queries.js";
 export function createDocPayloadDrop(siteContext, renderingContext, docValues, options = {}) {
     const documentType = getDocumentTypeByName(siteContext.siteSchema, docValues.type);
@@ -28,10 +26,7 @@ export function createDocPayloadDrop(siteContext, renderingContext, docValues, o
     });
     return createLiquidJsDrop({
         renderingContext,
-        cacheKeyOptions: {
-            documentId: docValues,
-            keySuffix: options.fieldNames?.join(","),
-        },
+        renderingCacheKey: `doc:${encodeNodelId(docValues)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: {
             kind: options.kind ??
                 (documentType.documentKind === "routing" ? "routingDocument" : "regularDocument"),
@@ -106,17 +101,18 @@ export function createDocPayloadDrop(siteContext, renderingContext, docValues, o
                 });
             },
             translations: () => loadTranslationsAsDrops(siteContext, renderingContext, docValues),
-            labeling: createLabelingDrop(siteContext, renderingContext, docValues, documentType),
-            singleLabeling: createLabelingDrop(siteContext, renderingContext, docValues, documentType, {
-                one: true,
-            }),
-            flaggedWith: createLabelingDrop(siteContext, renderingContext, docValues, documentType, {
-                deprecated: true,
-            }),
-            flaggedWithOne: createLabelingDrop(siteContext, renderingContext, docValues, documentType, {
-                one: true,
-                deprecated: true,
-            }),
+            labeling: () => {
+                siteContext.logger.warn("'labeling' no longer exists, use a labeling field instead");
+            },
+            singleLabeling: () => {
+                siteContext.logger.warn("'singleLabeling' no longer exists, use a labeling field instead");
+            },
+            flaggedWith: () => {
+                siteContext.logger.warn("'flaggedWith' no longer exists, use a labeling field instead");
+            },
+            flaggedWithOne: () => {
+                siteContext.logger.warn("'flaggedWithOne' no longer exists, use a labeling field instead");
+            },
             og: () => makeOgValuesPayload(siteContext, renderingContext, documentType, docValues, options),
             breadcrumb: () => getPublicBreadcrumb(siteContext, renderingContext, docValues),
             siblings: () => getSiblingDocuments(siteContext, renderingContext, docValues),
@@ -124,45 +120,10 @@ export function createDocPayloadDrop(siteContext, renderingContext, docValues, o
         },
     }, siteContext);
 }
-function createLabelingDrop(siteContext, renderingContext, documentId, documentType, { one, deprecated } = {}) {
-    return createLiquidJsDrop({
-        renderingContext,
-        cacheKeyOptions: { documentId },
-        values: Object.fromEntries((documentType.labeling ?? []).map((useTaxonomy) => [
-            useTaxonomy.taxonomy,
-            async () => {
-                if (deprecated) {
-                    siteContext.logger.warn(`The 'flaggedWith' and 'flaggedWithOne' fields are deprecated, use 'labeling' and 'singleLabeling' instead.`);
-                }
-                renderingContext.addDependencyKey(makeCacheDependencyKey({
-                    nodeId: documentId.nodeId,
-                    relation: "labeled",
-                    taxonomyTypeName: useTaxonomy.taxonomy,
-                }));
-                const rawTerms = await loadLabeledByTerms(siteContext, renderingContext.tracker, {
-                    documentId,
-                    taxonomyTypeName: useTaxonomy.taxonomy,
-                });
-                if (!rawTerms || rawTerms.length === 0)
-                    return;
-                const terms = rawTerms.map((t) => createDocPayloadDrop(siteContext, renderingContext, t, {
-                    kind: "term",
-                    extraValues: { isLead: t.isLead, inRightLanguage: t.inRightLanguage },
-                }));
-                if (one) {
-                    renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: rawTerms[0] }));
-                    return terms[0];
-                }
-                renderingContext.addDependencyKey(...rawTerms.map((t) => makeCacheDependencyKey({ documentId: t })));
-                return terms;
-            },
-        ])),
-    }, siteContext);
-}
 function createPartsDrop(siteContext, renderingContext, documentId, documentType) {
     return createLiquidJsDrop({
         renderingContext,
-        cacheKeyOptions: { documentId },
+        renderingCacheKey: `partsOf:${encodeNodelId(documentId)}`,
         values: Object.fromEntries((documentType.lists ?? []).map((listType) => [
             listType.listName,
             async () => {
@@ -179,7 +140,7 @@ function createPartsDrop(siteContext, renderingContext, documentId, documentType
 function createPartCountDrop(siteContext, renderingContext, documentId, documentType) {
     return createLiquidJsDrop({
         renderingContext,
-        cacheKeyOptions: { documentId },
+        renderingCacheKey: `partCountersOf:${encodeNodelId(documentId)}`,
         values: Object.fromEntries((documentType.lists ?? []).map((listType) => [
             listType.listName,
             () => countPartsOf(siteContext, renderingContext.tracker, documentId, listType),
@@ -194,17 +155,21 @@ async function loadUrlOfDocument(siteContext, renderingContext, documentId) {
     return url;
 }
 async function makeOgValuesPayload(siteContext, renderingContext, documentType, docValues, options) {
-    const excerpt = await loadOrFromRenderingCache(renderingContext, makeDropCacheKeyForRendering("excerpt", { documentId: docValues }), () => loadExcerpt(siteContext, renderingContext.tracker, {
+    const excerpt = await loadOrFromRenderingCache(renderingContext, `excerpt:${encodeNodelId(docValues)}:full`, () => loadExcerpt(siteContext, renderingContext.tracker, {
         nodelId: docValues,
         fieldTypes: documentType.fields ?? [],
     }));
     const url = options.url ??
-        (await loadOrFromRenderingCache(renderingContext, makeDropCacheKeyForRendering("url", { documentId: docValues }), () => loadUrlOfDocument(siteContext, renderingContext, docValues)));
-    const featuredImageUid = await loadOrFromRenderingCache(renderingContext, makeDropCacheKeyForRendering("featuredImageUid", { documentId: docValues }), async () => (await getFeaturedImageOf(siteContext, {
+        (await loadOrFromRenderingCache(renderingContext, `url:${encodeNodelId(docValues)}`, () => loadUrlOfDocument(siteContext, renderingContext, docValues)));
+    const featuredImageUid = await loadOrFromRenderingCache(renderingContext, `featuredImage:${encodeNodelId(docValues)}`, async () => (await getFeaturedImageOf(siteContext, {
         nodeId: docValues.nodeId,
         documentType,
     }))?.uid);
-    const siteTitle = await loadOrFromRenderingCache(renderingContext, makeDropCacheKeyForRendering("title", { language: docValues.language }), async () => strValOrUndef(await getSiteFieldValue(siteContext, { fieldName: "title", language: docValues.language })));
+    const siteTitle = await loadOrFromRenderingCache(renderingContext, `siteFields:${docValues.language}:title`, async () => strValOrUndef(await getSiteFieldValue(siteContext, {
+        fieldName: "title",
+        language: docValues.language,
+        publishedOnly: true,
+    })));
     const description = excerpt
         ? truncExcerptToWord(excerpt, 130)
         : docValues.metaDescription

package/dist/public-payload/create-doc-drop.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-doc-drop.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-doc-drop.ts"],"names":[],"mappings":"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"}

package/dist/public-payload/create-part-drop.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rend
 import type { SiteContext } from "../site-context/site-context.types.js";
 import { type CompletedPartData } from "./parts.queries.js";
 import type * as publicPayload from "./public-payload.types.js";
-export declare function createPartDrop(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.PartValues, options: {
+export declare function createPartDrop(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.TpPartValues, options: {
     fieldNames?: string[];
     byParent: Map<string, CompletedPartData[]>;
-}): DropInst<publicPayload.Part>;
+}): DropInst<publicPayload.TpPart>;

package/dist/public-payload/create-part-drop.js CHANGED Viewed

@@ -13,7 +13,7 @@ export function createPartDrop(siteContext, renderingContext, docValues, options
     });
     return createLiquidJsDrop({
         renderingContext,
-        cacheKeyOptions: { documentId: docValues },
+        renderingCacheKey: `part:${encodeNodelId(docValues)}:${options.fieldNames?.join(",") ?? "full"}`,
         values: {
             kind: "part",
             leafType: async () => {

package/dist/public-payload/create-part-drop.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-part-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-part-drop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAiB,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAGvF,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAEL,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAG5B,MAAM,UAAU,cAAc,CAC5B,WAAwB,EACxB,gBAAkC,EAClC,~~SAAmC~~,~~EACnC~~,OAMC;IAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,UAAU,EAAE;QACzD,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,QAAQ,EAAE,SAAS,CAAC,IAAI;KACzB,CAAC,CAAC;IAEH,OAAO,kBAAkB,CACvB;QACE,gBAAgB;QAChB,~~eAAe~~,EAAE,~~EAAE~~,UAAU,EAAE,~~SAAS~~,EAAE;~~QAC1C~~,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;gBACxE,OAAO,SAAS,CAAC,IAAI,CAAC;YACxB,CAAC;YACD,IAAI,MAAM;gBACR,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;gBACxE,OAAO,SAAS,CAAC,MAAM,CAAC;YAC1B,CAAC;YACD,EAAE,EAAE,aAAa,CAAC,SAAS,CAAC;YAC5B,GAAG,SAAS;YACZ,SAAS,EAAE,SAAS;YAEpB,GAAG,EAAE,GAAG,EAAE;gBACR,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC,MAAM,CAAC;YAC1B,CAAC;YACD,YAAY,EAAE,KAAK,IAAI,EAAE;gBACvB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;oBAC1E,UAAU,EAAE,QAAQ,CAAC,MAAM;oBAC3B,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;iBAC7B,CAAC,CAAC;gBACH,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/D,CAAC;YACD,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;gBACvF,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE;oBAC1E,UAAU,EAAE,QAAQ,CAAC,MAAM;oBAC3B,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;iBAC7B,CAAC,CAAC;gBACH,OAAO,KAAK,EAAE,GAAG,CAAC;YACpB,CAAC;YACD,KAAK,EAAE,GAAG,EAAE,CACV,qBAAqB,CAAC,WAAW,EAAE,gBAAgB,EAAE;gBACnD,QAAQ,EAAE,SAAS,CAAC,IAAI;gBACxB,OAAO,EAAE,SAAS;gBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC;YACJ,MAAM,EAAE,GAAG,EAAE;gBACX,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;gBACjF,OAAO,qBAAqB,CAAC,WAAW,EAAE,gBAAgB,EAAE;oBAC1D,QAAQ,EAAE,SAAS,CAAC,IAAI;oBACxB,OAAO,EAAE,SAAS;oBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;iBAC/B,CAAC,CAAC;YACL,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI;oBAAE,OAAO;gBAC3B,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CACzC,mBAAmB,CAAC;oBAClB,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;oBAChC,YAAY,EAAE,SAAS,CAAC,MAAM;iBAC/B,CAAC,CACH,CAAC;gBACF,IAAI,CAAC,cAAc;oBAAE,OAAO;gBAC5B,MAAM,QAAQ,GAAG,sBAAsB,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACpF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,cAAc,CAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,CAC7D,CAAC;YACJ,CAAC;SACF;KACF,EACD,WAAW,CACZ,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"create-part-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-part-drop.ts"],"names":[],"mappings":"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"}

package/dist/public-payload/doc-values.queries.d.ts CHANGED Viewed

@@ -1,13 +1,15 @@
 import { type Obj } from "@paroi/data-formatters-lib";
 import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ParsedNodelId, ScDocumentKind, ScSorting } from "@paroicms/public-anywhere-lib";
+import type { LabeledBy } from "@paroicms/public-server-lib";
 import type { Knex } from "knex";
+import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-import type { DocValues } from "./public-payload.types.js";
-export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<DocValues>;
+import type { TpDocValues } from "./public-payload.types.js";
+export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<TpDocValues>;
 export declare function getDocItem(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId, options: {
     allowUndef: true;
-}): Promise<DocValues | undefined>;
+}): Promise<TpDocValues | undefined>;
 export interface PaginatedResult<T> {
     items: T[];
     total: number;
@@ -19,20 +21,20 @@ export interface GetPaginatedDocsOptions {
     parentId: ParsedNodelId;
     documentKind: ScDocumentKind;
     orderBy?: ScSorting;
-    labeledByTermId?: string;
+    labeledBy?: LabeledBy;
     pageIndex: number;
     pageSize: number;
 }
-export declare function getPaginatedListOfDocValues(siteContext: SiteContext, tracker: Tracker, options: GetPaginatedDocsOptions): Promise<PaginatedResult<DocValues>>;
+export declare function getPaginatedListOfDocValues(siteContext: SiteContext, renderingContext: RenderingContext, options: GetPaginatedDocsOptions): Promise<PaginatedResult<TpDocValues>>;
 export interface GetDocsOptions {
     parentId: ParsedNodelId;
     documentKind: ScDocumentKind;
     orderBy?: ScSorting;
     offset?: number;
     limit?: number;
-    labeledByTermId?: string;
+    labeledBy?: LabeledBy;
 }
-export declare function getListOfDocValues(siteContext: SiteContext, tracker: Tracker, options: GetDocsOptions): Promise<DocValues[]>;
+export declare function getListOfDocValues(siteContext: SiteContext, renderingContext: RenderingContext, options: GetDocsOptions): Promise<TpDocValues[]>;
 export declare function querySelectDocValues(query: Knex.QueryBuilder, { omitId }?: {
     omitId?: boolean;
 }): void;
@@ -40,4 +42,4 @@ export declare function formatDocValues(row: Obj, { language, nodeId, typeName }
     language?: string;
     nodeId?: string;
     typeName?: string;
-}): DocValues;
+}): TpDocValues;

package/dist/public-payload/doc-values.queries.js CHANGED Viewed

@@ -3,6 +3,7 @@ import { mainDbSchemaName } from "@paroicms/connector";
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { getTypeNameOf } from "../bo-backend/node/node.queries.js";
 import { applyRegularChildrenSortingOnQuery } from "../common/child-ordering-query.js";
+import { makeCacheDependencyKey } from "../common/text-cache.js";
 export async function getDocItem(siteContext, tracker, documentId, options = {}) {
     const query = siteContext.cn("PaDocument as d");
     querySelectDocValues(query, { omitId: true });
@@ -27,15 +28,15 @@ export async function getDocItem(siteContext, tracker, documentId, options = {})
     }
     return formatDocValues(row, documentId);
 }
-export async function getPaginatedListOfDocValues(siteContext, tracker, options) {
+export async function getPaginatedListOfDocValues(siteContext, renderingContext, options) {
     const { pageIndex, pageSize, ...otherOptions } = options;
-    const items = await getListOfDocValues(siteContext, tracker, {
+    const items = await getListOfDocValues(siteContext, renderingContext, {
         offset: options.pageIndex > 0 ? options.pageIndex * options.pageSize : undefined,
         limit: options.pageSize,
         ...otherOptions,
     });
     const total = options.pageSize === items.length
-        ? await countDocItems(siteContext, tracker, { parentId: options.parentId })
+        ? await countDocItems(siteContext, renderingContext.tracker, { parentId: options.parentId })
         : items.length;
     return {
         items,
@@ -45,7 +46,7 @@ export async function getPaginatedListOfDocValues(siteContext, tracker, options)
         pageSize,
     };
 }
-export async function getListOfDocValues(siteContext, tracker, options) {
+export async function getListOfDocValues(siteContext, renderingContext, options) {
     const { parentId, documentKind } = options;
     const parentTypeName = await getTypeNameOf(siteContext, parentId.nodeId);
     const parentDocumentType = getDocumentTypeByName(siteContext.siteSchema, parentTypeName);
@@ -54,6 +55,10 @@ export async function getListOfDocValues(siteContext, tracker, options) {
         : parentDocumentType.routingChildren;
     if (!typeNames?.length)
         return [];
+    renderingContext.addDependencyKey(makeCacheDependencyKey({
+        relation: "children",
+        documentId: parentId,
+    }));
     const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
     query.whereIn("l.typeName", typeNames);
     querySelectDocValues(query);
@@ -62,10 +67,17 @@ export async function getListOfDocValues(siteContext, tracker, options) {
         parentDocumentType,
         regularChildrenSorting: options.orderBy,
     });
-    if (options.labeledByTermId !== undefined) {
+    if (options.labeledBy) {
+        const { fieldName, termNodeId } = options.labeledBy;
         query
-            .innerJoin("PaLabeling", "f", "f.labeledId = l.id")
-            .andWhere("f.termId = :termId", { termId: options.labeledByTermId });
+            .innerJoin("PaFieldLabeling", "f", "f.nodeId = l.id")
+            .andWhere("f.termId = :termId", { termId: termNodeId })
+            .andWhere("f.field = :fieldName", { fieldName });
+        renderingContext.addDependencyKey(makeCacheDependencyKey({
+            relation: "labeled",
+            termNodeId: termNodeId,
+            fieldName,
+        }));
     }
     if (options.offset !== undefined) {
         query.offset(options.offset);
@@ -74,12 +86,12 @@ export async function getListOfDocValues(siteContext, tracker, options) {
         query.limit(options.limit);
     }
     const rows = await query;
-    tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
+    renderingContext.tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
     return rows.map((row) => formatDocValues(row, { language: parentId.language }));
 }
 async function countDocItems(siteContext, tracker, { parentId }) {
     const query = createBaseDocItemsQueryBuilder(siteContext, { parentId });
-    const row = (await query.count("* as total").first());
+    const row = await query.count("* as total").first();
     tracker.trackAccess(mainDbSchemaName, "PaDocument", "read");
     return nbVal(row?.total);
 }

package/dist/public-payload/doc-values.queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"doc-values.queries.js","sourceRoot":"","sources":["../../src/public-payload/doc-values.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;~~AAIxE~~,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,kCAAkC,EAAE,MAAM,mCAAmC,CAAC;~~AAevF~~,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,UAAoC,EAAE;IAEtC,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAChD,oBAAoB,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9C,KAAK;SACF,SAAS,CAAC,cAAc,EAAE;QACzB,UAAU,EAAE,UAAU;QACtB,YAAY,EAAE,YAAY;KAC3B,CAAC;SACD,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC;SAC5C,KAAK,CAAC;QACL,UAAU,EAAE,UAAU,CAAC,MAAM;QAC7B,YAAY,EAAE,UAAU,CAAC,QAAQ;QACjC,SAAS,EAAE,CAAC;KACb,CAAC;SACD,QAAQ,CAAC,oCAAoC,CAAC,CAAC;IAElD,MAAM,GAAG,~~GAAG~~,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;~~IAChC~~,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,IAAI,OAAO,CAAC,UAAU;YAAE,OAAO;QAC/B,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AAC1C,CAAC;AAmBD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,WAAwB,EACxB,~~OAAgB~~,~~EAChB~~,OAAgC;IAEhC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,~~OAAO~~,EAAE;~~QAC3D~~,MAAM,EAAE,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAChF,KAAK,EAAE,OAAO,CAAC,QAAQ;QACvB,GAAG,YAAY;KAChB,CAAC,CAAC;IAEH,MAAM,KAAK,GACT,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,MAAM;QAC/B,CAAC,CAAC,MAAM,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;~~QAC3E~~,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAEnB,OAAO;QACL,KAAK;QACL,KAAK;QACL,SAAS;QACT,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;QACtC,QAAQ;KACT,CAAC;AACJ,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,~~OAAgB~~,~~EAChB~~,OAAuB;IAEvB,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAEzF,MAAM,SAAS,GACb,YAAY,KAAK,SAAS;QACxB,CAAC,CAAC,kBAAkB,CAAC,eAAe;QACpC,CAAC,CAAC,kBAAkB,CAAC,eAAe,CAAC;IACzC,IAAI,CAAC,SAAS,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,KAAK,GAAG,8BAA8B,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxE,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACvC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC5B,kCAAkC,CAAC,WAAW,EAAE;QAC9C,KAAK;QACL,kBAAkB;QAClB,sBAAsB,EAAE,OAAO,CAAC,OAAO;KACxC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,~~eAAe~~,~~KAAK~~,SAAS,EAAE,CAAC;~~QAC1C~~,KAAK;aACF,SAAS,CAAC,~~YAAY~~,EAAE,GAAG,EAAE,~~oBAAoB~~,CAAC;~~aAClD~~,QAAQ,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,~~OAAO~~,CAAC,~~eAAe~~,EAAE,CAAC,CAAC;~~IACzE~~,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,IAAI,GAAU,MAAM,KAAK,CAAC;IAChC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;~~IAE5D~~,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,OAAgB,EAChB,EAAE,QAAQ,EAA+B;IAEzC,MAAM,KAAK,GAAG,8BAA8B,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxE,MAAM,GAAG,~~GAAG~~,~~CAAC,~~MAAM,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,~~CAAoB,~~CAAC;~~IAEzE~~,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAC5D,OAAO,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAwB,EACxB,EAAE,MAAM,KAA2B,EAAE;IAGrC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAGD,KAAK,CAAC,MAAM,CACV,YAAY,EACZ,cAAc,EACd,SAAS,EACT,QAAQ,EACR,eAAe,EACf,mBAAmB,EACnB,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CACrC,WAAwB,EACxB,EAAE,QAAQ,EAA+B;IAEzC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAC3B,OAAO,EAAE,CAAC,aAAa,CAAC;SACrB,SAAS,CAAC,cAAc,EAAE;QACzB,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAC/C,CAAC;SACD,SAAS,CAAC,iBAAiB,EAAE;QAC5B,UAAU,EAAE,UAAU;QACtB,YAAY,EAAE,YAAY;KAC3B,CAAC;SACD,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;SACpC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;SACnB,QAAQ,CAAC,oCAAoC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,IAAI,EAAE,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACtC,MAAM,EAAE,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;QACpC,QAAQ,EAAE,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1C,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;QAClC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;QAC/B,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;QAC7B,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE;QACnD,eAAe,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;QACnD,YAAY,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;KAC9C,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"doc-values.queries.js","sourceRoot":"","sources":["../../src/public-payload/doc-values.queries.ts"],"names":[],"mappings":"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"}

package/dist/public-payload/excerpt.queries.js CHANGED Viewed

@@ -1,12 +1,13 @@
 import { strValOrUndef } from "@paroi/data-formatters-lib";
 import { mainDbSchemaName } from "@paroicms/connector";
-import { isFTextFieldType } from "@paroicms/internal-anywhere-lib";
 import { dbAnyLanguage } from "../context.js";
 import { truncExcerptToWord } from "../helpers/excerpt.helpers.js";
 export async function loadExcerpt(siteContext, tracker, { nodelId, fieldTypes, maxLength, }) {
     const excerptFieldTypes = [];
     for (const field of fieldTypes ?? []) {
-        if (field.storedAs === "text" && isFTextFieldType(field) && field.useAsExcerpt !== undefined) {
+        if (field.storedAs === "text" &&
+            field.renderAs === "html" &&
+            field.useAsExcerpt !== undefined) {
             const useAsExcerpt = field.useAsExcerpt;
             excerptFieldTypes.push({
                 ...field,

package/dist/public-payload/excerpt.queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"excerpt.queries.js","sourceRoot":"","sources":["../../src/public-payload/excerpt.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;~~AACvD~~,OAAO,EAAE,~~gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,~~aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,EACE,OAAO,EACP,UAAU,EACV,SAAS,GAKV;IAED,MAAM,iBAAiB,GAIjB,EAAE,CAAC;IAET,KAAK,MAAM,KAAK,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACrC,~~IAAI~~,KAAK,CAAC,QAAQ,KAAK,MAAM,~~IAAI~~,~~gBAAgB,~~CAAC,KAAK,~~CAAC~~,~~IAAI,~~KAAK,CAAC,YAAY,KAAK,SAAS,~~EAAE~~,CAAC;~~YAC7F~~,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACxC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,GAAG,KAAK;gBACR,YAAY;aACb,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5F,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;QACtE,MAAM,GAAG,~~GAAG~~,MAAM,WAAW;~~aAC1B~~,EAAE,CAAC,kBAAkB,CAAC;aACtB,MAAM,CAAC,sBAAsB,CAAC;aAC9B,KAAK,CAAC;YACL,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,YAAY,EAAE,UAAU;SACzB,CAAC;aACD,KAAK,EAAE,CAAC;QAEX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,IAAI,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;~~QAC~~/C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"excerpt.queries.js","sourceRoot":"","sources":["../../src/public-payload/excerpt.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,OAAgB,EAChB,EACE,OAAO,EACP,UAAU,EACV,SAAS,GAKV;IAED,MAAM,iBAAiB,GAIjB,EAAE,CAAC;IAET,KAAK,MAAM,KAAK,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;QACrC,IACE,KAAK,CAAC,QAAQ,KAAK,MAAM;YACzB,KAAK,CAAC,QAAQ,KAAK,MAAM;YACzB,KAAK,CAAC,YAAY,KAAK,SAAS,EAChC,CAAC;YACD,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACxC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,GAAG,KAAK;gBACR,YAAY;aACb,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5F,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;QACtE,MAAM,GAAG,GAAoB,MAAM,WAAW;aAC3C,EAAE,CAAC,kBAAkB,CAAC;aACtB,MAAM,CAAC,sBAAsB,CAAC;aAC9B,KAAK,CAAC;YACL,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,YAAY,EAAE,UAAU;SACzB,CAAC;aACD,KAAK,EAAE,CAAC;QAEX,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,IAAI,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QAE/C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/public-payload/field-values.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
+import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
 import type { Image, Media } from "@paroicms/server-database-media-storage";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-import type { PublicMedia } from "./public-payload.types.js";
+import type { TpFieldValues, TpPublicMedia } from "./public-payload.types.js";
 export declare function getPublicSiteFieldValues(siteContext: SiteContext, renderingContext: RenderingContext, language: string, { deprecated }?: {
     deprecated?: boolean;
 }): any;
@@ -10,5 +10,5 @@ export declare function loadPublicFieldValues(siteContext: SiteContext, renderin
     typeName: string;
     nodelId: ParsedNodelId;
     fieldNames?: string[];
-}): Promise<any>;
-export declare function toPublicMedia(siteContext: SiteContext, media: Media | Image): PublicMedia;
+}): Promise<TpFieldValues>;
+export declare function toPublicMedia(siteContext: SiteContext, media: Media | Image): TpPublicMedia;