@unchainedshop/platform 3.0.0-alpha7 → 3.0.0-rc10

package/src/templates/resolveAccountActionTemplate.ts

@@ -1,4 +1,5 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
+import mustache from 'mustache';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_URL, EMAIL_WEBSITE_NAME } = process.env;
 
@@ -96,12 +97,17 @@ export const resolveAccountActionTemplate: TemplateResolver = async (
   const { url } = emailConfig[action];
   const { subject, message, buttonText } = emailConfig[action][locale.language];
 
-  const data = {
-    buttonText,
-    message,
-    subject,
-    url: url(token),
-  };
+  const text = mustache.render(
+    textTemplate,
+    {
+      buttonText,
+      message,
+      subject,
+      url: url(token),
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -110,7 +116,7 @@ export const resolveAccountActionTemplate: TemplateResolver = async (
         from: EMAIL_FROM || 'noreply@unchained.local',
         to: recipientEmail || modules.users.primaryEmail(user)?.address,
         subject,
-        text: modules.messaging.renderToText(textTemplate, data),
+        text,
       },
     },
   ];

package/src/templates/resolveEnrollmentStatusTemplate.ts

@@ -1,5 +1,5 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
-
+import { TemplateResolver } from '@unchainedshop/core';
+import mustache from 'mustache';
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
 const textTemplate = `
@@ -22,12 +22,17 @@ export const resolveEnrollmentStatusTemplate: TemplateResolver = async (
 
   const subject = `${EMAIL_WEBSITE_NAME}: Updated Enrollment / ${enrollment.enrollmentNumber}`;
 
-  const data = {
-    enrollment,
-    locale,
-    subject,
-    url: `${EMAIL_WEBSITE_URL}/enrollment?_id=${enrollment._id}`,
-  };
+  const text = mustache.render(
+    textTemplate,
+    {
+      enrollment,
+      locale,
+      subject,
+      url: `${EMAIL_WEBSITE_URL}/enrollment?_id=${enrollment._id}`,
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -36,7 +41,7 @@ export const resolveEnrollmentStatusTemplate: TemplateResolver = async (
         from: EMAIL_FROM || 'noreply@unchained.local',
         to: modules.users.primaryEmail(user)?.address,
         subject,
-        text: modules.messaging.renderToText(textTemplate, data),
+        text,
       },
     },
   ];

package/src/templates/resolveErrorReportTemplate.ts

@@ -1,5 +1,6 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
-import util from 'util';
+import { TemplateResolver } from '@unchainedshop/core';
+import { stringify } from 'safe-stable-stringify';
+import mustache from 'mustache';
 
 const {
   EMAIL_FROM = 'noreply@unchained.local',
@@ -11,7 +12,7 @@ const {
 const formatWorkItems = (workItems) => {
   return workItems
     .map(({ _id, type, started, error }) => {
-      const stringifiedErrors = util.inspect(error, false, 10, false);
+      const stringifiedErrors = stringify(error, null, 2);
       return `${new Date(started).toLocaleString()} ${type} (${_id}): ${stringifiedErrors}`;
     })
     .join('\n');
@@ -26,8 +27,17 @@ Shop Name: {{name}}
 {{content}}
 `;
 
-const resolveErrorReportTemplate: TemplateResolver = async ({ workItems }, context) => {
-  const { modules } = context;
+const resolveErrorReportTemplate: TemplateResolver = async ({ workItems }) => {
+  const text = mustache.render(
+    textTemplate,
+    {
+      endpoint: ROOT_URL,
+      content: formatWorkItems(workItems),
+      name: EMAIL_WEBSITE_NAME,
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -36,11 +46,7 @@ const resolveErrorReportTemplate: TemplateResolver = async ({ workItems }, conte
         from: EMAIL_FROM || 'noreply@unchained.local',
         to: EMAIL_ERROR_REPORT_RECIPIENT,
         subject: `${EMAIL_WEBSITE_NAME}: Queue Errors`,
-        text: modules.messaging.renderToText(textTemplate, {
-          endpoint: ROOT_URL,
-          content: formatWorkItems(workItems),
-          name: EMAIL_WEBSITE_NAME,
-        }),
+        text,
       },
     },
   ];

package/src/templates/resolveForwardDeliveryTemplate.ts

@@ -1,6 +1,7 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import { systemLocale } from '@unchainedshop/utils';
 import { transformOrderToText } from './order-parser/index.js';
+import mustache from 'mustache';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
@@ -25,11 +26,16 @@ export const resolveForwardDeliveryTemplate: TemplateResolver = async ({ config,
 
   const subject = `${EMAIL_WEBSITE_NAME} Order ${order.orderNumber}`;
 
-  const data = {
-    shopName: EMAIL_WEBSITE_NAME,
-    shopUrl: EMAIL_WEBSITE_URL,
-    orderDetails: await transformOrderToText({ order, locale: systemLocale }, context),
-  };
+  const text = mustache.render(
+    textTemplate,
+    {
+      shopName: EMAIL_WEBSITE_NAME,
+      shopUrl: EMAIL_WEBSITE_URL,
+      orderDetails: await transformOrderToText({ order, locale: systemLocale.baseName }, context),
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -39,7 +45,7 @@ export const resolveForwardDeliveryTemplate: TemplateResolver = async ({ config,
         to: configObject.to || 'orders@unchained.local',
         cc: configObject.cc,
         subject,
-        text: modules.messaging.renderToText(textTemplate, data),
+        text,
       },
     },
   ];

package/src/templates/resolveOrderConfirmationTemplate.ts

@@ -1,5 +1,6 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import { transformOrderToText } from './order-parser/index.js';
+import mustache from 'mustache';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
@@ -11,10 +12,10 @@ Thank you very much for your order.
 {{shopName}}: {{shopUrl}}
 `;
 
-export const resolveOrderConfirmationTemplate: TemplateResolver = async (
-  { orderId, locale },
-  context,
-) => {
+export const resolveOrderConfirmationTemplate: TemplateResolver<{
+  orderId: string;
+  locale: string;
+}> = async ({ orderId, locale }, context) => {
   const { modules } = context;
   const order = await modules.orders.findOrder({ orderId });
 
@@ -24,11 +25,16 @@ export const resolveOrderConfirmationTemplate: TemplateResolver = async (
 
   const subject = `Order ${order.orderNumber}`;
 
-  const data = {
-    shopName: EMAIL_WEBSITE_NAME,
-    shopUrl: EMAIL_WEBSITE_URL,
-    orderDetails: await transformOrderToText({ order, locale }, context),
-  };
+  const text = mustache.render(
+    textTemplate,
+    {
+      shopName: EMAIL_WEBSITE_NAME,
+      shopUrl: EMAIL_WEBSITE_URL,
+      orderDetails: await transformOrderToText({ order, locale }, context),
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -37,7 +43,7 @@ export const resolveOrderConfirmationTemplate: TemplateResolver = async (
         from: `${EMAIL_WEBSITE_NAME} <${EMAIL_FROM || 'noreply@unchained.local'}>`,
         to: order.contact.emailAddress,
         subject,
-        text: modules.messaging.renderToText(textTemplate, data),
+        text,
       },
     },
   ];

package/src/templates/resolveOrderRejectionTemplate.ts

@@ -1,5 +1,6 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import { transformOrderToText } from './order-parser/index.js';
+import mustache from 'mustache';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
@@ -25,11 +26,16 @@ export const resolveOrderRejectionTemplate: TemplateResolver = async ({ orderId,
 
   const subject = `Order rejected ${order.orderNumber}`;
 
-  const data = {
-    shopName: EMAIL_WEBSITE_NAME,
-    shopUrl: EMAIL_WEBSITE_URL,
-    orderDetails: await transformOrderToText({ order, locale }, context),
-  };
+  const text = mustache.render(
+    textTemplate,
+    {
+      shopName: EMAIL_WEBSITE_NAME,
+      shopUrl: EMAIL_WEBSITE_URL,
+      orderDetails: await transformOrderToText({ order, locale }, context),
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -38,7 +44,7 @@ export const resolveOrderRejectionTemplate: TemplateResolver = async ({ orderId,
         from: `${EMAIL_WEBSITE_NAME} <${EMAIL_FROM || 'noreply@unchained.local'}>`,
         to: order.contact.emailAddress,
         subject,
-        text: modules.messaging.renderToText(textTemplate, data),
+        text,
       },
     },
   ];

package/src/templates/resolveQuotationStatusTemplate.ts

@@ -1,4 +1,5 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
+import mustache from 'mustache';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
@@ -32,12 +33,17 @@ export const resolveQuotationStatusTemplate: TemplateResolver = async (
 
   const subject = `${EMAIL_WEBSITE_NAME}: Updated Quotation / ${quotation.quotationNumber}`;
 
-  const data = {
-    locale,
-    quotation,
-    subject,
-    url: `${EMAIL_WEBSITE_URL}/quotation?_id=${quotation._id}`,
-  };
+  const text = mustache.render(
+    textTemplate,
+    {
+      locale,
+      quotation,
+      subject,
+      url: `${EMAIL_WEBSITE_URL}/quotation?_id=${quotation._id}`,
+    },
+    undefined,
+    { escape: (t) => t },
+  );
 
   return [
     {
@@ -46,7 +52,7 @@ export const resolveQuotationStatusTemplate: TemplateResolver = async (
         from: EMAIL_FROM,
         to: modules.users.primaryEmail(user)?.address,
         subject,
-        text: modules.messaging.renderToText(textTemplate, data),
+        text,
         attachments,
       },
     },

package/tsconfig.json

@@ -1,11 +1,9 @@
 {
   "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib",
+    "declarationDir": "./lib",
+    "rootDir": "./src",
+    "outDir": "./lib"
   },
-  "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
-  "include": [
-    "./src"
-  ]
-}
+  "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
+}

package/lib/templates/order-parser/formatAddress.d.ts

@@ -1,3 +0,0 @@
-import type { Address } from '@unchainedshop/mongodb';
-export declare const formatAddress: (address: Address) => string;
-//# sourceMappingURL=formatAddress.d.ts.map

package/lib/templates/order-parser/formatAddress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatAddress.d.ts","sourceRoot":"","sources":["../../../src/templates/order-parser/formatAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,aAAa,YAAa,OAAO,WAY7C,CAAC"}

package/lib/templates/order-parser/formatAddress.js

@@ -1,14 +0,0 @@
-export const formatAddress = (address) => {
-    return [
-        [address.firstName, address.lastName].filter(Boolean).join(' '),
-        address.company,
-        address.addressLine,
-        address.addressLine2,
-        [address.postalCode, address.city].filter(Boolean).join(' '),
-        address.regionCode,
-        [address.countryCode].filter(Boolean).join(''),
-    ]
-        .filter(Boolean)
-        .join('\n');
-};
-//# sourceMappingURL=formatAddress.js.map

package/lib/templates/order-parser/formatAddress.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatAddress.js","sourceRoot":"","sources":["../../../src/templates/order-parser/formatAddress.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAgB,EAAE,EAAE;IAChD,OAAO;QACL,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC/D,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,YAAY;QACpB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC5D,OAAO,CAAC,UAAU;QAClB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;KAC/C;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}

package/lib/templates/order-parser/formatPrice.d.ts

@@ -1,6 +0,0 @@
-export declare const formatPrice: ({ amount, currency }: {
-    amount: number;
-    currency: string;
-}) => string;
-export default formatPrice;
-//# sourceMappingURL=formatPrice.d.ts.map

package/lib/templates/order-parser/formatPrice.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatPrice.d.ts","sourceRoot":"","sources":["../../../src/templates/order-parser/formatPrice.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,yBAA0B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,WAGrF,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/templates/order-parser/formatPrice.js

@@ -1,6 +0,0 @@
-export const formatPrice = ({ amount, currency }) => {
-    const fixedPrice = amount / 100;
-    return `${currency} ${fixedPrice}`;
-};
-export default formatPrice;
-//# sourceMappingURL=formatPrice.js.map

package/lib/templates/order-parser/formatPrice.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatPrice.js","sourceRoot":"","sources":["../../../src/templates/order-parser/formatPrice.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAwC,EAAE,EAAE;IACxF,MAAM,UAAU,GAAG,MAAM,GAAG,GAAG,CAAC;IAChC,OAAO,GAAG,QAAQ,IAAI,UAAU,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/src/templates/order-parser/formatAddress.ts

@@ -1,15 +0,0 @@
-import type { Address } from '@unchainedshop/mongodb';
-
-export const formatAddress = (address: Address) => {
-  return [
-    [address.firstName, address.lastName].filter(Boolean).join(' '),
-    address.company,
-    address.addressLine,
-    address.addressLine2,
-    [address.postalCode, address.city].filter(Boolean).join(' '),
-    address.regionCode,
-    [address.countryCode].filter(Boolean).join(''),
-  ]
-    .filter(Boolean)
-    .join('\n');
-};

package/src/templates/order-parser/formatPrice.ts

@@ -1,6 +0,0 @@
-export const formatPrice = ({ amount, currency }: { amount: number; currency: string }) => {
-  const fixedPrice = amount / 100;
-  return `${currency} ${fixedPrice}`;
-};
-
-export default formatPrice;