@paroicms/server 1.105.0 → 1.105.2
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/fields/fields.resolver.js +18 -22
- package/dist/admin-backend/fields/fields.resolver.js.map +1 -1
- package/dist/admin-backend/fields/load-fields-of.queries.d.ts +6 -5
- package/dist/admin-backend/fields/load-fields-of.queries.js +3 -17
- package/dist/admin-backend/fields/load-fields-of.queries.js.map +1 -1
- package/dist/admin-backend/fields/load-fields.queries.d.ts +8 -4
- package/dist/admin-backend/fields/load-fields.queries.js +59 -8
- package/dist/admin-backend/fields/load-fields.queries.js.map +1 -1
- package/dist/plugin-services/rendering-hook.d.ts +3 -3
- package/dist/rendered-site/helpers/liquid-tag-helpers.d.ts +1 -1
- package/dist/rendered-site/helpers/liquid-tag-helpers.js +12 -6
- package/dist/rendered-site/helpers/liquid-tag-helpers.js.map +1 -1
- package/dist/rendered-site/helpers/out-liquid-tag.js +2 -2
- package/dist/rendered-site/helpers/out-liquid-tag.js.map +1 -1
- package/dist/rendered-site/helpers/set-liquid-tag.js +2 -2
- package/dist/rendered-site/helpers/set-liquid-tag.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -11
- package/schema.graphql +9 -5
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { siteReadyGuard } from "../../graphql/graphql.types.js";
|
|
2
|
-
import { createNoRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
3
|
-
import { executeRenderingHook } from "../../plugin-services/rendering-hook.js";
|
|
4
2
|
import { authGuard } from "../auth/auth.helper.js";
|
|
5
3
|
import { getTypeNameOf } from "../node/node.queries.js";
|
|
6
4
|
import { getFieldValuesOfLNode, getFieldValuesOfOneList } from "./load-fields-of.queries.js";
|
|
7
|
-
import { getFieldTypesByNames, loadFieldValues } from "./load-fields.queries.js";
|
|
5
|
+
import { getFieldTypesByNames, loadFieldValues, } from "./load-fields.queries.js";
|
|
8
6
|
import { parseFieldValues, saveFieldValues } from "./save-fields.queries.js";
|
|
9
7
|
export const fieldResolvers = {
|
|
10
8
|
Mutation: {
|
|
@@ -39,10 +37,10 @@ export const fieldResolvers = {
|
|
|
39
37
|
const fieldValues = await getFieldValuesOfLNode(siteContext, {
|
|
40
38
|
lNodeId,
|
|
41
39
|
fieldNames: fieldNames ?? undefined,
|
|
42
|
-
preprocess: preprocess
|
|
40
|
+
preprocess: formatPreprocessedFields(preprocess),
|
|
43
41
|
publishedOnly: false,
|
|
44
42
|
});
|
|
45
|
-
return
|
|
43
|
+
return formatProcessedFieldValues(fieldValues);
|
|
46
44
|
},
|
|
47
45
|
fieldValuesOfList: async (_parent, { parentLNodeId, listName, fieldNames, preprocess }, { siteContext, httpContext }) => {
|
|
48
46
|
authGuard(httpContext);
|
|
@@ -51,12 +49,12 @@ export const fieldResolvers = {
|
|
|
51
49
|
parentLNodeId,
|
|
52
50
|
listName: listName ?? undefined,
|
|
53
51
|
fieldNames: fieldNames ?? undefined,
|
|
54
|
-
preprocess: preprocess
|
|
52
|
+
preprocess: formatPreprocessedFields(preprocess),
|
|
55
53
|
publishedOnly: false,
|
|
56
54
|
});
|
|
57
55
|
return Array.from(map.entries()).map(([lNodeId, fieldValues]) => ({
|
|
58
56
|
lNodeId,
|
|
59
|
-
fieldValues:
|
|
57
|
+
fieldValues: formatProcessedFieldValues(fieldValues),
|
|
60
58
|
}));
|
|
61
59
|
},
|
|
62
60
|
siteFieldValues: async (_parent, { language, fieldNames, preprocess }, { siteContext, httpContext }) => {
|
|
@@ -67,7 +65,7 @@ export const fieldResolvers = {
|
|
|
67
65
|
nodeId: siteContext.homeRoutingCluster.siteNodeId,
|
|
68
66
|
fieldNames: fieldNames ?? undefined,
|
|
69
67
|
language: language ?? undefined,
|
|
70
|
-
preprocess: preprocess
|
|
68
|
+
preprocess: formatPreprocessedFields(preprocess),
|
|
71
69
|
});
|
|
72
70
|
},
|
|
73
71
|
},
|
|
@@ -82,7 +80,7 @@ export const extendLNodeWrapWithFieldValuesResolvers = {
|
|
|
82
80
|
nodeId,
|
|
83
81
|
language,
|
|
84
82
|
fieldNames: fieldNames ?? undefined,
|
|
85
|
-
preprocess: preprocess
|
|
83
|
+
preprocess: formatPreprocessedFields(preprocess),
|
|
86
84
|
});
|
|
87
85
|
},
|
|
88
86
|
},
|
|
@@ -97,7 +95,7 @@ export const extendPartWithFieldValuesResolver = {
|
|
|
97
95
|
nodeId,
|
|
98
96
|
language,
|
|
99
97
|
fieldNames: fieldNames ?? undefined,
|
|
100
|
-
preprocess: preprocess
|
|
98
|
+
preprocess: formatPreprocessedFields(preprocess),
|
|
101
99
|
});
|
|
102
100
|
},
|
|
103
101
|
},
|
|
@@ -113,18 +111,16 @@ async function resolveFieldValues(siteContext, options) {
|
|
|
113
111
|
language,
|
|
114
112
|
fieldTypes,
|
|
115
113
|
publishedOnly: false,
|
|
114
|
+
preprocess,
|
|
116
115
|
});
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
});
|
|
127
|
-
await renderingContext.close();
|
|
128
|
-
return JSON.stringify(preprocessed);
|
|
116
|
+
return formatProcessedFieldValues(values);
|
|
117
|
+
}
|
|
118
|
+
function formatProcessedFieldValues(values) {
|
|
119
|
+
return JSON.stringify(values);
|
|
120
|
+
}
|
|
121
|
+
function formatPreprocessedFields(preprocess) {
|
|
122
|
+
return preprocess
|
|
123
|
+
? { replaceWithExcerpt: preprocess.replaceWithExcerpt ?? undefined }
|
|
124
|
+
: undefined;
|
|
129
125
|
}
|
|
130
126
|
//# sourceMappingURL=fields.resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/fields.resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAuB,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"fields.resolver.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/fields.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type ReadFieldValuesOrWAttached } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import type { SiteContext } from "../../site-context/site-context.types.js";
|
|
3
|
+
import { type PreprocessFieldsInput } from "./load-fields.queries.js";
|
|
3
4
|
export declare function getFieldValuesOfLNode(siteContext: SiteContext, options: {
|
|
4
5
|
lNodeId: string;
|
|
5
6
|
fieldNames?: string[];
|
|
6
|
-
preprocess?:
|
|
7
|
+
preprocess?: PreprocessFieldsInput;
|
|
7
8
|
ignoreUnknownFieldNames?: boolean;
|
|
8
9
|
publishedOnly: boolean;
|
|
9
|
-
}): Promise<
|
|
10
|
+
}): Promise<ReadFieldValuesOrWAttached>;
|
|
10
11
|
export declare function getFieldValuesOfOneList(siteContext: SiteContext, options: {
|
|
11
12
|
parentLNodeId: string;
|
|
12
13
|
listName?: string;
|
|
13
14
|
fieldNames?: string[];
|
|
14
|
-
preprocess?:
|
|
15
|
+
preprocess?: PreprocessFieldsInput;
|
|
15
16
|
publishedOnly: boolean;
|
|
16
|
-
}): Promise<Map<string,
|
|
17
|
+
}): Promise<Map<string, ReadFieldValuesOrWAttached>>;
|
|
@@ -2,10 +2,8 @@ import { getNodeTypeByName, PART_DEFAULT_LIST_NAME } from "@paroicms/internal-an
|
|
|
2
2
|
import { encodeLNodeId, parseLNodeId, } from "@paroicms/public-anywhere-lib";
|
|
3
3
|
import { ApiError } from "@paroicms/public-server-lib";
|
|
4
4
|
import { type } from "arktype";
|
|
5
|
-
import { createNoRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
6
|
-
import { executeRenderingHook } from "../../plugin-services/rendering-hook.js";
|
|
7
5
|
import { getTypeNameOf } from "../node/node.queries.js";
|
|
8
|
-
import { getFieldTypesByNames, loadFieldValues } from "./load-fields.queries.js";
|
|
6
|
+
import { getFieldTypesByNames, loadFieldValues, } from "./load-fields.queries.js";
|
|
9
7
|
export async function getFieldValuesOfLNode(siteContext, options) {
|
|
10
8
|
const { lNodeId, fieldNames, preprocess, ignoreUnknownFieldNames, publishedOnly } = options;
|
|
11
9
|
const { nodeId, language } = parseLNodeId(lNodeId);
|
|
@@ -15,25 +13,13 @@ export async function getFieldValuesOfLNode(siteContext, options) {
|
|
|
15
13
|
fieldNames,
|
|
16
14
|
ignoreUnknownFieldNames,
|
|
17
15
|
});
|
|
18
|
-
|
|
16
|
+
return await loadFieldValues(siteContext, {
|
|
19
17
|
nodeId,
|
|
20
18
|
language,
|
|
21
19
|
fieldTypes,
|
|
22
20
|
publishedOnly,
|
|
21
|
+
preprocess,
|
|
23
22
|
});
|
|
24
|
-
if (preprocess) {
|
|
25
|
-
const renderingContext = createNoRenderingContext(siteContext);
|
|
26
|
-
const preprocessed = await executeRenderingHook(renderingContext, "fieldPreprocessor", {
|
|
27
|
-
fieldTypes,
|
|
28
|
-
values,
|
|
29
|
-
options: {
|
|
30
|
-
absoluteUrls: true,
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
await renderingContext.close();
|
|
34
|
-
return preprocessed;
|
|
35
|
-
}
|
|
36
|
-
return values;
|
|
37
23
|
}
|
|
38
24
|
export async function getFieldValuesOfOneList(siteContext, options) {
|
|
39
25
|
const { parentLNodeId, listName, fieldNames, preprocess, publishedOnly } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/load-fields-of.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE5F,OAAO,EACL,aAAa,EACb,YAAY,GAGb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"load-fields-of.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/load-fields-of.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,22 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ReadFieldValueOrWAttached, ReadFieldValuesOrWAttached, ScFieldType } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import type { SiteContext } from "../../site-context/site-context.types.js";
|
|
3
|
+
export interface PreprocessFieldsInput {
|
|
4
|
+
replaceWithExcerpt?: boolean;
|
|
5
|
+
}
|
|
3
6
|
export declare function getSiteFieldValue(siteContext: Pick<SiteContext, "cn" | "siteSchema" | "siteNodeId">, options: {
|
|
4
7
|
fieldName: string;
|
|
5
8
|
language?: string;
|
|
6
9
|
publishedOnly: boolean;
|
|
7
|
-
}): Promise<
|
|
10
|
+
}): Promise<ReadFieldValueOrWAttached | undefined>;
|
|
8
11
|
export declare function getFieldTypesByNames(siteContext: Pick<SiteContext, "siteSchema">, options: {
|
|
9
12
|
typeName: string;
|
|
10
13
|
fieldNames?: string[];
|
|
11
14
|
ignoreUnknownFieldNames?: boolean;
|
|
12
15
|
}): ScFieldType[];
|
|
13
|
-
export declare function loadFieldValues(siteContext: Pick<SiteContext, "cn" | "siteSchema" | "siteNodeId">, { fieldTypes, nodeId, language, publishedOnly, }: {
|
|
16
|
+
export declare function loadFieldValues(siteContext: Pick<SiteContext, "cn" | "siteSchema" | "siteNodeId">, { fieldTypes, nodeId, language, publishedOnly, preprocess, }: {
|
|
14
17
|
fieldTypes: ScFieldType[];
|
|
15
18
|
nodeId: string;
|
|
16
19
|
language?: string;
|
|
17
20
|
publishedOnly: boolean;
|
|
18
|
-
|
|
21
|
+
preprocess?: PreprocessFieldsInput;
|
|
22
|
+
}): Promise<ReadFieldValuesOrWAttached>;
|
|
@@ -29,7 +29,7 @@ export function getFieldTypesByNames(siteContext, options) {
|
|
|
29
29
|
}
|
|
30
30
|
return result;
|
|
31
31
|
}
|
|
32
|
-
export async function loadFieldValues(siteContext, { fieldTypes, nodeId, language, publishedOnly, }) {
|
|
32
|
+
export async function loadFieldValues(siteContext, { fieldTypes, nodeId, language, publishedOnly, preprocess, }) {
|
|
33
33
|
const result = {};
|
|
34
34
|
if (fieldTypes.length === 0)
|
|
35
35
|
return result;
|
|
@@ -51,6 +51,7 @@ export async function loadFieldValues(siteContext, { fieldTypes, nodeId, languag
|
|
|
51
51
|
const nodeTextValues = await loadTextFieldValues(siteContext, {
|
|
52
52
|
fieldTypes: nodeTextFieldTypes,
|
|
53
53
|
nodeId,
|
|
54
|
+
selectExcerpt: preprocess?.replaceWithExcerpt ?? false,
|
|
54
55
|
});
|
|
55
56
|
const lNodeTextFieldTypes = fieldTypes.filter((item) => item.storedAs === "text" && item.localized);
|
|
56
57
|
if (language === undefined && lNodeTextFieldTypes.length !== 0) {
|
|
@@ -60,6 +61,7 @@ export async function loadFieldValues(siteContext, { fieldTypes, nodeId, languag
|
|
|
60
61
|
fieldTypes: lNodeTextFieldTypes,
|
|
61
62
|
nodeId,
|
|
62
63
|
language,
|
|
64
|
+
selectExcerpt: preprocess?.replaceWithExcerpt ?? false,
|
|
63
65
|
});
|
|
64
66
|
const labelingFieldTypes = fieldTypes.filter((item) => item.storedAs === "labeling");
|
|
65
67
|
const labelingValues = await loadFieldLabelingValues(siteContext, {
|
|
@@ -80,10 +82,10 @@ export async function loadFieldValues(siteContext, { fieldTypes, nodeId, languag
|
|
|
80
82
|
}
|
|
81
83
|
else if (storedAs === "text") {
|
|
82
84
|
if (!localized) {
|
|
83
|
-
value = nodeTextValues.get(name);
|
|
85
|
+
value = nodeTextValues.get(name)?.value;
|
|
84
86
|
}
|
|
85
87
|
else {
|
|
86
|
-
value = lNodeTextValues.get(name);
|
|
88
|
+
value = lNodeTextValues.get(name)?.value;
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
91
|
else if (storedAs === "labeling") {
|
|
@@ -103,9 +105,38 @@ export async function loadFieldValues(siteContext, { fieldTypes, nodeId, languag
|
|
|
103
105
|
throw new Error(`invalid field storedAs '${fieldType.storedAs}'`);
|
|
104
106
|
}
|
|
105
107
|
result[name] = fieldType.withGallery
|
|
106
|
-
? [
|
|
108
|
+
? [
|
|
109
|
+
value ?? null,
|
|
110
|
+
{
|
|
111
|
+
attached: "gallery",
|
|
112
|
+
h: getHandleOfField(siteContext, { fieldType, nodeId }),
|
|
113
|
+
},
|
|
114
|
+
]
|
|
107
115
|
: value;
|
|
108
116
|
}
|
|
117
|
+
if (preprocess?.replaceWithExcerpt) {
|
|
118
|
+
for (const fieldType of fieldTypes) {
|
|
119
|
+
if (fieldType.storedAs !== "text" || fieldType.renderAs !== "html")
|
|
120
|
+
continue;
|
|
121
|
+
const current = result[fieldType.name];
|
|
122
|
+
const excerpt = getExcerptFromLoadedValues({
|
|
123
|
+
localized: fieldType.localized,
|
|
124
|
+
name: fieldType.name,
|
|
125
|
+
nodeTextValues,
|
|
126
|
+
lNodeTextValues,
|
|
127
|
+
});
|
|
128
|
+
const hasExcerpt = excerpt !== undefined && excerpt !== "";
|
|
129
|
+
if (!hasExcerpt)
|
|
130
|
+
continue;
|
|
131
|
+
if (Array.isArray(current)) {
|
|
132
|
+
current[0] = null;
|
|
133
|
+
current.push({ attached: "text", excerpt });
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
result[fieldType.name] = [null, { attached: "text", excerpt }];
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
109
140
|
return result;
|
|
110
141
|
}
|
|
111
142
|
const FieldVarcharRowAT = type({
|
|
@@ -151,21 +182,36 @@ const FieldTextRowAT = type({
|
|
|
151
182
|
field: data.field,
|
|
152
183
|
dataType: data.dataType,
|
|
153
184
|
val: data.val ?? undefined,
|
|
185
|
+
excerpt: undefined,
|
|
186
|
+
}));
|
|
187
|
+
const FieldTextWithExcerptRowAT = type({
|
|
188
|
+
field: "string",
|
|
189
|
+
dataType: "string",
|
|
190
|
+
val: "string|null",
|
|
191
|
+
excerpt: "string|null",
|
|
192
|
+
"+": "reject",
|
|
193
|
+
}).pipe((data) => ({
|
|
194
|
+
field: data.field,
|
|
195
|
+
dataType: data.dataType,
|
|
196
|
+
val: data.val ?? undefined,
|
|
197
|
+
excerpt: data.excerpt ?? undefined,
|
|
154
198
|
}));
|
|
155
199
|
async function loadTextFieldValues(siteContext, options) {
|
|
156
|
-
const { nodeId, language, fieldTypes } = options;
|
|
200
|
+
const { nodeId, language, fieldTypes, selectExcerpt } = options;
|
|
157
201
|
const values = new Map();
|
|
158
202
|
if (fieldTypes.length === 0)
|
|
159
203
|
return values;
|
|
160
204
|
const typeMap = new Map(fieldTypes.map((item) => [item.name, item]));
|
|
205
|
+
const selectCols = ["f.field", "f.dataType", "f.val"].concat(selectExcerpt ? ["f.excerpt"] : []);
|
|
161
206
|
const rows = await siteContext
|
|
162
207
|
.cn("PaFieldText as f")
|
|
163
|
-
.select(
|
|
208
|
+
.select(selectCols)
|
|
164
209
|
.where("f.nodeId", nodeId)
|
|
165
210
|
.whereIn("f.field", Array.from(typeMap.keys()))
|
|
166
211
|
.where("f.language", language ?? dbAnyLanguage);
|
|
212
|
+
const RowAT = selectExcerpt ? FieldTextWithExcerptRowAT : FieldTextRowAT;
|
|
167
213
|
for (const row of rows) {
|
|
168
|
-
const { field: fieldName, dataType, val: rawVal } =
|
|
214
|
+
const { field: fieldName, dataType, val: rawVal, excerpt } = RowAT.assert(row);
|
|
169
215
|
const fieldType = typeMap.get(fieldName);
|
|
170
216
|
if (!fieldType)
|
|
171
217
|
throw new Error(`should have the field type of '${fieldName}'`);
|
|
@@ -173,10 +219,15 @@ async function loadTextFieldValues(siteContext, options) {
|
|
|
173
219
|
throw new Error(`dataType mismatch for '${fieldName}', '${language ? `${language}:` : ""}${nodeId}'`);
|
|
174
220
|
}
|
|
175
221
|
const val = formatStringFieldValue(rawVal, { fieldType, nodeId });
|
|
176
|
-
values.set(fieldName, val);
|
|
222
|
+
values.set(fieldName, { value: val, excerpt });
|
|
177
223
|
}
|
|
178
224
|
return values;
|
|
179
225
|
}
|
|
226
|
+
function getExcerptFromLoadedValues(args) {
|
|
227
|
+
const { name, localized, nodeTextValues, lNodeTextValues } = args;
|
|
228
|
+
const entry = localized ? lNodeTextValues.get(name) : nodeTextValues.get(name);
|
|
229
|
+
return entry?.excerpt;
|
|
230
|
+
}
|
|
180
231
|
function formatStringFieldValue(rawVal, options) {
|
|
181
232
|
const { fieldType } = options;
|
|
182
233
|
switch (fieldType.dataType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-fields.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/load-fields.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AASpE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"load-fields.queries.js","sourceRoot":"","sources":["../../../src/admin-backend/fields/load-fields.queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type ReadFieldValueOrWAttached, type ReadFieldValues, type ReadFieldValuesOrWAttached, type ScFieldType } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import type { RenderingHookOptions } from "@paroicms/public-server-lib";
|
|
3
3
|
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
4
4
|
export declare function executeRenderingHook(renderingContext: RenderingContext, hookName: "fieldPreprocessor", hookPayload: {
|
|
5
5
|
fieldTypes: ScFieldType[];
|
|
6
|
-
values:
|
|
6
|
+
values: ReadFieldValuesOrWAttached;
|
|
7
7
|
options?: Omit<RenderingHookOptions, "language" | "fieldType">;
|
|
8
8
|
}): Promise<ReadFieldValues>;
|
|
9
9
|
export declare function executeRenderingHookForExcerpt(renderingContext: RenderingContext, hookPayload: {
|
|
10
|
-
value:
|
|
10
|
+
value: ReadFieldValueOrWAttached | undefined;
|
|
11
11
|
fieldType: ScFieldType;
|
|
12
12
|
}): Promise<string | undefined>;
|
|
@@ -19,5 +19,5 @@ export declare function createDeprecatedAssignLiquidTag(tagHandler: LegacyLiquid
|
|
|
19
19
|
}): TagClass;
|
|
20
20
|
export declare function createDeprecatedAssignLiquidTag(tagHandler: NewLiquidTagReturnsVarHandler): TagClass;
|
|
21
21
|
export declare function wrapLiquidTagPromise<T = unknown>(renderingContext: RenderingContext, promise: Promise<T>, tagName: string): Promise<T>;
|
|
22
|
-
export declare function
|
|
22
|
+
export declare function isGeneratorObject(value: unknown): value is Generator;
|
|
23
23
|
export declare function consumeGenerator(gen: Generator): unknown;
|
|
@@ -35,7 +35,7 @@ export function createDeprecatedAssignLiquidTag(tagHandler, options = {}) {
|
|
|
35
35
|
namedParameters,
|
|
36
36
|
variableName: this.#varName,
|
|
37
37
|
});
|
|
38
|
-
const val =
|
|
38
|
+
const val = isGeneratorObject(result)
|
|
39
39
|
? yield* result
|
|
40
40
|
: isPromise(result)
|
|
41
41
|
? yield wrapLiquidTagPromise(renderingContext, result, tagHandler.name)
|
|
@@ -53,11 +53,17 @@ export async function wrapLiquidTagPromise(renderingContext, promise, tagName) {
|
|
|
53
53
|
throw error;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
-
export function
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
56
|
+
export function isGeneratorObject(value) {
|
|
57
|
+
if (!value || typeof value !== "object")
|
|
58
|
+
return false;
|
|
59
|
+
const tag = Object.prototype.toString.call(value);
|
|
60
|
+
if (tag === "[object Generator]")
|
|
61
|
+
return true;
|
|
62
|
+
const v = value;
|
|
63
|
+
return (typeof v.next === "function" &&
|
|
64
|
+
typeof v.throw === "function" &&
|
|
65
|
+
typeof v.return === "function" &&
|
|
66
|
+
v[Symbol.iterator] === v);
|
|
61
67
|
}
|
|
62
68
|
export function consumeGenerator(gen) {
|
|
63
69
|
let last;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquid-tag-helpers.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/liquid-tag-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,EACT,IAAI,EAEJ,GAAG,GAIJ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AA8BjF,MAAM,UAAU,+BAA+B,CAC7C,UAAsC,EACtC,UAAsC,EAAE;IAExC,OAAO,MAAM,WAAY,SAAQ,GAAG;QAElC,QAAQ,CAAS;QACjB,KAAK,CAAO;QACZ,cAAc,CAAc;QAE5B,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;YAExD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;gBAEzB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;gBAChC,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBAEN,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,SAAS,CAAC,MAAM,CACnB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,EAC7B,2BAA2B,KAAK,CAAC,IAAI,iBAAiB,CACvD,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBAEzB,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBAClD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;gBAClE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;gBAGrC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBACjD,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAED,CAAC,MAAM,CAAC,GAAY,EAAE,QAAiB;YACrC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;YAEtD,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc;gBACvC,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC;gBAC3C,CAAC,CAAC,SAAS,CAAC;YAEd,MAAM,MAAM,GAAG,UAAU,CAAC,gBAAgB,EAAE;gBAC1C,aAAa;gBACb,eAAe;gBACf,YAAY,EAAE,IAAI,CAAC,QAAQ;aAC5B,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"liquid-tag-helpers.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/liquid-tag-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Tag, } from "liquidjs";
|
|
|
2
2
|
import { isPromise } from "node:util/types";
|
|
3
3
|
import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
|
|
4
4
|
import { evaluateFunctionCallArgs, parseFunctionCallFromTokenizer, } from "./liquid-function-call-args.js";
|
|
5
|
-
import { consumeGenerator,
|
|
5
|
+
import { consumeGenerator, isGeneratorObject, wrapLiquidTagPromise } from "./liquid-tag-helpers.js";
|
|
6
6
|
export function createOutLiquidTag() {
|
|
7
7
|
const handlers = new Map();
|
|
8
8
|
return {
|
|
@@ -27,7 +27,7 @@ export function createOutLiquidTag() {
|
|
|
27
27
|
const result = handler(renderingContext, { positionedParameters, namedParameters });
|
|
28
28
|
let val;
|
|
29
29
|
try {
|
|
30
|
-
if (
|
|
30
|
+
if (isGeneratorObject(result)) {
|
|
31
31
|
val = consumeGenerator(result);
|
|
32
32
|
}
|
|
33
33
|
else if (isPromise(result)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"out-liquid-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/out-liquid-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,GAAG,GAIJ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EACL,wBAAwB,EACxB,8BAA8B,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"out-liquid-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/out-liquid-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,GAAG,GAIJ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EACL,wBAAwB,EACxB,8BAA8B,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAepG,MAAM,UAAU,kBAAkB;IAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;IAErD,OAAO;QACL,QAAQ,EAAE,MAAM,MAAO,SAAQ,GAAG;YAChC,YAAY,CAAS;YACrB,iBAAiB,GAAiB,EAAE,CAAC;YACrC,aAAa,GAA8C,EAAE,CAAC;YAE9D,YAAY,KAAe,EAAE,YAA6B,EAAE,MAAc;gBACxE,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;gBAEnC,MAAM,MAAM,GAAG,8BAA8B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9D,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC;gBACvC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBACjD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;YAC3C,CAAC;YAED,CAAC,MAAM,CAAC,GAAY,EAAE,OAAgB;gBACpC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;gBACtD,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC;gBAEhD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChD,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;gBAExE,MAAM,EAAE,oBAAoB,EAAE,eAAe,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,wBAAwB,CAChF,GAAG,EACH,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,aAAa,CACnB,CAAQ,CAAC;gBAEV,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,EAAE,oBAAoB,EAAE,eAAe,EAAE,CAAC,CAAC;gBAEpF,IAAI,GAAY,CAAC;gBACjB,IAAI,CAAC;oBACH,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC9B,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBACjC,CAAC;yBAAM,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC7B,GAAG,GAAG,MAAM,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;oBACzF,CAAC;yBAAM,CAAC;wBACN,GAAG,GAAG,MAAM,CAAC;oBACf,CAAC;oBACD,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC7B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,YAAY,WAAW,EAAE,KAAK,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;SACF;QACD,eAAe,CAAC,IAAI,EAAE,OAAO;YAC3B,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { Tag, } from "liquidjs";
|
|
|
2
2
|
import { isPromise } from "node:util/types";
|
|
3
3
|
import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
|
|
4
4
|
import { evaluateFunctionCallArgs, parseFunctionCallFromTokenizer, } from "./liquid-function-call-args.js";
|
|
5
|
-
import { consumeGenerator,
|
|
5
|
+
import { consumeGenerator, isGeneratorObject, wrapLiquidTagPromise } from "./liquid-tag-helpers.js";
|
|
6
6
|
export function createSetLiquidTag() {
|
|
7
7
|
const handlers = new Map();
|
|
8
8
|
return {
|
|
@@ -37,7 +37,7 @@ export function createSetLiquidTag() {
|
|
|
37
37
|
namedParameters,
|
|
38
38
|
variableName: this.#varName,
|
|
39
39
|
});
|
|
40
|
-
if (
|
|
40
|
+
if (isGeneratorObject(result)) {
|
|
41
41
|
val = consumeGenerator(result);
|
|
42
42
|
}
|
|
43
43
|
else if (isPromise(result)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-liquid-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/helpers/set-liquid-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,GAAG,GAIJ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EACL,wBAAwB,EACxB,8BAA8B,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,
|
|
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docs-liquid-set-handler.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/docs-liquid-set-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,gCAAgC,EAChC,mBAAmB,EACnB,YAAY,GAGb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EACL,2BAA2B,GAE5B,MAAM,8DAA8D,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAG5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAGxE,MAAM,UAAU,0BAA0B;IACxC,OAAO,CAAC,gBAAgB,EAAE,EAAE,oBAAoB,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE,EAAE;QACnF,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;QAEzC,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;YAAE,OAAO;QAE9B,IAAI,cAAc,GAAG,8BAA8B,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEvE,MAAM,EAAE,oBAAoB,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,eAAe,EAAE,WAAW,EAAE;YAC5F,YAAY;SACb,CAAC,CAAC;QACH,cAAc,GAAG,mBAAmB,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;QAE3E,MAAM,QAAQ,GAAG,2BAA2B,CAAC,MAAM,EAAE;YACnD,aAAa,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE;SAC9C,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,gBAAgB,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"docs-liquid-set-handler.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/docs-liquid-set-handler.ts"],"names":[],"mappings":"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"}
|