@paroicms/server 1.52.4 → 1.52.6
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/common/serve-text-or.js +1 -1
- package/dist/common/serve-text-or.js.map +1 -1
- package/dist/common/text-cache.d.ts +6 -5
- package/dist/common/text-cache.js +4 -4
- package/dist/common/text-cache.js.map +1 -1
- package/dist/common/url-helpers.d.ts +2 -1
- package/dist/common/url-helpers.js +21 -14
- package/dist/common/url-helpers.js.map +1 -1
- package/dist/modules/public-api/public-api-rendering.js +2 -2
- package/dist/modules/public-api/public-api-rendering.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/public-route/make-url.js +1 -1
- package/dist/modules/public-site/public-route/make-url.js.map +1 -1
- package/dist/modules/public-site/public-site.controller.js +1 -1
- package/dist/modules/public-site/public-site.controller.js.map +1 -1
- package/dist/modules/public-site/public-site.middleware.js +5 -2
- package/dist/modules/public-site/public-site.middleware.js.map +1 -1
- package/dist/public-payload/breadcrumb.queries.js +1 -1
- package/dist/public-payload/breadcrumb.queries.js.map +1 -1
- package/package.json +10 -10
|
@@ -51,7 +51,7 @@ function serveTextFromCacheOr(siteContext, tracker, options) {
|
|
|
51
51
|
}
|
|
52
52
|
async function render404Html(siteContext, res, options) {
|
|
53
53
|
const tracker = (0, internal_server_lib_1.createTracker)();
|
|
54
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: "404" });
|
|
54
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "html", url: "404" });
|
|
55
55
|
let cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
|
|
56
56
|
if (!cacheVal) {
|
|
57
57
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":";;AAeA,oDAwDC;AAED,sCAgCC;AAzGD,uEAA4E;AAE5E,0DAA2D;AAC3D,0FAA4F;AAC5F,8FAAgG;AAChG,6EAA8E;AAE9E,6CAA4C;AAC5C,qDAA0D;AAO1D,SAAgB,oBAAoB,CAClC,WAAwB,EACxB,OAAgB,EAChB,OAQC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAE5B,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc;YAC3C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACxD;gBACE,QAAQ;gBACR,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA+B;IAE/B,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":";;AAeA,oDAwDC;AAED,sCAgCC;AAzGD,uEAA4E;AAE5E,0DAA2D;AAC3D,0FAA4F;AAC5F,8FAAgG;AAChG,6EAA8E;AAE9E,6CAA4C;AAC5C,qDAA0D;AAO1D,SAAgB,oBAAoB,CAClC,WAAwB,EACxB,OAAgB,EAChB,OAQC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAE5B,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc;YAC3C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACxD;gBACE,QAAQ;gBACR,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA+B;IAE/B,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IACjF,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,IAAA,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC;SACxE,CAAC,CAAC;QAEH,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAClD;YACE,QAAQ;YACR,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;YACpD,KAAK,EAAE,IAAI;SACZ,EACD,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAA,+BAAgB,EAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC,CAAC;IACH,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACxF,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type ParsedSectionId } from "@paroicms/public-anywhere-lib";
|
|
2
|
+
import type { AppLog } from "@paroicms/public-server-lib";
|
|
2
3
|
import type { SiteContext } from "../site-context/site-context.types";
|
|
3
4
|
export declare function makeCacheDependencyKey(options: {
|
|
4
5
|
documentId: ParsedSectionId;
|
|
@@ -18,23 +19,23 @@ export declare function makeCacheDependencyKey(options: {
|
|
|
18
19
|
} | {
|
|
19
20
|
global: "all";
|
|
20
21
|
}): string;
|
|
21
|
-
export declare function makeCacheKey(options: {
|
|
22
|
+
export declare function makeCacheKey(logger: AppLog, options: {
|
|
22
23
|
kind: "redirect";
|
|
23
24
|
urlKey: string;
|
|
24
25
|
}): string;
|
|
25
|
-
export declare function makeCacheKey(options: {
|
|
26
|
+
export declare function makeCacheKey(logger: AppLog, options: {
|
|
26
27
|
kind: "url";
|
|
27
28
|
documentId: ParsedSectionId;
|
|
28
29
|
}): string;
|
|
29
|
-
export declare function makeCacheKey(options: {
|
|
30
|
+
export declare function makeCacheKey(logger: AppLog, options: {
|
|
30
31
|
kind: "html";
|
|
31
32
|
url: string;
|
|
32
33
|
}): string;
|
|
33
|
-
export declare function makeCacheKey(options: {
|
|
34
|
+
export declare function makeCacheKey(logger: AppLog, options: {
|
|
34
35
|
kind: "feed";
|
|
35
36
|
url: string;
|
|
36
37
|
}): string;
|
|
37
|
-
export declare function makeCacheKey(options: {
|
|
38
|
+
export declare function makeCacheKey(logger: AppLog, options: {
|
|
38
39
|
kind: "api";
|
|
39
40
|
url: string;
|
|
40
41
|
}): string;
|
|
@@ -33,14 +33,14 @@ function makeCacheDependencyKey(options) {
|
|
|
33
33
|
return `${encodedId}:${options.perimeter}`;
|
|
34
34
|
return encodedId;
|
|
35
35
|
}
|
|
36
|
-
function makeCacheKey(options) {
|
|
36
|
+
function makeCacheKey(logger, options) {
|
|
37
37
|
const { kind, url, urlKey, documentId } = options;
|
|
38
38
|
if (kind === "html")
|
|
39
|
-
return `${kind}:${(0, url_helpers_1.normalizeUrlForCache)(url)}`;
|
|
39
|
+
return `${kind}:${(0, url_helpers_1.normalizeUrlForCache)(logger, url)}`;
|
|
40
40
|
if (kind === "feed")
|
|
41
|
-
return `${kind}:${(0, url_helpers_1.normalizeUrlForCache)(url)}`;
|
|
41
|
+
return `${kind}:${(0, url_helpers_1.normalizeUrlForCache)(logger, url)}`;
|
|
42
42
|
if (kind === "api")
|
|
43
|
-
return `${kind}:${(0, url_helpers_1.normalizeUrlForCache)(url)}`;
|
|
43
|
+
return `${kind}:${(0, url_helpers_1.normalizeUrlForCache)(logger, url)}`;
|
|
44
44
|
if (kind === "redirect")
|
|
45
45
|
return `${kind}:${urlKey}`;
|
|
46
46
|
if (documentId)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import type { AppLog } from "@paroicms/public-server-lib";
|
|
2
|
+
export declare function normalizeUrlForCache(logger: AppLog, url: string): string;
|
|
@@ -1,19 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeUrlForCache = normalizeUrlForCache;
|
|
4
|
-
function normalizeUrlForCache(url) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
paramEntries
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
sortedParams
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
4
|
+
function normalizeUrlForCache(logger, url) {
|
|
5
|
+
try {
|
|
6
|
+
const isRelative = !URL.canParse(url);
|
|
7
|
+
const parsedUrl = new URL(url, isRelative ? "http://foo.bar" : undefined);
|
|
8
|
+
const params = new URLSearchParams(parsedUrl.search);
|
|
9
|
+
const paramEntries = [];
|
|
10
|
+
params.forEach((value, key) => {
|
|
11
|
+
paramEntries.push([key, value]);
|
|
12
|
+
});
|
|
13
|
+
paramEntries.sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
|
|
14
|
+
const sortedParams = new URLSearchParams();
|
|
15
|
+
paramEntries.forEach(([key, value]) => {
|
|
16
|
+
sortedParams.append(key, value);
|
|
17
|
+
});
|
|
18
|
+
parsedUrl.search = sortedParams.toString();
|
|
19
|
+
return isRelative ? `${parsedUrl.pathname}${parsedUrl.search}` : parsedUrl.toString();
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
logger.warn(`Failed to normalize URL '${url}' for cache`, error);
|
|
23
|
+
return url;
|
|
24
|
+
}
|
|
18
25
|
}
|
|
19
26
|
//# sourceMappingURL=url-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/common/url-helpers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/common/url-helpers.ts"],"names":[],"mappings":";;AAEA,oDA+BC;AA/BD,SAAgB,oBAAoB,CAAC,MAAc,EAAE,GAAW;IAC9D,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAE1E,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAGrD,MAAM,YAAY,GAAuB,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAGH,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAGhE,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;QAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAG3C,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IACxF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,aAAa,EAAE,KAAK,CAAC,CAAC;QACjE,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC"}
|
|
@@ -15,7 +15,7 @@ const site_payload_1 = require("../../public-payload/site-payload");
|
|
|
15
15
|
const search_text_queries_1 = require("./search-text/search-text.queries");
|
|
16
16
|
async function renderChildPartials(siteContext, options) {
|
|
17
17
|
const { req, res, params, parentDocumentId, labeledByTermId } = options;
|
|
18
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "api", url: req.url });
|
|
18
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "api", url: req.url });
|
|
19
19
|
const tracker = (0, internal_server_lib_1.createTracker)();
|
|
20
20
|
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, {
|
|
21
21
|
cacheKey,
|
|
@@ -38,7 +38,7 @@ async function renderChildPartials(siteContext, options) {
|
|
|
38
38
|
}
|
|
39
39
|
async function renderSearchPartials(siteContext, options) {
|
|
40
40
|
const { req, res, language, words, limit, start, templateName } = options;
|
|
41
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "api", url: req.url });
|
|
41
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "api", url: req.url });
|
|
42
42
|
const tracker = (0, internal_server_lib_1.createTracker)();
|
|
43
43
|
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, {
|
|
44
44
|
cacheKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-api-rendering.js","sourceRoot":"","sources":["../../../src/modules/public-api/public-api-rendering.ts"],"names":[],"mappings":";;AAiBA,kDAmCC;AAED,oDAsCC;AA5FD,oEAAmD;AACnD,uEAA4E;AAG5E,8DAAkE;AAClE,wDAA+E;AAC/E,gEAAqE;AACrE,6FAA+F;AAC/F,iGAAmG;AACnG,0EAA4E;AAC5E,gFAA6E;AAC7E,oEAAoE;AAIpE,2EAAuF;AAEhF,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,OAMC;IAED,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"public-api-rendering.js","sourceRoot":"","sources":["../../../src/modules/public-api/public-api-rendering.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ exports.FeedMiddleware = FeedMiddleware = __decorate([
|
|
|
52
52
|
], FeedMiddleware);
|
|
53
53
|
async function serveFeed(siteContext, req, res, { language, feedUrl }) {
|
|
54
54
|
const tracker = (0, internal_server_lib_1.createTracker)();
|
|
55
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "feed", url: feedUrl });
|
|
55
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "feed", url: feedUrl });
|
|
56
56
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, {
|
|
57
57
|
cacheKey,
|
|
58
58
|
tracker,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed.middleware.js","sourceRoot":"","sources":["../../../../src/modules/public-site/feed/feed.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiE;AACjE,uEAA8D;AAC9D,mEAA0D;AAE1D,iEAAqE;AACrE,2DAAkF;AAClF,oGAAsG;AACtG,qEAAoE;AAEpE,qDAAmD;AACnD,iDAA8C;AAGvC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpF,IAAI,EAAE,CAAC;gBACP,OAAO;YACT,CAAC;YACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;gBACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC;aACnD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,IAAI,EAAE,CAAC;gBACP,OAAO;YACT,CAAC;YACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;gBACrC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe;gBAChD,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,CAAC;aAClC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAA;AA7BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;GACA,cAAc,CA6B1B;AAED,KAAK,UAAU,SAAS,CACtB,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,EAAE,QAAQ,EAAE,OAAO,EAAyC;IAE5D,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"feed.middleware.js","sourceRoot":"","sources":["../../../../src/modules/public-site/feed/feed.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiE;AACjE,uEAA8D;AAC9D,mEAA0D;AAE1D,iEAAqE;AACrE,2DAAkF;AAClF,oGAAsG;AACtG,qEAAoE;AAEpE,qDAAmD;AACnD,iDAA8C;AAGvC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpF,IAAI,EAAE,CAAC;gBACP,OAAO;YACT,CAAC;YACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;gBACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC;aACnD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,IAAI,EAAE,CAAC;gBACP,OAAO;YACT,CAAC;YACD,MAAM,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;gBACrC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe;gBAChD,OAAO,EAAE,IAAA,+BAAW,EAAC,WAAW,CAAC;aAClC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAA;AA7BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;GACA,cAAc,CA6B1B;AAED,KAAK,UAAU,SAAS,CACtB,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,EAAE,QAAQ,EAAE,OAAO,EAAyC;IAE5D,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACnF,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE;QACjE,QAAQ;QACR,OAAO;QACP,aAAa,EAAE,IAAA,mCAAsB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;KACzD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE;QACzD,QAAQ;QACR,GAAG;QACH,GAAG;QACH,WAAW,EAAE,oCAAoC;KAClD,CAAC,CAAC;IACH,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,IAAI,GAAG,MAAM,IAAA,gCAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE;QAChE,QAAQ;QACR,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -8,7 +8,7 @@ const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
|
|
|
8
8
|
const text_cache_1 = require("../../../common/text-cache");
|
|
9
9
|
const leaf_queries_1 = require("../../core/leaf/leaf.queries");
|
|
10
10
|
async function getUrlOfDocument(siteContext, tracker, documentId, options = {}) {
|
|
11
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "url", documentId });
|
|
11
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "url", documentId });
|
|
12
12
|
const cacheValue = await siteContext.textCache.getCacheValue(cacheKey, tracker);
|
|
13
13
|
if (cacheValue) {
|
|
14
14
|
if (!options.returnUrlDependencyKeys)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":";;AAiCA,4CA+CC;AA0ED,gCAEC;AA5JD,oEAAsF;AACtF,mDAAuD;AACvD,2EAAwE;AAGxE,2DAAkF;AAElF,+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;
|
|
1
|
+
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":";;AAiCA,4CA+CC;AA0ED,gCAEC;AA5JD,oEAAsF;AACtF,mDAAuD;AACvD,2EAAwE;AAGxE,2DAAkF;AAElF,+DAA4D;AA0BrD,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAA2B,EAC3B,UAAiD,EAAE;IAEnD,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAChF,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,QAAQ,EAAE,GAAG,UAAU,CAAC;IAExC,MAAM,KAAK,GAAG,MAAM,IAAA,2BAAY,EAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxC,cAAc,GAAG,EAAE,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,KAAK,CAAC,UAAU,EAAO,CAAC;QAC5C,OAAO,CAAC,WAAW,CAAC,4BAAgB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,IAAI,MAAM,GAAG,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1C,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,cAAc,GAAG,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;QACE,QAAQ;QACR,KAAK,EAAE,GAAG;QACV,cAAc;KACf,EACD,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAED,SAAS,aAAa,CAAC,WAAwB,EAAE,SAA0B,EAAE,KAAa;IACxF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAEvC,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE;SACzB,kBAAkB,EAAE;SACpB,SAAS,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;SACnC,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,WAAW,GAAG,EAAE,CAAC;SAC/C,SAAS,CAAC,IAAI,GAAG,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC;SACnD,SAAS,CAAC,IAAI,GAAG,cAAc,EAAE,cAAc,GAAG,EAAE,CAAC;SACrD,SAAS,CAAC,IAAI,GAAG,OAAO,EAAE,OAAO,GAAG,EAAE,CAAC;SACvC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC;SACzB,SAAS,CAAC,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,mBAAmB,EAAE;QAC7F,QAAQ;KACT,CAAC;SACD,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAClE;SACA,QAAQ,CAAC,IAAI,GAAG,eAAe,EAAE,EAAE,MAAM,EAAE,CAAC;SAC5C,QAAQ,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;IAE/C,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;QAChB,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC;QACf,KAAK;aACF,SAAS,CAAC,IAAI,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;aACnC,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,WAAW,GAAG,EAAE,CAAC;aAC/C,SAAS,CAAC,IAAI,GAAG,aAAa,EAAE,aAAa,GAAG,EAAE,CAAC;aACnD,SAAS,CAAC,IAAI,GAAG,cAAc,EAAE,cAAc,GAAG,EAAE,CAAC;aACrD,SAAS,CAAC,IAAI,GAAG,OAAO,EAAE,OAAO,GAAG,EAAE,CAAC;aACvC,SAAS,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,UAAU,IAAI,WAAW,CAAC;aAChE,SAAS,CACR,WAAW,EACX,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,mBAAmB,EAC1D;YACE,QAAQ;SACT,CACF;aACA,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAClE;aACA,QAAQ,CAAC,IAAI,GAAG,0BAA0B,CAAC,CAAC;QAE/C,IAAI,GAAG,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,yBAAyB,EAAE;QAChD,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;KAC/C,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,GAAQ,EAAE,KAAa;IAC5C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QACtC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACb,MAAM,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YAC/B,QAAQ,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;YACvC,UAAU,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;YAC3C,IAAI,EAAE,IAAA,mCAAa,EAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACtC,WAAW,EAAE,IAAA,6BAAO,EAAC,GAAG,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,SAAgB,UAAU,CAAC,WAA4C,EAAE,QAAgB;IACvF,OAAO,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtE,CAAC;AAED,SAAS,OAAO,CACd,WAA4C,EAC5C,OAAgB,EAChB,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,IAAI,MAAM,GAAG,IAAA,6CAAqB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEvD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CACb,4CAA4C,IAAI,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,CAC3G,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAA,6CAAqB,EAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEjE,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;gBAC1C,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;gBAC/D,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;gBAE7B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAClE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC9D,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,OAAO,OAAO,CAAC,QAAQ,gCAAgC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QAED,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAiB;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;AACzE,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAgB,EAAE,QAAgB;IAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,IAAA,mCAAsB,EAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -44,7 +44,7 @@ exports.PublicSiteController = PublicSiteController = __decorate([
|
|
|
44
44
|
(0, common_1.Controller)()
|
|
45
45
|
], PublicSiteController);
|
|
46
46
|
async function serveHomePage(siteContext, req, res, tracker) {
|
|
47
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: req.url });
|
|
47
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "html", url: req.url });
|
|
48
48
|
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
|
|
49
49
|
if (await serveOr.serveFromCache())
|
|
50
50
|
return;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,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"}
|
|
@@ -38,11 +38,14 @@ exports.PublicSiteMiddleware = PublicSiteMiddleware = __decorate([
|
|
|
38
38
|
(0, common_1.Injectable)()
|
|
39
39
|
], PublicSiteMiddleware);
|
|
40
40
|
async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
|
|
41
|
-
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: req.url });
|
|
41
|
+
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "html", url: req.url });
|
|
42
42
|
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
|
|
43
43
|
if (await serveOr.serveFromCache())
|
|
44
44
|
return;
|
|
45
|
-
const redirectCacheKey = (0, text_cache_1.makeCacheKey)(
|
|
45
|
+
const redirectCacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, {
|
|
46
|
+
kind: "redirect",
|
|
47
|
+
urlKey: parsedRoute.urlCacheKey,
|
|
48
|
+
});
|
|
46
49
|
const cacheRedirect = await siteContext.textCache.getCacheValue(redirectCacheKey, tracker);
|
|
47
50
|
if (cacheRedirect && cacheRedirect.value !== req.url) {
|
|
48
51
|
return (0, http_helpers_1.serve301Redirect)(res, cacheRedirect.value);
|
|
@@ -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,uEAA4E;AAE5E,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,mCAAa,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;
|
|
1
|
+
{"version":3,"file":"public-site.middleware.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const make_url_1 = require("../modules/public-site/public-route/make-url");
|
|
|
8
8
|
async function getPublicBreadcrumb(siteContext, renderingContext, documentId) {
|
|
9
9
|
const items = await (0, section_queries_1.getBreadcrumb)(siteContext, renderingContext.tracker, documentId, {
|
|
10
10
|
ensurePublished: true,
|
|
11
|
-
skipHome:
|
|
11
|
+
skipHome: false,
|
|
12
12
|
});
|
|
13
13
|
const result = [];
|
|
14
14
|
for (const item of items) {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,KAAK;KAChB,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "1.52.
|
|
3
|
+
"version": "1.52.6",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -44,16 +44,16 @@
|
|
|
44
44
|
"@nestjs/platform-express": "~10.3.10",
|
|
45
45
|
"@nestjs/throttler": "~6.1.0",
|
|
46
46
|
"@paroi/data-formatters-lib": "~0.4.0",
|
|
47
|
-
"@paroicms/internal-anywhere-lib": "1.18.
|
|
48
|
-
"@paroicms/bo": "1.
|
|
49
|
-
"@paroicms/public-anywhere-lib": "0.
|
|
50
|
-
"@paroicms/public-server-lib": "0.12.
|
|
51
|
-
"@paroicms/server-database-media-storage": "1.8.
|
|
52
|
-
"@paroicms/server-image-cache-engine": "1.12.
|
|
53
|
-
"@paroicms/internal-server-lib": "1.7.
|
|
54
|
-
"@paroicms/server-text-cache-system": "1.7.
|
|
47
|
+
"@paroicms/internal-anywhere-lib": "1.18.4",
|
|
48
|
+
"@paroicms/bo": "1.40.0",
|
|
49
|
+
"@paroicms/public-anywhere-lib": "0.6.0",
|
|
50
|
+
"@paroicms/public-server-lib": "0.12.3",
|
|
51
|
+
"@paroicms/server-database-media-storage": "1.8.10",
|
|
52
|
+
"@paroicms/server-image-cache-engine": "1.12.9",
|
|
53
|
+
"@paroicms/internal-server-lib": "1.7.10",
|
|
54
|
+
"@paroicms/server-text-cache-system": "1.7.11",
|
|
55
55
|
"@paroicms/site-app": "1.11.2",
|
|
56
|
-
"@paroicms/connector": "0.
|
|
56
|
+
"@paroicms/connector": "0.7.0",
|
|
57
57
|
"@types/express": "*",
|
|
58
58
|
"bcrypt": "~5.1.1",
|
|
59
59
|
"class-transformer": "~0.5.1",
|