@paroicms/server 1.78.1 → 1.80.0

package/dist/{modules/core → bo-backend}/part/part.resolver.js

@@ -5,12 +5,12 @@ import { getTypeNameOf } from "../node/node.queries.js";
 import { createNodeWithPart, createPartOnNode, deletePart, loadPartSeed, readPartSeedsOf, } from "./part.queries.js";
 export const partResolvers = {
     Query: {
-        part: async (_parent, { nodelId }, { req, siteContext }) => {
-            authGuard(req);
+        part: async (_parent, { nodelId }, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             return await loadPartSeed(siteContext, parseNodelId(nodelId));
         },
-        partsOf: async (_parent, { documentId }, { req, siteContext }) => {
-            authGuard(req);
+        partsOf: async (_parent, { documentId }, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             const { nodeId, language } = parseNodelId(documentId);
             const typeName = await getTypeNameOf(siteContext, nodeId);
             const documentType = getDocumentTypeByName(siteContext.siteSchema, typeName);
@@ -23,16 +23,16 @@ export const partResolvers = {
         },
     },
     Mutation: {
-        createPartOnNode: async (_parent, { language, nodeId }, { req, siteContext }) => {
-            authGuard(req);
+        createPartOnNode: async (_parent, { language, nodeId }, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             const newId = await createPartOnNode(siteContext, {
                 language,
                 nodeId,
             });
             return await loadPartSeed(siteContext, newId);
         },
-        createNodeWithPart: async (_parent, { parentNodelId, listName, typeName }, { req, siteContext }) => {
-            authGuard(req);
+        createNodeWithPart: async (_parent, { parentNodelId, listName, typeName }, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             const newId = await createNodeWithPart(siteContext, {
                 listName,
                 parentNodelId: parseNodelId(parentNodelId),
@@ -40,8 +40,8 @@ export const partResolvers = {
             });
             return await loadPartSeed(siteContext, newId);
         },
-        deletePart: async (_parent, { nodelId }, { req, siteContext }) => {
-            authGuard(req);
+        deletePart: async (_parent, { nodelId }, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             await deletePart(siteContext, parseNodelId(nodelId));
             return true;
         },

package/dist/bo-backend/part/part.resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"part.resolver.js","sourceRoot":"","sources":["../../../src/bo-backend/part/part.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,MAAM,aAAa,GAAiC;IACzD,KAAK,EAAE;QACL,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACjE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO,MAAM,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACvE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAE7E,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAExE,OAAO,MAAM,eAAe,CAAC,WAAW,EAAE;gBACxC,cAAc,EAAE,MAAM;gBACtB,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;KACF;IAED,QAAQ,EAAE;QACR,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACtF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE;gBAChD,QAAQ;gBACR,MAAM;aACP,CAAC,CAAC;YACH,OAAO,MAAM,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,kBAAkB,EAAE,KAAK,EACvB,OAAO,EACP,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,EACrC,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE;gBAClD,QAAQ;gBACR,aAAa,EAAE,YAAY,CAAC,aAAa,CAAC;gBAC1C,QAAQ;aACT,CAAC,CAAC;YACH,OAAO,MAAM,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACvE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;KACF;CACF,CAAC"}

package/dist/bo-backend/site-constants/site-constants.resolver.d.ts

@@ -0,0 +1,3 @@
+import type { GqlResolvers } from "../../graphql/generated-graphql-types.js";
+import type { GraphqlContext } from "../../graphql/graphql.types.js";
+export declare const siteConstantsResolvers: GqlResolvers<GraphqlContext>;

package/dist/{modules/core → bo-backend}/site-constants/site-constants.resolver.js

@@ -1,9 +1,9 @@
-import { appVersion } from "../../../context.js";
+import { appVersion } from "../../context.js";
 import { authGuard } from "../auth/auth.helper.js";
 export const siteConstantsResolvers = {
     Query: {
-        siteConstants: async (_parent, _args, { req, siteContext }) => {
-            authGuard(req);
+        siteConstants: async (_parent, _args, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             return {
                 appVersion,
                 siteConfiguration: {
@@ -12,12 +12,12 @@ export const siteConstantsResolvers = {
                 trusted: siteContext.trusted,
             };
         },
-        routingIds: async (_parent, _args, { req, siteContext }) => {
-            authGuard(req);
+        routingIds: async (_parent, _args, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             return JSON.stringify(siteContext.siteIds.homeIds);
         },
-        plugins: async (_parent, _args, { req, siteContext }) => {
-            authGuard(req);
+        plugins: async (_parent, _args, { siteContext, httpContext }) => {
+            authGuard(httpContext);
             return Array.from(siteContext.plugins.values())
                 .filter((p) => !!p.boPluginBaseUrl)
                 .map((p) => ({
@@ -30,14 +30,14 @@ export const siteConstantsResolvers = {
         },
     },
     SiteConstants: {
-        themeConf: async (_parent, _args, { req, siteContext }) => {
+        themeConf: async (_parent, _args, { siteContext, httpContext }) => {
             const themeConf = siteContext.themeConf;
             return {
                 pixelRatio: themeConf.pixelRatio,
                 fTextImages: themeConf.fTextImages,
             };
         },
-        siteSchema: async (_parent, _args, { req, siteContext }) => {
+        siteSchema: async (_parent, _args, { siteContext, httpContext }) => {
             return JSON.stringify(siteContext.siteSchema);
         },
     },

package/dist/bo-backend/site-constants/site-constants.resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"site-constants.resolver.js","sourceRoot":"","sources":["../../../src/bo-backend/site-constants/site-constants.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,CAAC,MAAM,sBAAsB,GAAiC;IAClE,KAAK,EAAE;QACL,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACpE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO;gBACL,UAAU;gBACV,iBAAiB,EAAE;oBACjB,kBAAkB,EAAE,WAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,IAAI,KAAK;iBAC1F;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO;aAC7B,CAAC;QACJ,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACjE,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9D,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;iBAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACX,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,eAAe,EAAE,CAAC,CAAC,eAAyB;gBAC5C,QAAQ,EACN,CAAC,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS;oBACnC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;aAC9C,CAAC,CAAC,CAAC;QACR,CAAC;KACF;IAED,aAAa,EAAE;QACb,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YAChE,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;YACxC,OAAO;gBACL,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,WAAW,EAAE,SAAS,CAAC,WAAW;aACnC,CAAC;QACJ,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE;YACjE,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC;KACF;CACF,CAAC"}

package/dist/{modules/core → bo-backend}/unprotected/unprotected.resolver.d.ts

@@ -1,5 +1,5 @@
-import type { GqlResolvers } from "../../../graphql/generated-graphql-types.js";
-import type { GraphqlContext } from "../../graphql.types.js";
+import type { GqlResolvers } from "../../graphql/generated-graphql-types.js";
+import type { GraphqlContext } from "../../graphql/graphql.types.js";
 export declare const unprotectedResolvers: GqlResolvers<GraphqlContext>;
 export interface FaviconThumb {
     url: string;

package/dist/{modules/core → bo-backend}/unprotected/unprotected.resolver.js

@@ -1,6 +1,6 @@
 import { generateImageSlug } from "@paroicms/public-server-lib";
-import { getHandleOfSiteBoFavicon, getHandleOfSiteFavicon, } from "../../../common/media-handles.helpers.js";
-import { appConf, platformAuthUrl } from "../../../context.js";
+import { getHandleOfSiteBoFavicon, getHandleOfSiteFavicon, } from "../../common/media-handles.helpers.js";
+import { appConf, platformAuthUrl } from "../../context.js";
 import { registerImageVariant } from "../media/media.js";
 export const unprotectedResolvers = {
     Query: {

package/dist/bo-backend/unprotected/unprotected.resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../src/bo-backend/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAI5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,CAAC,MAAM,oBAAoB,GAAiC;IAChE,KAAK,EAAE;QACL,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YAC7D,OAAO;gBACL,kBAAkB,EAAE,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACtE,QAAQ;oBACR,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;iBACvD,CAAC,CAAC;gBACH,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,eAAe,EACb,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe;aACnF,CAAC;QACJ,CAAC;KACF;IAED,mBAAmB,EAAE;QACnB,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACtD,OAAO,CACL,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE;gBACxC,MAAM,EAAE,sBAAsB,EAAE;gBAChC,QAAQ,EAAE,SAAS;aACpB,CAAC,CAAC,IAAI,IAAI,CACZ,CAAC;QACJ,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACxD,OAAO,CACL,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE;gBACxC,MAAM,EAAE,wBAAwB,EAAE;gBAClC,QAAQ,EAAE,SAAS;aACpB,CAAC,CAAC,IAAI,IAAI,CACZ,CAAC;QACJ,CAAC;KACF;CACF,CAAC;AASF,KAAK,UAAU,qBAAqB,CAClC,WAAwB,EACxB,EAAE,MAAM,EAAE,QAAQ,EAA2C;IAE7D,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO;IAE7C,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE;QACzD,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB;QACD,QAAQ,EAAE,QAAQ;QAClB,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,IAAI;QACjB,gBAAgB,EAAE,IAAI;QACtB,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC;QAC3C,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,EAAE,UAAU,CAAC,GAAG;QACnB,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,SAAS,EAAE,UAAU,CAAC,SAAS;KAChC,CAAC;AACJ,CAAC"}

package/dist/common/child-ordering-query.d.ts

@@ -1,8 +1,8 @@
 import type { OrderByItem, ScDocumentType, ScSorting } from "@paroicms/public-anywhere-lib";
-import type { SelectQueryBuilder } from "typeorm";
+import type { Knex } from "knex";
 import type { SiteContext } from "../site-context/site-context.types.js";
 export declare function applyRegularChildrenSortingOnQuery(siteContext: Pick<SiteContext, "cn" | "siteSchema">, options: {
-    query: SelectQueryBuilder<any>;
+    query: Knex.QueryBuilder;
     parentDocumentType: ScDocumentType;
     regularChildrenSorting?: ScSorting;
     leftJoinDocument?: boolean;
@@ -12,4 +12,3 @@ export declare function applyRegularChildrenSortingOnQuery(siteContext: Pick<Sit
     ordered: boolean;
     orderBy?: string;
 };
-export declare function formatTypeOrmDirection(direction: "asc" | "desc"): "ASC" | "DESC";

package/dist/common/child-ordering-query.js

@@ -9,20 +9,23 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
     const orderPropertiesMap = makeMapOfOrderProperties(siteContext, parentDocumentType.regularChildren);
     const orderByQb = orderByAsString ? makeOrderByAsStringQB() : query;
     if (orderBy === "manual") {
-        query.leftJoin("PaOrderedNode", "o", "o.nodeId = l.id");
-        orderByQb.orderBy("o.orderNum", "ASC").addOrderBy("l.id", "ASC");
+        query.leftJoin("PaOrderedNode as o", "o.nodeId", "l.id");
+        orderByQb.orderBy("o.orderNum", "asc").orderBy("l.id", "asc");
     }
     else {
         let index = 0;
         for (const { fieldName, direction } of orderBy) {
             if (fieldName === "title") {
                 if (leftJoinDocument) {
-                    query.leftJoin("PaDocument", "d", "d.nodeId = s.nodeId and d.language = s.language");
+                    query.leftJoin("PaDocument as d", {
+                        "d.nodeId": "s.nodeId",
+                        "d.language": "s.language",
+                    });
                 }
-                orderByQb.addOrderBy("d.title", formatTypeOrmDirection(direction));
+                orderByQb.orderBy("d.title", direction);
             }
             else if (fieldName === "publishDate") {
-                orderByQb.addOrderBy("l.publishDate", formatTypeOrmDirection(direction));
+                orderByQb.orderBy("l.publishDate", direction);
             }
             else {
                 const orderProperties = orderPropertiesMap.get(fieldName);
@@ -39,12 +42,12 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
                 else {
                     throw new Error(`invalid data type '${dataType}'`);
                 }
-                const languageJoinCrit = localized
-                    ? `f${index}.language = s.language`
-                    : `f${index}.language = :dbAnyLanguage`;
-                const critParams = localized ? { fieldName } : { fieldName, dbAnyLanguage };
-                query.leftJoin("PaFieldVarchar", `f${index}`, `f${index}.field = :fieldName and f${index}.nodeId = s.nodeId and ${languageJoinCrit}`, critParams);
-                orderByQb.addOrderBy(orderByField, formatTypeOrmDirection(direction));
+                query.leftJoin(`PaFieldVarchar as f${index}`, {
+                    "f${index}.field": fieldName,
+                    "f${index}.nodeId": "s.nodeId",
+                    "f${index}.language": localized ? "s.language" : siteContext.cn.raw("?", [dbAnyLanguage]),
+                });
+                orderByQb.orderBy(orderByField, direction);
             }
             ++index;
         }
@@ -94,13 +97,6 @@ function makeOrderByAsStringQB() {
     };
     return qb;
 }
-export function formatTypeOrmDirection(direction) {
-    if (direction === "asc")
-        return "ASC";
-    if (direction === "desc")
-        return "DESC";
-    throw new Error(`Invalid direction ${direction}`);
-}
 function toOrderByOrManual(regularChildrenSorting) {
     if (!regularChildrenSorting)
         return;

package/dist/common/child-ordering-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}

package/dist/common/data-format.d.ts

@@ -1,8 +1,8 @@
 import type { Obj } from "@paroi/data-formatters-lib";
 import type { AccountRow, DocumentRow } from "@paroicms/connector";
-import type { Account, AccountPreferences, AuthenticatedAccount } from "../modules/core/account/account.queries.js";
-import type { LabelingSeed } from "../modules/core/labeling/labeling.queries.js";
-import type { NodeSeed } from "../modules/core/node/node.queries.js";
+import type { Account, AccountPreferences, AuthenticatedAccount } from "../bo-backend/account/account.queries.js";
+import type { LabelingSeed } from "../bo-backend/labeling/labeling.queries.js";
+import type { NodeSeed } from "../bo-backend/node/node.queries.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
 export interface Document {
     nodelId: string;

package/dist/common/data-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-format.js","sourceRoot":"","sources":["../../src/common/data-format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAU3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAatE,MAAM,UAAU,gBAAgB,CAAC,IAAS;IACxC,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QACnC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAqB;IACxD,OAAO;QACL,OAAO,EAAE,aAAa,CAAC;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,mBAAmB,EAAE,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAAS;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACzB,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;QAC5C,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAAY;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,IAAgB;IACrE,OAAO;QACL,GAAG,yBAAyB,CAAC,IAAI,CAAC;QAClC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACvF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,IAAgB;IACxD,OAAO;QACL,GAAG,IAAI;QACP,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAAyC;IACxE,OAAO,WAAW,WAAW,CAAC,OAAO,IAAI,UAAU,EAAE,CAAC;AACxD,CAAC"}
+{"version":3,"file":"data-format.js","sourceRoot":"","sources":["../../src/common/data-format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAM9D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAatE,MAAM,UAAU,gBAAgB,CAAC,IAAS;IACxC,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QACnC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAqB;IACxD,OAAO;QACL,OAAO,EAAE,aAAa,CAAC;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;QACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,mBAAmB,EAAE,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAAS;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACzB,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;QAC5C,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAAY;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,IAAgB;IACrE,OAAO;QACL,GAAG,yBAAyB,CAAC,IAAI,CAAC;QAClC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACvF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,IAAgB;IACxD,OAAO;QACL,GAAG,IAAI;QACP,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAAyC;IACxE,OAAO,WAAW,WAAW,CAAC,OAAO,IAAI,UAAU,EAAE,CAAC;AACxD,CAAC"}

package/dist/common/serve-text-or.d.ts

@@ -1,16 +1,14 @@
 import { type Tracker } from "@paroicms/internal-server-lib";
-import type { Request, Response } from "express";
+import type { PaHttpContext } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../site-context/site-context.types.js";
 export interface ServeTextOr {
     serveFromCache: () => Promise<boolean>;
     putInCacheAndServe: (html: string, dependencyKeys: string[]) => Promise<void>;
 }
-export declare function serveTextFromCacheOr(siteContext: SiteContext, tracker: Tracker, options: {
+export declare function serveTextFromCacheOr(siteContext: SiteContext, httpContext: PaHttpContext, tracker: Tracker, options: {
     cacheKey: string;
-    req: Request;
-    res: Response;
     contentType?: string;
 }): ServeTextOr;
-export declare function render404Html(siteContext: SiteContext, res: Response, options?: {
+export declare function render404Html(siteContext: SiteContext, httpContext: PaHttpContext, options?: {
     language?: string;
 }): Promise<void>;

package/dist/common/serve-text-or.js

@@ -5,20 +5,18 @@ import { createRenderingContext } from "../liquidjs-tools/liquidjs-rendering/ren
 import { makeDetachedPublicPayload } from "../public-payload/make-public-payload.js";
 import { makeCacheKey } from "./text-cache.js";
 import { trackerReportToMessage } from "./tracker-report.js";
-export function serveTextFromCacheOr(siteContext, tracker, options) {
-    const { cacheKey, req, res, contentType } = options;
+export function serveTextFromCacheOr(siteContext, httpContext, tracker, options) {
+    const { cacheKey, contentType } = options;
     return {
         async serveFromCache() {
             const cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
             if (!cacheVal)
                 return false;
-            serveTextContent({
-                res,
+            serveTextContent(httpContext, {
                 contentType,
                 text: cacheVal.value,
                 or304: cacheVal.resourceVersion
                     ? {
-                        req,
                         etag: cacheVal.resourceVersion,
                     }
                     : undefined,
@@ -31,21 +29,15 @@ export function serveTextFromCacheOr(siteContext, tracker, options) {
                 dependencyKeys,
                 value: html,
             }, tracker);
-            serveTextContent({
-                res,
+            serveTextContent(httpContext, {
                 contentType,
                 text: cacheVal.value,
-                or304: cacheVal.resourceVersion
-                    ? {
-                        req,
-                        etag: cacheVal.resourceVersion,
-                    }
-                    : undefined,
+                or304: cacheVal.resourceVersion ? { etag: cacheVal.resourceVersion } : undefined,
             });
         },
     };
 }
-export async function render404Html(siteContext, res, options) {
+export async function render404Html(siteContext, httpContext, options) {
     const tracker = createTracker();
     const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: "404" });
     let cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
@@ -61,8 +53,7 @@ export async function render404Html(siteContext, res, options) {
             value: html,
         }, tracker);
     }
-    serveTextContent({
-        res,
+    serveTextContent(httpContext, {
         status: 404,
         text: cacheVal.value,
     });

package/dist/common/serve-text-or.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAErF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAO7D,MAAM,UAAU,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,gBAAgB,CAAC;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,gBAAgB,CAAC;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;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA+B;IAE/B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,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,sBAAsB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1F,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC;SAC3E,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,gBAAgB,CAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC,CAAC;IACH,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACvF,CAAC"}
+{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"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"}

package/dist/common/text-cache.js

@@ -1,6 +1,6 @@
 import { encodeNodelId } from "@paroicms/public-anywhere-lib";
 import { allDependencyKey } from "@paroicms/server-text-cache-system";
-import { getParentDocumentIdsOf, getParentNodeIdOf, getParentNodelIdOf, } from "../modules/core/document/load-documents.queries.js";
+import { getParentDocumentIdsOf, getParentNodeIdOf, getParentNodelIdOf, } from "../bo-backend/document/load-documents.queries.js";
 import { normalizeUrlForCache } from "./url-helpers.js";
 export function makeCacheDependencyKey(options) {
     if ("global" in options)

package/dist/common/text-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":"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"}

package/dist/express/http-helpers.d.ts

@@ -1,29 +1,28 @@
-import type { Request, Response } from "express";
+import type { PaHttpContext } from "@paroicms/public-server-lib";
+import type { Request } from "express";
 import type { SiteContext } from "../site-context/site-context.types.js";
-export declare function serveTextContent({ res, status, contentType, text, or304, }: {
-    res: Response;
+declare module "express-serve-static-core" {
+    interface Request {
+        paSiteContext?: SiteContext;
+    }
+}
+export declare function getPaSiteContext(req: Request): SiteContext;
+export declare function getRouteParameter(params: Record<string, string | undefined>, parameterName: string): string;
+export declare function getRouteParameter(params: Record<string, string | undefined>, parameterName: string, options: {
+    optional: true;
+}): string | undefined;
+export declare function serveTextContent(httpContext: PaHttpContext, { status, contentType, text, or304, }: {
     status?: number;
     contentType?: string;
     text: string;
     or304?: {
         etag: string;
-        req: Request;
     };
 }): void;
-export declare function serve500Html(res: Response): void;
-export declare function serve404SimpleHtml(res: Response): void;
-export declare function serve304NotModified(res: Response, headers: {
+export declare function serve500Html(httpContext: PaHttpContext): void;
+export declare function serve404SimpleHtml(httpContext: PaHttpContext): void;
+export declare function serve304NotModified(httpContext: PaHttpContext, headers: {
     cacheControl: string;
     etag: string;
 }): void;
-export declare function serve301Redirect(res: Response, redirectTo: string): void;
-export declare function getHttpRequestParameter(req: Request, parameterName: string): string;
-export declare function getHttpRequestParameter(req: Request, parameterName: string, options: {
-    optional: true;
-}): string | undefined;
-declare module "express-serve-static-core" {
-    interface Request {
-        paSiteContext?: SiteContext;
-    }
-}
-export declare function getReqSiteContext(req: Request): SiteContext;
+export declare function serve301Redirect(httpContext: PaHttpContext, redirectTo: string): void;

package/dist/express/http-helpers.js

@@ -1,9 +1,24 @@
 import { ApiError } from "../common/api-error-handler.js";
-export function serveTextContent({ res, status, contentType, text, or304, }) {
+export function getPaSiteContext(req) {
+    if (!req.paSiteContext) {
+        throw new Error("site context missing in request");
+    }
+    return req.paSiteContext;
+}
+export function getRouteParameter(params, parameterName, options = {}) {
+    const value = params[parameterName];
+    if (value)
+        return value;
+    if (options.optional)
+        return;
+    throw new ApiError(`missing parameter "${parameterName}"`, { status: 400 });
+}
+export function serveTextContent(httpContext, { status, contentType, text, or304, }) {
+    const { req, res } = httpContext;
     const cacheControl = "max-age=0";
     if (or304) {
-        if (or304.req.headers["if-none-match"] === or304.etag) {
-            return serve304NotModified(res, {
+        if (req.headers["if-none-match"] === or304.etag) {
+            return serve304NotModified(httpContext, {
                 cacheControl,
                 etag: or304.etag,
             });
@@ -20,47 +35,33 @@ export function serveTextContent({ res, status, contentType, text, or304, }) {
     res.status(status ?? 200);
     res.send(buf);
 }
-export function serve500Html(res) {
+export function serve500Html(httpContext) {
     const html = `<!DOCTYPE html>
 <p>Internal error</p>`;
-    serveTextContent({
-        res,
+    serveTextContent(httpContext, {
         status: 500,
         text: html,
     });
 }
-export function serve404SimpleHtml(res) {
+export function serve404SimpleHtml(httpContext) {
     const html = `<!DOCTYPE html>
 <p>404 Not Found</p>`;
-    serveTextContent({
-        res,
+    serveTextContent(httpContext, {
         status: 404,
         text: html,
     });
 }
-export function serve304NotModified(res, headers) {
+export function serve304NotModified(httpContext, headers) {
+    const { res } = httpContext;
     res.append("Cache-Control", headers.cacheControl);
     res.append("Etag", headers.etag);
     res.status(304);
     res.send();
 }
-export function serve301Redirect(res, redirectTo) {
+export function serve301Redirect(httpContext, redirectTo) {
+    const { res } = httpContext;
     res.append("location", redirectTo);
     res.status(301);
     res.send();
 }
-export function getHttpRequestParameter(req, parameterName, options = {}) {
-    const value = req.params[parameterName];
-    if (value)
-        return value;
-    if (options.optional)
-        return;
-    throw new ApiError(`missing parameter "${parameterName}"`, { status: 400 });
-}
-export function getReqSiteContext(req) {
-    if (!req.paSiteContext) {
-        throw new Error("site context missing in request");
-    }
-    return req.paSiteContext;
-}
 //# sourceMappingURL=http-helpers.js.map

package/dist/express/http-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../src/express/http-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../src/express/http-helpers.ts"],"names":[],"mappings":"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"}

package/dist/express/http-redirection-middleware.d.ts

@@ -0,0 +1,2 @@
+import type { NextFunction, Request, Response } from "express";
+export declare function httpRedirectionMiddleware(req: Request, res: Response, next: NextFunction): void;

package/dist/express/http-redirection-middleware.js

@@ -0,0 +1,11 @@
+import { httpRedirections } from "../context.js";
+import { createRedirectUrl } from "./http-redirection-url.js";
+export function httpRedirectionMiddleware(req, res, next) {
+    const entry = httpRedirections.get(req.hostname);
+    if (!entry) {
+        next();
+        return;
+    }
+    res.redirect(301, createRedirectUrl(req, entry));
+}
+//# sourceMappingURL=http-redirection-middleware.js.map

package/dist/express/http-redirection-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-redirection-middleware.js","sourceRoot":"","sources":["../../src/express/http-redirection-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,UAAU,yBAAyB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACvF,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC"}

package/dist/express/{create-redirect-url.js → http-redirection-url.js}

@@ -13,4 +13,4 @@ export function createRedirectUrl(req, entry) {
     const path = mappedPath ?? (entry.preservePath ? originalUrl : "");
     return `${entry.to}${path}`;
 }
-//# sourceMappingURL=create-redirect-url.js.map
+//# sourceMappingURL=http-redirection-url.js.map

package/dist/express/http-redirection-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-redirection-url.js","sourceRoot":"","sources":["../../src/express/http-redirection-url.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,iBAAiB,CAAC,GAAY,EAAE,KAA0B;IACxE,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;IAE5B,IAAI,UAA8B,CAAC;IACnC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5B,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAChD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnE,OAAO,GAAG,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;AAC9B,CAAC"}

package/dist/express/pa-http-context.d.ts

@@ -0,0 +1,3 @@
+import type { PaHttpContext } from "@paroicms/public-server-lib";
+import type { Request, Response } from "express";
+export declare function toPaHttpContext(expressReq: Request, expressRes: Response): PaHttpContext;