@paroicms/server 1.73.2 → 1.74.0

package/dist/modules/public-site/media-serve/media-serve.controller.js

@@ -1,47 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.serveFilecontroller = serveFilecontroller;
-exports.serveVersionedImageController = serveVersionedImageController;
-exports.serveUnversionedImageController = serveUnversionedImageController;
-const public_server_lib_1 = require("@paroicms/public-server-lib");
-const api_error_handler_1 = require("../../../common/api-error-handler");
-const http_constants_1 = require("../../../express/http-constants");
-const http_helpers_1 = require("../../../express/http-helpers");
-const _media_serve_helpers_1 = require("./_media-serve-helpers");
-async function serveFilecontroller(req, res) {
-    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
-    const mediaUid = (0, http_helpers_1.getHttpRequestParameter)(req, "mediaUid");
-    const nameAndExt = (0, http_helpers_1.getHttpRequestParameter)(req, "nameAndExt");
+import { generateImageSlug, isVariantName, makeUrlOfImageVariant, makeUrlOfMediaFile, } from "@paroicms/public-server-lib";
+import { ApiError } from "../../../common/api-error-handler.js";
+import { HTTP_MAX_AGE } from "../../../express/http-constants.js";
+import { getHttpRequestParameter, getReqSiteContext, serve301Redirect, serve304NotModified, } from "../../../express/http-helpers.js";
+import { parseNameAndExt } from "./_media-serve-helpers.js";
+export async function serveFilecontroller(req, res) {
+    const siteContext = getReqSiteContext(req);
+    const mediaUid = getHttpRequestParameter(req, "mediaUid");
+    const nameAndExt = getHttpRequestParameter(req, "nameAndExt");
     const cacheControl = "max-age=0";
     const fts = await getFileToServe(siteContext, {
         mediaUid,
         ifNoneMatch: req.headers["if-none-match"],
     });
     if (fts.status === 304) {
-        return (0, http_helpers_1.serve304NotModified)(res, {
+        return serve304NotModified(res, {
             cacheControl,
             etag: fts.resourceVersion,
         });
     }
     const { file } = fts;
-    const { url, fileName } = (0, public_server_lib_1.makeUrlOfMediaFile)(siteContext, { mediaUid, mediaType: file.mediaType, originalName: file.originalName }, { returnObj: true });
+    const { url, fileName } = makeUrlOfMediaFile(siteContext, { mediaUid, mediaType: file.mediaType, originalName: file.originalName }, { returnObj: true });
     if (fileName !== nameAndExt)
-        return (0, http_helpers_1.serve301Redirect)(res, url);
+        return serve301Redirect(res, url);
     res.append("Cache-Control", cacheControl);
     res.append("Etag", file.resourceVersion);
     res.append("Content-Type", file.mediaType);
     res.append("Content-Length", file.binaryFile.byteLength.toString());
     res.send(file.binaryFile);
 }
-async function serveVersionedImageController(req, res) {
-    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
-    const cacheControl = `public, max-age=${http_constants_1.HTTP_MAX_AGE}, immutable`;
-    const mediaUid = (0, http_helpers_1.getHttpRequestParameter)(req, "mediaUid");
-    const resourceVersion = (0, http_helpers_1.getHttpRequestParameter)(req, "resourceVersion");
-    const nameAndExt = (0, http_helpers_1.getHttpRequestParameter)(req, "nameAndExt");
-    const parsed = (0, _media_serve_helpers_1.parseNameAndExt)(nameAndExt);
+export async function serveVersionedImageController(req, res) {
+    const siteContext = getReqSiteContext(req);
+    const cacheControl = `public, max-age=${HTTP_MAX_AGE}, immutable`;
+    const mediaUid = getHttpRequestParameter(req, "mediaUid");
+    const resourceVersion = getHttpRequestParameter(req, "resourceVersion");
+    const nameAndExt = getHttpRequestParameter(req, "nameAndExt");
+    const parsed = parseNameAndExt(nameAndExt);
     if (!parsed)
-        throw new api_error_handler_1.ApiError("invalid name and ext", { status: 404 });
+        throw new ApiError("invalid name and ext", { status: 404 });
     const { variantName } = parsed;
     const fts = await getVariantImageToServe(siteContext, {
         mediaUid,
@@ -50,13 +45,13 @@ async function serveVersionedImageController(req, res) {
         ifNoneMatch: req.headers["if-none-match"],
     });
     if (fts.status === 304) {
-        return (0, http_helpers_1.serve304NotModified)(res, {
+        return serve304NotModified(res, {
             cacheControl,
             etag: fts.resourceVersion,
         });
     }
     const { file } = fts;
-    const newUrl = (0, public_server_lib_1.makeUrlOfImageVariant)(siteContext, {
+    const newUrl = makeUrlOfImageVariant(siteContext, {
         mediaUid,
         mediaType: file.mediaType,
         variantName,
@@ -64,7 +59,7 @@ async function serveVersionedImageController(req, res) {
         slug: file.slug,
     }, { returnObj: true });
     if (file.resourceVersion !== resourceVersion || newUrl.fileName !== nameAndExt) {
-        return (0, http_helpers_1.serve301Redirect)(res, newUrl.url);
+        return serve301Redirect(res, newUrl.url);
     }
     res.append("Cache-Control", cacheControl);
     res.append("Etag", file.resourceVersion);
@@ -72,20 +67,20 @@ async function serveVersionedImageController(req, res) {
     res.append("Content-Length", file.binaryFile.byteLength.toString());
     res.send(file.binaryFile);
 }
-async function serveUnversionedImageController(req, res) {
-    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
+export async function serveUnversionedImageController(req, res) {
+    const siteContext = getReqSiteContext(req);
     const cacheControl = "max-age=0";
-    const mediaUid = (0, http_helpers_1.getHttpRequestParameter)(req, "mediaUid");
-    const nameAndExt = (0, http_helpers_1.getHttpRequestParameter)(req, "nameAndExt");
-    const parsed = (0, _media_serve_helpers_1.parseNameAndExt)(nameAndExt);
+    const mediaUid = getHttpRequestParameter(req, "mediaUid");
+    const nameAndExt = getHttpRequestParameter(req, "nameAndExt");
+    const parsed = parseNameAndExt(nameAndExt);
     if (!parsed) {
-        throw new api_error_handler_1.ApiError("invalid name and ext", {
+        throw new ApiError("invalid name and ext", {
             status: 404,
         });
     }
     const { variantName } = parsed;
-    if (!(0, public_server_lib_1.isVariantName)(variantName))
-        throw new api_error_handler_1.ApiError("invalid variant name", { status: 404 });
+    if (!isVariantName(variantName))
+        throw new ApiError("invalid variant name", { status: 404 });
     const fts = await getVariantImageToServe(siteContext, {
         mediaUid,
         variantName,
@@ -93,13 +88,13 @@ async function serveUnversionedImageController(req, res) {
         ifNoneMatch: req.headers["if-none-match"],
     });
     if (fts.status === 304) {
-        return (0, http_helpers_1.serve304NotModified)(res, {
+        return serve304NotModified(res, {
             cacheControl,
             etag: fts.resourceVersion,
         });
     }
     const { file } = fts;
-    const newUrl = (0, public_server_lib_1.makeUrlOfImageVariant)(siteContext, {
+    const newUrl = makeUrlOfImageVariant(siteContext, {
         mediaUid,
         mediaType: file.mediaType,
         variantName,
@@ -107,7 +102,7 @@ async function serveUnversionedImageController(req, res) {
         slug: file.slug,
     }, { returnObj: true });
     if (newUrl.fileName !== nameAndExt) {
-        return (0, http_helpers_1.serve301Redirect)(res, newUrl.url);
+        return serve301Redirect(res, newUrl.url);
     }
     res.append("Cache-Control", cacheControl);
     res.append("Etag", file.resourceVersion);
@@ -134,7 +129,7 @@ async function getVariantImageToServe(siteContext, options) {
             file = await tryToCreateImageVariant(siteContext, { mediaUid, variantName });
         }
         if (!file)
-            throw new api_error_handler_1.ApiError("image not found", { status: 404 });
+            throw new ApiError("image not found", { status: 404 });
     }
     return {
         status: 200,
@@ -145,7 +140,7 @@ async function getFileToServe(siteContext, options) {
     const { mediaUid, ifNoneMatch } = options;
     const media = await siteContext.mediaStorage.getMediaWithBinary(mediaUid);
     if (!media)
-        throw new api_error_handler_1.ApiError(`media '${mediaUid}' not found`, { status: 404 });
+        throw new ApiError(`media '${mediaUid}' not found`, { status: 404 });
     if (media.resourceVersion === ifNoneMatch) {
         return {
             status: 304,
@@ -161,7 +156,7 @@ async function tryToCreateImageVariant(siteContext, options) {
     const { mediaUid, variantName } = options;
     const media = await siteContext.mediaStorage.getMedia({ uid: mediaUid });
     if (!media || media.kind !== "image") {
-        throw new api_error_handler_1.ApiError(`image '${mediaUid}' not found`, { status: 404 });
+        throw new ApiError(`image '${mediaUid}' not found`, { status: 404 });
     }
     return await siteContext.imageCache.conditionallyCreateImageVariantWithBinary({
         imageUid: media.uid,
@@ -171,7 +166,7 @@ async function tryToCreateImageVariant(siteContext, options) {
     }, {
         authorisedImageSizes: siteContext.themeConf.fTextImages.map((val) => val.realSize),
         variantName,
-        slug: (0, public_server_lib_1.generateImageSlug)(media.originalName),
+        slug: generateImageSlug(media.originalName),
         dependsOnUsedKey: "themeConf.fTextImages",
     });
 }

package/dist/modules/public-site/media-serve/media-serve.controller.js.map

@@ -1 +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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"}
+{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,WAAW,CAAC;IAEjC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;QAC5C,QAAQ;QACR,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,GAAG,EAAE;YAC9B,YAAY;YACZ,IAAI,EAAE,GAAG,CAAC,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAC1C,WAAW,EACX,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,EACxE,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,IAAI,QAAQ,KAAK,UAAU;QAAE,OAAO,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAE/D,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,mBAAmB,YAAY,aAAa,CAAC;IAElE,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,uBAAuB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAEzE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE/B,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACpD,QAAQ;QACR,WAAW;QACX,gBAAgB,EAAE,KAAK;QACvB,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,GAAG,EAAE;YAC9B,YAAY;YACZ,IAAI,EAAE,GAAG,CAAC,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IAErB,MAAM,MAAM,GAAG,qBAAqB,CAClC,WAAW,EACX;QACE,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW;QACX,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,eAAe,KAAK,eAAe,IAAI,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC/E,OAAO,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC;IAEjC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE;YACzC,MAAM,EAAE,GAAG;SACZ,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QAAE,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAE7F,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACpD,QAAQ;QACR,WAAW;QACX,gBAAgB,EAAE,IAAI;QACtB,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;KAC1C,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,GAAG,EAAE;YAC9B,YAAY;YACZ,IAAI,EAAE,GAAG,CAAC,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IAErB,MAAM,MAAM,GAAG,qBAAqB,CAClC,WAAW,EACX;QACE,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,IAAI,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACnC,OAAO,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5B,CAAC;AA6BD,KAAK,UAAU,sBAAsB,CACnC,WAAwB,EACxB,OAKC;IAED,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEzE,IAAI,IAAI,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAChE,QAAQ,EAAE,QAAQ;QAClB,WAAW;KACZ,CAAC,CAAC;IACH,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,WAAW,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;YACzC,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,eAAe,EAAE,IAAI,CAAC,eAAe;aACtC,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI;KACL,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,OAAmD;IAEnD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC1E,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,QAAQ,CAAC,UAAU,QAAQ,aAAa,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACjF,IAAI,KAAK,CAAC,eAAe,KAAK,WAAW,EAAE,CAAC;QAC1C,OAAO;YACL,MAAM,EAAE,GAAG;YACX,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,WAAwB,EACxB,OAAuD;IAEvD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACrC,MAAM,IAAI,QAAQ,CAAC,UAAU,QAAQ,aAAa,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,MAAM,WAAW,CAAC,UAAU,CAAC,yCAAyC,CAC3E;QACE,QAAQ,EAAE,KAAK,CAAC,GAAG;QACnB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,EACD;QACE,oBAAoB,EAAE,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClF,WAAW;QACX,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC;QAC3C,gBAAgB,EAAE,uBAAuB;KAC1C,CACF,CAAC;AACJ,CAAC"}

package/dist/modules/public-site/public-route/make-url.d.ts

@@ -1,6 +1,6 @@
 import type { Tracker } from "@paroicms/internal-server-lib";
 import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
-import type { SiteContext } from "../../../site-context/site-context.types";
+import type { SiteContext } from "../../../site-context/site-context.types.js";
 export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId): Promise<string>;
 export declare function getUrlOfDocument(siteContext: SiteContext, tracker: Tracker, documentId: ParsedNodelId, options: {
     returnUrlDependencyKeys: true;

package/dist/modules/public-site/public-route/make-url.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUrlOfDocument = getUrlOfDocument;
-exports.getHomeUrl = getHomeUrl;
-const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
-const connector_1 = require("@paroicms/connector");
-const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
-const text_cache_1 = require("../../../common/text-cache");
-const node_queries_1 = require("../../core/node/node.queries");
-async function getUrlOfDocument(siteContext, tracker, documentId, options = {}) {
-    const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.logger, { kind: "url", documentId });
+import { dateVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
+import { mainDbSchemaName } from "@paroicms/connector";
+import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
+import { makeCacheDependencyKey, makeCacheKey } from "../../../common/text-cache.js";
+import { getNodeDepth } from "../../core/node/node.queries.js";
+export async function getUrlOfDocument(siteContext, tracker, documentId, options = {}) {
+    const cacheKey = makeCacheKey(siteContext.logger, { kind: "url", documentId });
     const cacheValue = await siteContext.textCache.getCacheValue(cacheKey, tracker);
     if (cacheValue) {
         if (!options.returnUrlDependencyKeys)
@@ -21,7 +17,7 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
     let dependencyKeys;
     let url;
     const { nodeId, language } = documentId;
-    const depth = await (0, node_queries_1.getNodeDepth)(siteContext, tracker, nodeId);
+    const depth = await getNodeDepth(siteContext, tracker, nodeId);
     if (depth === 0) {
         url = getHomeUrl(siteContext, language);
         dependencyKeys = [];
@@ -29,7 +25,7 @@ async function getUrlOfDocument(siteContext, tracker, documentId, options = {})
     else {
         const query = buildUrlQuery(siteContext, documentId, depth);
         const [row] = await query.getRawMany();
-        tracker.trackAccess(connector_1.mainDbSchemaName, "PaNode", "read");
+        tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
         if (!row) {
             throw new Error(`invalid url data for document "${language}:${nodeId}"`);
         }
@@ -87,22 +83,22 @@ function formatUrlData(row, depth) {
     const parts = new Map();
     for (let cur = 1; cur <= depth; ++cur) {
         parts.set(cur, {
-            nodeId: (0, data_formatters_lib_1.strVal)(row[`id${cur}`]),
-            typeName: (0, data_formatters_lib_1.strVal)(row[`typeName${cur}`]),
-            relativeId: (0, data_formatters_lib_1.strVal)(row[`relativeId${cur}`]),
-            slug: (0, data_formatters_lib_1.strValOrUndef)(row[`slug${cur}`]),
-            publishDate: (0, data_formatters_lib_1.dateVal)(row[`publishDate${cur}`]),
+            nodeId: strVal(row[`id${cur}`]),
+            typeName: strVal(row[`typeName${cur}`]),
+            relativeId: strVal(row[`relativeId${cur}`]),
+            slug: strValOrUndef(row[`slug${cur}`]),
+            publishDate: dateVal(row[`publishDate${cur}`]),
         });
     }
     return { depth, parts };
 }
-function getHomeUrl(siteContext, language) {
+export function getHomeUrl(siteContext, language) {
     return siteContext.siteSchema.isMultilingual ? `/${language}` : "/";
 }
 function makeDocumentUrl(siteContext, urlData, language) {
     const { siteSchema } = siteContext;
     const urlParts = siteSchema.isMultilingual ? [language] : [];
-    let parent = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, "home");
+    let parent = getDocumentTypeByName(siteSchema, "home");
     for (let cur = 1; cur <= urlData.depth; ++cur) {
         const part = urlData.parts.get(cur);
         if (!part)
@@ -110,7 +106,7 @@ function makeDocumentUrl(siteContext, urlData, language) {
         if (!parent.children?.includes(part.typeName)) {
             throw new Error(`schema and database are not compatible, '${part.typeName}' should not be a child of '${parent.typeName}'`);
         }
-        const docType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, part.typeName);
+        const docType = getDocumentTypeByName(siteSchema, part.typeName);
         if (docType.isRoutingPoint) {
             const part = docType.urlPaths?.[language];
             if (!part) {
@@ -141,7 +137,7 @@ function makeRelativeIdSlugUrlPart(part) {
     return part.slug ? `${part.relativeId}-${part.slug}` : part.relativeId;
 }
 function makeUrlDependencyKeys(urlData, language) {
-    return Array.from(urlData.parts.values()).map((part) => (0, text_cache_1.makeCacheDependencyKey)({
+    return Array.from(urlData.parts.values()).map((part) => makeCacheDependencyKey({
         documentId: { language, nodeId: part.nodeId },
         perimeter: "slug",
     }));

package/dist/modules/public-site/public-route/make-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":";;AAiCA,4CA+CC;AA+ED,gCAEC;AAjKD,oEAAsF;AACtF,mDAAuD;AACvD,2EAAwE;AAGxE,2DAAkF;AAElF,+DAA4D;AA0BrD,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,UAAiD,EAAE;IAEnD,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/E,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,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACtD,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,OAAsB,EAAE,KAAa;IACpF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAErC,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,CACR,SAAS,EACT,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,uBAAuB,EAC9D;QACE,QAAQ;KACT,CACF;SACA,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,WAAW,CAC1E;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,SAAS,EACT,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,YAAY,GAAG,uBAAuB,EAC9D;YACE,QAAQ;SACT,CACF;aACA,QAAQ,CACP,YAAY,EACZ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,cAAc,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,WAAW,CAC1E;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,eAAe,CACtB,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"}
+{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/make-url.ts"],"names":[],"mappings":"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"}

package/dist/modules/public-site/public-route/public-route-parser.d.ts

@@ -1,5 +1,5 @@
 import type { ScRegularDocumentType, ScRoutingPointDocumentType } from "@paroicms/public-anywhere-lib";
-import type { SiteContext } from "../../../site-context/site-context.types";
+import type { SiteContext } from "../../../site-context/site-context.types.js";
 export interface ParsedPublicRoute {
     language: string;
     routingPoints: ScRoutingPointDocumentType[];

package/dist/modules/public-site/public-route/public-route-parser.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePublicRoute = parsePublicRoute;
-exports.findParentParsedRouteWithDocument = findParentParsedRouteWithDocument;
-const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
-function parsePublicRoute(siteContext, path) {
+import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
+export function parsePublicRoute(siteContext, path) {
     const { siteSchema } = siteContext;
     const { cleanedPath, urlParameters } = parseUrlParameters(path);
     const tokens = cleanedPath
@@ -75,7 +71,7 @@ function parseUrlParameters(path) {
 }
 function findRoutingPointByUrlPath({ siteSchema, parent, urlPath, language, }) {
     for (const typeName of parent.children ?? []) {
-        const documentType = (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, typeName);
+        const documentType = getDocumentTypeByName(siteSchema, typeName);
         if (!documentType.isRoutingPoint || !documentType.urlPaths)
             continue;
         if (urlPath === documentType.urlPaths[language])
@@ -89,7 +85,7 @@ function findRegularRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, p
             childTypeNames.push(...parent.children);
         return childTypeNames;
     }, [])
-        ?.map((typeName) => (0, internal_anywhere_lib_1.getDocumentTypeByName)(siteSchema, typeName))
+        ?.map((typeName) => getDocumentTypeByName(siteSchema, typeName))
         .filter((docType) => !docType.isRoutingPoint);
     if (!candidateTypes || candidateTypes.length === 0)
         return;
@@ -136,7 +132,7 @@ function isDay(s) {
     const val = Number(s);
     return val >= 1 && val <= 31;
 }
-function findParentParsedRouteWithDocument(parsedRoute) {
+export function findParentParsedRouteWithDocument(parsedRoute) {
     let curRoute = parsedRoute;
     while (true) {
         curRoute = findParentParsedRoute(curRoute);

package/dist/modules/public-site/public-route/public-route-parser.js.map

@@ -1 +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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"}
+{"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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"}

package/dist/modules/public-site/public-route/raw-document-payload.d.ts

@@ -1,4 +1,4 @@
-import type { DocValues } from "../../../public-payload/public-payload.types";
-import type { SiteContext } from "../../../site-context/site-context.types";
-import type { ParsedPublicRoute } from "./public-route-parser";
+import type { DocValues } from "../../../public-payload/public-payload.types.js";
+import type { SiteContext } from "../../../site-context/site-context.types.js";
+import type { ParsedPublicRoute } from "./public-route-parser.js";
 export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParsedPublicRoute): Promise<DocValues | undefined>;

package/dist/modules/public-site/public-route/raw-document-payload.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchRawDocPayload = fetchRawDocPayload;
-const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
-async function fetchRawDocPayload(siteContext, parsedRoute) {
+import { formatDocValues } from "../../../public-payload/doc-values.queries.js";
+export async function fetchRawDocPayload(siteContext, parsedRoute) {
     const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
     const [row] = await query.getRawMany();
     if (!row)
         return;
-    return (0, doc_values_queries_1.formatDocValues)(row, {
+    return formatDocValues(row, {
         language: parsedRoute.language,
     });
 }

package/dist/modules/public-site/public-route/raw-document-payload.js.map

@@ -1 +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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"}
+{"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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"}

package/dist/modules/public-site/public-site.controller.js

@@ -1,29 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.indexController = indexController;
-const internal_server_lib_1 = require("@paroicms/internal-server-lib");
-const serve_text_or_1 = require("../../common/serve-text-or");
-const text_cache_1 = require("../../common/text-cache");
-const tracker_report_1 = require("../../common/tracker-report");
-const http_helpers_1 = require("../../express/http-helpers");
-const render_liquidjs_1 = require("../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
-const rendering_context_1 = require("../../liquidjs-tools/liquidjs-rendering/rendering-context");
-const make_public_payload_1 = require("../../public-payload/make-public-payload");
-async function indexController(req, res) {
-    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
-    const tracker = (0, internal_server_lib_1.createTracker)();
+import { createTracker } from "@paroicms/internal-server-lib";
+import { serveTextFromCacheOr } from "../../common/serve-text-or.js";
+import { makeCacheKey } from "../../common/text-cache.js";
+import { trackerReportToMessage } from "../../common/tracker-report.js";
+import { getReqSiteContext } from "../../express/http-helpers.js";
+import { renderLiquidTemplate } from "../../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
+import { createRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { makeDetachedPublicPayload } from "../../public-payload/make-public-payload.js";
+export async function indexController(req, res) {
+    const siteContext = getReqSiteContext(req);
+    const tracker = createTracker();
     await serveIndexPage(siteContext, req, res, tracker);
-    siteContext.logger.stats((0, tracker_report_1.trackerReportToMessage)(tracker.toReport(), `serve ${req.url}`));
+    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${req.url}`));
 }
 async function serveIndexPage(siteContext, req, res, tracker) {
-    const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.logger, { kind: "html", url: req.url });
-    const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
+    const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: req.url });
+    const serveOr = serveTextFromCacheOr(siteContext, tracker, { cacheKey, req, res });
     if (await serveOr.serveFromCache())
         return;
-    const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });
-    const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
+    const renderingContext = await createRenderingContext(siteContext, { cacheKey, tracker });
+    const html = await renderLiquidTemplate(siteContext, renderingContext, {
         templateNames: ["index", "default"],
-        payload: (0, make_public_payload_1.makeDetachedPublicPayload)(siteContext, renderingContext),
+        payload: makeDetachedPublicPayload(siteContext, renderingContext),
     });
     await serveOr.putInCacheAndServe(html, renderingContext.getDependencyKeys());
 }

package/dist/modules/public-site/public-site.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;AAWA,0CAKC;AAhBD,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6DAA+D;AAC/D,6FAA+F;AAC/F,iGAAmG;AACnG,kFAAqF;AAG9E,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,GAAa;IAC/D,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrD,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAClF,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,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,IAAA,+CAAyB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAClE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AACtG,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAGxF,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAY,EAAE,GAAa;IAC/D,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrD,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,oBAAoB,CAAC,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,sBAAsB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,CAAC;KAClE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}

package/dist/modules/public-site/public-site.middleware.js

@@ -1,48 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.publicSiteMiddleware = publicSiteMiddleware;
-const internal_server_lib_1 = require("@paroicms/internal-server-lib");
-const serve_text_or_1 = require("../../common/serve-text-or");
-const text_cache_1 = require("../../common/text-cache");
-const tracker_report_1 = require("../../common/tracker-report");
-const http_helpers_1 = require("../../express/http-helpers");
-const public_route_parser_1 = require("./public-route/public-route-parser");
-const serve_document_1 = require("./serve-document/serve-document");
-async function publicSiteMiddleware(req, res, next) {
-    const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
-    const parsedRoute = (0, public_route_parser_1.parsePublicRoute)(siteContext, req.url);
+import { createTracker } from "@paroicms/internal-server-lib";
+import { render404Html, serveTextFromCacheOr } from "../../common/serve-text-or.js";
+import { makeCacheKey } from "../../common/text-cache.js";
+import { trackerReportToMessage } from "../../common/tracker-report.js";
+import { getReqSiteContext, serve301Redirect } from "../../express/http-helpers.js";
+import { parsePublicRoute } from "./public-route/public-route-parser.js";
+import { generateDocumentHtml } from "./serve-document/serve-document.js";
+export async function publicSiteMiddleware(req, res, next) {
+    const siteContext = getReqSiteContext(req);
+    const parsedRoute = parsePublicRoute(siteContext, req.url);
     if (!parsedRoute) {
         next();
         return;
     }
-    const tracker = (0, internal_server_lib_1.createTracker)();
+    const tracker = createTracker();
     await serveDocument(siteContext, req, res, parsedRoute, tracker);
-    siteContext.logger.stats((0, tracker_report_1.trackerReportToMessage)(tracker.toReport(), `serve ${req.url}`));
+    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${req.url}`));
 }
 async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
-    const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.logger, { kind: "html", url: req.url });
-    const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
+    const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: req.url });
+    const serveOr = serveTextFromCacheOr(siteContext, tracker, { cacheKey, req, res });
     if (await serveOr.serveFromCache())
         return;
-    const redirectCacheKey = (0, text_cache_1.makeCacheKey)(siteContext.logger, {
+    const redirectCacheKey = makeCacheKey(siteContext.logger, {
         kind: "redirect",
         urlKey: parsedRoute.urlCacheKey,
     });
     const cacheRedirect = await siteContext.textCache.getCacheValue(redirectCacheKey, tracker);
     if (cacheRedirect && cacheRedirect.value !== req.url) {
-        return (0, http_helpers_1.serve301Redirect)(res, cacheRedirect.value);
+        return serve301Redirect(res, cacheRedirect.value);
     }
-    const generated = await (0, serve_document_1.generateDocumentHtml)(siteContext, { req, parsedRoute, cacheKey }, tracker);
+    const generated = await generateDocumentHtml(siteContext, { req, parsedRoute, cacheKey }, tracker);
     if (generated.status === 301) {
         await siteContext.textCache.setCacheValue({
             cacheKey: redirectCacheKey,
             dependencyKeys: generated.dependencyKeys,
             value: generated.url,
         }, tracker);
-        return (0, http_helpers_1.serve301Redirect)(res, generated.url);
+        return serve301Redirect(res, generated.url);
     }
     if (generated.status === 404) {
-        await (0, serve_text_or_1.render404Html)(siteContext, res, { language: parsedRoute.language });
+        await render404Html(siteContext, res, { language: parsedRoute.language });
         return;
     }
     await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);