@paroicms/server 1.23.1 → 1.24.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 +2 -2
- package/ddl/main.ddl.sql +1 -1
- package/dist/common/child-ordering-query.js +3 -3
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/common/data-format.js +8 -8
- package/dist/common/data-format.js.map +1 -1
- package/dist/common/media-handles.helpers.d.ts +2 -2
- package/dist/common/media-handles.helpers.js +7 -7
- package/dist/common/media-handles.helpers.js.map +1 -1
- package/dist/common/serve-text-or.d.ts +1 -1
- package/dist/common/serve-text-or.js.map +1 -1
- package/dist/common/text-cache.js +10 -7
- package/dist/common/text-cache.js.map +1 -1
- package/dist/context.d.ts +6 -6
- package/dist/context.js +6 -6
- package/dist/context.js.map +1 -1
- package/dist/helpers/label-translator.helper.d.ts +2 -2
- package/dist/helpers/label-translator.helper.js +2 -2
- package/dist/helpers/label-translator.helper.js.map +1 -1
- package/dist/helpers/simple-i18n.d.ts +2 -2
- package/dist/helpers/simple-i18n.js +8 -8
- package/dist/helpers/simple-i18n.js.map +1 -1
- package/dist/helpers/url.helpers.d.ts +2 -2
- package/dist/helpers/url.helpers.js +2 -2
- package/dist/helpers/url.helpers.js.map +1 -1
- package/dist/helpers/utils-helper.d.ts +5 -0
- package/dist/helpers/utils-helper.js +8 -1
- package/dist/helpers/utils-helper.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-drop.d.ts +1 -1
- package/dist/liquidjs-tools/liquidjs-drop.js +3 -3
- package/dist/liquidjs-tools/liquidjs-drop.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.js +4 -0
- package/dist/liquidjs-tools/liquidjs-rendering/render-liquidjs.js.map +1 -1
- package/dist/liquidjs-tools/liquidjs-utils.d.ts +1 -1
- package/dist/liquidjs-tools/liquidjs-utils.js +5 -5
- package/dist/liquidjs-tools/liquidjs-utils.js.map +1 -1
- package/dist/modules/app.controller.js +1 -1
- package/dist/modules/app.controller.js.map +1 -1
- package/dist/modules/core/account/account.queries.js +10 -10
- package/dist/modules/core/account/account.queries.js.map +1 -1
- package/dist/modules/core/account/account.schema.d.ts +3 -3
- package/dist/modules/core/account/account.schema.js +6 -6
- package/dist/modules/core/account/account.schema.js.map +1 -1
- package/dist/modules/core/auth/auth.service.js +6 -6
- package/dist/modules/core/auth/auth.service.js.map +1 -1
- package/dist/modules/core/auth/auth.types.d.ts +1 -1
- package/dist/modules/core/document/document.resolver.d.ts +2 -2
- package/dist/modules/core/document/document.resolver.extend.d.ts +2 -2
- package/dist/modules/core/document/document.resolver.extend.js +5 -5
- package/dist/modules/core/document/document.resolver.extend.js.map +1 -1
- package/dist/modules/core/document/document.resolver.js +5 -5
- package/dist/modules/core/document/document.resolver.js.map +1 -1
- package/dist/modules/core/document/document.schema.d.ts +3 -3
- package/dist/modules/core/document/document.schema.js +6 -6
- package/dist/modules/core/document/document.schema.js.map +1 -1
- package/dist/modules/core/document/load-documents.queries.d.ts +4 -7
- package/dist/modules/core/document/load-documents.queries.js +26 -19
- package/dist/modules/core/document/load-documents.queries.js.map +1 -1
- package/dist/modules/core/document/save-documents.queries.d.ts +3 -3
- package/dist/modules/core/document/save-documents.queries.js +19 -17
- package/dist/modules/core/document/save-documents.queries.js.map +1 -1
- package/dist/modules/core/fields/_fields.helpers.d.ts +1 -1
- package/dist/modules/core/fields/_fields.helpers.js +5 -5
- package/dist/modules/core/fields/_fields.helpers.js.map +1 -1
- package/dist/modules/core/fields/fields.resolver.d.ts +5 -5
- package/dist/modules/core/fields/fields.resolver.js +13 -13
- package/dist/modules/core/fields/fields.resolver.js.map +1 -1
- package/dist/modules/core/fields/load-fields.queries.d.ts +3 -3
- package/dist/modules/core/fields/load-fields.queries.js +16 -16
- package/dist/modules/core/fields/load-fields.queries.js.map +1 -1
- package/dist/modules/core/fields/quill-delta.js +2 -2
- package/dist/modules/core/fields/quill-delta.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 +15 -9
- package/dist/modules/core/fields/save-fields.queries.js.map +1 -1
- package/dist/modules/core/media/media-upload.controller.js +1 -1
- package/dist/modules/core/media/media-upload.controller.js.map +1 -1
- package/dist/modules/core/media/media.d.ts +3 -3
- package/dist/modules/core/media/media.js +4 -4
- package/dist/modules/core/media/media.js.map +1 -1
- package/dist/modules/core/media/media.resolver.d.ts +1 -1
- package/dist/modules/core/media/media.resolver.js +8 -8
- package/dist/modules/core/media/media.resolver.js.map +1 -1
- package/dist/modules/core/media/media.schema.d.ts +1 -1
- package/dist/modules/core/media/media.schema.js +2 -2
- package/dist/modules/core/media/media.schema.js.map +1 -1
- package/dist/modules/core/part/part.queries.d.ts +1 -1
- package/dist/modules/core/part/part.queries.js +18 -15
- 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.d.ts +1 -1
- package/dist/modules/core/part/part.resolver.extend.js +2 -2
- package/dist/modules/core/part/part.resolver.extend.js.map +1 -1
- package/dist/modules/core/part/part.resolver.js +4 -4
- package/dist/modules/core/part/part.resolver.js.map +1 -1
- package/dist/modules/core/part/part.schema.d.ts +1 -1
- package/dist/modules/core/part/part.schema.js +2 -2
- package/dist/modules/core/part/part.schema.js.map +1 -1
- package/dist/modules/core/section/section-wrap.resolver.d.ts +2 -2
- package/dist/modules/core/section/section-wrap.resolver.js +12 -12
- package/dist/modules/core/section/section-wrap.resolver.js.map +1 -1
- package/dist/modules/core/section/section.queries.d.ts +2 -2
- package/dist/modules/core/section/section.queries.js +30 -29
- package/dist/modules/core/section/section.queries.js.map +1 -1
- package/dist/modules/core/section/section.resolver.js +2 -2
- package/dist/modules/core/section/section.resolver.js.map +1 -1
- package/dist/modules/core/section/section.schema.d.ts +4 -4
- package/dist/modules/core/section/section.schema.js +8 -8
- package/dist/modules/core/section/section.schema.js.map +1 -1
- package/dist/modules/core/unprotected/unprotected.resolver.js +7 -7
- package/dist/modules/core/unprotected/unprotected.resolver.js.map +1 -1
- package/dist/modules/core/unprotected/unprotected.schema.d.ts +3 -3
- package/dist/modules/core/unprotected/unprotected.schema.js +12 -12
- package/dist/modules/core/unprotected/unprotected.schema.js.map +1 -1
- package/dist/modules/private-api.module.js +1 -1
- package/dist/modules/private-api.module.js.map +1 -1
- package/dist/modules/public-api/mail/contact-form-mail.js +7 -7
- package/dist/modules/public-api/mail/contact-form-mail.js.map +1 -1
- package/dist/modules/public-api/mail/mail.dto.d.ts +1 -1
- package/dist/modules/public-api/mail/mail.dto.js +2 -2
- package/dist/modules/public-api/mail/mail.dto.js.map +1 -1
- package/dist/modules/public-api/public-api-controller.js +14 -14
- package/dist/modules/public-api/public-api-controller.js.map +1 -1
- package/dist/modules/public-api/search-text/search-text.dto.d.ts +1 -1
- package/dist/modules/public-api/search-text/search-text.dto.js +2 -2
- package/dist/modules/public-api/search-text/search-text.dto.js.map +1 -1
- package/dist/modules/public-api/search-text/search-text.queries.d.ts +5 -5
- package/dist/modules/public-api/search-text/search-text.queries.js +16 -16
- package/dist/modules/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/modules/public-site/helpers/format-date.helper.d.ts +1 -1
- package/dist/modules/public-site/helpers/format-date.helper.js +6 -6
- package/dist/modules/public-site/helpers/format-date.helper.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/format-date.js +3 -3
- package/dist/modules/public-site/liquidjs-filters/format-date.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/format-number.js +3 -3
- package/dist/modules/public-site/liquidjs-filters/format-number.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/info-filter.js +22 -14
- package/dist/modules/public-site/liquidjs-filters/info-filter.js.map +1 -1
- package/dist/modules/public-site/liquidjs-filters/translate-filter.js +3 -3
- package/dist/modules/public-site/liquidjs-filters/translate-filter.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/{get-page-tag.d.ts → get-doc-tag.d.ts} +4 -2
- package/dist/modules/public-site/liquidjs-tags/{get-page-tag.js → get-doc-tag.js} +19 -16
- package/dist/modules/public-site/liquidjs-tags/get-doc-tag.js.map +1 -0
- package/dist/modules/public-site/liquidjs-tags/{get-pages-tag.d.ts → get-docs-tag.d.ts} +4 -2
- package/dist/modules/public-site/liquidjs-tags/{get-pages-tag.js → get-docs-tag.js} +17 -14
- package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js.map +1 -0
- package/dist/modules/public-site/liquidjs-tags/use-image-tag.js +2 -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.d.ts +2 -2
- package/dist/modules/public-site/media-serve/_media-serve-helpers.js +1 -1
- package/dist/modules/public-site/media-serve/_media-serve-helpers.js.map +1 -1
- package/dist/modules/public-site/media-serve/media-serve.controller.js +5 -5
- package/dist/modules/public-site/media-serve/media-serve.controller.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 +18 -18
- 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 +1 -1
- package/dist/modules/public-site/public-route/public-route-parser.js +8 -8
- package/dist/modules/public-site/public-route/public-route-parser.js.map +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.d.ts +4 -4
- package/dist/modules/public-site/public-route/raw-document-payload.js +16 -16
- package/dist/modules/public-site/public-route/raw-document-payload.js.map +1 -1
- package/dist/modules/public-site/public-site.middleware.js +1 -1
- package/dist/modules/public-site/public-site.middleware.js.map +1 -1
- package/dist/modules/public-site/serve-document/serve-document.js +10 -12
- package/dist/modules/public-site/serve-document/serve-document.js.map +1 -1
- package/dist/public-payload/{create-page-drop.d.ts → create-doc-drop.d.ts} +2 -2
- package/dist/public-payload/{create-page-drop.js → create-doc-drop.js} +46 -42
- package/dist/public-payload/create-doc-drop.js.map +1 -0
- package/dist/public-payload/{create-page-part-drop.d.ts → create-doc-part-drop.d.ts} +2 -2
- package/dist/public-payload/{create-page-part-drop.js → create-doc-part-drop.js} +15 -15
- package/dist/public-payload/create-doc-part-drop.js.map +1 -0
- package/dist/public-payload/doc-values.queries.d.ts +27 -0
- package/dist/public-payload/{page-values.queries.js → doc-values.queries.js} +28 -26
- package/dist/public-payload/doc-values.queries.js.map +1 -0
- package/dist/public-payload/excerpt.queries.d.ts +1 -1
- package/dist/public-payload/excerpt.queries.js +2 -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 +3 -3
- package/dist/public-payload/field-values.js.map +1 -1
- package/dist/public-payload/get-siblings.queries.js +11 -9
- package/dist/public-payload/get-siblings.queries.js.map +1 -1
- package/dist/public-payload/load-default-image.d.ts +1 -1
- package/dist/public-payload/load-default-image.js +4 -4
- package/dist/public-payload/load-default-image.js.map +1 -1
- package/dist/public-payload/make-basic-payload.d.ts +1 -1
- package/dist/public-payload/make-basic-payload.js +5 -5
- package/dist/public-payload/make-basic-payload.js.map +1 -1
- package/dist/public-payload/make-image-available.d.ts +3 -3
- package/dist/public-payload/make-image-available.js +3 -3
- package/dist/public-payload/make-image-available.js.map +1 -1
- package/dist/public-payload/parts.queries.d.ts +1 -1
- package/dist/public-payload/parts.queries.js +25 -25
- package/dist/public-payload/parts.queries.js.map +1 -1
- package/dist/public-payload/public-payload.types.d.ts +29 -29
- package/dist/public-payload/site-payload.d.ts +1 -1
- package/dist/public-payload/site-payload.js +10 -10
- package/dist/public-payload/site-payload.js.map +1 -1
- package/dist/public-payload/taxonomies.queries.d.ts +2 -2
- package/dist/public-payload/taxonomies.queries.js +12 -12
- package/dist/public-payload/taxonomies.queries.js.map +1 -1
- package/dist/public-payload/translations.queries.d.ts +3 -3
- package/dist/public-payload/translations.queries.js +21 -21
- package/dist/public-payload/translations.queries.js.map +1 -1
- package/dist/site-context/create-site-context.js +8 -6
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/db-init/ddl-migration.js +7 -7
- package/dist/site-context/db-init/ddl-migration.js.map +1 -1
- package/dist/site-context/db-init/init-routing-points.js +13 -13
- package/dist/site-context/db-init/init-routing-points.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +1 -1
- package/dist/site-context/theme-conf-reader.js +6 -6
- package/dist/site-context/theme-conf-reader.js.map +1 -1
- package/dist/site-schema/common-schema-reader.js +1 -1
- package/dist/site-schema/common-schema-reader.js.map +1 -1
- package/dist/site-schema/merged-schema-lib.d.ts +2 -2
- package/dist/site-schema/merged-schema-lib.js +7 -7
- package/dist/site-schema/merged-schema-lib.js.map +1 -1
- package/dist/site-schema/read-locales.d.ts +3 -3
- package/dist/site-schema/read-locales.js +35 -35
- package/dist/site-schema/read-locales.js.map +1 -1
- package/dist/site-schema/site-schema-factory.js +28 -28
- package/dist/site-schema/site-schema-factory.js.map +1 -1
- package/dist/site-schema/site-schema-lib-reader.js +1 -1
- package/dist/site-schema/site-schema-lib-reader.js.map +1 -1
- package/dist/types.to.json +1 -1
- package/package.json +8 -8
- package/schema.gql +24 -34
- package/site-schema-lib/common-schema.json +1 -1
- package/site-schema-lib/fields.site-schema.json +1 -1
- package/site-schema-lib/gallery-page.site-schema.json +1 -1
- package/site-schema-lib/lowcost.site-schema.json +1 -1
- package/site-schema-lib/media-policies.site-schema.json +1 -1
- package/site-schema-lib/portfolio.site-schema.json +1 -1
- package/site-schema-lib/post.site-schema.json +1 -1
- package/site-schema-lib/simple-pages.site-schema.json +1 -1
- package/site-schema-lib/special-page.site-schema.json +1 -1
- package/site-schema-lib/tour.site-schema.json +1 -1
- package/site-schema-lib/tour.site-schema.l10n.en.json +1 -1
- package/site-schema-lib/tour.site-schema.l10n.fr.json +1 -1
- package/dist/modules/public-site/liquidjs-tags/get-page-tag.js.map +0 -1
- package/dist/modules/public-site/liquidjs-tags/get-pages-tag.js.map +0 -1
- package/dist/public-payload/create-page-drop.js.map +0 -1
- package/dist/public-payload/create-page-part-drop.js.map +0 -1
- package/dist/public-payload/page-values.queries.d.ts +0 -27
- package/dist/public-payload/page-values.queries.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":";;;AAAA,oEAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { VariantName } from "@paroicms/anywhere-lib";
|
|
2
2
|
export declare function parseNameAndExt(nameAndExt: string): {
|
|
3
3
|
slug: string;
|
|
4
|
-
variantName:
|
|
4
|
+
variantName: VariantName;
|
|
5
5
|
} | undefined;
|
|
@@ -11,7 +11,7 @@ function parseNameAndExt(nameAndExt) {
|
|
|
11
11
|
if (!match)
|
|
12
12
|
return;
|
|
13
13
|
const [, slug, variantName] = match;
|
|
14
|
-
if (!(0, server_image_cache_engine_1.
|
|
14
|
+
if (!(0, server_image_cache_engine_1.isVariantName)(variantName))
|
|
15
15
|
return;
|
|
16
16
|
return { slug, variantName };
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":";;;AACA,mFAAoE;AAEpE,SAAgB,eAAe,CAC7B,UAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,CAAC,CAAC;QAAE,OAAO;IAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;IACpC,IAAI,CAAC,IAAA,yCAAa,EAAC,WAAW,CAAC;QAAE,OAAO;IACxC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC;AAXD,0CAWC"}
|
|
@@ -67,7 +67,7 @@ let MediaServeController = class MediaServeController {
|
|
|
67
67
|
const newUrl = (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
|
|
68
68
|
mediaUid,
|
|
69
69
|
mediaType: file.mediaType,
|
|
70
|
-
|
|
70
|
+
variantName,
|
|
71
71
|
resourceVersion: file.resourceVersion,
|
|
72
72
|
slug: file.slug,
|
|
73
73
|
}, { returnObj: true });
|
|
@@ -86,8 +86,8 @@ let MediaServeController = class MediaServeController {
|
|
|
86
86
|
const parsed = (0, _media_serve_helpers_1.parseNameAndExt)(nameAndExt);
|
|
87
87
|
if (!parsed)
|
|
88
88
|
throw new common_1.NotFoundException();
|
|
89
|
-
const { variantName
|
|
90
|
-
if (!(0, server_image_cache_engine_1.
|
|
89
|
+
const { variantName } = parsed;
|
|
90
|
+
if (!(0, server_image_cache_engine_1.isVariantName)(variantName))
|
|
91
91
|
throw new common_1.NotFoundException("invalid variant name");
|
|
92
92
|
const fts = await getVariantImageToServe(siteContext, {
|
|
93
93
|
mediaUid,
|
|
@@ -105,7 +105,7 @@ let MediaServeController = class MediaServeController {
|
|
|
105
105
|
const newUrl = (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
|
|
106
106
|
mediaUid,
|
|
107
107
|
mediaType: file.mediaType,
|
|
108
|
-
|
|
108
|
+
variantName,
|
|
109
109
|
resourceVersion: undefined,
|
|
110
110
|
slug: file.slug,
|
|
111
111
|
}, { returnObj: true });
|
|
@@ -209,7 +209,7 @@ async function tryToCreateImageVariant(siteContext, options) {
|
|
|
209
209
|
width: media.width,
|
|
210
210
|
height: media.height,
|
|
211
211
|
}, {
|
|
212
|
-
|
|
212
|
+
authorisedImageSizes: siteContext.themeConf.fTextImages.map((val) => val.realSize),
|
|
213
213
|
variantName,
|
|
214
214
|
slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
|
|
215
215
|
dependsOnUsedKey: "themeConf.fTextImages",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AAGxB,
|
|
1
|
+
{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,4 +8,4 @@ export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Trac
|
|
|
8
8
|
url: string;
|
|
9
9
|
dependencyKeys: string[];
|
|
10
10
|
}>;
|
|
11
|
-
export declare function getHomeUrl(siteContext: Pick<SiteContext, "multilingual">,
|
|
11
|
+
export declare function getHomeUrl(siteContext: Pick<SiteContext, "multilingual">, language: string): string;
|
|
@@ -19,10 +19,10 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
|
|
|
19
19
|
}
|
|
20
20
|
let dependencyKeys;
|
|
21
21
|
let url;
|
|
22
|
-
const { leafId,
|
|
22
|
+
const { leafId, language } = documentId;
|
|
23
23
|
const depth = await (0, leaf_queries_1.getLeafDepth)(siteContext, tracker, leafId);
|
|
24
24
|
if (depth === 0) {
|
|
25
|
-
url = getHomeUrl(siteContext,
|
|
25
|
+
url = getHomeUrl(siteContext, language);
|
|
26
26
|
dependencyKeys = [];
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
@@ -30,11 +30,11 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
|
|
|
30
30
|
const [row] = await query.getRawMany();
|
|
31
31
|
tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaLeaf", "read");
|
|
32
32
|
if (!row) {
|
|
33
|
-
throw new Error(`invalid url data for document "${
|
|
33
|
+
throw new Error(`invalid url data for document "${language}:${leafId}"`);
|
|
34
34
|
}
|
|
35
35
|
const urlData = formatUrlData(row, depth);
|
|
36
|
-
url = makeUrl(siteContext, urlData,
|
|
37
|
-
dependencyKeys = makeUrlDependencyKeys(urlData,
|
|
36
|
+
url = makeUrl(siteContext, urlData, language);
|
|
37
|
+
dependencyKeys = makeUrlDependencyKeys(urlData, language);
|
|
38
38
|
}
|
|
39
39
|
await siteContext.textCache.setCacheValue({
|
|
40
40
|
cacheKey,
|
|
@@ -45,7 +45,7 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
|
|
|
45
45
|
}
|
|
46
46
|
exports.getUrlOfDocument = getUrlOfDocument;
|
|
47
47
|
function buildUrlQuery(siteContext, sectionId, depth) {
|
|
48
|
-
const { leafId,
|
|
48
|
+
const { leafId, language } = sectionId;
|
|
49
49
|
let cur = depth;
|
|
50
50
|
const query = siteContext.cn
|
|
51
51
|
.createQueryBuilder()
|
|
@@ -55,8 +55,8 @@ function buildUrlQuery(siteContext, sectionId, depth) {
|
|
|
55
55
|
.addSelect(`l${cur}.publishDate`, `publishDate${cur}`)
|
|
56
56
|
.addSelect(`d${cur}.slug`, `slug${cur}`)
|
|
57
57
|
.from("PaLeaf", `l${cur}`)
|
|
58
|
-
.innerJoin("PaSection", `s${cur}`, `s${cur}.leafId = l${cur}.id and s${cur}.lang = :
|
|
59
|
-
|
|
58
|
+
.innerJoin("PaSection", `s${cur}`, `s${cur}.leafId = l${cur}.id and s${cur}.lang = :language`, {
|
|
59
|
+
language,
|
|
60
60
|
})
|
|
61
61
|
.leftJoin("PaDocument", `d${cur}`, `d${cur}.leafId = s${cur}.leafId and d${cur}.lang = s${cur}.lang`)
|
|
62
62
|
.where(`l${cur}.id = :leafId`, { leafId })
|
|
@@ -71,8 +71,8 @@ function buildUrlQuery(siteContext, sectionId, depth) {
|
|
|
71
71
|
.addSelect(`l${cur}.publishDate`, `publishDate${cur}`)
|
|
72
72
|
.addSelect(`d${cur}.slug`, `slug${cur}`)
|
|
73
73
|
.innerJoin("PaLeaf", `l${cur}`, `l${cur}.id = l${prev}.parentId`)
|
|
74
|
-
.innerJoin("PaSection", `s${cur}`, `s${cur}.leafId = l${cur}.id and s${cur}.lang = :
|
|
75
|
-
|
|
74
|
+
.innerJoin("PaSection", `s${cur}`, `s${cur}.leafId = l${cur}.id and s${cur}.lang = :language`, {
|
|
75
|
+
language,
|
|
76
76
|
})
|
|
77
77
|
.leftJoin("PaDocument", `d${cur}`, `d${cur}.leafId = s${cur}.leafId and d${cur}.lang = s${cur}.lang`)
|
|
78
78
|
.andWhere(`l${cur}.publishDate is not null`);
|
|
@@ -96,13 +96,13 @@ function formatUrlData(row, depth) {
|
|
|
96
96
|
}
|
|
97
97
|
return { depth, parts };
|
|
98
98
|
}
|
|
99
|
-
function getHomeUrl(siteContext,
|
|
100
|
-
return siteContext.multilingual ? `/${
|
|
99
|
+
function getHomeUrl(siteContext, language) {
|
|
100
|
+
return siteContext.multilingual ? `/${language}` : "/";
|
|
101
101
|
}
|
|
102
102
|
exports.getHomeUrl = getHomeUrl;
|
|
103
|
-
function makeUrl(siteContext, urlData,
|
|
103
|
+
function makeUrl(siteContext, urlData, language) {
|
|
104
104
|
const { siteSchema, multilingual } = siteContext;
|
|
105
|
-
const urlParts = multilingual ? [
|
|
105
|
+
const urlParts = multilingual ? [language] : [];
|
|
106
106
|
let parent = (0, anywhere_lib_1.getDocumentTypeByLeafType)(siteSchema, "home");
|
|
107
107
|
for (let cur = 1; cur <= urlData.depth; ++cur) {
|
|
108
108
|
const part = urlData.parts.get(cur);
|
|
@@ -113,9 +113,9 @@ function makeUrl(siteContext, urlData, lang) {
|
|
|
113
113
|
}
|
|
114
114
|
const docType = (0, anywhere_lib_1.getDocumentTypeByLeafType)(siteSchema, part.leafType);
|
|
115
115
|
if (docType.kind === "routingPoint") {
|
|
116
|
-
const part = docType.urlPaths?.[
|
|
116
|
+
const part = docType.urlPaths?.[language];
|
|
117
117
|
if (!part) {
|
|
118
|
-
throw new Error(`missing urlPath['${
|
|
118
|
+
throw new Error(`missing urlPath['${language}'] in document type '${docType.leafType}'`);
|
|
119
119
|
}
|
|
120
120
|
urlParts.push(part);
|
|
121
121
|
}
|
|
@@ -141,9 +141,9 @@ function makeUrl(siteContext, urlData, lang) {
|
|
|
141
141
|
function makeRelativeIdSlugUrlPart(part) {
|
|
142
142
|
return part.slug ? `${part.relativeId}-${part.slug}` : part.relativeId;
|
|
143
143
|
}
|
|
144
|
-
function makeUrlDependencyKeys(urlData,
|
|
144
|
+
function makeUrlDependencyKeys(urlData, language) {
|
|
145
145
|
return Array.from(urlData.parts.values()).map((part) => (0, text_cache_1.makeCacheDependencyKey)({
|
|
146
|
-
documentId: {
|
|
146
|
+
documentId: { language, leafId: part.leafId },
|
|
147
147
|
perimeter: "slug",
|
|
148
148
|
}));
|
|
149
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":";;;AAAA,oEAA4E;AAC5E,yDAAmG;AAEnG,2DAAkF;AAClF,+EAA2E;AAE3E,+DAA4D;AA0BrD,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAA2B,EAC3B,UAAiD,EAAE;IAEnD,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChF,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;YAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAC9D,OAAO;YACL,GAAG,EAAE,UAAU,CAAC,KAAK;YACrB,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;SACjF,CAAC;IACJ,CAAC;IAED,IAAI,cAAwB,CAAC;IAC7B,IAAI,GAAW,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ClassicDocumentSchema, DocumentSchema, RoutingPointDocumentSchema } from "@paroicms/anywhere-lib";
|
|
2
2
|
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
export interface ParsedPublicRoute {
|
|
4
|
-
|
|
4
|
+
language: string;
|
|
5
5
|
routingPoints: RoutingPointDocumentSchema[];
|
|
6
6
|
classicRelativeIds: ClassicRelativeId[];
|
|
7
7
|
documentType: DocumentSchema;
|
|
@@ -8,20 +8,20 @@ function parsePublicRoute(siteContext, path) {
|
|
|
8
8
|
.split("/")
|
|
9
9
|
.slice(1)
|
|
10
10
|
.filter((token) => token.length > 0);
|
|
11
|
-
const
|
|
11
|
+
const language = multilingual ? tokens[0] : siteSchema.defaultLanguage;
|
|
12
12
|
const parts = multilingual ? tokens.slice(1) : tokens;
|
|
13
|
-
if (!
|
|
13
|
+
if (!language || !siteSchema.languages.includes(language))
|
|
14
14
|
return;
|
|
15
15
|
const urlCacheKey = [];
|
|
16
16
|
if (multilingual)
|
|
17
|
-
urlCacheKey.push(
|
|
17
|
+
urlCacheKey.push(language);
|
|
18
18
|
let prev = siteSchema.documentTypes.home;
|
|
19
19
|
const routingPoints = [prev];
|
|
20
20
|
let depth = 0;
|
|
21
21
|
let i = 0;
|
|
22
22
|
for (; i < parts.length; ++i) {
|
|
23
23
|
const urlPath = parts[i];
|
|
24
|
-
const routingPoint = findRoutingPointByUrlPath({ siteSchema, parent: prev, urlPath,
|
|
24
|
+
const routingPoint = findRoutingPointByUrlPath({ siteSchema, parent: prev, urlPath, language });
|
|
25
25
|
if (!routingPoint)
|
|
26
26
|
break;
|
|
27
27
|
routingPoints.push(routingPoint);
|
|
@@ -46,7 +46,7 @@ function parsePublicRoute(siteContext, path) {
|
|
|
46
46
|
i += found.skipUrlParts;
|
|
47
47
|
}
|
|
48
48
|
return {
|
|
49
|
-
|
|
49
|
+
language,
|
|
50
50
|
routingPoints,
|
|
51
51
|
classicRelativeIds,
|
|
52
52
|
documentType: prev,
|
|
@@ -69,14 +69,14 @@ function parseUrlParameters(path) {
|
|
|
69
69
|
urlParameters: undefined,
|
|
70
70
|
};
|
|
71
71
|
}
|
|
72
|
-
function findRoutingPointByUrlPath({ siteSchema, parent, urlPath,
|
|
72
|
+
function findRoutingPointByUrlPath({ siteSchema, parent, urlPath, language, }) {
|
|
73
73
|
for (const leafType of parent.children ?? []) {
|
|
74
74
|
const documentType = siteSchema.documentTypes[leafType];
|
|
75
75
|
if (!documentType)
|
|
76
76
|
throw new Error(`document-type '${leafType}' should be in the schema`);
|
|
77
77
|
if (documentType.kind !== "routingPoint" || !documentType.urlPaths)
|
|
78
78
|
continue;
|
|
79
|
-
if (urlPath === documentType.urlPaths[
|
|
79
|
+
if (urlPath === documentType.urlPaths[language])
|
|
80
80
|
return documentType;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
@@ -158,7 +158,7 @@ function findParentParsedRoute(parsedRoute) {
|
|
|
158
158
|
const lastClassic = classicRelativeIds.length > 0 ? classicRelativeIds[classicRelativeIds.length - 1] : undefined;
|
|
159
159
|
const documentType = lastClassic?.documentType ?? routingPoints[routingPoints.length - 1];
|
|
160
160
|
return {
|
|
161
|
-
|
|
161
|
+
language: parsedRoute.language,
|
|
162
162
|
routingPoints,
|
|
163
163
|
classicRelativeIds,
|
|
164
164
|
documentType,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":";;;AAuBA,SAAgB,gBAAgB,CAC9B,WAA6D,EAC7D,IAAY;IAEZ,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACjD,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,WAAW;SACvB,KAAK,CAAC,GAAG,CAAC;SACV,KAAK,CAAC,CAAC,CAAC;SACR,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvC,MAAM,
|
|
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,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { DocValues } from "../../../public-payload/public-payload.types";
|
|
2
2
|
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
import type { ParsedPublicRoute } from "./public-route-parser";
|
|
4
|
-
export interface
|
|
4
|
+
export interface RawDocPayload {
|
|
5
5
|
leafIdPath: string[];
|
|
6
|
-
|
|
6
|
+
docValues: DocValues;
|
|
7
7
|
}
|
|
8
|
-
export declare function
|
|
8
|
+
export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParsedPublicRoute): Promise<RawDocPayload | undefined>;
|
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.fetchRawDocPayload = void 0;
|
|
4
4
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
|
-
const
|
|
6
|
-
async function
|
|
7
|
-
const query =
|
|
5
|
+
const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
|
|
6
|
+
async function fetchRawDocPayload(siteContext, parsedRoute) {
|
|
7
|
+
const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
|
|
8
8
|
const [row] = await query.getRawMany();
|
|
9
9
|
if (!row)
|
|
10
10
|
return;
|
|
11
|
-
return
|
|
11
|
+
return formatRawDocPayload(row, {
|
|
12
12
|
depth: parsedRoute.depth,
|
|
13
|
-
|
|
13
|
+
language: parsedRoute.language,
|
|
14
14
|
leafType: parsedRoute.documentType.leafType,
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
|
-
exports.
|
|
18
|
-
function
|
|
17
|
+
exports.fetchRawDocPayload = fetchRawDocPayload;
|
|
18
|
+
function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
19
19
|
const query = siteContext.cn.createQueryBuilder();
|
|
20
20
|
query
|
|
21
21
|
.select("cast(l0.id as varchar)", "_id0")
|
|
22
22
|
.from("PaLeaf", "l0")
|
|
23
|
-
.innerJoin("PaSection", "s0", "l0.id = s0.leafId and s0.lang = :
|
|
24
|
-
|
|
23
|
+
.innerJoin("PaSection", "s0", "l0.id = s0.leafId and s0.lang = :language", {
|
|
24
|
+
language: parsedRoute.language,
|
|
25
25
|
})
|
|
26
26
|
.where("l0.depth = 0")
|
|
27
27
|
.andWhere("l0.leafType = 'home'")
|
|
@@ -35,8 +35,8 @@ function buildRawPagePayloadQuery(siteContext, parsedRoute) {
|
|
|
35
35
|
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.leafType = :leafType${cur}`, {
|
|
36
36
|
[`leafType${cur}`]: routingPoint.leafType,
|
|
37
37
|
})
|
|
38
|
-
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :
|
|
39
|
-
|
|
38
|
+
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
|
|
39
|
+
language: parsedRoute.language,
|
|
40
40
|
})
|
|
41
41
|
.andWhere(`l${cur}.publishDate <= current_timestamp`)
|
|
42
42
|
.andWhere(`s${cur}.ready = 1`);
|
|
@@ -49,8 +49,8 @@ function buildRawPagePayloadQuery(siteContext, parsedRoute) {
|
|
|
49
49
|
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.relativeId = :relativeId${cur}`, {
|
|
50
50
|
[`relativeId${cur}`]: relativeId,
|
|
51
51
|
})
|
|
52
|
-
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :
|
|
53
|
-
|
|
52
|
+
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
|
|
53
|
+
language: parsedRoute.language,
|
|
54
54
|
})
|
|
55
55
|
.andWhere(`l${cur}.leafType = :leafType${cur}`, {
|
|
56
56
|
[`leafType${cur}`]: documentType.leafType,
|
|
@@ -72,7 +72,7 @@ function buildRawPagePayloadQuery(siteContext, parsedRoute) {
|
|
|
72
72
|
}
|
|
73
73
|
return query;
|
|
74
74
|
}
|
|
75
|
-
function
|
|
75
|
+
function formatRawDocPayload(row, { depth, language, leafType }) {
|
|
76
76
|
const leafIdPath = [];
|
|
77
77
|
for (let i = 0; i <= depth; ++i) {
|
|
78
78
|
leafIdPath.push((0, data_formatters_lib_1.strVal)(row[`_id${i}`], { varName: `_id${i}` }));
|
|
@@ -80,7 +80,7 @@ function formatRawPagePayload(row, { depth, lang, leafType }) {
|
|
|
80
80
|
const leafId = leafIdPath[depth];
|
|
81
81
|
return {
|
|
82
82
|
leafIdPath,
|
|
83
|
-
|
|
83
|
+
docValues: (0, doc_values_queries_1.formatDocValues)(row, { language, leafId, leafType }),
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
86
|
//# sourceMappingURL=raw-document-payload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":";;;AAAA,oEAAoD;AAEpD,
|
|
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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"}
|
|
@@ -57,7 +57,7 @@ async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
|
|
|
57
57
|
return (0, http_helpers_1.serve301Redirect)(res, generated.url);
|
|
58
58
|
}
|
|
59
59
|
if (generated.status === 404) {
|
|
60
|
-
await (0, serve_text_or_1.render404Html)(siteContext, res, {
|
|
60
|
+
await (0, serve_text_or_1.render404Html)(siteContext, res, { language: parsedRoute.language });
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
63
|
await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiE;AACjE,qDAAmE;AAEnE,8DAAiF;AACjF,wDAAuD;AACvD,gEAAqE;AACrE,6DAA8D;AAC9D,kEAAiE;AAEjE,4EAA8F;AAC9F,oEAAuE;AAGhE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,sCAAgB,EAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;QAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACjE,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;AAlBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAkBhC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,WAA8B,EAC9B,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,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7F,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3F,IAAI,aAAa,IAAI,aAAa,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAoB,EAC1C,WAAW,EACX,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,EAC9B,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;YACE,QAAQ,EAAE,gBAAgB;YAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,KAAK,EAAE,SAAS,CAAC,GAAG;SACrB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,IAAA,6BAAa,EAAC,WAAW,EAAE,GAAG,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiE;AACjE,qDAAmE;AAEnE,8DAAiF;AACjF,wDAAuD;AACvD,gEAAqE;AACrE,6DAA8D;AAC9D,kEAAiE;AAEjE,4EAA8F;AAC9F,oEAAuE;AAGhE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,sCAAgB,EAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;QAChC,MAAM,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACjE,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;AAlBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAkBhC;AAED,KAAK,UAAU,aAAa,CAC1B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,WAA8B,EAC9B,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,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7F,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3F,IAAI,aAAa,IAAI,aAAa,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAoB,EAC1C,WAAW,EACX,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,EAC9B,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;YACE,QAAQ,EAAE,gBAAgB;YAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,KAAK,EAAE,SAAS,CAAC,GAAG;SACrB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7B,MAAM,IAAA,6BAAa,EAAC,WAAW,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.generateDocumentHtml = void 0;
|
|
|
4
4
|
const text_cache_1 = require("../../../common/text-cache");
|
|
5
5
|
const render_liquidjs_1 = require("../../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
6
6
|
const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
|
|
7
|
-
const
|
|
7
|
+
const create_doc_drop_1 = require("../../../public-payload/create-doc-drop");
|
|
8
8
|
const site_payload_1 = require("../../../public-payload/site-payload");
|
|
9
9
|
const make_url_1 = require("../public-route/make-url");
|
|
10
10
|
const public_route_parser_1 = require("../public-route/public-route-parser");
|
|
@@ -13,24 +13,22 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
13
13
|
const { req, parsedRoute, cacheKey } = options;
|
|
14
14
|
if (!parsedRoute.documentType.withData) {
|
|
15
15
|
const parentRoute = (0, public_route_parser_1.findParentParsedRouteWithData)(parsedRoute);
|
|
16
|
-
const rawPayload = parentRoute
|
|
17
|
-
? await (0, raw_document_payload_1.fetchRawPagePayload)(siteContext, parentRoute)
|
|
18
|
-
: undefined;
|
|
16
|
+
const rawPayload = parentRoute ? await (0, raw_document_payload_1.fetchRawDocPayload)(siteContext, parentRoute) : undefined;
|
|
19
17
|
if (rawPayload && parentRoute) {
|
|
20
18
|
const { url, dependencyKeys } = await (0, make_url_1.getUrlOfDocument)(siteContext, tracker, {
|
|
21
|
-
|
|
22
|
-
leafId: rawPayload.
|
|
19
|
+
language: parentRoute.language,
|
|
20
|
+
leafId: rawPayload.docValues.leafId,
|
|
23
21
|
}, { returnUrlDependencyKeys: true });
|
|
24
22
|
return { status: 301, url, dependencyKeys };
|
|
25
23
|
}
|
|
26
24
|
return { status: 404 };
|
|
27
25
|
}
|
|
28
|
-
const rawPayload = await (0, raw_document_payload_1.
|
|
26
|
+
const rawPayload = await (0, raw_document_payload_1.fetchRawDocPayload)(siteContext, parsedRoute);
|
|
29
27
|
if (!rawPayload)
|
|
30
28
|
return { status: 404 };
|
|
31
29
|
const { url: docUrl, dependencyKeys: urlDependencyKeys } = await (0, make_url_1.getUrlOfDocument)(siteContext, tracker, {
|
|
32
|
-
|
|
33
|
-
leafId: rawPayload.
|
|
30
|
+
language: parsedRoute.language,
|
|
31
|
+
leafId: rawPayload.docValues.leafId,
|
|
34
32
|
}, { returnUrlDependencyKeys: true });
|
|
35
33
|
const completeDocUrl = `${docUrl}${parsedRoute.urlParameters ?? ""}`;
|
|
36
34
|
if (completeDocUrl !== req.url) {
|
|
@@ -39,7 +37,7 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
39
37
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, {
|
|
40
38
|
cacheKey,
|
|
41
39
|
tracker,
|
|
42
|
-
dependencyKey: (0, text_cache_1.makeCacheDependencyKey)({ documentId: rawPayload.
|
|
40
|
+
dependencyKey: (0, text_cache_1.makeCacheDependencyKey)({ documentId: rawPayload.docValues }),
|
|
43
41
|
});
|
|
44
42
|
const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
|
|
45
43
|
templateNames: parsedRoute.documentType.templateNames,
|
|
@@ -54,8 +52,8 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
54
52
|
exports.generateDocumentHtml = generateDocumentHtml;
|
|
55
53
|
function makeRegularPublicPayload(siteContext, renderingContext, rawPayload, url) {
|
|
56
54
|
return {
|
|
57
|
-
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, rawPayload.
|
|
58
|
-
|
|
55
|
+
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, rawPayload.docValues.language),
|
|
56
|
+
doc: (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, rawPayload.docValues, { url }),
|
|
59
57
|
};
|
|
60
58
|
}
|
|
61
59
|
//# sourceMappingURL=serve-document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":";;;AAEA,2DAAoE;AACpE,gGAAkG;AAClG,oGAGsE;AACtE
|
|
1
|
+
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { type DropInst } from "../liquidjs-tools/liquidjs-drop";
|
|
|
3
3
|
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
|
|
4
4
|
import type { SiteContext } from "../site-context/site-context.types";
|
|
5
5
|
import type * as publicPayload from "./public-payload.types";
|
|
6
|
-
export declare function
|
|
6
|
+
export declare function createDocPayloadDrop(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.DocValues, options?: {
|
|
7
7
|
url?: string;
|
|
8
8
|
fieldNames?: string[];
|
|
9
9
|
kind?: string;
|
|
10
10
|
extraValues?: Obj;
|
|
11
|
-
}): DropInst<publicPayload.
|
|
11
|
+
}): DropInst<publicPayload.DocPayload>;
|