@paroicms/contact-form-plugin 0.9.0 → 0.10.0

package/backend/dist/contact-form-mail.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendContactFormMail = sendContactFormMail;
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const public_server_lib_1 = require("@paroicms/public-server-lib");
-async function sendContactFormMail(ctx, input, i18n) {
+async function sendContactFormMail(service, input, i18n) {
     const { email, name, message, subject, gRecaptchaResponse } = input;
     let contactEmail;
     try {
-        contactEmail = (0, data_formatters_lib_1.strValOrUndef)(await ctx.getSiteFieldValue({
+        contactEmail = (0, data_formatters_lib_1.strValOrUndef)(await service.getSiteFieldValue({
             fieldName: "contactEmail",
             language: input.language,
         }));
         if (!contactEmail)
-            throw new Error(`['${ctx.fqdn}'] missing 'contactEmail'`);
-        if (!(await ctx.validateRecaptchaResponse(gRecaptchaResponse))) {
+            throw new Error(`['${service.fqdn}'] missing 'contactEmail'`);
+        if (!(await service.validateRecaptchaResponse(gRecaptchaResponse))) {
             throw new Error("invalid recaptcha response");
         }
         const noSubject = i18n.translate({
@@ -23,9 +23,9 @@ async function sendContactFormMail(ctx, input, i18n) {
         const contactFrom = i18n.translate({
             key: "contactFrom",
             language: input.language,
-            args: [ctx.fqdn],
+            args: [service.fqdn],
         });
-        await ctx.sendMail({
+        await service.sendMail({
             to: contactEmail,
             replyTo: { email, name },
             subject: `${subject ?? noSubject} ${contactFrom}`,
@@ -40,7 +40,7 @@ async function sendContactFormMail(ctx, input, i18n) {
                 args: [(0, public_server_lib_1.escapeHtml)(email)],
             })}</p>
 <p>${(0, public_server_lib_1.escapeHtml)(message, { newLinesToBr: true })}</p>`,
-        }, { appLog: ctx.siteLog });
+        });
         return {
             success: true,
         };
@@ -48,7 +48,7 @@ async function sendContactFormMail(ctx, input, i18n) {
     catch (err) {
         if (err)
             throw err;
-        ctx.siteLog.error(`fail to send mail: ${(0, data_formatters_lib_1.messageOf)(err)}`);
+        service.logger.error(`fail to send mail: ${(0, data_formatters_lib_1.messageOf)(err)}`);
         return {
             success: false,
             message: contactEmail

package/backend/dist/plugin.js

@@ -15,11 +15,11 @@ const plugin = {
         const simpleI18n = await (0, public_server_lib_1.createSimpleTranslator)({
             l10nDir: (0, node_path_1.join)(projectDir, "locales"),
             languages: ["en", "fr"],
-            appLog: service.siteLog,
+            appLog: service.logger,
         });
         service.setPublicAssetsDirectory((0, node_path_1.join)(packageDir, "public-front", "dist"));
         service.addHeadTag(`<link rel="stylesheet" href="${(0, public_server_lib_1.escapeHtml)(`${service.pluginAssetsUrl}/style.css`)}">`, `<script type="module" src="${(0, public_server_lib_1.escapeHtml)(`${service.pluginAssetsUrl}/public-front-plugin.mjs`)}"></script>`);
-        service.setPublicApiHandler(async (ctx, req, res, relativePath) => {
+        service.setPublicApiHandler(async (service, req, res, relativePath) => {
             if (relativePath !== "") {
                 res.status(404).send({ status: 404 });
                 return;
@@ -32,7 +32,7 @@ const plugin = {
                 res.status(400).send({ status: 400, message: error.message });
                 return;
             }
-            const result = await (0, contact_form_mail_1.sendContactFormMail)(ctx, input, simpleI18n);
+            const result = await (0, contact_form_mail_1.sendContactFormMail)(service, input, simpleI18n);
             res.send(result);
         });
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/contact-form-plugin",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Contact form plugin for ParoiCMS",
   "keywords": [
     "paroicms",
@@ -30,8 +30,8 @@
     "@paroicms/public-server-lib": "0"
   },
   "devDependencies": {
-    "@paroicms/public-anywhere-lib": "0.7.0",
-    "@paroicms/public-server-lib": "0.13.0",
+    "@paroicms/public-anywhere-lib": "0.8.0",
+    "@paroicms/public-server-lib": "0.14.0",
     "@solid-primitives/i18n": "~2.1.1",
     "@types/node": "~20.14.8",
     "rimraf": "~6.0.1",

package/public-front/dist/public-front-plugin.mjs

@@ -92,11 +92,7 @@ function _(e) {
   if (!e.fn) return;
   V(e);
   const t = k;
-  Be(
-    e,
-    e.value,
-    t
-  );
+  Be(e, e.value, t);
 }
 function Be(e, t, s) {
   let n;
@@ -222,25 +218,17 @@ function pe(e) {
   const t = e.keyed, s = ee(() => e.when, void 0, {
     equals: (n, l) => t ? n === l : !n == !l
   });
-  return ee(
-    () => {
-      const n = s();
-      if (n) {
-        const l = e.children;
-        return typeof l == "function" && l.length > 0 ? A(
-          () => l(
-            t ? n : () => {
-              if (!A(s)) throw Ve("Show");
-              return e.when;
-            }
-          )
-        ) : l;
-      }
-      return e.fallback;
-    },
-    void 0,
-    void 0
-  );
+  return ee(() => {
+    const n = s();
+    if (n) {
+      const l = e.children;
+      return typeof l == "function" && l.length > 0 ? A(() => l(t ? n : () => {
+        if (!A(s)) throw Ve("Show");
+        return e.when;
+      })) : l;
+    }
+    return e.fallback;
+  }, void 0, void 0);
 }
 function Ge(e, t, s) {
   let n = s.length, l = t.length, r = n, i = 0, o = 0, f = t[l - 1].nextSibling, p = null;
@@ -354,11 +342,7 @@ function se(e, t, s, n) {
     else if (p === "function")
       if (n) {
         for (; typeof o == "function"; ) o = o();
-        l = se(
-          e,
-          Array.isArray(o) ? o : [o],
-          Array.isArray(f) ? f : [f]
-        ) || l;
+        l = se(e, Array.isArray(o) ? o : [o], Array.isArray(f) ? f : [f]) || l;
       } else
         e.push(o), l = !0;
     else {