@paroicms/server 1.104.5 → 1.105.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.
- package/dist/admin-backend/document/load-documents.queries.js +19 -19
- package/dist/admin-backend/document/save-documents.queries.js +11 -11
- package/dist/admin-backend/fields/load-fields-of.queries.js +6 -6
- package/dist/admin-backend/lnode/lnode-wrap.formatters.d.ts +3 -3
- package/dist/admin-backend/lnode/lnode-wrap.formatters.js.map +1 -1
- package/dist/admin-backend/lnode/lnode-wrap.resolver.js +11 -13
- package/dist/admin-backend/lnode/lnode-wrap.resolver.js.map +1 -1
- package/dist/admin-backend/lnode/lnode.queries.d.ts +8 -11
- package/dist/admin-backend/lnode/lnode.queries.js +34 -25
- package/dist/admin-backend/lnode/lnode.queries.js.map +1 -1
- package/dist/admin-backend/node/node.queries.js +14 -14
- package/dist/admin-backend/node/ordered-node.queries.js +6 -6
- package/dist/admin-backend/part/part-node.queries.js +9 -9
- package/dist/admin-backend/part/part.queries.js +34 -34
- package/dist/common/child-ordering-query.d.ts +2 -2
- package/dist/common/child-ordering-query.js +19 -18
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/connector/plugin-loader/init-plugins.js +5 -2
- package/dist/connector/plugin-loader/init-plugins.js.map +1 -1
- package/dist/connector/plugin-loader/plugin-loader.js +2 -1
- package/dist/connector/plugin-loader/plugin-loader.js.map +1 -1
- package/dist/connector/plugin-loader/plugin-types.d.ts +10 -11
- package/dist/connector/site-schema/site-schema-factory.js +1 -2
- package/dist/connector/site-schema/site-schema-factory.js.map +1 -1
- package/dist/helpers/utils-helper.d.ts +0 -1
- package/dist/helpers/utils-helper.js +0 -4
- package/dist/helpers/utils-helper.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-drop.d.ts +4 -0
- package/dist/liquidjs-tools/liquidjs-drop.js +4 -1
- package/dist/liquidjs-tools/liquidjs-drop.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.js +11 -2
- package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.js.map +1 -1
- package/dist/liquidjs-tools/render-clone/forloop-drop.js.map +1 -1
- package/dist/liquidjs-tools/render-clone/render.d.ts +7 -3
- package/dist/liquidjs-tools/render-clone/render.js +82 -12
- package/dist/liquidjs-tools/render-clone/render.js.map +1 -1
- package/dist/plugin-services/make-backend-plugin-service.js +41 -5
- package/dist/plugin-services/make-backend-plugin-service.js.map +1 -1
- package/dist/rendered-site/feed/feed-generator.js +14 -14
- package/dist/rendered-site/helpers/liquid-function-call-args.d.ts +17 -0
- package/dist/rendered-site/helpers/liquid-function-call-args.js +88 -0
- package/dist/rendered-site/helpers/liquid-function-call-args.js.map +1 -0
- package/dist/rendered-site/helpers/liquid-tag-helpers.d.ts +4 -6
- package/dist/rendered-site/helpers/liquid-tag-helpers.js +14 -23
- package/dist/rendered-site/helpers/liquid-tag-helpers.js.map +1 -1
- package/dist/rendered-site/helpers/out-liquid-tag.d.ts +11 -0
- package/dist/rendered-site/helpers/out-liquid-tag.js +51 -0
- package/dist/rendered-site/helpers/out-liquid-tag.js.map +1 -0
- package/dist/rendered-site/helpers/set-liquid-tag.d.ts +14 -0
- package/dist/rendered-site/helpers/set-liquid-tag.js +62 -0
- package/dist/rendered-site/helpers/set-liquid-tag.js.map +1 -0
- package/dist/rendered-site/liquidjs-filters/info-filter.js +35 -20
- package/dist/rendered-site/liquidjs-filters/info-filter.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/deprecated-get-doc-tag.js +4 -2
- package/dist/rendered-site/liquidjs-tags/deprecated-get-doc-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/deprecated-get-docs-tag.js +40 -28
- package/dist/rendered-site/liquidjs-tags/deprecated-get-docs-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/deprecated-get-paginated-docs-tag.d.ts +11 -5
- package/dist/rendered-site/liquidjs-tags/deprecated-get-paginated-docs-tag.js +44 -27
- package/dist/rendered-site/liquidjs-tags/deprecated-get-paginated-docs-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/deprecated-use-image-tag.d.ts +0 -4
- package/dist/rendered-site/liquidjs-tags/deprecated-use-image-tag.js +4 -3
- package/dist/rendered-site/liquidjs-tags/deprecated-use-image-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/doc-liquid-set-handler.d.ts +2 -0
- package/dist/rendered-site/liquidjs-tags/doc-liquid-set-handler.js +68 -0
- package/dist/rendered-site/liquidjs-tags/doc-liquid-set-handler.js.map +1 -0
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.d.ts +2 -0
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.js +98 -0
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.js.map +1 -0
- package/dist/rendered-site/liquidjs-tags/image-liquid-set-handler.d.ts +2 -0
- package/dist/rendered-site/liquidjs-tags/image-liquid-set-handler.js +89 -0
- package/dist/rendered-site/liquidjs-tags/image-liquid-set-handler.js.map +1 -0
- package/dist/rendered-site/liquidjs-tags/paginated-docs-liquid-set-handler.d.ts +2 -0
- package/dist/rendered-site/liquidjs-tags/paginated-docs-liquid-set-handler.js +111 -0
- package/dist/rendered-site/liquidjs-tags/paginated-docs-liquid-set-handler.js.map +1 -0
- package/dist/rendered-site/page-route/raw-document-payload.js +25 -25
- package/dist/rendering-payload/breadcrumb.queries.js +8 -2
- package/dist/rendering-payload/breadcrumb.queries.js.map +1 -1
- package/dist/rendering-payload/cluster-payloads.js +16 -8
- package/dist/rendering-payload/cluster-payloads.js.map +1 -1
- package/dist/rendering-payload/create-doc-drop.d.ts +3 -1
- package/dist/rendering-payload/create-doc-drop.js +16 -4
- package/dist/rendering-payload/create-doc-drop.js.map +1 -1
- package/dist/rendering-payload/doc-list.queries.d.ts +16 -0
- package/dist/rendering-payload/doc-list.queries.js +155 -0
- package/dist/rendering-payload/doc-list.queries.js.map +1 -0
- package/dist/rendering-payload/doc-values.queries.d.ts +1 -28
- package/dist/rendering-payload/doc-values.queries.js +8 -102
- package/dist/rendering-payload/doc-values.queries.js.map +1 -1
- package/dist/rendering-payload/field-values.js +7 -3
- package/dist/rendering-payload/field-values.js.map +1 -1
- package/dist/rendering-payload/get-siblings.queries.js +34 -24
- package/dist/rendering-payload/get-siblings.queries.js.map +1 -1
- package/dist/rendering-payload/make-public-payload.js +4 -4
- package/dist/rendering-payload/make-public-payload.js.map +1 -1
- package/dist/rendering-payload/parts.queries.js +18 -18
- package/dist/rendering-payload/rendering-payload.types.d.ts +9 -13
- package/dist/rendering-payload/site-payload.d.ts +1 -1
- package/dist/rendering-payload/site-payload.js +8 -3
- package/dist/rendering-payload/site-payload.js.map +1 -1
- package/dist/rendering-payload/translations.queries.d.ts +1 -1
- package/dist/rendering-payload/translations.queries.js +26 -16
- package/dist/rendering-payload/translations.queries.js.map +1 -1
- package/dist/site-context/core-plugin/create-core-plugin.js +2 -1
- package/dist/site-context/core-plugin/create-core-plugin.js.map +1 -1
- package/dist/site-context/liquid-init.d.ts +6 -1
- package/dist/site-context/liquid-init.js +18 -0
- package/dist/site-context/liquid-init.js.map +1 -1
- package/dist/site-context/load-site-context.js +14 -15
- package/dist/site-context/load-site-context.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +4 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +12 -12
- package/schema.graphql +6 -6
- package/dist/connector/site-schema/site-schema-public-helpers.d.ts +0 -3
- package/dist/connector/site-schema/site-schema-public-helpers.js +0 -15
- package/dist/connector/site-schema/site-schema-public-helpers.js.map +0 -1
- package/dist/public-api/public-api-rendering.d.ts +0 -15
- package/dist/public-api/public-api-rendering.js +0 -114
- package/dist/public-api/public-api-rendering.js.map +0 -1
- package/dist/public-api/search-text/search-text.queries.d.ts +0 -15
- package/dist/public-api/search-text/search-text.queries.js +0 -85
- package/dist/public-api/search-text/search-text.queries.js.map +0 -1
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { Tag, } from "liquidjs";
|
|
2
|
+
import { isPromise } from "node:util/types";
|
|
3
|
+
import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
|
|
4
|
+
import { evaluateFunctionCallArgs, parseFunctionCallFromTokenizer, } from "./liquid-function-call-args.js";
|
|
5
|
+
import { consumeGenerator, isIterable, wrapLiquidTagPromise } from "./liquid-tag-helpers.js";
|
|
6
|
+
export function createSetLiquidTag() {
|
|
7
|
+
const handlers = new Map();
|
|
8
|
+
return {
|
|
9
|
+
tagClass: class GetTag extends Tag {
|
|
10
|
+
#varName;
|
|
11
|
+
#handlerName;
|
|
12
|
+
#positionalTokens = [];
|
|
13
|
+
#namedEntries = [];
|
|
14
|
+
constructor(token, remainTokens, liquid) {
|
|
15
|
+
super(token, remainTokens, liquid);
|
|
16
|
+
const varId = this.tokenizer.readIdentifier();
|
|
17
|
+
this.#varName = varId?.content ?? "";
|
|
18
|
+
this.tokenizer.skipBlank();
|
|
19
|
+
this.tokenizer.assert(this.tokenizer.peek() === "=", "Syntax error, expected '='");
|
|
20
|
+
this.tokenizer.advance();
|
|
21
|
+
const parsed = parseFunctionCallFromTokenizer(this.tokenizer);
|
|
22
|
+
this.#handlerName = parsed.handlerName;
|
|
23
|
+
this.#positionalTokens = parsed.positionalTokens;
|
|
24
|
+
this.#namedEntries = parsed.namedEntries;
|
|
25
|
+
}
|
|
26
|
+
*render(ctx, _emitter) {
|
|
27
|
+
const renderingContext = extractRenderingContext(ctx);
|
|
28
|
+
const { logger } = renderingContext.siteContext;
|
|
29
|
+
const handler = handlers.get(this.#handlerName);
|
|
30
|
+
if (!handler)
|
|
31
|
+
throw new Error(`Unknown handler '${this.#handlerName}'`);
|
|
32
|
+
const { positionedParameters, namedParameters } = (yield* evaluateFunctionCallArgs(ctx, this.#positionalTokens, this.#namedEntries));
|
|
33
|
+
let val;
|
|
34
|
+
try {
|
|
35
|
+
const result = handler(renderingContext, {
|
|
36
|
+
positionedParameters,
|
|
37
|
+
namedParameters,
|
|
38
|
+
variableName: this.#varName,
|
|
39
|
+
});
|
|
40
|
+
if (isIterable(result)) {
|
|
41
|
+
val = consumeGenerator(result);
|
|
42
|
+
}
|
|
43
|
+
else if (isPromise(result)) {
|
|
44
|
+
val = yield wrapLiquidTagPromise(renderingContext, result, `set:${this.#handlerName}`);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
val = result;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
logger.error(`Error in {% set ${this.#varName} = ${this.#handlerName}(...) %}"`, error);
|
|
52
|
+
val = undefined;
|
|
53
|
+
}
|
|
54
|
+
ctx.bottom()[this.#varName] = val;
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
registerHandler(name, handler) {
|
|
58
|
+
handlers.set(name, handler);
|
|
59
|
+
},
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=set-liquid-tag.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"set-liquid-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/set-liquid-tag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isObj } from "@paroicms/public-anywhere-lib";
|
|
2
|
-
import { escapeHtml } from "@paroicms/public-server-lib";
|
|
1
|
+
import { encodeLNodeId, isObj } from "@paroicms/public-anywhere-lib";
|
|
2
|
+
import { escapeHtml, extractLoadDescriptor } from "@paroicms/public-server-lib";
|
|
3
3
|
import { promiseSymbol, valuesFnSymbol } from "../../liquidjs-tools/liquidjs-drop.js";
|
|
4
4
|
const ignoreDeprecatedKeys = new Set([
|
|
5
5
|
"uid",
|
|
@@ -16,6 +16,7 @@ const ignoreDeprecatedKeys = new Set([
|
|
|
16
16
|
"featuredImageId",
|
|
17
17
|
"recaptchaKey",
|
|
18
18
|
"routingIds",
|
|
19
|
+
"googleRecaptchaSiteKey",
|
|
19
20
|
]);
|
|
20
21
|
export async function infoLiquidFilter(val) {
|
|
21
22
|
return await valueToInfo(val, 0);
|
|
@@ -53,7 +54,7 @@ async function valueToInfo(rawVal, depth, options = {}) {
|
|
|
53
54
|
}
|
|
54
55
|
if (Array.isArray(val)) {
|
|
55
56
|
if (val.length === 0)
|
|
56
|
-
return
|
|
57
|
+
return `<i>empty array</i>${descTagOf(val, "inline")}`;
|
|
57
58
|
const result = [];
|
|
58
59
|
let shortenAll = false;
|
|
59
60
|
for (const rawItem of val) {
|
|
@@ -62,19 +63,19 @@ async function valueToInfo(rawVal, depth, options = {}) {
|
|
|
62
63
|
result.push(`${onDemand}${await valueToInfo(item, childDepth, { isNested: true, shortenAll })}`);
|
|
63
64
|
shortenAll = true;
|
|
64
65
|
}
|
|
65
|
-
return
|
|
66
|
+
return `${descTagOf(val, "raw")}<table>${result.map((item) => `<tr><td>${item}</td></tr>`).join("")}</table>`;
|
|
66
67
|
}
|
|
67
68
|
if (typeof val !== "object") {
|
|
68
|
-
return `<i>(${typeof val})</i
|
|
69
|
+
return `<i>(${typeof val})</i>${descTagOf(val, "inline")}`;
|
|
69
70
|
}
|
|
70
71
|
if (val instanceof Date) {
|
|
71
|
-
return `<i>${val.toISOString()}</i
|
|
72
|
+
return `<i>${val.toISOString()}</i>${descTagOf(val, "inline")}`;
|
|
72
73
|
}
|
|
73
74
|
const obj = valuesFnSymbol in val && typeof val[valuesFnSymbol] === "function"
|
|
74
75
|
? await val[valuesFnSymbol]()
|
|
75
76
|
: val;
|
|
76
77
|
if (!isObj(obj)) {
|
|
77
|
-
return `<i>invalid values "${typeof obj}"</i
|
|
78
|
+
return `<i>invalid values "${typeof obj}"</i>${descTagOf(val, "inline")}`;
|
|
78
79
|
}
|
|
79
80
|
if (obj.kind && (options.shortenAll || (options.isNested && isBigPayload(obj)))) {
|
|
80
81
|
return makeExtractFromObject(obj);
|
|
@@ -94,8 +95,10 @@ async function makeTableInfo(obj, childDepth, options) {
|
|
|
94
95
|
onDemand: typeof value === "function" ? getOnDemandTag() : "",
|
|
95
96
|
});
|
|
96
97
|
}
|
|
97
|
-
if (items.length === 0)
|
|
98
|
-
|
|
98
|
+
if (items.length === 0) {
|
|
99
|
+
const descTag = descTagOf(obj, "raw");
|
|
100
|
+
return descTag ?? "<i>empty object</i>";
|
|
101
|
+
}
|
|
99
102
|
const nestedTableCss = ["border: 1px solid #888", "margin: 5px 0"];
|
|
100
103
|
const tableCss = [];
|
|
101
104
|
if (!options.isNested) {
|
|
@@ -123,7 +126,7 @@ async function makeTableInfo(obj, childDepth, options) {
|
|
|
123
126
|
.join("")}
|
|
124
127
|
</table>`;
|
|
125
128
|
if (!tableTitle)
|
|
126
|
-
return table
|
|
129
|
+
return `${descTagOf(obj, "raw")}${table}`;
|
|
127
130
|
const wrapperCss = [
|
|
128
131
|
"display: flex",
|
|
129
132
|
"flex-direction: column",
|
|
@@ -150,36 +153,37 @@ async function makeTableInfo(obj, childDepth, options) {
|
|
|
150
153
|
}
|
|
151
154
|
const classAttr = !options.isNested ? ` class="PaInfoFilter"` : "";
|
|
152
155
|
return `<div${classAttr} style="${wrapperCss.join("; ")}">
|
|
153
|
-
<div style="${headCss.join("; ")}">${tableTitle}</div>
|
|
156
|
+
${descTagOf(obj, "raw")}<div style="${headCss.join("; ")}">${tableTitle}</div>
|
|
154
157
|
${table}</div>`;
|
|
155
158
|
}
|
|
156
159
|
function makeExtractFromObject(obj) {
|
|
160
|
+
const descTag = descTagOf(obj, "inline");
|
|
157
161
|
if (!obj.kind) {
|
|
158
162
|
const keys = Object.keys(obj);
|
|
159
163
|
if (keys.length === 0)
|
|
160
164
|
return "-";
|
|
161
|
-
return `<i>object with properties: ${Object.keys(obj).join(", ")}</i
|
|
165
|
+
return `<i>object with properties: ${Object.keys(obj).join(", ")}</i>${descTag}`;
|
|
162
166
|
}
|
|
163
167
|
const title = (obj.title && typeof obj.title === "string" ? shortenStringAndEsc(obj.title) : obj.title) ??
|
|
164
168
|
"-";
|
|
165
169
|
switch (obj.kind) {
|
|
166
170
|
case "site":
|
|
167
|
-
return `<i>⇒ site ${obj.language}</i
|
|
171
|
+
return `<i>⇒ site ${obj.language}</i>${descTag}`;
|
|
168
172
|
case "detached":
|
|
169
|
-
return `<i>⇒ detached doc ${obj.id} (${obj.type}), ${title}</i
|
|
173
|
+
return `<i>⇒ detached doc ${obj.id} (${obj.type}), ${title}</i>${descTag}`;
|
|
170
174
|
case "routingDocument":
|
|
171
175
|
case "regularDocument":
|
|
172
|
-
return `<i>⇒ doc ${obj.id} (${obj.type}), ${title}</i
|
|
176
|
+
return `<i>⇒ doc ${obj.id} (${obj.type}), ${title}</i>${descTag}`;
|
|
173
177
|
case "term":
|
|
174
|
-
return `<i>⇒ term ${obj.id} (${obj.type}), ${title}</i
|
|
178
|
+
return `<i>⇒ term ${obj.id} (${obj.type}), ${title}</i>${descTag}`;
|
|
175
179
|
case "part":
|
|
176
|
-
return `<i>⇒ part ${obj.id} (${obj.type})</i
|
|
180
|
+
return `<i>⇒ part ${obj.id} (${obj.type})</i>${descTag}`;
|
|
177
181
|
case "media":
|
|
178
|
-
return `<i>⇒ media ${obj.mediaId} (${obj.mediaType})</i
|
|
182
|
+
return `<i>⇒ media ${obj.mediaId} (${obj.mediaType})</i>${descTag}`;
|
|
179
183
|
case "image":
|
|
180
|
-
return `<i>⇒ image ${obj.mediaId} (${obj.mediaType})</i
|
|
184
|
+
return `<i>⇒ image ${obj.mediaId} (${obj.mediaType})</i>${descTag}`;
|
|
181
185
|
default:
|
|
182
|
-
return `<i>/unknown kind '${obj.kind}'/</i
|
|
186
|
+
return `<i>/unknown kind '${obj.kind}'/</i>${descTag}`;
|
|
183
187
|
}
|
|
184
188
|
}
|
|
185
189
|
const bigKinds = new Set(["site", "detached", "routingDocument", "regularDocument", "term"]);
|
|
@@ -200,6 +204,17 @@ function getOnDemandTag() {
|
|
|
200
204
|
];
|
|
201
205
|
return ` <span style="${css.join("; ")}">on demand</span> `;
|
|
202
206
|
}
|
|
207
|
+
function descTagOf(obj, pos) {
|
|
208
|
+
const loadDescriptor = extractLoadDescriptor(obj);
|
|
209
|
+
if (!loadDescriptor)
|
|
210
|
+
return "";
|
|
211
|
+
const css = ["background-color: #444", "color: #bbb", "font-size: 0.875em", "padding: 2px 4px"];
|
|
212
|
+
const prefix = pos === "inline" ? " " : "";
|
|
213
|
+
if (loadDescriptor.load === "one") {
|
|
214
|
+
return `${prefix}<span style="${css.join("; ")}">↗ ${encodeLNodeId(loadDescriptor.documentId)}</span>`;
|
|
215
|
+
}
|
|
216
|
+
return `${prefix}<span style="${css.join("; ")}">↗ ${loadDescriptor.descriptorName}</span>`;
|
|
217
|
+
}
|
|
203
218
|
function camelCaseToSpaced(s) {
|
|
204
219
|
return s.replace(/([A-Z])/g, " $1").trim();
|
|
205
220
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/info-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"info-filter.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-filters/info-filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,12 @@ import { makeCacheDependencyKey } from "../../common/text-cache.js";
|
|
|
4
4
|
import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
5
5
|
import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
|
|
6
6
|
import { getDocItem } from "../../rendering-payload/doc-values.queries.js";
|
|
7
|
-
import {
|
|
7
|
+
import { createDeprecatedAssignLiquidTag, wrapLiquidTagPromise, } from "../helpers/liquid-tag-helpers.js";
|
|
8
8
|
const availableParameterNames = new Set(["id", "fields"]);
|
|
9
9
|
export function createDeprecatedGetDocLiquidTag() {
|
|
10
|
-
return
|
|
10
|
+
return createDeprecatedAssignLiquidTag(function* (renderingContext, { namedParameters, variableName }) {
|
|
11
11
|
const { siteContext } = renderingContext;
|
|
12
|
+
siteContext.logger.warn(`'getDoc' (or 'getPage') is deprecated, use 'set ${variableName} = doc(...)' instead.`);
|
|
12
13
|
const options = validateParameters(namedParameters, siteContext, { variableName });
|
|
13
14
|
if (options.id === undefined)
|
|
14
15
|
return;
|
|
@@ -53,6 +54,7 @@ async function loadDoc(renderingContext, documentId, options) {
|
|
|
53
54
|
const fieldNames = options.fields?.trim().split(/\s*,\s*/);
|
|
54
55
|
const docValues = await getDocItem(siteContext, renderingContext.tracker, documentId);
|
|
55
56
|
return createDocPayloadDrop(renderingContext, docValues, {
|
|
57
|
+
documentId,
|
|
56
58
|
fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
|
|
57
59
|
});
|
|
58
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deprecated-get-doc-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/deprecated-get-doc-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,YAAY,EAEZ,YAAY,GACb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EACL,2BAA2B,GAE5B,MAAM,8DAA8D,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAG3E,OAAO,
|
|
1
|
+
{"version":3,"file":"deprecated-get-doc-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/deprecated-get-doc-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,YAAY,EAEZ,YAAY,GACb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EACL,2BAA2B,GAE5B,MAAM,8DAA8D,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAG3E,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE1D,MAAM,UAAU,+BAA+B;IAC7C,OAAO,+BAA+B,CACpC,QAAQ,CAAC,EACP,gBAAgB,EAChB,EAAE,eAAe,EAAE,YAAY,EAAE;QAEjC,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;QACzC,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,mDAAmD,YAAY,uBAAuB,CACvF,CAAC;QACF,MAAM,OAAO,GAAG,kBAAkB,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACnF,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS;YAAE,OAAO;QAErC,MAAM,QAAQ,GAAG,2BAA2B,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;QAEnF,IAAI,UAAyB,CAAC;QAC9B,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1B,UAAU,GAAG;gBACX,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;gBACnC,MAAM,EAAE,OAAO,CAAC,EAAE;aACnB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC;QAED,gBAAgB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GACZ,gBAAgB,CAAC,iBAAiB,CAAuC,QAAQ,CAAC,CAAC;QACrF,IAAI,QAAQ,CAAC,KAAK;YAAE,OAAO,QAAQ,CAAC,GAAG,CAAC;QAExC,MAAM,GAAG,GAAG,MAAM,oBAAoB,CACpC,gBAAgB,EAChB,OAAO,CAAC,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,EAC9C,QAAQ,CACT,CAAC;QAEF,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,YAAY,EAAE,IAAI,EAAE,CACvB,CAAC;AACJ,CAAC;AAOD,MAAM,kBAAkB,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,8BAA8B;IACrC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,QAAQ;CACd,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjB,EAAE,EAAE,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,SAAS,CAAC;IAC1E,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS;CACjC,CAAC,CAAC,CAAC;AAEJ,SAAS,kBAAkB,CACzB,MAAW,EACX,EAAE,MAAM,EAA+B,EACvC,EAAE,YAAY,EAA4B;IAE1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YAChE,MAAM,CAAC,IAAI,CAAC,+BAA+B,IAAI,GAAG,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,gBAAkC,EAClC,UAAyB,EACzB,OAA4B;IAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;IACzC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACtF,OAAO,oBAAoB,CAAC,gBAAgB,EAAE,SAAS,EAAE;QACvD,UAAU;QACV,UAAU,EAAE,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;KACzE,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { isDef, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
|
|
1
|
+
import { extractNodeId, isDef, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
|
|
2
|
+
import { parseSorting } from "@paroicms/public-server-lib";
|
|
2
3
|
import { type } from "arktype";
|
|
4
|
+
import { getTypeNameOf } from "../../admin-backend/node/node.queries.js";
|
|
3
5
|
import { makeCacheDependencyKey } from "../../common/text-cache.js";
|
|
4
|
-
import { parseSorting } from "../../connector/site-schema/site-schema-public-helpers.js";
|
|
5
|
-
import { toNodeId } from "../../helpers/utils-helper.js";
|
|
6
6
|
import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
7
7
|
import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
8
|
+
import { listDocValues } from "../../rendering-payload/doc-list.queries.js";
|
|
9
|
+
import { createDeprecatedAssignLiquidTag, wrapLiquidTagPromise, } from "../helpers/liquid-tag-helpers.js";
|
|
10
10
|
import { loadPaginatedDocs } from "./deprecated-get-paginated-docs-tag.js";
|
|
11
11
|
const availableParameterNames = new Set([
|
|
12
12
|
"parentId",
|
|
@@ -18,8 +18,9 @@ const availableParameterNames = new Set([
|
|
|
18
18
|
"withTotal",
|
|
19
19
|
]);
|
|
20
20
|
export function createDeprecatedGetDocsLiquidTag() {
|
|
21
|
-
return
|
|
21
|
+
return createDeprecatedAssignLiquidTag(function* (renderingContext, { namedParameters, variableName }) {
|
|
22
22
|
const { siteContext } = renderingContext;
|
|
23
|
+
siteContext.logger.warn(`'getDocs' (or 'getPages') is deprecated, use 'set ${variableName} = docs(...)' instead.`);
|
|
23
24
|
const options = validateParameters(namedParameters, siteContext, { variableName });
|
|
24
25
|
if (options.parentId === undefined)
|
|
25
26
|
return;
|
|
@@ -34,10 +35,10 @@ export function createDeprecatedGetDocsLiquidTag() {
|
|
|
34
35
|
siteContext.logger.warn(`The 'withTotal' parameter is deprecated. Use the 'getPaginatedDocs' tag instead.`);
|
|
35
36
|
const paginated = yield wrapLiquidTagPromise(renderingContext, loadPaginatedDocs(renderingContext, parentId, {
|
|
36
37
|
parentId: options.parentId,
|
|
37
|
-
|
|
38
|
+
sorting: options.sorting,
|
|
38
39
|
fields: options.fields,
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
labeledWithId: options.labeledWithId,
|
|
41
|
+
labeledWithField: options.labeledWithField,
|
|
41
42
|
pageSize: options.limit ?? 20,
|
|
42
43
|
pageIndex: 0,
|
|
43
44
|
}), "getDocs");
|
|
@@ -82,39 +83,50 @@ function validateParameters(values, { logger }, { variableName }) {
|
|
|
82
83
|
}
|
|
83
84
|
}
|
|
84
85
|
const validated = GetDocsParametersAT.assert(omitProperty(values, variableName));
|
|
85
|
-
let
|
|
86
|
-
let
|
|
87
|
-
if (
|
|
88
|
-
logger.warn(`[getDocs] the '
|
|
89
|
-
|
|
86
|
+
let labeledWithId = validated.labeledById;
|
|
87
|
+
let labeledWithField = validated.labeledByField;
|
|
88
|
+
if (labeledWithId && !labeledWithField) {
|
|
89
|
+
logger.warn(`[getDocs] the 'labeledWithId' parameter requires the 'labeledWithField' parameter to be set`);
|
|
90
|
+
labeledWithId = undefined;
|
|
90
91
|
}
|
|
91
|
-
else if (!
|
|
92
|
-
logger.warn(`[getDocs] the '
|
|
93
|
-
|
|
92
|
+
else if (!labeledWithId && labeledWithField) {
|
|
93
|
+
logger.warn(`[getDocs] the 'labeledWithField' parameter requires the 'labeledWithId' parameter to be set`);
|
|
94
|
+
labeledWithField = undefined;
|
|
94
95
|
}
|
|
95
96
|
return {
|
|
96
97
|
parentId: validated.parentId,
|
|
97
|
-
|
|
98
|
+
sorting: validated.orderBy,
|
|
98
99
|
fields: validated.fields,
|
|
99
|
-
|
|
100
|
-
|
|
100
|
+
labeledWithId,
|
|
101
|
+
labeledWithField,
|
|
101
102
|
limit: validated.limit,
|
|
102
103
|
withTotal: validated.withTotal,
|
|
103
104
|
};
|
|
104
105
|
}
|
|
105
|
-
async function loadDocs(renderingContext,
|
|
106
|
+
async function loadDocs(renderingContext, parentDocumentId, options) {
|
|
106
107
|
const fieldNames = options.fields?.trim().split(/\s*,\s*/);
|
|
107
|
-
const
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
108
|
+
const labeledWithTermId = isDef(options.labeledWithId)
|
|
109
|
+
? extractNodeId(options.labeledWithId)
|
|
110
|
+
: undefined;
|
|
111
|
+
const parentDocumentTypeName = await getTypeNameOf(renderingContext.siteContext, parentDocumentId.nodeId);
|
|
112
|
+
const loadDescriptor = {
|
|
113
|
+
load: "list",
|
|
114
|
+
nodeKind: "document",
|
|
115
|
+
descriptorName: "children",
|
|
116
|
+
parentDocumentTypeName,
|
|
117
|
+
parentDocumentId,
|
|
118
|
+
sorting: options.sorting ? parseSorting(options.sorting) : undefined,
|
|
119
|
+
labeledWith: labeledWithTermId !== undefined && options.labeledWithField
|
|
120
|
+
? { termNodeId: labeledWithTermId, fieldName: options.labeledWithField }
|
|
114
121
|
: undefined,
|
|
115
122
|
limit: options.limit,
|
|
123
|
+
};
|
|
124
|
+
const { items } = await listDocValues(renderingContext, loadDescriptor, {
|
|
125
|
+
onlyPublished: true,
|
|
126
|
+
withTotal: false,
|
|
116
127
|
});
|
|
117
128
|
return items.map((item) => createDocPayloadDrop(renderingContext, item, {
|
|
129
|
+
documentId: item,
|
|
118
130
|
fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
|
|
119
131
|
}));
|
|
120
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deprecated-get-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/deprecated-get-docs-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,YAAY,EAEZ,YAAY,GACb,MAAM,+BAA+B,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"deprecated-get-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/deprecated-get-docs-tag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,23 @@
|
|
|
1
1
|
import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import type { DropInst } from "../../liquidjs-tools/liquidjs-drop.js";
|
|
3
3
|
import { type RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
4
|
-
import { type PaginatedResult } from "../../rendering-payload/doc-values.queries.js";
|
|
5
4
|
import type { TpDocPayload } from "../../rendering-payload/rendering-payload.types.js";
|
|
5
|
+
export interface PaginatedResult<T> {
|
|
6
|
+
items: T[];
|
|
7
|
+
total: number;
|
|
8
|
+
pageIndex: number;
|
|
9
|
+
pageCount: number;
|
|
10
|
+
pageSize: number;
|
|
11
|
+
}
|
|
6
12
|
export declare function createDeprecatedGetPaginatedDocsLiquidTag(): import("liquidjs/dist/template/tag.js").TagClass;
|
|
7
13
|
interface GetPaginatedDocsRawParameters {
|
|
8
14
|
parentId?: string;
|
|
9
|
-
|
|
15
|
+
sorting?: string;
|
|
10
16
|
fields?: string;
|
|
11
|
-
|
|
12
|
-
|
|
17
|
+
labeledWithId?: string;
|
|
18
|
+
labeledWithField?: string;
|
|
13
19
|
pageIndex?: number;
|
|
14
20
|
pageSize: number;
|
|
15
21
|
}
|
|
16
|
-
export declare function loadPaginatedDocs(renderingContext: RenderingContext,
|
|
22
|
+
export declare function loadPaginatedDocs(renderingContext: RenderingContext, parentDocumentId: ParsedLNodeId, options: GetPaginatedDocsRawParameters): Promise<PaginatedResult<DropInst<TpDocPayload>>>;
|
|
17
23
|
export {};
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { isDef, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
|
|
1
|
+
import { extractNodeId, isDef, omitProperty, parseLNodeId, } from "@paroicms/public-anywhere-lib";
|
|
2
|
+
import { parseSorting } from "@paroicms/public-server-lib";
|
|
2
3
|
import { type } from "arktype";
|
|
4
|
+
import { getTypeNameOf } from "../../admin-backend/node/node.queries.js";
|
|
3
5
|
import { makeCacheDependencyKey } from "../../common/text-cache.js";
|
|
4
|
-
import { parseSorting } from "../../connector/site-schema/site-schema-public-helpers.js";
|
|
5
|
-
import { toNodeId } from "../../helpers/utils-helper.js";
|
|
6
6
|
import { makeTagCacheKeyForRendering, } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
7
7
|
import { createDocPayloadDrop } from "../../rendering-payload/create-doc-drop.js";
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
8
|
+
import { listDocValues } from "../../rendering-payload/doc-list.queries.js";
|
|
9
|
+
import { createDeprecatedAssignLiquidTag, wrapLiquidTagPromise, } from "../helpers/liquid-tag-helpers.js";
|
|
10
10
|
const availableParameterNames = new Set([
|
|
11
11
|
"parentId",
|
|
12
12
|
"orderBy",
|
|
@@ -17,8 +17,9 @@ const availableParameterNames = new Set([
|
|
|
17
17
|
"pageSize",
|
|
18
18
|
]);
|
|
19
19
|
export function createDeprecatedGetPaginatedDocsLiquidTag() {
|
|
20
|
-
return
|
|
20
|
+
return createDeprecatedAssignLiquidTag(function* (renderingContext, { namedParameters, variableName }) {
|
|
21
21
|
const { siteContext } = renderingContext;
|
|
22
|
+
siteContext.logger.warn(`'getPaginatedDocs' is deprecated, use 'set ${variableName} = paginatedDocs(...)' instead.`);
|
|
22
23
|
const options = validateParameters(namedParameters, siteContext, { variableName });
|
|
23
24
|
if (options.parentId === undefined)
|
|
24
25
|
return;
|
|
@@ -50,44 +51,60 @@ function validateParameters(values, { logger }, { variableName }) {
|
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
const validated = GetPaginatedDocsParametersAT.assert(omitProperty(values, variableName));
|
|
53
|
-
let
|
|
54
|
-
let
|
|
55
|
-
if (
|
|
54
|
+
let labeledWithId = validated.labeledById;
|
|
55
|
+
let labeledWithField = validated.labeledByField;
|
|
56
|
+
if (labeledWithId && !labeledWithField) {
|
|
56
57
|
logger.warn(`[getDocs] the 'labeledById' parameter requires the 'labeledByField' parameter to be set`);
|
|
57
|
-
|
|
58
|
+
labeledWithId = undefined;
|
|
58
59
|
}
|
|
59
|
-
else if (!
|
|
60
|
+
else if (!labeledWithId && labeledWithField) {
|
|
60
61
|
logger.warn(`[getDocs] the 'labeledByField' parameter requires the 'labeledById' parameter to be set`);
|
|
61
|
-
|
|
62
|
+
labeledWithField = undefined;
|
|
62
63
|
}
|
|
63
64
|
return {
|
|
64
65
|
parentId: validated.parentId,
|
|
65
|
-
|
|
66
|
+
sorting: validated.orderBy,
|
|
66
67
|
fields: validated.fields,
|
|
67
|
-
|
|
68
|
-
|
|
68
|
+
labeledWithId,
|
|
69
|
+
labeledWithField,
|
|
69
70
|
pageIndex: validated.pageIndex,
|
|
70
71
|
pageSize: validated.pageSize,
|
|
71
72
|
};
|
|
72
73
|
}
|
|
73
|
-
export async function loadPaginatedDocs(renderingContext,
|
|
74
|
+
export async function loadPaginatedDocs(renderingContext, parentDocumentId, options) {
|
|
74
75
|
const fieldNames = options.fields?.trim().split(/\s*,\s*/);
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
76
|
+
const labeledWithTermId = isDef(options.labeledWithId)
|
|
77
|
+
? extractNodeId(options.labeledWithId)
|
|
78
|
+
: undefined;
|
|
79
|
+
const parentDocumentTypeName = await getTypeNameOf(renderingContext.siteContext, parentDocumentId.nodeId);
|
|
80
|
+
const loadDescriptor = {
|
|
81
|
+
load: "list",
|
|
82
|
+
nodeKind: "document",
|
|
83
|
+
descriptorName: "children",
|
|
84
|
+
parentDocumentId,
|
|
85
|
+
parentDocumentTypeName,
|
|
86
|
+
sorting: options.sorting ? parseSorting(options.sorting) : undefined,
|
|
87
|
+
labeledWith: labeledWithTermId !== undefined && options.labeledWithField
|
|
88
|
+
? { termNodeId: labeledWithTermId, fieldName: options.labeledWithField }
|
|
82
89
|
: undefined,
|
|
83
|
-
|
|
84
|
-
|
|
90
|
+
limit: options.pageSize,
|
|
91
|
+
offset: (options.pageIndex ?? 0) * options.pageSize,
|
|
92
|
+
};
|
|
93
|
+
const { items, total } = await listDocValues(renderingContext, loadDescriptor, {
|
|
94
|
+
onlyPublished: true,
|
|
95
|
+
withTotal: true,
|
|
85
96
|
});
|
|
97
|
+
const pageIndex = options.pageIndex ?? 0;
|
|
98
|
+
const pageCount = Math.ceil(total / options.pageSize);
|
|
86
99
|
return {
|
|
87
|
-
|
|
88
|
-
|
|
100
|
+
items: items.map((item) => createDocPayloadDrop(renderingContext, item, {
|
|
101
|
+
documentId: item,
|
|
89
102
|
fieldNames: fieldNames && fieldNames.length > 0 ? fieldNames : undefined,
|
|
90
103
|
})),
|
|
104
|
+
total,
|
|
105
|
+
pageIndex,
|
|
106
|
+
pageCount,
|
|
107
|
+
pageSize: options.pageSize,
|
|
91
108
|
};
|
|
92
109
|
}
|
|
93
110
|
//# sourceMappingURL=deprecated-get-paginated-docs-tag.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deprecated-get-paginated-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/deprecated-get-paginated-docs-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,YAAY,EAEZ,YAAY,GACb,MAAM,+BAA+B,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"deprecated-get-paginated-docs-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/deprecated-get-paginated-docs-tag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type ResizeRule } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import type { TpSourceImage } from "../../rendering-payload/rendering-payload.types.js";
|
|
3
|
-
import type { SiteContext } from "../../site-context/site-context.types.js";
|
|
4
3
|
export interface UseImageTagParameters {
|
|
5
4
|
image: TpSourceImage | string | undefined;
|
|
6
5
|
resize: ResizeRule;
|
|
@@ -9,6 +8,3 @@ export interface UseImageTagParameters {
|
|
|
9
8
|
mediaType?: string;
|
|
10
9
|
}
|
|
11
10
|
export declare function createDeprecatedUseImageLiquidTag(): import("liquidjs/dist/template/tag.js").TagClass;
|
|
12
|
-
export declare function toTpSourceImageOrUndefParameter(siteContext: Pick<SiteContext, "logger">, image: any, { warnPrefix }: {
|
|
13
|
-
warnPrefix: string;
|
|
14
|
-
}): TpSourceImage | undefined;
|