@paroicms/server 1.79.0 → 1.80.0

package/dist/index.js

@@ -1,5 +1,3 @@
-import { ApolloServer } from "@apollo/server";
-import { expressMiddleware } from "@apollo/server/express4";
 import { createSiteConfsFromSingle, loadSitePackConfs, readCommonSchemaLibrary, } from "@paroicms/connector";
 import { eachDay, startCronLike } from "@paroicms/internal-server-lib";
 import { makeUrl } from "@paroicms/public-server-lib";
@@ -7,33 +5,15 @@ import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
 import compression from "compression";
 import express from "express";
 import rateLimit from "express-rate-limit";
-import { GraphQLError } from "graphql";
-import multer from "multer";
-import { ApiError } from "./common/api-error-handler.js";
 import { appConf, initCommonSchemaLib, initializeContext, platformAuthUrl, platformLogger, siteConfs, } from "./context.js";
-import { getReqSiteContext } from "./express/http-helpers.js";
-import { pluginPublicApiMiddleware } from "./express/public-api-middlewares.js";
-import { wrapMiddlewareHandler, wrapRouteHandler } from "./express/route-handler-wrapper.js";
-import { httpRedirectionMiddleware, loadSiteContextMiddleware, tailMiddleware, } from "./express/small-middlewares.js";
-import { boMiddleware, boPluginsMiddleware, publicAssetsMiddleware, } from "./express/static-files-middlewares.js";
-import { federateResolvers, typeDefs } from "./graphql/apollo-server-init.js";
-import { createComplexityPlugin } from "./graphql/complexity-plugin.js";
-import { disableApolloStudioPlugin } from "./graphql/disable-apollo-studio-plugin.js";
-import { createErrorConverterPlugin } from "./graphql/error-converter-plugin.js";
+import { httpRedirectionMiddleware } from "./express/http-redirection-middleware.js";
+import { loadPaContextsMiddleware, reqHandlerToExpressMiddleware, } from "./express/route-handler-wrapper.js";
+import { createBoGraphqlMiddleware, createSiteMiddleware } from "./express/site-middleware.js";
 import { createCorsMiddleware } from "./helpers/cors-middleware.js";
 import { maintenanceTask, unloadAllActiveSites } from "./maintenance/maintenance-task.js";
 import { handleShutdownEvents } from "./maintenance/shutdown.js";
-import { faviconController, robotsTxtController } from "./modules/app.controller.js";
-import { downloadBackupController } from "./modules/core/backup/backup.controller.js";
-import { loginController } from "./modules/core/login/login.controller.js";
-import { uploadMediaController } from "./modules/core/media/media-upload.controller.js";
-import { checkPasswordResetController, setAccountPasswordController, } from "./modules/public-api/password-reset/password-reset.controller.js";
-import { healthCheckController } from "./modules/public-api/public-api-controller.js";
-import { feedMiddleware } from "./modules/public-site/feed/feed.middleware.js";
-import { serveFilecontroller, serveUnversionedImageController, serveVersionedImageController, } from "./modules/public-site/media-serve/media-serve.controller.js";
-import { indexController } from "./modules/public-site/public-site.controller.js";
-import { publicSiteMiddleware } from "./modules/public-site/public-site.middleware.js";
-import { oauth2ClientMiddleware } from "./oauth/oauth-middleware.js";
+import { createOauth2ClientMiddleware } from "./oauth/oauth-middleware.js";
+import { tailReqHandler } from "./public-site/serve-index-page.js";
 import { watchForIdleSiteContexts } from "./site-context/site-context.js";
 if (process.env.NODE_ENV === "development") {
     (await import("source-map-support")).default.install();
@@ -52,28 +32,6 @@ export async function start(options = {}) {
             shouldExecute: eachDay({ hours: 2 }),
             logger: platformLogger,
         });
-        const developmentMode = process.env.NODE_ENV === "development";
-        const graphqlServer = new ApolloServer({
-            typeDefs,
-            resolvers: federateResolvers(),
-            plugins: [
-                createComplexityPlugin(),
-                createErrorConverterPlugin(),
-                ...(developmentMode ? [] : [disableApolloStudioPlugin()]),
-            ],
-            introspection: developmentMode,
-            formatError(formattedError, error) {
-                if (error instanceof GraphQLError && (!error.cause || error.cause instanceof ApiError)) {
-                    return formattedError;
-                }
-                platformLogger.error("Unexpected graphql error", formattedError, error);
-                return {
-                    message: "Internal Server Error",
-                    code: "INTERNAL_SERVER_ERROR",
-                };
-            },
-        });
-        await graphqlServer.start();
         const expressApp = express();
         expressApp.use(express.json({ limit: "50mb" }));
         expressApp.use(rateLimit({
@@ -84,43 +42,14 @@ export async function start(options = {}) {
         }));
         expressApp.use(createCorsMiddleware());
         expressApp.use(httpRedirectionMiddleware);
-        if (platformAuthUrl) {
-            const passport = (await import("./modules/core/account-auth/account-auth.strategy.js"))
-                .default;
-            expressApp.use(passport.initialize());
-            expressApp.use(oauth2ClientMiddleware);
+        if (platformAuthUrl && appConf.googleAuth) {
+            expressApp.use(await createOauth2ClientMiddleware(appConf.googleAuth.fqdn));
         }
-        expressApp.use(wrapMiddlewareHandler(loadSiteContextMiddleware));
-        expressApp.use("/adm/backend/graphql", expressMiddleware(graphqlServer, {
-            context: async ({ req, res }) => {
-                return {
-                    req,
-                    res,
-                    siteContext: getReqSiteContext(req),
-                };
-            },
-        }));
-        const upload = multer();
-        expressApp.post("/adm/backend/upload", upload.single("file"), wrapRouteHandler(uploadMediaController));
-        expressApp.get("/adm/backend/backup/:backupName", wrapRouteHandler(downloadBackupController));
-        expressApp.use(wrapMiddlewareHandler(boPluginsMiddleware));
-        expressApp.use(wrapMiddlewareHandler(boMiddleware));
+        expressApp.use(loadPaContextsMiddleware);
+        expressApp.use("/adm/backend/graphql", await createBoGraphqlMiddleware());
         expressApp.use(compression());
-        expressApp.get("/api/v1/healthcheck", wrapRouteHandler(healthCheckController));
-        expressApp.post("/api/v1/login", wrapRouteHandler(loginController));
-        expressApp.post("/api/v1/set-account-password", wrapRouteHandler(setAccountPasswordController));
-        expressApp.post("/api/v1/check-password-reset", wrapRouteHandler(checkPasswordResetController));
-        expressApp.use(pluginPublicApiMiddleware);
-        expressApp.use(wrapMiddlewareHandler(publicAssetsMiddleware));
-        expressApp.use(wrapMiddlewareHandler(feedMiddleware));
-        expressApp.use(wrapMiddlewareHandler(publicSiteMiddleware));
-        expressApp.get("/robots.txt", wrapRouteHandler(robotsTxtController));
-        expressApp.get("/favicon.ico", wrapRouteHandler(faviconController));
-        expressApp.get("/medias/:mediaUid/file/:nameAndExt", wrapRouteHandler(serveFilecontroller));
-        expressApp.get("/medias/:mediaUid/image/:resourceVersion/:nameAndExt", wrapRouteHandler(serveVersionedImageController));
-        expressApp.get("/medias/:mediaUid/image/:nameAndExt", wrapRouteHandler(serveUnversionedImageController));
-        expressApp.get("/", wrapRouteHandler(indexController));
-        expressApp.use(wrapMiddlewareHandler(tailMiddleware));
+        expressApp.use(createSiteMiddleware());
+        expressApp.use(reqHandlerToExpressMiddleware(tailReqHandler));
         let httpServer;
         if (appConf.hostname) {
             httpServer = expressApp.listen(appConf.port, appConf.hostname);

package/dist/index.js.map

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

package/dist/{modules/core/account-auth → oauth}/account-auth.service.d.ts

@@ -1,3 +1,3 @@
 import type { Profile } from "passport-google-oauth20";
-import type { LoginFailed, OAuthSuccess } from "../auth/auth.types.js";
+import type { LoginFailed, OAuthSuccess } from "../bo-backend/auth/auth.types.js";
 export declare function validateOAuthLogin(googleAccount: Profile): Promise<OAuthSuccess | LoginFailed>;

package/dist/{modules/core/account-auth → oauth}/account-auth.service.js

@@ -1,4 +1,4 @@
-import { platformLogger } from "../../../context.js";
+import { platformLogger } from "../context.js";
 export async function validateOAuthLogin(googleAccount) {
     try {
         const email = googleAccount._json.email;

package/dist/oauth/account-auth.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-auth.service.js","sourceRoot":"","sources":["../../src/oauth/account-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;QACxC,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,cAAqC,CAAC;QAChF,IAAI,CAAC,KAAK,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACrC,cAAc,CAAC,KAAK,CAClB,+EAA+E,CAChF,CAAC;YACF,OAAO;gBACL,OAAO,EAAE,cAAc;gBACvB,UAAU,EAAE,GAAG;aAChB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO;YACL,OAAO,EAAE,cAAc;YACvB,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/{modules/core/account-auth → oauth}/account-auth.strategy.js

@@ -1,6 +1,6 @@
 import passport from "passport";
 import { Strategy as GoogleStrategy } from "passport-google-oauth20";
-import { appConf, platformAuthUrl, platformLogger } from "../../../context.js";
+import { appConf, platformAuthUrl, platformLogger } from "../context.js";
 import { validateOAuthLogin } from "./account-auth.service.js";
 if (!appConf.googleAuth || appConf.googleAuth.disabled) {
     throw new Error("Google auth is disabled");

package/dist/oauth/account-auth.strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-auth.strategy.js","sourceRoot":"","sources":["../../src/oauth/account-auth.strategy.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,QAAQ,IAAI,cAAc,EAAgB,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACvD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC;AAED,eAAe,QAAQ,CAAC,GAAG,CACzB,IAAI,cAAc,CAChB;IACE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;IACrC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY;IAC7C,WAAW,EAAE,GAAG,eAAe,kBAAkB;IACjD,iBAAiB,EAAE,IAAI;IACvB,KAAK,EAAE,CAAC,OAAO,CAAC;CACjB,EACD,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,OAAuB,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,CAAC;QACH,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnB,CAAC;AACH,CAAC,CACF,CACF,CAAC"}

package/dist/oauth/oauth-middleware.d.ts

@@ -1,2 +1,2 @@
-import type { NextFunction, Request, Response } from "express";
-export declare function oauth2ClientMiddleware(req: Request, res: Response, next: NextFunction): void;
+import { type NextFunction, type Request, type Response } from "express";
+export declare function createOauth2ClientMiddleware(authFqdn: string): Promise<(req: Request, res: Response, next: NextFunction) => void>;

package/dist/oauth/oauth-middleware.js

@@ -1,17 +1,22 @@
 import express from "express";
-import { appConf } from "../context.js";
-import { wrapRouteHandler } from "../express/route-handler-wrapper.js";
-import { authController, googleLogin, googleLoginCallbackController, siteUrlController, } from "./oauth2-client.controller.js";
-const authRouter = express.Router();
-authRouter.get("/auth", wrapRouteHandler(authController));
-authRouter.get("/auth/google", wrapRouteHandler(googleLogin));
-authRouter.get("/auth/google/callback", wrapRouteHandler(googleLoginCallbackController));
-authRouter.get("/auth/site-url/:redirectTo", wrapRouteHandler(siteUrlController));
-export function oauth2ClientMiddleware(req, res, next) {
-    if (req.hostname !== appConf.googleAuth?.fqdn) {
-        next();
-        return;
-    }
-    authRouter(req, res, next);
+import { wrapExpressRoute } from "../express/route-handler-wrapper.js";
+import { authController, googleLoginCallbackController, googleLoginController, siteUrlController, } from "./oauth2-client.controller.js";
+export async function createOauth2ClientMiddleware(authFqdn) {
+    const passport = (await import("./account-auth.strategy.js")).default;
+    const passportMiddleware = passport.initialize();
+    const router = express.Router();
+    router.get("/auth", wrapExpressRoute(authController));
+    router.get("/auth/google", wrapExpressRoute(googleLoginController));
+    router.get("/auth/google/callback", wrapExpressRoute(googleLoginCallbackController));
+    router.get("/auth/site-url/:redirectTo", wrapExpressRoute(siteUrlController));
+    return (req, res, next) => {
+        if (req.hostname !== authFqdn) {
+            next();
+            return;
+        }
+        passportMiddleware(req, res, () => {
+            router(req, res, next);
+        });
+    };
 }
 //# sourceMappingURL=oauth-middleware.js.map

package/dist/oauth/oauth-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-middleware.js","sourceRoot":"","sources":["../../src/oauth/oauth-middleware.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EACL,cAAc,EACd,WAAW,EACX,6BAA6B,EAC7B,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AACpC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;AAC1D,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;AAC9D,UAAU,CAAC,GAAG,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,6BAA6B,CAAC,CAAC,CAAC;AACzF,UAAU,CAAC,GAAG,CAAC,4BAA4B,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAElF,MAAM,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACpF,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QAC9C,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"oauth-middleware.js","sourceRoot":"","sources":["../../src/oauth/oauth-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,OAA2D,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EACL,cAAc,EACd,6BAA6B,EAC7B,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,QAAgB;IACjE,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC,CAAC,OAAO,CAAC;IACtE,MAAM,kBAAkB,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;IAEjD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACpE,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,6BAA6B,CAAC,CAAC,CAAC;IACrF,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAE9E,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,OAAO;QACT,CAAC;QAED,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;YAChC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/dist/oauth/oauth2-client.controller.d.ts

@@ -1,5 +1,5 @@
 import type { Request, Response } from "express";
 export declare function authController(req: Request, res: Response): Promise<void>;
-export declare function googleLogin(req: Request, res: Response): Promise<void>;
+export declare function googleLoginController(req: Request, res: Response): Promise<void>;
 export declare function googleLoginCallbackController(req: Request, res: Response): Promise<void>;
 export declare function siteUrlController(req: Request, _res: Response): Promise<string>;

package/dist/oauth/oauth2-client.controller.js

@@ -1,8 +1,8 @@
 import { escapeHtml, makeUrl } from "@paroicms/public-server-lib";
+import { generatePlatformToken, googleAuthGuard } from "../bo-backend/auth/auth.helper.js";
 import { ApiError } from "../common/api-error-handler.js";
 import { appConf, platformAuthUrl, siteConfs } from "../context.js";
-import { getHttpRequestParameter } from "../express/http-helpers.js";
-import { generatePlatformToken, googleAuthGuard } from "../modules/core/auth/auth.helper.js";
+import { getRouteParameter } from "../express/http-helpers.js";
 export async function authController(req, res) {
     if (!appConf.googleAuth || appConf.googleAuth.disabled || !platformAuthUrl) {
         throw new Error("Google auth is disabled");
@@ -12,7 +12,7 @@ export async function authController(req, res) {
     }
     res.send(generateAuthPageHtml(platformAuthUrl));
 }
-export async function googleLogin(req, res) {
+export async function googleLoginController(req, res) {
     await googleAuthGuard(req, res);
 }
 export async function googleLoginCallbackController(req, res) {
@@ -24,7 +24,7 @@ export async function googleLoginCallbackController(req, res) {
     res.send(generateGoogleRedirectPageHtml({ platformToken, platformAuthUrl }));
 }
 export async function siteUrlController(req, _res) {
-    const redirectTo = getHttpRequestParameter(req, "redirectTo");
+    const redirectTo = getRouteParameter(req.params, "redirectTo");
     if (!redirectTo)
         throw new ApiError("Missing redirectTo", { status: 404 });
     if (!appConf.googleAuth || appConf.googleAuth.disabled || !platformAuthUrl) {

package/dist/oauth/oauth2-client.controller.js.map

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

package/dist/{modules/public-api → public-api}/mail/validate-recaptcha-response.d.ts

@@ -1,4 +1,4 @@
-import type { SiteContext } from "../../../site-context/site-context.types.js";
+import type { SiteContext } from "../../site-context/site-context.types.js";
 export declare function validateRecaptchaResponse(siteContext: Pick<SiteContext, "fqdn">, { gRecaptchaResponse, secretKey, }: {
     gRecaptchaResponse: string | undefined;
     secretKey: string;

package/dist/{modules/public-api → public-api}/mail/validate-recaptcha-response.js

@@ -1,4 +1,4 @@
-import { ApiError } from "../../../common/api-error-handler.js";
+import { ApiError } from "../../common/api-error-handler.js";
 export async function validateRecaptchaResponse(siteContext, { gRecaptchaResponse, secretKey, }) {
     if (!gRecaptchaResponse)
         throw new ApiError("Missing gRecaptchaResponse", { status: 400 });

package/dist/public-api/mail/validate-recaptcha-response.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-recaptcha-response.js","sourceRoot":"","sources":["../../../src/public-api/mail/validate-recaptcha-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAgB7D,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,WAAsC,EACtC,EACE,kBAAkB,EAClB,SAAS,GAIV;IAED,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,QAAQ,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3F,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,GAAG,GAAG,0DAA0D,SAAS,aAAa,kBAAkB,EAAE,CAAC;IACjH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsC,CAAC;IAC5E,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,QAAQ,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC"}

package/dist/public-api/password-reset/password-reset.controller.d.ts

@@ -0,0 +1,6 @@
+import type { PaHttpContext } from "@paroicms/public-server-lib";
+import type { SiteContext } from "../../site-context/site-context.types.js";
+export declare function setAccountPasswordController(siteContext: SiteContext, httpContext: PaHttpContext): Promise<void>;
+export declare function checkPasswordResetController(siteContext: SiteContext, httpContext: PaHttpContext): Promise<import("./password-reset.service.js").PasswordResetInfo | {
+    authorized: false;
+}>;

package/dist/public-api/password-reset/password-reset.controller.js

@@ -0,0 +1,46 @@
+import { objVal, strValOrUndef } from "@paroi/data-formatters-lib";
+import { ApiError } from "../../common/api-error-handler.js";
+import { checkAccountPasswordReset, updateAccountPassword, } from "./password-reset.service.js";
+export async function setAccountPasswordController(siteContext, httpContext) {
+    const { accountId, password, resetToken } = formatSetAccountPasswordDto(httpContext.req.body);
+    const payload = {
+        accountId,
+        password,
+        resetToken,
+    };
+    await updateAccountPassword(siteContext, payload);
+}
+export async function checkPasswordResetController(siteContext, httpContext) {
+    const { accountId, resetToken } = formatCheckPasswordResetDto(httpContext.req.body);
+    return await checkAccountPasswordReset(siteContext, {
+        accountId,
+        resetToken,
+    });
+}
+function formatSetAccountPasswordDto(data) {
+    const val = objVal(data);
+    const accountId = strValOrUndef(val.accountId);
+    const password = strValOrUndef(val.password);
+    const resetToken = strValOrUndef(val.resetToken);
+    if (!accountId || !password || !resetToken) {
+        throw new ApiError("Missing required parameters", { status: 400 });
+    }
+    return {
+        accountId,
+        password,
+        resetToken,
+    };
+}
+function formatCheckPasswordResetDto(data) {
+    const val = objVal(data);
+    const accountId = strValOrUndef(val.accountId);
+    const resetToken = strValOrUndef(val.resetToken);
+    if (!accountId || !resetToken) {
+        throw new ApiError("Missing required parameters", { status: 400 });
+    }
+    return {
+        accountId,
+        resetToken,
+    };
+}
+//# sourceMappingURL=password-reset.controller.js.map

package/dist/public-api/password-reset/password-reset.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,OAAO,EAGL,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,2BAA2B,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE9F,MAAM,OAAO,GAAG;QACd,SAAS;QACT,QAAQ;QACR,UAAU;KACX,CAAC;IAEF,MAAM,qBAAqB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,2BAA2B,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEpF,OAAO,MAAM,yBAAyB,CAAC,WAAW,EAAE;QAClD,SAAS;QACT,UAAU;KACX,CAAC,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAa;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,QAAQ,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO;QACL,SAAS;QACT,QAAQ;QACR,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAa;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,QAAQ,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO;QACL,SAAS;QACT,UAAU;KACX,CAAC;AACJ,CAAC"}

package/dist/{modules/public-api → public-api}/password-reset/password-reset.service.d.ts

@@ -1,4 +1,4 @@
-import type { SiteContext } from "../../../site-context/site-context.types.js";
+import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface PasswordResetInfo {
     authorized: true;
     name?: string;

package/dist/{modules/public-api → public-api}/password-reset/password-reset.service.js

@@ -1,6 +1,6 @@
 import { strVal, strValOrUndef } from "@paroi/data-formatters-lib";
-import { ApiError } from "../../../common/api-error-handler.js";
-import { hashPassword } from "../../../helpers/passwordEncrypt-helper.js";
+import { ApiError } from "../../common/api-error-handler.js";
+import { hashPassword } from "../../helpers/passwordEncrypt-helper.js";
 export async function updateAccountPassword(siteContext, payload) {
     const account = await getAccount(siteContext, payload.accountId);
     if (account.passwordResetToken !== payload.resetToken) {

package/dist/public-api/password-reset/password-reset.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"password-reset.service.js","sourceRoot":"","sources":["../../../src/public-api/password-reset/password-reset.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAoBvE,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAwB,EACxB,OAAkC;IAElC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAEjE,IAAI,OAAO,CAAC,kBAAkB,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;QACtD,MAAM,IAAI,QAAQ,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1D,MAAM,WAAW;SACd,EAAE,CAAC,WAAW,CAAC;SACf,MAAM,CAAC;QACN,YAAY;QACZ,kBAAkB,EAAE,IAAI;KACzB,CAAC;SACD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,WAAwB,EACxB,OAAkC;IAOlC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAEjE,IAAI,OAAO,CAAC,kBAAkB,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;QACtD,OAAO;YACL,UAAU,EAAE,KAAK;SAClB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,WAAwB,EAAE,EAAU;IAC5D,MAAM,KAAK,GAAG,MAAM,WAAW;SAC5B,EAAE,CAAC,gBAAgB,CAAC;SACpB,MAAM,CAAC;QACN,YAAY;QACZ,kBAAkB;QAClB,gBAAgB;QAChB,8BAA8B;QAC9B,gCAAgC;QAChC,4CAA4C;KAC7C,CAAC;SACD,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;SACjB,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,OAAO,GAAe;QAC1B,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/B,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC;QAC7C,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC;QAC/C,kBAAkB,EAAE,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC;KAC5D,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/public-api/public-api-controller.d.ts

@@ -0,0 +1,7 @@
+export interface ApiSearchResult {
+    html?: string;
+    total: number;
+}
+export declare function healthCheckController(): Promise<{
+    status: string;
+}>;

package/dist/public-api/public-api-controller.js

@@ -0,0 +1,6 @@
+export async function healthCheckController() {
+    return {
+        status: "ready",
+    };
+}
+//# sourceMappingURL=public-api-controller.js.map

package/dist/public-api/public-api-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-api-controller.js","sourceRoot":"","sources":["../../src/public-api/public-api-controller.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,OAAO;QACL,MAAM,EAAE,OAAO;KAChB,CAAC;AACJ,CAAC"}

package/dist/{modules/public-api → public-api}/public-api-rendering.d.ts

@@ -1,17 +1,12 @@
 import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
-import type { Request, Response } from "express";
-import type { SiteContext } from "../../site-context/site-context.types.js";
-import type { PartialsParamsInput } from "./partials/partials-params.dto.js";
-export declare function renderChildPartials(siteContext: SiteContext, options: {
-    req: Request;
-    res: Response;
+import type { PaHttpContext, PartialsParamsInput } from "@paroicms/public-server-lib";
+import type { SiteContext } from "../site-context/site-context.types.js";
+export declare function renderChildPartials(siteContext: SiteContext, httpContext: PaHttpContext, options: {
     params: PartialsParamsInput;
     parentDocumentId: ParsedNodelId;
     labeledByTermId?: string;
 }): Promise<void>;
-export declare function renderSearchPartials(siteContext: SiteContext, options: {
-    req: Request;
-    res: Response;
+export declare function renderSearchPartials(siteContext: SiteContext, httpContext: PaHttpContext, options: {
     language: string;
     words: string[];
     limit: number;

package/dist/{modules/public-api → public-api}/public-api-rendering.js

@@ -1,22 +1,23 @@
 import { nbVal } from "@paroi/data-formatters-lib";
 import { createTracker } from "@paroicms/internal-server-lib";
-import { serveTextFromCacheOr } from "../../common/serve-text-or.js";
-import { makeCacheDependencyKey, makeCacheKey } from "../../common/text-cache.js";
-import { trackerReportToMessage } from "../../common/tracker-report.js";
-import { renderLiquidTemplate } from "../../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
-import { createRenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { createDocPayloadDrop } from "../../public-payload/create-doc-drop.js";
-import { getListOfDocValues } from "../../public-payload/doc-values.queries.js";
-import { makeSitePayload } from "../../public-payload/site-payload.js";
+import { serveTextFromCacheOr } from "../common/serve-text-or.js";
+import { makeCacheDependencyKey, makeCacheKey } from "../common/text-cache.js";
+import { trackerReportToMessage } from "../common/tracker-report.js";
+import { renderLiquidTemplate } from "../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
+import { createRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { createDocPayloadDrop } from "../public-payload/create-doc-drop.js";
+import { getListOfDocValues } from "../public-payload/doc-values.queries.js";
+import { makeSitePayload } from "../public-payload/site-payload.js";
 import { searchText } from "./search-text/search-text.queries.js";
-export async function renderChildPartials(siteContext, options) {
-    const { req, res, params, parentDocumentId, labeledByTermId } = options;
-    const cacheKey = makeCacheKey(siteContext.logger, { kind: "api", url: req.url });
+export async function renderChildPartials(siteContext, httpContext, options) {
+    const { params, parentDocumentId, labeledByTermId } = options;
+    const cacheKey = makeCacheKey(siteContext.logger, {
+        kind: "api",
+        url: httpContext.req.relativeUrl,
+    });
     const tracker = createTracker();
-    const serveOr = serveTextFromCacheOr(siteContext, tracker, {
+    const serveOr = serveTextFromCacheOr(siteContext, httpContext, tracker, {
         cacheKey,
-        req,
-        res,
         contentType: "text/plain; charset=utf-8",
     });
     if (!(await serveOr.serveFromCache())) {
@@ -30,16 +31,17 @@ export async function renderChildPartials(siteContext, options) {
         });
         await serveOr.putInCacheAndServe(html, dependencyKeys);
     }
-    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${req.url}`));
+    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${httpContext.req.relativeUrl}`));
 }
-export async function renderSearchPartials(siteContext, options) {
-    const { req, res, language, words, limit, start, templateName } = options;
-    const cacheKey = makeCacheKey(siteContext.logger, { kind: "api", url: req.url });
+export async function renderSearchPartials(siteContext, httpContext, options) {
+    const { language, words, limit, start, templateName } = options;
+    const cacheKey = makeCacheKey(siteContext.logger, {
+        kind: "api",
+        url: httpContext.req.relativeUrl,
+    });
     const tracker = createTracker();
-    const serveOr = serveTextFromCacheOr(siteContext, tracker, {
+    const serveOr = serveTextFromCacheOr(siteContext, httpContext, tracker, {
         cacheKey,
-        req,
-        res,
         contentType: "application/json",
     });
     if (!(await serveOr.serveFromCache())) {
@@ -54,7 +56,7 @@ export async function renderSearchPartials(siteContext, options) {
         const content = JSON.stringify(result);
         await serveOr.putInCacheAndServe(content, dependencyKeys);
     }
-    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${req.url}`));
+    siteContext.logger.stats(trackerReportToMessage(tracker.toReport(), `serve ${httpContext.req.relativeUrl}`));
 }
 async function renderChildDocuments(siteContext, tracker, options) {
     const { parentId: parentDocumentId, templateName } = options;

package/dist/public-api/public-api-rendering.js.map

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

package/dist/{modules/public-api → public-api}/search-text/search-text.queries.d.ts

@@ -1,6 +1,6 @@
-import type { DocValues } from "../../../public-payload/public-payload.types.js";
-import type { SiteContext } from "../../../site-context/site-context.types.js";
-import type { OrderByItem } from "../../core/nodel/nodel.queries.js";
+import type { OrderByItem } from "../../bo-backend/nodel/nodel.queries.js";
+import type { DocValues } from "../../public-payload/public-payload.types.js";
+import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface SearchTextOptions {
     language: string;
     words: string[];

package/dist/{modules/public-api → public-api}/search-text/search-text.queries.js

@@ -1,5 +1,5 @@
-import { dbAnyLanguage } from "../../../context.js";
-import { formatDocValues, querySelectDocValues, } from "../../../public-payload/doc-values.queries.js";
+import { dbAnyLanguage } from "../../context.js";
+import { formatDocValues, querySelectDocValues } from "../../public-payload/doc-values.queries.js";
 export async function searchText(siteContext, options) {
     const { words, language, start, limit, onlyPublished, orderBy = [{ fieldName: "publishDate", direction: "desc" }], } = options;
     const query = createBaseSearchTextQueryBuilder(siteContext, { language, words, onlyPublished })

package/dist/public-api/search-text/search-text.queries.js.map

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

package/dist/public-payload/breadcrumb.queries.js

@@ -1,7 +1,7 @@
 import { encodeNodelId } from "@paroicms/public-anywhere-lib";
+import { getBreadcrumb } from "../bo-backend/nodel/nodel.queries.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
-import { getBreadcrumb } from "../modules/core/nodel/nodel.queries.js";
-import { getUrlOfDocument } from "../modules/public-site/public-route/make-url.js";
+import { getUrlOfDocument } from "../public-site/public-route/make-url.js";
 export async function getPublicBreadcrumb(siteContext, renderingContext, documentId) {
     const items = await getBreadcrumb(siteContext, renderingContext.tracker, documentId, {
         ensurePublished: true,

package/dist/public-payload/breadcrumb.queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AAInF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,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,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,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,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"breadcrumb.queries.js","sourceRoot":"","sources":["../../src/public-payload/breadcrumb.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAI3E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,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,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,IAAI,CAAC;YACV,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,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,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAChF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/public-payload/create-doc-drop.js

@@ -2,14 +2,14 @@ import { strValOrUndef } from "@paroi/data-formatters-lib";
 import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
 import { encodeNodelId, } from "@paroicms/public-anywhere-lib";
 import { toAbsoluteUrl } from "@paroicms/public-server-lib";
+import { getSiteFieldValue } from "../bo-backend/fields/load-fields.queries.js";
 import { getHandleOfSiteField } from "../common/media-handles.helpers.js";
 import { makeCacheDependencyKey } from "../common/text-cache.js";
 import { truncExcerptToWord } from "../helpers/excerpt.helpers.js";
 import { getNodeTypeLabel } from "../helpers/label-translator.helper.js";
 import { createLiquidJsDrop, loadOrFromRenderingCache, makeDropCacheKeyForRendering, } from "../liquidjs-tools/liquidjs-drop.js";
-import { getSiteFieldValue } from "../modules/core/fields/load-fields.queries.js";
-import { getFeaturedImageOf } from "../modules/public-site/helpers/medias.helpers.js";
-import { getUrlOfDocument } from "../modules/public-site/public-route/make-url.js";
+import { getFeaturedImageOf } from "../public-site/helpers/medias.helpers.js";
+import { getUrlOfDocument } from "../public-site/public-route/make-url.js";
 import { getPublicBreadcrumb } from "./breadcrumb.queries.js";
 import { createPartDrop } from "./create-part-drop.js";
 import { loadExcerpt } from "./excerpt.queries.js";