@paroicms/server 1.88.3 → 1.89.0

package/dist/rendered-site/liquidjs-filters/open-graph-filter.js

@@ -1,10 +1,8 @@
 import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
 import { escapeHtml } from "@paroicms/public-server-lib";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
-export function injectOpenGraphTagsLiquidJsFilter(values, { ctx }) {
+export function injectOpenGraphTagsLiquidFilter(values, { renderingContext }) {
     if (typeof values !== "object")
         return "";
-    const renderingContext = extractRenderingContext(ctx);
     return generateOpenGraphTags(renderingContext, values);
 }
 export async function generateOpenGraphTags(renderingContext, { description, title, image, url, type, siteName, locale }) {

package/dist/rendered-site/liquidjs-filters/open-graph-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-graph-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/open-graph-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAGjF,MAAM,UAAU,iCAAiC,CAAC,MAAe,EAAE,EAAE,GAAG,EAAoB;IAC1F,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IAC1C,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IACtD,OAAO,qBAAqB,CAAC,gBAAgB,EAAE,MAA6B,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,gBAAkC,EAClC,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAuB;IAE/E,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IAEzC,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,IAAI,GAAG;QAAE,IAAI,CAAC,IAAI,CAAC,oCAAoC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5E,IAAI,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,uCAAuC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrF,IAAI,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,0CAA0C,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5F,IAAI,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,sCAAsC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,qCAAqC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CACP,sCAAsC,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAC3F,4CAA4C,KAAK,CAAC,QAAQ,IAAI,EAC9D,6CAA6C,KAAK,CAAC,SAAS,IAAI,EAChE,2CAA2C,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAC3E,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,4CAA4C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACzD,CAAC"}
+{"version":3,"file":"open-graph-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/open-graph-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAIzD,MAAM,UAAU,+BAA+B,CAC7C,MAAe,EACf,EAAE,gBAAgB,EAA0C;IAE5D,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IAC1C,OAAO,qBAAqB,CAAC,gBAAgB,EAAE,MAA6B,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,gBAAkC,EAClC,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAuB;IAE/E,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IAEzC,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,IAAI,GAAG;QAAE,IAAI,CAAC,IAAI,CAAC,oCAAoC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5E,IAAI,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,uCAAuC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrF,IAAI,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,0CAA0C,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5F,IAAI,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,sCAAsC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,qCAAqC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CACP,sCAAsC,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAC3F,4CAA4C,KAAK,CAAC,QAAQ,IAAI,EAC9D,6CAA6C,KAAK,CAAC,SAAS,IAAI,EAChE,2CAA2C,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAC3E,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,4CAA4C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAED,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACzD,CAAC"}

package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.d.ts

@@ -1,7 +1,5 @@
-import type { Context } from "liquidjs";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function pluginAssetUrlLiquidJsFilter(val: unknown, { ctx, siteContext, args }: {
-    ctx: Context;
-    siteContext: SiteContext;
+import { type RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+export declare function pluginAssetUrlLiquidFilter(val: unknown, { renderingContext, args }: {
+    renderingContext: RenderingContext;
     args: unknown[];
 }): Promise<string>;

package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js

@@ -1,8 +1,7 @@
 import { strValOrUndef } from "@paroi/data-formatters-lib";
 import { getPluginAssetsUrl } from "@paroicms/connector";
-import { makeTagCacheKeyForRendering } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
-export async function pluginAssetUrlLiquidJsFilter(val, { ctx, siteContext, args }) {
+import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+export async function pluginAssetUrlLiquidFilter(val, { renderingContext, args }) {
     const relativeUrl = strValOrUndef(val) ?? "";
     const pluginSlug = strValOrUndef(args[0]);
     if (!pluginSlug)
@@ -10,11 +9,10 @@ export async function pluginAssetUrlLiquidJsFilter(val, { ctx, siteContext, args
     const cacheKey = makeTagCacheKeyForRendering("pluginAssetUrl", {
         tagParameters: pluginSlug,
     });
-    const renderingContext = extractRenderingContext(ctx);
     const cacheVal = renderingContext.getValueFromCache(cacheKey);
     if (cacheVal.found)
         return cacheVal.val;
-    const plugin = siteContext.pluginsBySlug.get(pluginSlug);
+    const plugin = renderingContext.siteContext.pluginsBySlug.get(pluginSlug);
     const result = plugin ? `${getPluginAssetsUrl(plugin)}${relativeUrl}` : relativeUrl;
     renderingContext.setValueIntoCache(cacheKey, result);
     return result;

package/dist/rendered-site/liquidjs-filters/plugin-asset-url-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-asset-url-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/plugin-asset-url-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAC3G,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAGjF,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,GAAY,EACZ,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAA+D;IAEvF,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,IAAI,CAAC,UAAU;QAAE,OAAO,WAAW,CAAC;IAEpC,MAAM,QAAQ,GAAG,2BAA2B,CAAC,gBAAgB,EAAE;QAC7D,aAAa,EAAE,UAAU;KAC1B,CAAC,CAAC;IACH,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,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAEpF,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"plugin-asset-url-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/plugin-asset-url-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAEL,2BAA2B,GAC5B,MAAM,8DAA8D,CAAC;AAEtE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,GAAY,EACZ,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,IAAI,CAAC,UAAU;QAAE,OAAO,WAAW,CAAC;IAEpC,MAAM,QAAQ,GAAG,2BAA2B,CAAC,gBAAgB,EAAE;QAC7D,aAAa,EAAE,UAAU;KAC1B,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC,GAAG,CAAC;IAExC,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAEpF,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/rendered-site/liquidjs-filters/translate-filter.d.ts

@@ -1,7 +1,5 @@
-import type { Context } from "liquidjs";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function translateLiquidJsFilter(value: unknown, { ctx, siteContext, args }: {
-    ctx: Context;
-    siteContext: SiteContext;
+import type { RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+export declare function translateLiquidFilter(value: unknown, { renderingContext, args }: {
+    renderingContext: RenderingContext;
     args: unknown[];
 }): string;

package/dist/rendered-site/liquidjs-filters/translate-filter.js

@@ -1,13 +1,15 @@
 import { strValOrUndef } from "@paroi/data-formatters-lib";
-import { getLiquidJsDocValues } from "../../liquidjs-tools/liquidjs-utils.js";
-export function translateLiquidJsFilter(value, { ctx, siteContext, args }) {
+export function translateLiquidFilter(value, { renderingContext, args }) {
+    const { siteContext } = renderingContext;
     const str = strValOrUndef(value);
     if (!str)
         return "";
     const formattedArgs = args.map(formatStringOrNumber);
-    const doc = getLiquidJsDocValues(ctx);
-    const language = strValOrUndef(doc?.language) ?? siteContext.siteSchema.defaultLanguage;
-    return siteContext.themeTranslator.translate({ language, key: str, args: formattedArgs });
+    return siteContext.themeTranslator.translate({
+        language: renderingContext.language,
+        key: str,
+        args: formattedArgs,
+    });
 }
 function formatStringOrNumber(value) {
     if (typeof value === "number")

package/dist/rendered-site/liquidjs-filters/translate-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"translate-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/translate-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAG9E,MAAM,UAAU,uBAAuB,CACrC,KAAc,EACd,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAA+D;IAEvF,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACrD,MAAM,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IACxF,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,KAAK,GAAG,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"translate-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/translate-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,MAAM,UAAU,qBAAqB,CACnC,KAAc,EACd,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACrD,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC;QAC3C,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;QACnC,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,aAAa;KACpB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,KAAK,GAAG,CAAC,CAAC;AAC9D,CAAC"}

package/dist/rendered-site/liquidjs-tags/get-doc-tag.d.ts

@@ -1,15 +1,3 @@
-import { type Context, Hash, type Liquid, type TagToken, type TopLevelToken } from "liquidjs";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function createGetDocLiquidJsTag(siteContext: SiteContext, { deprecated }?: {
+export declare function createGetDocLiquidTag({ deprecated }?: {
     deprecated?: boolean;
-}): {
-    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
-        tokenizer: any;
-        "__#3@#varName": string;
-        "__#3@#args": Hash;
-        render(ctx: Context): Generator<unknown, void, any>;
-        name: string;
-        liquid: Liquid;
-        token: TagToken;
-    };
-};
+}): any;

package/dist/rendered-site/liquidjs-tags/get-doc-tag.js

@@ -1,57 +1,43 @@
 import { isNumeric, strValOrUndef } from "@paroi/data-formatters-lib";
 import { parseNodelId } from "@paroicms/public-anywhere-lib";
-import { Hash, Tag } from "liquidjs";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
 import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
 import { getDocItem } from "../../rendering-payload/doc-values.queries.js";
+import { createLiquidTagWrapper } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set(["id", "fields"]);
-export function createGetDocLiquidJsTag(siteContext, { deprecated } = {}) {
-    return class GetDocTag extends Tag {
-        #varName;
-        #args;
-        constructor(token, remainTokens, liquid) {
-            super(token, remainTokens, liquid);
-            this.#varName = this.tokenizer.readIdentifier().content;
-            this.#args = new Hash(token.args);
+export function createGetDocLiquidTag({ deprecated } = {}) {
+    return createLiquidTagWrapper("assignToVar", function* (renderingContext, parameters) {
+        const { siteContext } = renderingContext;
+        if (deprecated) {
+            siteContext.logger.warn("'getPage' is deprecated, use 'getDoc' instead.");
         }
-        *render(ctx) {
-            if (deprecated) {
-                siteContext.logger.warn("'getPage' is deprecated, use 'getDoc' instead.");
-            }
-            const options = validateParameters(yield this.#args.render(ctx), this.#varName, siteContext);
-            if (options.id === undefined)
-                return;
-            const cacheKey = makeTagCacheKeyForRendering("getDoc", { tagParameters: options });
-            const renderingContext = extractRenderingContext(ctx);
-            let documentId;
-            if (isNumeric(options.id)) {
-                const doc = ctx.getSync(["doc"]);
-                const language = strValOrUndef(doc?.language) ?? "en";
-                documentId = {
-                    language,
-                    nodeId: options.id,
-                };
-            }
-            else {
-                documentId = parseNodelId(options.id);
-            }
-            renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
-            const cacheVal = renderingContext.getValueFromCache(cacheKey);
-            if (cacheVal.found) {
-                ctx.bottom()[this.#varName] = cacheVal.val;
-                return;
-            }
-            const val = yield loadDoc(renderingContext, documentId, options);
-            renderingContext.setValueIntoCache(cacheKey, val);
-            ctx.bottom()[this.#varName] = val;
+        const options = validateParameters(parameters, siteContext);
+        if (options.id === undefined)
+            return;
+        const cacheKey = makeTagCacheKeyForRendering("getDoc", { tagParameters: options });
+        let documentId;
+        if (isNumeric(options.id)) {
+            documentId = {
+                language: renderingContext.language,
+                nodeId: options.id,
+            };
         }
-    };
+        else {
+            documentId = parseNodelId(options.id);
+        }
+        renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
+        const cacheVal = renderingContext.getValueFromCache(cacheKey);
+        if (cacheVal.found)
+            return cacheVal.val;
+        const val = yield loadDoc(renderingContext, documentId, options);
+        renderingContext.setValueIntoCache(cacheKey, val);
+        return val;
+    });
 }
-function validateParameters(values, varName, { logger }) {
+function validateParameters(values, { logger }) {
     for (const name of Object.keys(values)) {
-        if (!availableParameterNames.has(name) && name !== varName) {
+        if (!availableParameterNames.has(name)) {
             logger.warn(`[getDoc] unknown parameter "${name}"`);
         }
     }

package/dist/rendered-site/liquidjs-tags/get-doc-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-doc-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/get-doc-tag.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-doc-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/get-doc-tag.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-tags/get-docs-tag.d.ts

@@ -1,15 +1,3 @@
-import { type Context, Hash, type Liquid, type TagToken, type TopLevelToken } from "liquidjs";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function createGetDocsLiquidJsTag(siteContext: SiteContext, { deprecated }?: {
+export declare function createGetDocsLiquidTag({ deprecated }?: {
     deprecated?: boolean;
-}): {
-    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
-        tokenizer: any;
-        "__#5@#varName": string;
-        "__#5@#args": Hash;
-        render(ctx: Context): Generator<unknown, void, any>;
-        name: string;
-        liquid: Liquid;
-        token: TagToken;
-    };
-};
+}): any;

package/dist/rendered-site/liquidjs-tags/get-docs-tag.js

@@ -1,14 +1,13 @@
 import { boolValOrUndef, isDef, nbValOrUndef, strValOrUndef } from "@paroi/data-formatters-lib";
 import { parseSorting } from "@paroicms/connector";
 import { parseNodelId } from "@paroicms/public-anywhere-lib";
-import { Hash, Tag } from "liquidjs";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { toNodeId } from "../../helpers/utils-helper.js";
 import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
 import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
 import { getListOfDocValues, } from "../../rendering-payload/doc-values.queries.js";
 import { loadPaginatedDocs } from "./get-paginated-docs-tag.js";
+import { createLiquidTagWrapper } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set([
     "parentId",
     "orderBy",
@@ -18,69 +17,58 @@ const availableParameterNames = new Set([
     "labeledByField",
     "withTotal",
 ]);
-export function createGetDocsLiquidJsTag(siteContext, { deprecated } = {}) {
-    return class GetDocsTag extends Tag {
-        #varName;
-        #args;
-        constructor(token, remainTokens, liquid) {
-            super(token, remainTokens, liquid);
-            this.#varName = this.tokenizer.readIdentifier().content;
-            this.#args = new Hash(token.args);
+export function createGetDocsLiquidTag({ deprecated } = {}) {
+    return createLiquidTagWrapper("assignToVar", function* (renderingContext, parameters) {
+        const { siteContext } = renderingContext;
+        if (deprecated) {
+            siteContext.logger.warn("'getPages' is deprecated, use 'getDocs' instead.");
         }
-        *render(ctx) {
-            if (deprecated) {
-                siteContext.logger.warn("'getPages' is deprecated, use 'getDocs' instead.");
-            }
-            const options = validateParameters(yield this.#args.render(ctx), this.#varName, siteContext);
-            if (options.parentId === undefined)
-                return;
-            const parentId = parseNodelId(options.parentId);
-            const cacheKey = makeTagCacheKeyForRendering("getDocs", { tagParameters: options });
-            const renderingContext = extractRenderingContext(ctx);
-            renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
-            const cacheVal = renderingContext.getValueFromCache(cacheKey);
-            if (cacheVal.found) {
-                ctx.bottom()[this.#varName] = cacheVal.val;
-                return;
-            }
-            let val;
-            if (options.withTotal !== undefined) {
-                siteContext.logger.warn(`The 'withTotal' parameter is deprecated. Use the 'getPaginatedDocs' tag instead.`);
-                const paginated = yield loadPaginatedDocs(renderingContext, parentId, {
-                    parentId: options.parentId,
-                    orderBy: options.orderBy,
-                    fields: options.fields,
-                    labeledById: options.labeledById,
-                    labeledByField: options.labeledByField,
-                    pageSize: options.limit ?? 20,
-                    pageIndex: 0,
-                });
-                val = {
-                    list: paginated.items,
-                    total: paginated.total,
-                };
-            }
-            else {
-                const list = yield loadDocs(renderingContext, parentId, options);
-                val = [...list];
-                Object.defineProperty(val, "list", {
-                    get: () => {
-                        siteContext.logger.warn(`On 'getDocs' tag, the 'list' property is deprecated, use the result as a list directly.`);
-                        return list;
-                    },
-                });
-            }
-            if (val.length === 0) {
-                val = undefined;
-            }
-            renderingContext.setValueIntoCache(cacheKey, val);
-            ctx.bottom()[this.#varName] = val;
+        const options = validateParameters(parameters, siteContext);
+        if (options.parentId === undefined)
+            return;
+        const parentId = parseNodelId(options.parentId);
+        const cacheKey = makeTagCacheKeyForRendering("getDocs", { tagParameters: options });
+        renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
+        const cacheVal = renderingContext.getValueFromCache(cacheKey);
+        if (cacheVal.found)
+            return cacheVal.val;
+        let val;
+        if (options.withTotal !== undefined) {
+            siteContext.logger.warn(`The 'withTotal' parameter is deprecated. Use the 'getPaginatedDocs' tag instead.`);
+            const paginated = yield loadPaginatedDocs(renderingContext, parentId, {
+                parentId: options.parentId,
+                orderBy: options.orderBy,
+                fields: options.fields,
+                labeledById: options.labeledById,
+                labeledByField: options.labeledByField,
+                pageSize: options.limit ?? 20,
+                pageIndex: 0,
+            });
+            val = {
+                list: paginated.items,
+                total: paginated.total,
+            };
         }
-    };
+        else {
+            const list = yield loadDocs(renderingContext, parentId, options);
+            val = [...list];
+            Object.defineProperty(val, "list", {
+                get: () => {
+                    siteContext.logger.warn(`On 'getDocs' tag, the 'list' property is deprecated, use the result as a list directly.`);
+                    return list;
+                },
+            });
+        }
+        if (val.length === 0) {
+            val = undefined;
+        }
+        renderingContext.setValueIntoCache(cacheKey, val);
+        return val;
+    });
 }
-function validateParameters(values, varName, { logger }) {
+function validateParameters(values, { logger }) {
     for (const name of Object.keys(values)) {
-        if (!availableParameterNames.has(name) && name !== varName) {
+        if (!availableParameterNames.has(name)) {
             logger.warn(`[getDocs] unknown parameter "${name}"`);
         }
     }

package/dist/rendered-site/liquidjs-tags/get-docs-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/get-docs-tag.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/get-docs-tag.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.d.ts

@@ -1,21 +1,9 @@
 import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
-import { type Context, Hash, type Liquid, type TagToken, type TopLevelToken } from "liquidjs";
 import type { DropInst } from "../../liquidjs-tools/liquidjs-drop.js";
 import { type RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { type PaginatedResult } from "../../rendering-payload/doc-values.queries.js";
 import type { TpDocPayload } from "../../rendering-payload/rendering-payload.types.js";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export declare function createGetPaginatedDocsLiquidJsTag(siteContext: SiteContext): {
-    new (token: TagToken, remainTokens: TopLevelToken[], liquid: Liquid): {
-        tokenizer: any;
-        "__#4@#varName": string;
-        "__#4@#args": Hash;
-        render(ctx: Context): Generator<unknown, void, any>;
-        name: string;
-        liquid: Liquid;
-        token: TagToken;
-    };
-};
+export declare function createGetPaginatedDocsLiquidTag(): any;
 interface GetPaginatedDocsRawParameters {
     parentId?: string;
     orderBy?: string;

package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js

@@ -1,13 +1,12 @@
 import { isDef, nbVal, nbValOrUndef, strValOrUndef } from "@paroi/data-formatters-lib";
 import { parseSorting } from "@paroicms/connector";
 import { parseNodelId } from "@paroicms/public-anywhere-lib";
-import { Hash, Tag } from "liquidjs";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { toNodeId } from "../../helpers/utils-helper.js";
 import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
 import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
 import { getPaginatedListOfDocValues, } from "../../rendering-payload/doc-values.queries.js";
+import { createLiquidTagWrapper } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set([
     "parentId",
     "orderBy",
@@ -17,37 +16,26 @@ const availableParameterNames = new Set([
     "pageIndex",
     "pageSize",
 ]);
-export function createGetPaginatedDocsLiquidJsTag(siteContext) {
-    return class GetPaginatedDocsTag extends Tag {
-        #varName;
-        #args;
-        constructor(token, remainTokens, liquid) {
-            super(token, remainTokens, liquid);
-            this.#varName = this.tokenizer.readIdentifier().content;
-            this.#args = new Hash(token.args);
-        }
-        *render(ctx) {
-            const options = validateParameters(yield this.#args.render(ctx), this.#varName, siteContext);
-            if (options.parentId === undefined)
-                return;
-            const parentId = parseNodelId(options.parentId);
-            const cacheKey = makeTagCacheKeyForRendering("getPaginatedDocs", { tagParameters: options });
-            const renderingContext = extractRenderingContext(ctx);
-            renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
-            const cacheVal = renderingContext.getValueFromCache(cacheKey);
-            if (cacheVal.found) {
-                ctx.bottom()[this.#varName] = cacheVal.val;
-                return;
-            }
-            const val = yield loadPaginatedDocs(renderingContext, parentId, options);
-            renderingContext.setValueIntoCache(cacheKey, val);
-            ctx.bottom()[this.#varName] = val;
-        }
-    };
+export function createGetPaginatedDocsLiquidTag() {
+    return createLiquidTagWrapper("assignToVar", function* (renderingContext, parameters) {
+        const { siteContext } = renderingContext;
+        const options = validateParameters(parameters, siteContext);
+        if (options.parentId === undefined)
+            return;
+        const parentId = parseNodelId(options.parentId);
+        const cacheKey = makeTagCacheKeyForRendering("getPaginatedDocs", { tagParameters: options });
+        renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId: parentId, relation: "children" }));
+        const cacheVal = renderingContext.getValueFromCache(cacheKey);
+        if (cacheVal.found)
+            return cacheVal.val;
+        const val = yield loadPaginatedDocs(renderingContext, parentId, options);
+        renderingContext.setValueIntoCache(cacheKey, val);
+        return val;
+    });
 }
-function validateParameters(values, varName, { logger }) {
+function validateParameters(values, { logger }) {
     for (const name of Object.keys(values)) {
-        if (!availableParameterNames.has(name) && name !== varName) {
+        if (!availableParameterNames.has(name)) {
             logger.warn(`[getPaginatedDocs] unknown parameter "${name}"`);
         }
     }

package/dist/rendered-site/liquidjs-tags/get-paginated-docs-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-paginated-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/get-paginated-docs-tag.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-paginated-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/get-paginated-docs-tag.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.d.ts

@@ -0,0 +1,9 @@
+import type { RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+export type LiquidTagReturnsVarHandler = (renderingContext: RenderingContext, parameters: {
+    [key: string]: unknown;
+}) => Generator;
+export type LiquidTagReturnsHtmlHandler = (renderingContext: RenderingContext, parameters: {
+    [key: string]: unknown;
+}) => string | Promise<string>;
+export declare function createLiquidTagWrapper(tagKind: "assignToVar", tagHandler: LiquidTagReturnsVarHandler): any;
+export declare function createLiquidTagWrapper(tagKind: "injectHtml", tagHandler: LiquidTagReturnsHtmlHandler): any;

package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.js

@@ -0,0 +1,41 @@
+import { Hash, Tag, } from "liquidjs";
+import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
+export function createLiquidTagWrapper(tagKind, tagHandler) {
+    return class PaLiquidTag extends Tag {
+        #varName;
+        #args;
+        constructor(token, remainTokens, liquid) {
+            super(token, remainTokens, liquid);
+            this.#varName =
+                tagKind === "assignToVar" ? this.tokenizer.readIdentifier().content : undefined;
+            this.#args = new Hash(token.args);
+        }
+        *render(ctx, emitter) {
+            const renderingContext = extractRenderingContext(ctx);
+            const rawParameters = (yield this.#args.render(ctx)) ?? {};
+            const parameters = this.#varName
+                ? Object.fromEntries(Object.entries(rawParameters).filter(([key]) => key !== this.#varName))
+                : rawParameters;
+            const result = tagHandler(renderingContext, parameters);
+            if (this.#varName) {
+                const val = isIterable(result)
+                    ? yield* result
+                    : isPromiseLike(result)
+                        ? yield result
+                        : result;
+                ctx.bottom()[this.#varName] = val;
+            }
+            else if (tagKind === "injectHtml") {
+                const val = typeof result === "string" ? result : yield result;
+                emitter.write(val);
+            }
+        }
+    };
+}
+function isIterable(value) {
+    return value && typeof value[Symbol.iterator] === "function";
+}
+function isPromiseLike(value) {
+    return value && typeof value.then === "function";
+}
+//# sourceMappingURL=liquid-tag-wrapper.js.map

package/dist/rendered-site/liquidjs-tags/liquid-tag-wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"liquid-tag-wrapper.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/liquid-tag-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EAEJ,GAAG,GAGJ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAoBjF,MAAM,UAAU,sBAAsB,CACpC,OAAqC,EACrC,UAAoE;IAEpE,OAAO,MAAM,WAAY,SAAQ,GAAG;QAElC,QAAQ,CAAqB;QAC7B,KAAK,CAAO;QAEZ,YAAY,KAAe,EAAE,YAA6B,EAAE,MAAc;YACxE,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ;gBACX,OAAO,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAClF,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QAED,CAAC,MAAM,CAAC,GAAY,EAAE,OAAgB;YACpC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;YAEtD,MAAM,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ;gBAC9B,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5F,CAAC,CAAC,aAAa,CAAC;YAElB,MAAM,MAAM,GAAG,UAAU,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;YAExD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAElB,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC;oBAC5B,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM;oBACf,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;wBACrB,CAAC,CAAC,MAAM,MAAM;wBACd,CAAC,CAAC,MAAM,CAAC;gBACZ,GAAG,CAAC,MAAM,EAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;YAC7C,CAAC;iBAAM,IAAI,OAAO,KAAK,YAAY,EAAE,CAAC;gBACpC,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC;gBAC/D,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,KAAU;IAC5B,OAAO,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,UAAU,CAAC;AAC/D,CAAC;AAED,SAAS,aAAa,CAAC,KAAU;IAC/B,OAAO,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC;AACnD,CAAC"}