@paroicms/server 1.89.3 → 1.91.0

package/dist/rendered-site/liquidjs-filters/obfuscate.js

@@ -1,10 +1,9 @@
-import { strValOrUndef } from "@paroi/data-formatters-lib";
 import { generateObfuscatedHtml, obfuscateAsHtmlLink } from "@paroicms/public-server-lib";
 export function obfuscateLiquidFilter(value, { renderingContext, args }) {
-    const str = strValOrUndef(value);
+    const str = typeof value === "string" ? value : typeof value === "number" ? String(value) : undefined;
     if (!str)
         return;
-    const mode = strValOrUndef(args[0]);
+    const mode = typeof args[0] === "string" ? args[0] : undefined;
     if (mode === "asLink")
         return obfuscateAsHtmlLink(str);
     if (mode) {
@@ -14,7 +13,7 @@ export function obfuscateLiquidFilter(value, { renderingContext, args }) {
 }
 export function deprecatedObfuscateLiquidFilter(value, { renderingContext }) {
     renderingContext.siteContext.logger.warn(`The "obfuscateAsLink" filter is deprecated. Use {{ something | obfuscate: "asLink" }} instead.`);
-    const str = strValOrUndef(value);
+    const str = typeof value === "string" ? value : typeof value === "number" ? String(value) : undefined;
     if (str)
         return obfuscateAsHtmlLink(str);
 }

package/dist/rendered-site/liquidjs-filters/obfuscate.js.map

@@ -1 +1 @@
-{"version":3,"file":"obfuscate.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/obfuscate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAG1F,MAAM,UAAU,qBAAqB,CACnC,KAAc,EACd,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpC,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAEvD,IAAI,IAAI,EAAE,CAAC;QACT,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,2BAA2B,CAAC,CAAC;IAC7F,CAAC;IAED,OAAO,sBAAsB,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,KAAc,EACd,EAAE,gBAAgB,EAA0C;IAE5D,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CACtC,gGAAgG,CACjG,CAAC;IACF,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,GAAG;QAAE,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"obfuscate.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/obfuscate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAG1F,MAAM,UAAU,qBAAqB,CACnC,KAAc,EACd,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE/D,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAEvD,IAAI,IAAI,EAAE,CAAC;QACT,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,2BAA2B,CAAC,CAAC;IAC7F,CAAC;IAED,OAAO,sBAAsB,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,KAAc,EACd,EAAE,gBAAgB,EAA0C;IAE5D,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CACtC,gGAAgG,CACjG,CAAC;IACF,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,IAAI,GAAG;QAAE,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC"}

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

@@ -1,9 +1,10 @@
-import { strValOrUndef } from "@paroi/data-formatters-lib";
 import { getPluginAssetsUrl } from "@paroicms/connector";
+import { type } from "arktype";
 import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+const StringOrUndefinedOrNullAT = type("string|undefined|null");
 export async function pluginAssetUrlLiquidFilter(val, { renderingContext, args }) {
-    const relativeUrl = strValOrUndef(val) ?? "";
-    const pluginSlug = strValOrUndef(args[0]);
+    const relativeUrl = StringOrUndefinedOrNullAT.assert(val) ?? "";
+    const pluginSlug = StringOrUndefinedOrNullAT.assert(args[0]);
     if (!pluginSlug)
         return relativeUrl;
     const cacheKey = makeTagCacheKeyForRendering("pluginAssetUrl", {

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;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"}
+{"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,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAEL,2BAA2B,GAC5B,MAAM,8DAA8D,CAAC;AAEtE,MAAM,yBAAyB,GAAG,IAAI,CAAC,uBAAuB,CAAC,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,GAAY,EACZ,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,WAAW,GAAG,yBAAyB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAChE,MAAM,UAAU,GAAG,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,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.js

@@ -1,7 +1,8 @@
-import { strValOrUndef } from "@paroi/data-formatters-lib";
+import { type } from "arktype";
+const StringOrUndefinedOrNullAT = type("string|undefined|null");
 export function translateLiquidFilter(value, { renderingContext, args }) {
     const { siteContext } = renderingContext;
-    const str = strValOrUndef(value);
+    const str = StringOrUndefinedOrNullAT.assert(value);
     if (!str)
         return "";
     const formattedArgs = args.map(formatStringOrNumber);

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;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"}
+{"version":3,"file":"translate-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/translate-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/B,MAAM,yBAAyB,GAAG,IAAI,CAAC,uBAAuB,CAAC,CAAC;AAEhE,MAAM,UAAU,qBAAqB,CACnC,KAAc,EACd,EAAE,gBAAgB,EAAE,IAAI,EAA2D;IAEnF,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,GAAG,GAAG,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,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.js

@@ -1,10 +1,10 @@
-import { isNumeric, strValOrUndef } from "@paroi/data-formatters-lib";
-import { parseNodelId } from "@paroicms/public-anywhere-lib";
+import { isNumeric, omitProperty, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { type } from "arktype";
 import { makeCacheDependencyKey } from "../../common/text-cache.js";
 import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
 import { getDocItem } from "../../rendering-payload/doc-values.queries.js";
-import { createAssignToVarLiquidTagWrapper } from "./liquid-tag-wrapper.js";
+import { createAssignToVarLiquidTagWrapper, wrapLiquidTagPromise } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set(["id", "fields"]);
 export function createGetDocLiquidTag({ deprecated } = {}) {
     return createAssignToVarLiquidTagWrapper(function* (renderingContext, parameters, { variableName }) {
@@ -30,21 +30,26 @@ export function createGetDocLiquidTag({ deprecated } = {}) {
         const cacheVal = renderingContext.getValueFromCache(cacheKey);
         if (cacheVal.found)
             return cacheVal.val;
-        const val = yield loadDoc(renderingContext, documentId, options);
+        const val = yield wrapLiquidTagPromise(renderingContext, loadDoc(renderingContext, documentId, options), "getDoc");
         renderingContext.setValueIntoCache(cacheKey, val);
         return val;
     });
 }
+const GetDocValidationAT = type({
+    "id?": "string|number|undefined|null",
+    "fields?": "string|undefined|null",
+    "+": "reject",
+}).pipe((data) => ({
+    id: typeof data.id === "number" ? String(data.id) : (data.id ?? undefined),
+    fields: data.fields ?? undefined,
+}));
 function validateParameters(values, { logger }, { variableName }) {
     for (const name of Object.keys(values)) {
         if (!availableParameterNames.has(name) && name !== variableName) {
             logger.warn(`[getDoc] unknown parameter "${name}"`);
         }
     }
-    return {
-        id: strValOrUndef(values.id, { varName: "id" }),
-        fields: strValOrUndef(values.fields, { varName: "fields" }),
-    };
+    return GetDocValidationAT.assert(omitProperty(values, variableName));
 }
 async function loadDoc(renderingContext, documentId, options) {
     const { siteContext } = renderingContext;

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.js

@@ -1,13 +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 { isDef, omitProperty, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { type } from "arktype";
 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 { 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 { createAssignToVarLiquidTagWrapper } from "./liquid-tag-wrapper.js";
+import { createAssignToVarLiquidTagWrapper, wrapLiquidTagPromise } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set([
     "parentId",
     "orderBy",
@@ -35,7 +35,7 @@ export function createGetDocsLiquidTag({ deprecated } = {}) {
         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, {
+            const paginated = yield wrapLiquidTagPromise(renderingContext, loadPaginatedDocs(renderingContext, parentId, {
                 parentId: options.parentId,
                 orderBy: options.orderBy,
                 fields: options.fields,
@@ -43,7 +43,7 @@ export function createGetDocsLiquidTag({ deprecated } = {}) {
                 labeledByField: options.labeledByField,
                 pageSize: options.limit ?? 20,
                 pageIndex: 0,
-            });
+            }), "getDocs");
             val = {
                 list: paginated.items,
                 total: paginated.total,
@@ -66,14 +66,25 @@ export function createGetDocsLiquidTag({ deprecated } = {}) {
         return val;
     });
 }
+const GetDocsParametersAT = type({
+    "parentId?": "string|undefined",
+    "orderBy?": "string|undefined",
+    "fields?": "string|undefined",
+    "labeledById?": "string|undefined",
+    "labeledByField?": "string|undefined",
+    "limit?": "number|undefined",
+    "withTotal?": "boolean|undefined",
+    "+": "reject",
+});
 function validateParameters(values, { logger }, { variableName }) {
     for (const name of Object.keys(values)) {
         if (!availableParameterNames.has(name) && name !== variableName) {
             logger.warn(`[getDocs] unknown parameter "${name}"`);
         }
     }
-    let labeledById = strValOrUndef(values.labeledById, { varName: "labeledById" });
-    let labeledByField = strValOrUndef(values.labeledByField, { varName: "labeledByField" });
+    const validated = GetDocsParametersAT.assert(omitProperty(values, variableName));
+    let labeledById = validated.labeledById;
+    let labeledByField = validated.labeledByField;
     if (labeledById && !labeledByField) {
         logger.warn(`[getDocs] the 'labeledById' parameter requires the 'labeledByField' parameter to be set`);
         labeledById = undefined;
@@ -83,17 +94,16 @@ function validateParameters(values, { logger }, { variableName }) {
         labeledByField = undefined;
     }
     return {
-        parentId: strValOrUndef(values.parentId, { varName: "parentId" }),
-        orderBy: strValOrUndef(values.orderBy, { varName: "orderBy" }),
-        fields: strValOrUndef(values.fields, { varName: "fields" }),
+        parentId: validated.parentId,
+        orderBy: validated.orderBy,
+        fields: validated.fields,
         labeledById,
         labeledByField,
-        limit: nbValOrUndef(values.limit, { varName: "limit" }),
-        withTotal: boolValOrUndef(values.withTotal, { varName: "withTotal" }),
+        limit: validated.limit,
+        withTotal: validated.withTotal,
     };
 }
 async function loadDocs(renderingContext, parentId, options) {
-    const { siteContext } = renderingContext;
     const fieldNames = options.fields?.trim().split(/\s*,\s*/);
     const labeledByTermId = isDef(options.labeledById) ? toNodeId(options.labeledById) : undefined;
     const items = await getListOfDocValues(renderingContext, {

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.js

@@ -1,12 +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 { isDef, omitProperty, parseNodelId, } from "@paroicms/public-anywhere-lib";
+import { type } from "arktype";
 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 { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
 import { getPaginatedListOfDocValues, } from "../../rendering-payload/doc-values.queries.js";
-import { createAssignToVarLiquidTagWrapper } from "./liquid-tag-wrapper.js";
+import { createAssignToVarLiquidTagWrapper, wrapLiquidTagPromise } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set([
     "parentId",
     "orderBy",
@@ -28,19 +28,30 @@ export function createGetPaginatedDocsLiquidTag() {
         const cacheVal = renderingContext.getValueFromCache(cacheKey);
         if (cacheVal.found)
             return cacheVal.val;
-        const val = yield loadPaginatedDocs(renderingContext, parentId, options);
+        const val = yield wrapLiquidTagPromise(renderingContext, loadPaginatedDocs(renderingContext, parentId, options), "getPaginatedDocs");
         renderingContext.setValueIntoCache(cacheKey, val);
         return val;
     });
 }
+const GetPaginatedDocsParametersAT = type({
+    "parentId?": "string|undefined",
+    "orderBy?": "string|undefined",
+    "fields?": "string|undefined",
+    "labeledById?": "string|undefined",
+    "labeledByField?": "string|undefined",
+    "pageIndex?": "number|undefined",
+    pageSize: "number",
+    "+": "reject",
+});
 function validateParameters(values, { logger }, { variableName }) {
     for (const name of Object.keys(values)) {
         if (!availableParameterNames.has(name) && name !== variableName) {
             logger.warn(`[getPaginatedDocs] unknown parameter "${name}"`);
         }
     }
-    let labeledById = strValOrUndef(values.labeledById, { varName: "labeledById" });
-    let labeledByField = strValOrUndef(values.labeledByField, { varName: "labeledByField" });
+    const validated = GetPaginatedDocsParametersAT.assert(omitProperty(values, variableName));
+    let labeledById = validated.labeledById;
+    let labeledByField = validated.labeledByField;
     if (labeledById && !labeledByField) {
         logger.warn(`[getDocs] the 'labeledById' parameter requires the 'labeledByField' parameter to be set`);
         labeledById = undefined;
@@ -50,13 +61,13 @@ function validateParameters(values, { logger }, { variableName }) {
         labeledByField = undefined;
     }
     return {
-        parentId: strValOrUndef(values.parentId, { varName: "parentId" }),
-        orderBy: strValOrUndef(values.orderBy, { varName: "orderBy" }),
-        fields: strValOrUndef(values.fields, { varName: "fields" }),
+        parentId: validated.parentId,
+        orderBy: validated.orderBy,
+        fields: validated.fields,
         labeledById,
         labeledByField,
-        pageIndex: nbValOrUndef(values.pageIndex, { varName: "pageIndex" }),
-        pageSize: nbVal(values.pageSize, { varName: "pageSize" }),
+        pageIndex: validated.pageIndex,
+        pageSize: validated.pageSize,
     };
 }
 export async function loadPaginatedDocs(renderingContext, parentId, options) {

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/grouping-media-query.js

@@ -1,4 +1,4 @@
-import { messageOf } from "@paroi/data-formatters-lib";
+import { messageOf } from "@paroicms/public-anywhere-lib";
 import { applyPixelRatioToResizeRule, generateImageSlug } from "@paroicms/public-server-lib";
 import { galleryHandleOf, toTpImageVariant, toTpSourceMedia, } from "../../common/medias/to-media-values.js";
 import { handleSvgImageVariant } from "../../rendering-payload/make-image-available.js";

package/dist/rendered-site/liquidjs-tags/grouping-media-query.js.map

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

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

@@ -8,4 +8,5 @@ export type LiquidTagReturnsHtmlHandler = (renderingContext: RenderingContext, p
     [key: string]: unknown;
 }) => string | Promise<string>;
 export declare function createAssignToVarLiquidTagWrapper(tagHandler: LiquidTagReturnsVarHandler): any;
+export declare function wrapLiquidTagPromise(renderingContext: RenderingContext, promise: Promise<any>, tagName: string): Promise<any>;
 export declare function createInjectHtmlLiquidTagWrapper(tagHandler: LiquidTagReturnsHtmlHandler): any;

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

@@ -9,7 +9,7 @@ export function createAssignToVarLiquidTagWrapper(tagHandler) {
             this.#varName = this.tokenizer.readIdentifier().content;
             this.#args = new Hash(token.args);
         }
-        *render(ctx, emitter) {
+        *render(ctx, _emitter) {
             const renderingContext = extractRenderingContext(ctx);
             const parameters = (yield this.#args.render(ctx)) ?? {};
             const result = tagHandler(renderingContext, parameters, {
@@ -18,12 +18,21 @@ export function createAssignToVarLiquidTagWrapper(tagHandler) {
             const val = isIterable(result)
                 ? yield* result
                 : isPromiseLike(result)
-                    ? yield result
+                    ? yield wrapLiquidTagPromise(renderingContext, result, tagHandler.name)
                     : result;
             ctx.bottom()[this.#varName] = val;
         }
     };
 }
+export async function wrapLiquidTagPromise(renderingContext, promise, tagName) {
+    try {
+        return await promise;
+    }
+    catch (error) {
+        renderingContext.siteContext.logger.error(`Error in liquid tag "${tagName}"`, error);
+        throw error;
+    }
+}
 export function createInjectHtmlLiquidTagWrapper(tagHandler) {
     return class PaLiquidTag extends Tag {
         #args;

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

@@ -1 +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;AAajF,MAAM,UAAU,iCAAiC,CAAC,UAAsC;IACtF,OAAO,MAAM,WAAY,SAAQ,GAAG;QAElC,QAAQ,CAAS;QACjB,KAAK,CAAO;QAEZ,YAAY,KAAe,EAAE,YAA6B,EAAE,MAAc;YACxE,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC;YACxD,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,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAExD,MAAM,MAAM,GAAG,UAAU,CAAC,gBAAgB,EAAE,UAAU,EAAE;gBACtD,YAAY,EAAE,IAAI,CAAC,QAAQ;aAC5B,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC;gBAC5B,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM;gBACf,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;oBACrB,CAAC,CAAC,MAAM,MAAM;oBACd,CAAC,CAAC,MAAM,CAAC;YACZ,GAAG,CAAC,MAAM,EAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;QAC7C,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,UAAuC;IACtF,OAAO,MAAM,WAAY,SAAQ,GAAG;QAElC,KAAK,CAAO;QAEZ,YAAY,KAAe,EAAE,YAA6B,EAAE,MAAc;YACxE,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,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,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAExD,MAAM,MAAM,GAAG,UAAU,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;YAExD,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC;YAC/D,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrB,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"}
+{"version":3,"file":"liquid-tag-wrapper.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/liquid-tag-wrapper.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/liquidjs-tags/use-image-tag.js

@@ -1,10 +1,10 @@
-import { boolValOrUndef, nbValOrUndef, strValOrUndef } from "@paroi/data-formatters-lib";
-import { isResizeRule } from "@paroicms/public-anywhere-lib";
+import { isResizeRule, omitProperty } from "@paroicms/public-anywhere-lib";
+import { type } from "arktype";
 import { dependencyKeyOfMedia } from "../../common/text-cache.js";
 import { createLiquidDropFromPromise } from "../../liquidjs-tools/liquidjs-drop.js";
 import { makeTagCacheKeyForRendering } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { loadTpImageVariant } from "./grouping-media-query.js";
-import { createAssignToVarLiquidTagWrapper } from "./liquid-tag-wrapper.js";
+import { createAssignToVarLiquidTagWrapper, wrapLiquidTagPromise } from "./liquid-tag-wrapper.js";
 const availableParameterNames = new Set([
     "uid",
     "size",
@@ -26,12 +26,12 @@ export function createUseImageLiquidTag() {
         const cacheVal = renderingContext.getValueFromCache(cacheKey);
         if (cacheVal.found)
             return cacheVal.val;
-        const promise = loadTpImageVariant(renderingContext, {
+        const promise = wrapLiquidTagPromise(renderingContext, loadTpImageVariant(renderingContext, {
             ...options,
             image: imageParam,
             resizeRule,
             language: renderingContext.language,
-        });
+        }), "useImage");
         const val = createLiquidDropFromPromise({
             renderingCacheKey: cacheKey,
             renderingContext,
@@ -42,6 +42,16 @@ export function createUseImageLiquidTag() {
         return val;
     });
 }
+const UseImageParametersAT = type({
+    "resize?": "string|undefined",
+    "size?": "string|undefined",
+    "image?": "string|object|undefined",
+    "uid?": "string|undefined",
+    "autoCrop?": "boolean|undefined",
+    "pixelRatio?": "number|undefined",
+    "mediaType?": "string|undefined",
+    "+": "reject",
+});
 function validateParameters(siteContext, values, { variableName }) {
     const { logger } = siteContext;
     for (const name of Object.keys(values)) {
@@ -49,15 +59,16 @@ function validateParameters(siteContext, values, { variableName }) {
             logger.warn(`[useImage] unknown parameter "${name}"`);
         }
     }
+    const validated = UseImageParametersAT.assert(omitProperty(values, variableName));
     let resize;
-    const resizeVal = strValOrUndef(values.resize);
+    const resizeVal = validated.resize;
     if (resizeVal) {
         if (!isResizeRule(resizeVal))
             throw new Error(`[useImage] invalid parameter resize: "${resize}"`);
         resize = resizeVal;
     }
     else {
-        const size = strValOrUndef(values.size);
+        const size = validated.size;
         if (!size)
             throw new Error(`[useImage] missing parameter "resize"`);
         if (!isResizeRule(size))
@@ -65,18 +76,18 @@ function validateParameters(siteContext, values, { variableName }) {
         logger.warn(`[useImage] parameter "size" is deprecated. Please use "resize" instead`);
         resize = size;
     }
-    const uid = strValOrUndef(values.uid);
+    const uid = validated.uid;
     if (uid !== undefined) {
         logger.warn(`[useImage] deprecated parameter "uid". Please use "image" instead.`);
     }
-    const image = typeof values.image === "string"
-        ? values.image
+    const image = typeof validated.image === "string"
+        ? validated.image
         : toTpSourceImageOrUndefParameter(siteContext, values.image, {
             warnPrefix: `[useImage] parameter "image"`,
         });
-    const autoCrop = boolValOrUndef(values.autoCrop);
-    const pixelRatio = nbValOrUndef(values.pixelRatio);
-    let mediaType = strValOrUndef(values.mediaType);
+    const autoCrop = validated.autoCrop;
+    const pixelRatio = validated.pixelRatio;
+    let mediaType = validated.mediaType;
     if (mediaType && !mediaType.startsWith("image/")) {
         logger.warn(`[useImage] parameter "mediaType" should starts with "image/", got "${mediaType}"`);
         mediaType = undefined;

package/dist/rendered-site/liquidjs-tags/use-image-tag.js.map

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

package/dist/rendered-site/page-route/make-url.d.ts

@@ -1,4 +1,4 @@
-import type { Tracker } from "@paroicms/internal-server-lib";
+import { type Tracker } from "@paroicms/internal-server-lib";
 import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<string>;

package/dist/rendered-site/page-route/make-url.js

@@ -1,8 +1,13 @@
-import { dateVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
 import { mainDbSchemaName } from "@paroicms/connector";
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
-import { getNodeDepth } from "../../bo-backend/node/node.queries.js";
+import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
+import { type } from "arktype";
+import { getNodeDepth } from "../../admin-backend/node/node.queries.js";
 import { makeCacheDependencyKey, makeCacheKey } from "../../common/text-cache.js";
+const NumberAT = type("number");
+const StringAT = type("string");
+const StringOrNullAT = type("string|null");
+const StringOrNumberOrDateAT = type("string|number|Date");
 export async function getUrlOfDocument(siteContext, tracker, documentId, options = {}) {
     const cacheKey = makeCacheKey(siteContext.logger, { kind: "url", documentId });
     const cacheValue = await siteContext.textCache.getCacheValue(cacheKey, tracker);
@@ -97,11 +102,11 @@ function formatUrlData(row, depth) {
     const parts = new Map();
     for (let cur = 1; cur <= depth; ++cur) {
         parts.set(cur, {
-            nodeId: strVal(row[`id${cur}`]),
-            typeName: strVal(row[`typeName${cur}`]),
-            relativeId: strVal(row[`relativeId${cur}`]),
-            slug: strValOrUndef(row[`slug${cur}`]),
-            publishDate: dateVal(row[`publishDate${cur}`]),
+            nodeId: String(NumberAT.assert(row[`id${cur}`])),
+            typeName: StringAT.assert(row[`typeName${cur}`]),
+            relativeId: StringAT.assert(row[`relativeId${cur}`]),
+            slug: StringOrNullAT.assert(row[`slug${cur}`]) ?? undefined,
+            publishDate: parseSqliteDateTime(StringOrNumberOrDateAT.assert(row[`publishDate${cur}`])),
         });
     }
     return { depth, parts };