@paroicms/server 1.44.0 → 1.46.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/README.md +0 -1
- package/dist/common/child-ordering-query.d.ts +3 -3
- package/dist/common/child-ordering-query.js +3 -4
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/common/data-format.js +12 -13
- package/dist/common/data-format.js.map +1 -1
- package/dist/common/mail/sendMail.helpers.js +1 -2
- package/dist/common/mail/sendMail.helpers.js.map +1 -1
- package/dist/common/media-handles.helpers.d.ts +3 -3
- package/dist/common/media-handles.helpers.js +8 -9
- package/dist/common/media-handles.helpers.js.map +1 -1
- package/dist/common/serve-text-or.js +2 -3
- package/dist/common/serve-text-or.js.map +1 -1
- package/dist/common/text-cache.d.ts +2 -2
- package/dist/common/text-cache.js +10 -11
- package/dist/common/text-cache.js.map +1 -1
- package/dist/common/tracker-report.js +1 -2
- package/dist/common/tracker-report.js.map +1 -1
- package/dist/context.d.ts +3 -3
- package/dist/context.js +10 -10
- package/dist/context.js.map +1 -1
- package/dist/express/http-helpers.js +5 -6
- package/dist/express/http-helpers.js.map +1 -1
- package/dist/express/public-api-middlewares.js +1 -2
- package/dist/express/public-api-middlewares.js.map +1 -1
- package/dist/express/static-middlewares.js +3 -4
- package/dist/express/static-middlewares.js.map +1 -1
- package/dist/helpers/excerpt.helpers.js +2 -3
- package/dist/helpers/excerpt.helpers.js.map +1 -1
- package/dist/helpers/label-translator.helper.d.ts +5 -10
- package/dist/helpers/label-translator.helper.js +7 -14
- package/dist/helpers/label-translator.helper.js.map +1 -1
- package/dist/helpers/make-plugin-site-context.js +2 -4
- package/dist/helpers/make-plugin-site-context.js.map +1 -1
- package/dist/helpers/passwordEncrypt-helper.js +2 -3
- package/dist/helpers/passwordEncrypt-helper.js.map +1 -1
- package/dist/helpers/special-account.helpers.js +5 -5
- package/dist/helpers/special-account.helpers.js.map +1 -1
- package/dist/helpers/utils-helper.d.ts +0 -1
- package/dist/helpers/utils-helper.js +3 -12
- package/dist/helpers/utils-helper.js.map +1 -1
- package/dist/index.js +2 -3
- package/dist/index.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-drop.js +4 -4
- package/dist/liquidjs-tools/liquidjs-drop.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-filter.js +1 -2
- package/dist/liquidjs-tools/liquidjs-filter.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.js +1 -2
- package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.js +3 -4
- package/dist/liquidjs-tools/liquidjs-rendering/rendering-context.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-utils.js +2 -3
- package/dist/liquidjs-tools/liquidjs-utils.js.map +1 -1
- package/dist/liquidjs-tools/render-clone/collection.js +1 -2
- package/dist/liquidjs-tools/render-clone/collection.js.map +1 -1
- package/dist/liquidjs-tools/render-clone/render.js +2 -3
- package/dist/liquidjs-tools/render-clone/render.js.map +1 -1
- package/dist/maintenance/maintenance-task.js +3 -4
- package/dist/maintenance/maintenance-task.js.map +1 -1
- package/dist/maintenance/shutdown.js +2 -3
- package/dist/maintenance/shutdown.js.map +1 -1
- package/dist/modules/core/account/account.queries.js +10 -11
- package/dist/modules/core/account/account.queries.js.map +1 -1
- package/dist/modules/core/document/document.helper.d.ts +2 -2
- package/dist/modules/core/document/document.helper.js +4 -5
- package/dist/modules/core/document/document.helper.js.map +1 -1
- package/dist/modules/core/document/document.schema.d.ts +1 -1
- package/dist/modules/core/document/document.schema.js +2 -2
- package/dist/modules/core/document/load-documents.queries.js +7 -8
- package/dist/modules/core/document/load-documents.queries.js.map +1 -1
- package/dist/modules/core/document/save-documents.queries.js +12 -13
- package/dist/modules/core/document/save-documents.queries.js.map +1 -1
- package/dist/modules/core/fields/_fields.helpers.d.ts +2 -2
- package/dist/modules/core/fields/_fields.helpers.js +1 -2
- package/dist/modules/core/fields/_fields.helpers.js.map +1 -1
- package/dist/modules/core/fields/fields.resolver.js +8 -9
- package/dist/modules/core/fields/fields.resolver.js.map +1 -1
- package/dist/modules/core/fields/load-fields.queries.d.ts +4 -4
- package/dist/modules/core/fields/load-fields.queries.js +7 -9
- package/dist/modules/core/fields/load-fields.queries.js.map +1 -1
- package/dist/modules/core/fields/preprocess-fields.d.ts +3 -3
- package/dist/modules/core/fields/preprocess-fields.js +4 -5
- package/dist/modules/core/fields/preprocess-fields.js.map +1 -1
- package/dist/modules/core/fields/save-fields.queries.d.ts +2 -2
- package/dist/modules/core/fields/save-fields.queries.js +4 -5
- package/dist/modules/core/fields/save-fields.queries.js.map +1 -1
- package/dist/modules/core/labeling/labeling.queries.js +2 -3
- package/dist/modules/core/labeling/labeling.queries.js.map +1 -1
- package/dist/modules/core/labeling/labeling.schema.d.ts +1 -1
- package/dist/modules/core/labeling/labeling.schema.js +2 -2
- package/dist/modules/core/leaf/leaf.queries.d.ts +4 -11
- package/dist/modules/core/leaf/leaf.queries.js +22 -105
- package/dist/modules/core/leaf/leaf.queries.js.map +1 -1
- package/dist/modules/core/leaf/leaf.schema.d.ts +1 -1
- package/dist/modules/core/leaf/leaf.schema.js +2 -2
- package/dist/modules/core/leaf/ordered-leaf.queries.js +1 -2
- package/dist/modules/core/leaf/ordered-leaf.queries.js.map +1 -1
- package/dist/modules/core/media/media-upload.controller.d.ts +0 -1
- package/dist/modules/core/media/media-upload.controller.js +2 -2
- package/dist/modules/core/media/media-upload.controller.js.map +1 -1
- package/dist/modules/core/media/media.d.ts +0 -1
- package/dist/modules/core/media/media.js +2 -3
- package/dist/modules/core/media/media.js.map +1 -1
- package/dist/modules/core/part/part-leaf.queries.js +2 -3
- package/dist/modules/core/part/part-leaf.queries.js.map +1 -1
- package/dist/modules/core/part/part.queries.d.ts +3 -3
- package/dist/modules/core/part/part.queries.js +20 -22
- package/dist/modules/core/part/part.queries.js.map +1 -1
- package/dist/modules/core/part/part.resolver.d.ts +1 -1
- package/dist/modules/core/part/part.resolver.extend.js +4 -4
- package/dist/modules/core/part/part.resolver.extend.js.map +1 -1
- package/dist/modules/core/part/part.resolver.js +3 -3
- package/dist/modules/core/part/part.schema.d.ts +2 -2
- package/dist/modules/core/part/part.schema.js +4 -4
- package/dist/modules/core/section/section-wrap.resolver.js +1 -1
- package/dist/modules/core/section/section.queries.d.ts +1 -1
- package/dist/modules/core/section/section.queries.js +26 -23
- package/dist/modules/core/section/section.queries.js.map +1 -1
- package/dist/modules/core/section/section.schema.d.ts +1 -1
- package/dist/modules/core/section/section.schema.js +2 -2
- package/dist/modules/public-api/mail/validate-recaptcha-response.js +1 -2
- package/dist/modules/public-api/mail/validate-recaptcha-response.js.map +1 -1
- package/dist/modules/public-api/public-api-rendering.js +2 -3
- package/dist/modules/public-api/public-api-rendering.js.map +1 -1
- package/dist/modules/public-api/search-text/search-text.queries.js +2 -3
- package/dist/modules/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/modules/public-site/feed/feed-generator.d.ts +1 -1
- package/dist/modules/public-site/feed/feed-generator.js +12 -13
- package/dist/modules/public-site/feed/feed-generator.js.map +1 -1
- package/dist/modules/public-site/feed/feed-helpers.js +1 -2
- package/dist/modules/public-site/feed/feed-helpers.js.map +1 -1
- package/dist/modules/public-site/feed/feed.middleware.js +1 -1
- package/dist/modules/public-site/feed/feed.middleware.js.map +1 -1
- package/dist/modules/public-site/helpers/format-date.helper.js +1 -2
- package/dist/modules/public-site/helpers/format-date.helper.js.map +1 -1
- package/dist/modules/public-site/helpers/medias.helpers.d.ts +2 -2
- package/dist/modules/public-site/helpers/medias.helpers.js +1 -2
- package/dist/modules/public-site/helpers/medias.helpers.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/format-date.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/format-date.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/format-number.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/format-number.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/head-tags-filter.js +3 -4
- package/dist/modules/public-site/liquidjs-filters/head-tags-filter.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/image-zoom-url.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/image-zoom-url.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/info-filter.js +5 -6
- package/dist/modules/public-site/liquidjs-filters/info-filter.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/inject-facebook-chat.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/inject-facebook-chat.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/inject-menu-items-data.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/inject-menu-items-data.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/make-excerpt.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/make-excerpt.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/obfuscate.js +2 -3
- package/dist/modules/public-site/liquidjs-filters/obfuscate.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/open-graph-filter.js +2 -3
- package/dist/modules/public-site/liquidjs-filters/open-graph-filter.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/translate-filter.js +1 -2
- package/dist/modules/public-site/liquidjs-filters/translate-filter.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/get-doc-tag.js +1 -2
- package/dist/modules/public-site/liquidjs-tags/get-doc-tag.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js +1 -2
- package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.js +2 -3
- package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/use-image-tag.js +1 -2
- package/dist/modules/public-site/liquidjs-tags/use-image-tag.js.map +1 -1
- package/dist/modules/public-site/media-serve/_media-serve-helpers.js +1 -2
- package/dist/modules/public-site/media-serve/_media-serve-helpers.js.map +1 -1
- package/dist/modules/public-site/public-route/make-url.d.ts +1 -1
- package/dist/modules/public-site/public-route/make-url.js +15 -16
- package/dist/modules/public-site/public-route/make-url.js.map +1 -1
- package/dist/modules/public-site/public-route/public-route-parser.d.ts +6 -6
- package/dist/modules/public-site/public-route/public-route-parser.js +35 -42
- package/dist/modules/public-site/public-route/public-route-parser.js.map +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.js +8 -9
- package/dist/modules/public-site/public-route/raw-document-payload.js.map +1 -1
- package/dist/modules/public-site/public-site.controller.js +2 -2
- package/dist/modules/public-site/public-site.controller.js.map +1 -1
- package/dist/modules/public-site/serve-document/serve-document.js +2 -3
- package/dist/modules/public-site/serve-document/serve-document.js.map +1 -1
- package/dist/public-payload/breadcrumb.queries.js +1 -2
- package/dist/public-payload/breadcrumb.queries.js.map +1 -1
- package/dist/public-payload/create-doc-drop.js +9 -10
- package/dist/public-payload/create-doc-drop.js.map +1 -1
- package/dist/public-payload/create-doc-part-drop.js +6 -7
- package/dist/public-payload/create-doc-part-drop.js.map +1 -1
- package/dist/public-payload/doc-values.queries.d.ts +5 -5
- package/dist/public-payload/doc-values.queries.js +10 -11
- package/dist/public-payload/doc-values.queries.js.map +1 -1
- package/dist/public-payload/excerpt.queries.d.ts +2 -2
- package/dist/public-payload/excerpt.queries.js +1 -2
- package/dist/public-payload/excerpt.queries.js.map +1 -1
- package/dist/public-payload/field-values.d.ts +1 -1
- package/dist/public-payload/field-values.js +5 -6
- package/dist/public-payload/field-values.js.map +1 -1
- package/dist/public-payload/get-siblings.queries.js +5 -6
- package/dist/public-payload/get-siblings.queries.js.map +1 -1
- package/dist/public-payload/load-default-image.d.ts +2 -2
- package/dist/public-payload/load-default-image.js +2 -3
- package/dist/public-payload/load-default-image.js.map +1 -1
- package/dist/public-payload/make-basic-payload.js +1 -2
- package/dist/public-payload/make-basic-payload.js.map +1 -1
- package/dist/public-payload/make-image-available.js +1 -2
- package/dist/public-payload/make-image-available.js.map +1 -1
- package/dist/public-payload/parts.queries.d.ts +5 -5
- package/dist/public-payload/parts.queries.js +15 -16
- package/dist/public-payload/parts.queries.js.map +1 -1
- package/dist/public-payload/public-payload.types.d.ts +8 -8
- package/dist/public-payload/site-payload.js +4 -5
- package/dist/public-payload/site-payload.js.map +1 -1
- package/dist/public-payload/taxonomies.queries.d.ts +4 -4
- package/dist/public-payload/taxonomies.queries.js +6 -7
- package/dist/public-payload/taxonomies.queries.js.map +1 -1
- package/dist/public-payload/translations.queries.d.ts +1 -1
- package/dist/public-payload/translations.queries.js +2 -3
- package/dist/public-payload/translations.queries.js.map +1 -1
- package/dist/site-context/create-site-context.js +28 -7
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/site-context.js +5 -6
- package/dist/site-context/site-context.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +3 -3
- package/package.json +13 -13
- package/schema.gql +7 -7
- package/dist/plugins/plugin-api.d.ts +0 -3
- package/dist/plugins/plugin-api.js +0 -50
- package/dist/plugins/plugin-api.js.map +0 -1
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.parsePublicRoute = parsePublicRoute;
|
|
4
|
+
exports.findParentParsedRouteWithDocument = findParentParsedRouteWithDocument;
|
|
5
|
+
const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
|
|
4
6
|
function parsePublicRoute(siteContext, path) {
|
|
5
|
-
const { siteSchema
|
|
7
|
+
const { siteSchema } = siteContext;
|
|
6
8
|
const { cleanedPath, urlParameters } = parseUrlParameters(path);
|
|
7
9
|
const tokens = cleanedPath
|
|
8
10
|
.split("/")
|
|
9
11
|
.slice(1)
|
|
10
12
|
.filter((token) => token.length > 0);
|
|
11
|
-
const language =
|
|
12
|
-
const parts =
|
|
13
|
+
const language = siteSchema.isMultilingual ? tokens[0] : siteSchema.defaultLanguage;
|
|
14
|
+
const parts = siteSchema.isMultilingual ? tokens.slice(1) : tokens;
|
|
13
15
|
if (!language || !siteSchema.languages.includes(language))
|
|
14
16
|
return;
|
|
15
17
|
const urlCacheKey = [];
|
|
16
|
-
if (
|
|
18
|
+
if (siteSchema.isMultilingual)
|
|
17
19
|
urlCacheKey.push(language);
|
|
18
|
-
let prev = siteSchema.
|
|
20
|
+
let prev = siteSchema.leafTypes.home;
|
|
19
21
|
const routingPoints = [prev];
|
|
20
22
|
let depth = 0;
|
|
21
23
|
let i = 0;
|
|
@@ -31,9 +33,9 @@ function parsePublicRoute(siteContext, path) {
|
|
|
31
33
|
}
|
|
32
34
|
let lastRedirectTo = prev.redirectTo;
|
|
33
35
|
let parentCandidates = [prev];
|
|
34
|
-
const
|
|
36
|
+
const regularRelativeIds = [];
|
|
35
37
|
while (i < parts.length) {
|
|
36
|
-
const found =
|
|
38
|
+
const found = findRegularRelativeIdByUrlPath({
|
|
37
39
|
siteSchema,
|
|
38
40
|
parentCandidates,
|
|
39
41
|
parts,
|
|
@@ -41,24 +43,23 @@ function parsePublicRoute(siteContext, path) {
|
|
|
41
43
|
});
|
|
42
44
|
if (!found)
|
|
43
45
|
return;
|
|
44
|
-
|
|
45
|
-
urlCacheKey.push(`regular:${found.
|
|
46
|
+
regularRelativeIds.push(found.regularRelativeId);
|
|
47
|
+
urlCacheKey.push(`regular:${found.regularRelativeId.relativeId}`);
|
|
46
48
|
++depth;
|
|
47
|
-
parentCandidates = found.
|
|
49
|
+
parentCandidates = found.regularRelativeId.candidateTypes;
|
|
48
50
|
i += found.skipUrlParts;
|
|
49
51
|
lastRedirectTo = undefined;
|
|
50
52
|
}
|
|
51
53
|
return {
|
|
52
54
|
language,
|
|
53
55
|
routingPoints,
|
|
54
|
-
|
|
56
|
+
regularRelativeIds,
|
|
55
57
|
redirectTo: lastRedirectTo,
|
|
56
58
|
depth,
|
|
57
59
|
urlCacheKey: urlCacheKey.join("/"),
|
|
58
60
|
urlParameters,
|
|
59
61
|
};
|
|
60
62
|
}
|
|
61
|
-
exports.parsePublicRoute = parsePublicRoute;
|
|
62
63
|
function parseUrlParameters(path) {
|
|
63
64
|
const result = path.match(/(^.+)(\?.*)$/);
|
|
64
65
|
if (result) {
|
|
@@ -73,38 +74,31 @@ function parseUrlParameters(path) {
|
|
|
73
74
|
};
|
|
74
75
|
}
|
|
75
76
|
function findRoutingPointByUrlPath({ siteSchema, parent, urlPath, language, }) {
|
|
76
|
-
for (const
|
|
77
|
-
const documentType = siteSchema
|
|
78
|
-
if (!documentType)
|
|
79
|
-
throw new Error(`document-type '${leafType}' should be in the schema`);
|
|
80
|
-
if (documentType.kind !== "routingPoint" || !documentType.urlPaths)
|
|
77
|
+
for (const typeName of parent.children ?? []) {
|
|
78
|
+
const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, typeName);
|
|
79
|
+
if (!documentType.isRoutingPoint || !documentType.urlPaths)
|
|
81
80
|
continue;
|
|
82
81
|
if (urlPath === documentType.urlPaths[language])
|
|
83
82
|
return documentType;
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
|
-
function
|
|
85
|
+
function findRegularRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, partsIndex, }) {
|
|
87
86
|
const candidateTypes = parentCandidates
|
|
88
|
-
.reduce((
|
|
87
|
+
.reduce((childTypeNames, parent) => {
|
|
89
88
|
if (parent.children)
|
|
90
|
-
|
|
91
|
-
return
|
|
89
|
+
childTypeNames.push(...parent.children);
|
|
90
|
+
return childTypeNames;
|
|
92
91
|
}, [])
|
|
93
|
-
?.map((
|
|
94
|
-
|
|
95
|
-
if (!documentType)
|
|
96
|
-
throw new Error(`document-type '${leafType}' should be in the schema`);
|
|
97
|
-
return documentType;
|
|
98
|
-
})
|
|
99
|
-
.filter((docType) => docType.kind === "classic");
|
|
92
|
+
?.map((typeName) => (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, typeName))
|
|
93
|
+
.filter((docType) => !docType.isRoutingPoint);
|
|
100
94
|
if (!candidateTypes || candidateTypes.length === 0)
|
|
101
95
|
return;
|
|
102
96
|
const route = candidateTypes[0].route;
|
|
103
97
|
if (route === ":relativeId-:slug") {
|
|
104
98
|
const urlPath = parts[partsIndex];
|
|
105
|
-
const relativeId =
|
|
99
|
+
const relativeId = parseRegularRelativeIdSlug(urlPath);
|
|
106
100
|
return {
|
|
107
|
-
|
|
101
|
+
regularRelativeId: { relativeId, candidateTypes },
|
|
108
102
|
skipUrlParts: 1,
|
|
109
103
|
};
|
|
110
104
|
}
|
|
@@ -116,14 +110,14 @@ function findClassicRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, p
|
|
|
116
110
|
return;
|
|
117
111
|
}
|
|
118
112
|
const urlPath = parts[partsIndex + 3];
|
|
119
|
-
const relativeId =
|
|
113
|
+
const relativeId = parseRegularRelativeIdSlug(urlPath);
|
|
120
114
|
return {
|
|
121
|
-
|
|
115
|
+
regularRelativeId: { relativeId, candidateTypes },
|
|
122
116
|
skipUrlParts: 4,
|
|
123
117
|
};
|
|
124
118
|
}
|
|
125
119
|
}
|
|
126
|
-
function
|
|
120
|
+
function parseRegularRelativeIdSlug(urlPath) {
|
|
127
121
|
const index = urlPath.indexOf("-");
|
|
128
122
|
return index === -1 ? urlPath : urlPath.substring(0, index);
|
|
129
123
|
}
|
|
@@ -152,27 +146,26 @@ function findParentParsedRouteWithDocument(parsedRoute) {
|
|
|
152
146
|
return curRoute;
|
|
153
147
|
}
|
|
154
148
|
}
|
|
155
|
-
exports.findParentParsedRouteWithDocument = findParentParsedRouteWithDocument;
|
|
156
149
|
function findParentParsedRoute(parsedRoute) {
|
|
157
150
|
const routingPoints = [...parsedRoute.routingPoints];
|
|
158
|
-
const
|
|
151
|
+
const regularRelativeIds = [...parsedRoute.regularRelativeIds];
|
|
159
152
|
const urlCacheKey = parsedRoute.urlCacheKey.split("/");
|
|
160
|
-
if (
|
|
161
|
-
|
|
153
|
+
if (regularRelativeIds.length > 0) {
|
|
154
|
+
regularRelativeIds.pop();
|
|
162
155
|
urlCacheKey.pop();
|
|
163
156
|
}
|
|
164
157
|
else if (routingPoints.length > 0) {
|
|
165
158
|
routingPoints.pop();
|
|
166
159
|
urlCacheKey.pop();
|
|
167
160
|
}
|
|
168
|
-
if (
|
|
161
|
+
if (regularRelativeIds.length === 0 && routingPoints.length === 0)
|
|
169
162
|
return;
|
|
170
|
-
const
|
|
171
|
-
const redirectTo =
|
|
163
|
+
const lastRegular = regularRelativeIds.length > 0 ? regularRelativeIds[regularRelativeIds.length - 1] : undefined;
|
|
164
|
+
const redirectTo = lastRegular ? undefined : routingPoints[routingPoints.length - 1]?.redirectTo;
|
|
172
165
|
return {
|
|
173
166
|
language: parsedRoute.language,
|
|
174
167
|
routingPoints,
|
|
175
|
-
|
|
168
|
+
regularRelativeIds,
|
|
176
169
|
redirectTo,
|
|
177
170
|
depth: parsedRoute.depth - 1,
|
|
178
171
|
urlCacheKey: urlCacheKey.join("/"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.fetchRawDocPayload =
|
|
3
|
+
exports.fetchRawDocPayload = fetchRawDocPayload;
|
|
4
4
|
const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
|
|
5
5
|
async function fetchRawDocPayload(siteContext, parsedRoute) {
|
|
6
6
|
const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
|
|
@@ -11,7 +11,6 @@ async function fetchRawDocPayload(siteContext, parsedRoute) {
|
|
|
11
11
|
language: parsedRoute.language,
|
|
12
12
|
});
|
|
13
13
|
}
|
|
14
|
-
exports.fetchRawDocPayload = fetchRawDocPayload;
|
|
15
14
|
function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
16
15
|
const query = siteContext.cn.createQueryBuilder();
|
|
17
16
|
query
|
|
@@ -20,15 +19,15 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
|
20
19
|
language: parsedRoute.language,
|
|
21
20
|
})
|
|
22
21
|
.andWhere("l0.depth = 0")
|
|
23
|
-
.andWhere("l0.
|
|
22
|
+
.andWhere("l0.typeName = 'home'")
|
|
24
23
|
.andWhere("l0.publishDate <= current_timestamp")
|
|
25
24
|
.andWhere("s0.ready = 1");
|
|
26
25
|
let prev = 0;
|
|
27
26
|
for (const routingPoint of parsedRoute.routingPoints.slice(1)) {
|
|
28
27
|
const cur = prev + 1;
|
|
29
28
|
query
|
|
30
|
-
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.
|
|
31
|
-
[`
|
|
29
|
+
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.typeName = :typeName${cur}`, {
|
|
30
|
+
[`typeName${cur}`]: routingPoint.typeName,
|
|
32
31
|
})
|
|
33
32
|
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
|
|
34
33
|
language: parsedRoute.language,
|
|
@@ -37,7 +36,7 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
|
37
36
|
.andWhere(`s${cur}.ready = 1`);
|
|
38
37
|
prev = cur;
|
|
39
38
|
}
|
|
40
|
-
for (const { candidateTypes, relativeId } of parsedRoute.
|
|
39
|
+
for (const { candidateTypes, relativeId } of parsedRoute.regularRelativeIds) {
|
|
41
40
|
const cur = prev + 1;
|
|
42
41
|
query
|
|
43
42
|
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.relativeId = :relativeId${cur}`, {
|
|
@@ -46,15 +45,15 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
|
46
45
|
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
|
|
47
46
|
language: parsedRoute.language,
|
|
48
47
|
})
|
|
49
|
-
.andWhere(`l${cur}.
|
|
50
|
-
[`
|
|
48
|
+
.andWhere(`l${cur}.typeName in (:...typeName${cur})`, {
|
|
49
|
+
[`typeName${cur}`]: candidateTypes.map((t) => t.typeName),
|
|
51
50
|
})
|
|
52
51
|
.andWhere(`l${cur}.publishDate <= current_timestamp`)
|
|
53
52
|
.andWhere(`s${cur}.ready = 1`);
|
|
54
53
|
prev = cur;
|
|
55
54
|
}
|
|
56
55
|
query
|
|
57
|
-
.addSelect(`l${prev}.
|
|
56
|
+
.addSelect(`l${prev}.typeName`, "typeName")
|
|
58
57
|
.addSelect(`l${prev}.id`, "leafId")
|
|
59
58
|
.addSelect(`l${prev}.relativeId`, "relativeId")
|
|
60
59
|
.addSelect(`l${prev}.publishDate`, "publishDate");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.PublicSiteController = void 0;
|
|
16
|
+
exports.serveHomePage = serveHomePage;
|
|
16
17
|
const common_1 = require("@nestjs/common");
|
|
17
18
|
const internal_server_lib_1 = require("@paroicms/internal-server-lib");
|
|
18
19
|
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
@@ -54,5 +55,4 @@ async function serveHomePage(siteContext, req, res, tracker) {
|
|
|
54
55
|
});
|
|
55
56
|
await serveOr.putInCacheAndServe(html, renderingContext.getDependencyKeys());
|
|
56
57
|
}
|
|
57
|
-
exports.serveHomePage = serveHomePage;
|
|
58
58
|
//# sourceMappingURL=public-site.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAuBA,sCAkBC;AAzCD,2CAA2D;AAC3D,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6FAA+F;AAC/F,iGAAmG;AACnG,gFAAiF;AACjF,kEAAiE;AAI1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEzB,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAY,EAAS,GAAa;QACnD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;QAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAA;AARY,oDAAoB;AAEzB;IADL,IAAA,YAAG,GAAE;IACO,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAKtC;+BAPU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAQhC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,CAAC;QACxB,OAAO,EAAE,IAAA,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.generateDocumentHtml =
|
|
3
|
+
exports.generateDocumentHtml = generateDocumentHtml;
|
|
4
4
|
const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
|
|
5
5
|
const text_cache_1 = require("../../../common/text-cache");
|
|
6
6
|
const render_liquidjs_1 = require("../../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
@@ -35,7 +35,7 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
35
35
|
if (completeDocUrl !== req.url) {
|
|
36
36
|
return { status: 301, url: completeDocUrl, dependencyKeys: urlDependencyKeys };
|
|
37
37
|
}
|
|
38
|
-
const documentType = (0, internal_anywhere_lib_1.
|
|
38
|
+
const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteContext.siteSchema, docValues.typeName);
|
|
39
39
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, {
|
|
40
40
|
cacheKey,
|
|
41
41
|
tracker,
|
|
@@ -51,7 +51,6 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
51
51
|
dependencyKeys: renderingContext.getDependencyKeys(),
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
|
-
exports.generateDocumentHtml = generateDocumentHtml;
|
|
55
54
|
function makeRegularPublicPayload(siteContext, renderingContext, docValues, url) {
|
|
56
55
|
return {
|
|
57
56
|
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, docValues.language),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":";;AAmCA,oDAgEC;AAnGD,2EAAwE;AAGxE,2DAAoE;AACpE,gGAAkG;AAClG,oGAGsE;AACtE,6EAA+E;AAE/E,uEAAuE;AAEvE,uDAA4D;AAC5D,6EAG6C;AAC7C,+EAA0E;AAiBnE,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,OAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE/C,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,IAAA,uDAAiC,EAAC,WAAW,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/F,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,2BAAgB,EACpD,WAAW,EACX,OAAO,EACP;gBACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;aACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACrE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAEvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,2BAAgB,EAC/E,WAAW,EACX,OAAO,EACP;QACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;IACF,MAAM,cAAc,GAAG,GAAG,MAAM,GAAG,WAAW,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;IACrE,IAAI,cAAc,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACjF,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,6CAAqB,EAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEvF,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE;QACjE,QAAQ;QACR,OAAO;QACP,aAAa,EAAE,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;KACjE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,YAAY,CAAC,aAAa;QACzC,OAAO,EAAE,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC;KACpF,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI;QACJ,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;KACrD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,WAAwB,EACxB,gBAAkC,EAClC,SAAoB,EACpB,GAAW;IAEX,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,QAAQ,CAAC;QACxE,GAAG,EAAE,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC;KAC7E,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPublicBreadcrumb =
|
|
3
|
+
exports.getPublicBreadcrumb = getPublicBreadcrumb;
|
|
4
4
|
const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
|
|
5
5
|
const text_cache_1 = require("../common/text-cache");
|
|
6
6
|
const section_queries_1 = require("../modules/core/section/section.queries");
|
|
@@ -22,5 +22,4 @@ async function getPublicBreadcrumb(siteContext, renderingContext, documentId) {
|
|
|
22
22
|
renderingContext.addDependencyKey(...items.map((item) => (0, text_cache_1.makeCacheDependencyKey)({ documentId: item.documentId })));
|
|
23
23
|
return result;
|
|
24
24
|
}
|
|
25
|
-
exports.getPublicBreadcrumb = getPublicBreadcrumb;
|
|
26
25
|
//# sourceMappingURL=breadcrumb.queries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":";;AAQA,kDAsBC;AA9BD,uEAAsF;AACtF,qDAA8D;AAE9D,6EAAwE;AACxE,2EAAgF;AAIzE,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAA2B;IAE3B,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAa,EAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QACnF,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAgB,EAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,IAAA,qCAAe,EAAC,IAAI,CAAC,UAAU,CAAC;YACpC,GAAG;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,gBAAgB,CAC/B,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createDocPayloadDrop =
|
|
3
|
+
exports.createDocPayloadDrop = createDocPayloadDrop;
|
|
4
4
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
5
|
const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
|
|
6
6
|
const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
|
|
@@ -23,10 +23,10 @@ const parts_queries_1 = require("./parts.queries");
|
|
|
23
23
|
const taxonomies_queries_1 = require("./taxonomies.queries");
|
|
24
24
|
const translations_queries_1 = require("./translations.queries");
|
|
25
25
|
function createDocPayloadDrop(siteContext, renderingContext, docValues, options = {}) {
|
|
26
|
-
const documentType = (0, internal_anywhere_lib_1.
|
|
27
|
-
const typeLabel = (0, label_translator_helper_1.
|
|
26
|
+
const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteContext.siteSchema, docValues.typeName);
|
|
27
|
+
const typeLabel = (0, label_translator_helper_1.getLeafTypeLabel)(siteContext.siteSchema, {
|
|
28
28
|
language: docValues.language,
|
|
29
|
-
|
|
29
|
+
typeName: docValues.typeName,
|
|
30
30
|
});
|
|
31
31
|
return (0, liquidjs_drop_1.createLiquidJsDrop)({
|
|
32
32
|
renderingContext,
|
|
@@ -83,14 +83,14 @@ function createDocPayloadDrop(siteContext, renderingContext, docValues, options
|
|
|
83
83
|
return image?.uid;
|
|
84
84
|
},
|
|
85
85
|
field: () => (0, field_values_1.loadPublicFieldValues)(siteContext, renderingContext, {
|
|
86
|
-
|
|
86
|
+
typeName: docValues.typeName,
|
|
87
87
|
sectionId: docValues,
|
|
88
88
|
fieldNames: options.fieldNames,
|
|
89
89
|
}),
|
|
90
90
|
fields: () => {
|
|
91
91
|
siteContext.siteLog.warn("'fields' is deprecated, use 'field' instead");
|
|
92
92
|
return (0, field_values_1.loadPublicFieldValues)(siteContext, renderingContext, {
|
|
93
|
-
|
|
93
|
+
typeName: docValues.typeName,
|
|
94
94
|
sectionId: docValues,
|
|
95
95
|
fieldNames: options.fieldNames,
|
|
96
96
|
});
|
|
@@ -114,7 +114,6 @@ function createDocPayloadDrop(siteContext, renderingContext, docValues, options
|
|
|
114
114
|
},
|
|
115
115
|
}, siteContext);
|
|
116
116
|
}
|
|
117
|
-
exports.createDocPayloadDrop = createDocPayloadDrop;
|
|
118
117
|
function createLabelingDrop(siteContext, renderingContext, documentId, documentType, { one, deprecated } = {}) {
|
|
119
118
|
return (0, liquidjs_drop_1.createLiquidJsDrop)({
|
|
120
119
|
renderingContext,
|
|
@@ -128,11 +127,11 @@ function createLabelingDrop(siteContext, renderingContext, documentId, documentT
|
|
|
128
127
|
renderingContext.addDependencyKey((0, text_cache_1.makeCacheDependencyKey)({
|
|
129
128
|
leafId: documentId.leafId,
|
|
130
129
|
relation: "labeled",
|
|
131
|
-
|
|
130
|
+
taxonomyTypeName: useTaxonomy.taxonomy,
|
|
132
131
|
}));
|
|
133
132
|
const rawTerms = await (0, taxonomies_queries_1.loadLabeledByTerms)(siteContext, renderingContext.tracker, {
|
|
134
133
|
documentId,
|
|
135
|
-
|
|
134
|
+
taxonomyTypeName: useTaxonomy.taxonomy,
|
|
136
135
|
});
|
|
137
136
|
if (!rawTerms || rawTerms.length === 0)
|
|
138
137
|
return;
|
|
@@ -208,7 +207,7 @@ async function makeOgValuesPayload(siteContext, renderingContext, documentType,
|
|
|
208
207
|
(await siteContext.mediaStorage.getMedia({
|
|
209
208
|
handle: (0, media_handles_helpers_1.getHandleOfSiteField)(siteContext, { fieldName: "ogImage" }),
|
|
210
209
|
}))?.uid,
|
|
211
|
-
title: documentType.
|
|
210
|
+
title: documentType.typeName === "home" ? siteTitle : docValues.title,
|
|
212
211
|
siteName: siteTitle,
|
|
213
212
|
description,
|
|
214
213
|
locale: docValues.language,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-doc-drop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-doc-drop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createDocPartDrop =
|
|
3
|
+
exports.createDocPartDrop = createDocPartDrop;
|
|
4
4
|
const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
|
|
5
5
|
const public_anywhere_lib_1 = require("@paroicms/public-anywhere-lib");
|
|
6
6
|
const label_translator_helper_1 = require("../helpers/label-translator.helper");
|
|
@@ -9,10 +9,10 @@ const field_values_1 = require("./field-values");
|
|
|
9
9
|
const load_default_image_1 = require("./load-default-image");
|
|
10
10
|
const parts_queries_1 = require("./parts.queries");
|
|
11
11
|
function createDocPartDrop(siteContext, renderingContext, docValues, options) {
|
|
12
|
-
const partType = (0, internal_anywhere_lib_1.
|
|
13
|
-
const typeLabel = (0, label_translator_helper_1.
|
|
12
|
+
const partType = (0, internal_anywhere_lib_1.getPartTypeByName)(siteContext.siteSchema, docValues.typeName);
|
|
13
|
+
const typeLabel = (0, label_translator_helper_1.getLeafTypeLabel)(siteContext.siteSchema, {
|
|
14
14
|
language: docValues.language,
|
|
15
|
-
|
|
15
|
+
typeName: docValues.typeName,
|
|
16
16
|
});
|
|
17
17
|
return (0, liquidjs_drop_1.createLiquidJsDrop)({
|
|
18
18
|
renderingContext,
|
|
@@ -40,14 +40,14 @@ function createDocPartDrop(siteContext, renderingContext, docValues, options) {
|
|
|
40
40
|
return image?.uid;
|
|
41
41
|
},
|
|
42
42
|
field: () => (0, field_values_1.loadPublicFieldValues)(siteContext, renderingContext, {
|
|
43
|
-
|
|
43
|
+
typeName: docValues.typeName,
|
|
44
44
|
sectionId: docValues,
|
|
45
45
|
fieldNames: options.fieldNames,
|
|
46
46
|
}),
|
|
47
47
|
fields: () => {
|
|
48
48
|
siteContext.siteLog.warn("'part.fields' is deprecated, use 'part.field' instead");
|
|
49
49
|
return (0, field_values_1.loadPublicFieldValues)(siteContext, renderingContext, {
|
|
50
|
-
|
|
50
|
+
typeName: docValues.typeName,
|
|
51
51
|
sectionId: docValues,
|
|
52
52
|
fieldNames: options.fieldNames,
|
|
53
53
|
});
|
|
@@ -67,5 +67,4 @@ function createDocPartDrop(siteContext, renderingContext, docValues, options) {
|
|
|
67
67
|
},
|
|
68
68
|
}, siteContext);
|
|
69
69
|
}
|
|
70
|
-
exports.createDocPartDrop = createDocPartDrop;
|
|
71
70
|
//# sourceMappingURL=create-doc-part-drop.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-doc-part-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-doc-part-drop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-doc-part-drop.js","sourceRoot":"","sources":["../../src/public-payload/create-doc-part-drop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Obj } from "@paroi/data-formatters-lib";
|
|
2
2
|
import type { Tracker } from "@paroicms/internal-server-lib";
|
|
3
|
-
import type {
|
|
3
|
+
import type { ParsedSectionId, ScOrderChildrenBy } from "@paroicms/public-anywhere-lib";
|
|
4
4
|
import type { SelectQueryBuilder } from "typeorm";
|
|
5
5
|
import type { SiteContext } from "../site-context/site-context.types";
|
|
6
6
|
import type { DocValues } from "./public-payload.types";
|
|
@@ -14,7 +14,7 @@ export interface PaginatedResult<T> {
|
|
|
14
14
|
}
|
|
15
15
|
export interface GetPaginatedDocsOptions {
|
|
16
16
|
parentId: ParsedSectionId;
|
|
17
|
-
orderBy?:
|
|
17
|
+
orderBy?: ScOrderChildrenBy;
|
|
18
18
|
labeledByTermId?: string;
|
|
19
19
|
pageIndex: number;
|
|
20
20
|
pageSize: number;
|
|
@@ -22,7 +22,7 @@ export interface GetPaginatedDocsOptions {
|
|
|
22
22
|
export declare function getPaginatedListOfDocValues(siteContext: SiteContext, tracker: Tracker, options: GetPaginatedDocsOptions): Promise<PaginatedResult<DocValues>>;
|
|
23
23
|
export interface GetDocsOptions {
|
|
24
24
|
parentId: ParsedSectionId;
|
|
25
|
-
orderBy?:
|
|
25
|
+
orderBy?: ScOrderChildrenBy;
|
|
26
26
|
offset?: number;
|
|
27
27
|
limit?: number;
|
|
28
28
|
labeledByTermId?: string;
|
|
@@ -31,8 +31,8 @@ export declare function getListOfDocValues(siteContext: SiteContext, tracker: Tr
|
|
|
31
31
|
export declare function querySelectDocValues(query: SelectQueryBuilder<any>, { omitId }?: {
|
|
32
32
|
omitId?: boolean;
|
|
33
33
|
}): void;
|
|
34
|
-
export declare function formatDocValues(row: Obj, { language, leafId,
|
|
34
|
+
export declare function formatDocValues(row: Obj, { language, leafId, typeName }?: {
|
|
35
35
|
language?: string;
|
|
36
36
|
leafId?: string;
|
|
37
|
-
|
|
37
|
+
typeName?: string;
|
|
38
38
|
}): DocValues;
|