strapi-plugin-magic-mail 2.3.1 → 2.3.3

package/dist/server/index.js

@@ -17,8 +17,8 @@ const require$$2__default = /* @__PURE__ */ _interopDefault(require$$2$2);
 const require$$0__default$3 = /* @__PURE__ */ _interopDefault(require$$0$4);
 const require$$1__default$2 = /* @__PURE__ */ _interopDefault(require$$1$3);
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-function getDefaultExportFromCjs(x2) {
-  return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
 var register;
 var hasRequiredRegister;
@@ -1835,8 +1835,7 @@ function requireEmailDesigner$1() {
      */
     async renderTemplate(ctx) {
       try {
-        const { templateReferenceId } = ct;
-        x.params;
+        const { templateReferenceId } = ctx.params;
         const { data } = ctx.request.body;
         const rendered = await strapi2.plugin("magic-mail").service("email-designer").renderTemplate(parseInt(templateReferenceId), data);
         return ctx.send({
@@ -5544,7 +5543,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.0";
+const version = "2.3.2";
 const require$$2 = {
   version
 };
@@ -5961,11 +5960,17 @@ function requireEmailDesigner() {
       });
     },
     /**
-     * Get template by ID (documentId) with populated versions
+     * Get template by ID (documentId or numeric id) with populated versions
+     * Supports both documentId (string) and numeric id for backward compatibility
      */
-    async findOne(documentId) {
+    async findOne(idOrDocumentId) {
+      const isNumericId = /^\d+$/.test(String(idOrDocumentId));
+      if (isNumericId) {
+        const result = await this.findById(Number(idOrDocumentId));
+        if (result) return result;
+      }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId,
+        documentId: String(idOrDocumentId),
         populate: ["versions"]
       });
     },
@@ -6164,7 +6169,7 @@ function requireEmailDesigner() {
      * Get all versions for a template
      */
     async getVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] 📜 Fetching versions for template documentId: ${templateDocumentId}`);
+      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template documentId: ${templateDocumentId}`);
       const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
         documentId: templateDocumentId,
         populate: ["versions"]
@@ -6331,31 +6336,71 @@ function requireEmailDesigner() {
     },
     /**
      * Import templates from JSON
+     * Supports both magic-mail export format and strapi-plugin-email-designer-5 format
      */
     async importTemplates(templates) {
       strapi2.log.info(`[magic-mail] [IMPORT] Importing ${templates.length} templates...`);
       const results = [];
-      for (const templateData of templates) {
+      for (const rawData of templates) {
         try {
+          const templateData = this.normalizeImportData(rawData);
+          strapi2.log.info(`[magic-mail] [IMPORT] Processing: "${templateData.name}" (ref: ${templateData.templateReferenceId})`);
           const existing = await this.findByReferenceId(templateData.templateReferenceId);
           if (existing) {
             const updated = await this.update(existing.documentId, templateData);
             results.push({ success: true, action: "updated", template: updated });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Updated: "${templateData.name}"`);
           } else {
             const created = await this.create(templateData);
             results.push({ success: true, action: "created", template: created });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Created: "${templateData.name}"`);
           }
         } catch (error) {
+          strapi2.log.error(`[magic-mail] [ERROR] Import failed for "${rawData.name}": ${error.message}`);
           results.push({
             success: false,
             action: "failed",
             error: error.message,
-            templateName: templateData.name
+            templateName: rawData.name
           });
         }
       }
+      const successful = results.filter((r) => r.success).length;
+      const failed = results.filter((r) => !r.success).length;
+      strapi2.log.info(`[magic-mail] [IMPORT] Complete: ${successful} successful, ${failed} failed`);
       return results;
     },
+    /**
+     * Normalize import data from different export formats
+     * Supports: magic-mail, strapi-plugin-email-designer-5, and generic formats
+     */
+    normalizeImportData(rawData) {
+      const isActive = rawData.isActive !== void 0 ? rawData.isActive : rawData.enabled !== void 0 ? rawData.enabled : true;
+      const templateReferenceId = rawData.templateReferenceId || rawData.referenceId || Date.now() + Math.floor(Math.random() * 1e3);
+      const category = rawData.category || "custom";
+      let tags = rawData.tags;
+      if (typeof tags === "string") {
+        try {
+          tags = JSON.parse(tags);
+        } catch (e) {
+          tags = tags.split(",").map((t) => t.trim()).filter(Boolean);
+        }
+      }
+      if (!Array.isArray(tags)) {
+        tags = [];
+      }
+      return {
+        templateReferenceId,
+        name: rawData.name || "Imported Template",
+        subject: rawData.subject || "",
+        design: rawData.design || null,
+        bodyHtml: rawData.bodyHtml || rawData.message || "",
+        bodyText: rawData.bodyText || "",
+        category,
+        tags,
+        isActive
+      };
+    },
     // ============================================================
     // STATISTICS
     // ============================================================

package/dist/server/index.mjs

@@ -7,8 +7,8 @@ import require$$2$2 from "decode-html";
 import require$$0$4 from "path";
 import require$$1$3 from "fs";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-function getDefaultExportFromCjs(x2) {
-  return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
 var register;
 var hasRequiredRegister;
@@ -1825,8 +1825,7 @@ function requireEmailDesigner$1() {
      */
     async renderTemplate(ctx) {
       try {
-        const { templateReferenceId } = ct;
-        x.params;
+        const { templateReferenceId } = ctx.params;
         const { data } = ctx.request.body;
         const rendered = await strapi2.plugin("magic-mail").service("email-designer").renderTemplate(parseInt(templateReferenceId), data);
         return ctx.send({
@@ -5534,7 +5533,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.0";
+const version = "2.3.2";
 const require$$2 = {
   version
 };
@@ -5951,11 +5950,17 @@ function requireEmailDesigner() {
       });
     },
     /**
-     * Get template by ID (documentId) with populated versions
+     * Get template by ID (documentId or numeric id) with populated versions
+     * Supports both documentId (string) and numeric id for backward compatibility
      */
-    async findOne(documentId) {
+    async findOne(idOrDocumentId) {
+      const isNumericId = /^\d+$/.test(String(idOrDocumentId));
+      if (isNumericId) {
+        const result = await this.findById(Number(idOrDocumentId));
+        if (result) return result;
+      }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId,
+        documentId: String(idOrDocumentId),
         populate: ["versions"]
       });
     },
@@ -6154,7 +6159,7 @@ function requireEmailDesigner() {
      * Get all versions for a template
      */
     async getVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] 📜 Fetching versions for template documentId: ${templateDocumentId}`);
+      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template documentId: ${templateDocumentId}`);
       const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
         documentId: templateDocumentId,
         populate: ["versions"]
@@ -6321,31 +6326,71 @@ function requireEmailDesigner() {
     },
     /**
      * Import templates from JSON
+     * Supports both magic-mail export format and strapi-plugin-email-designer-5 format
      */
     async importTemplates(templates) {
       strapi2.log.info(`[magic-mail] [IMPORT] Importing ${templates.length} templates...`);
       const results = [];
-      for (const templateData of templates) {
+      for (const rawData of templates) {
         try {
+          const templateData = this.normalizeImportData(rawData);
+          strapi2.log.info(`[magic-mail] [IMPORT] Processing: "${templateData.name}" (ref: ${templateData.templateReferenceId})`);
           const existing = await this.findByReferenceId(templateData.templateReferenceId);
           if (existing) {
             const updated = await this.update(existing.documentId, templateData);
             results.push({ success: true, action: "updated", template: updated });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Updated: "${templateData.name}"`);
           } else {
             const created = await this.create(templateData);
             results.push({ success: true, action: "created", template: created });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Created: "${templateData.name}"`);
           }
         } catch (error) {
+          strapi2.log.error(`[magic-mail] [ERROR] Import failed for "${rawData.name}": ${error.message}`);
           results.push({
             success: false,
             action: "failed",
             error: error.message,
-            templateName: templateData.name
+            templateName: rawData.name
           });
         }
       }
+      const successful = results.filter((r) => r.success).length;
+      const failed = results.filter((r) => !r.success).length;
+      strapi2.log.info(`[magic-mail] [IMPORT] Complete: ${successful} successful, ${failed} failed`);
       return results;
     },
+    /**
+     * Normalize import data from different export formats
+     * Supports: magic-mail, strapi-plugin-email-designer-5, and generic formats
+     */
+    normalizeImportData(rawData) {
+      const isActive = rawData.isActive !== void 0 ? rawData.isActive : rawData.enabled !== void 0 ? rawData.enabled : true;
+      const templateReferenceId = rawData.templateReferenceId || rawData.referenceId || Date.now() + Math.floor(Math.random() * 1e3);
+      const category = rawData.category || "custom";
+      let tags = rawData.tags;
+      if (typeof tags === "string") {
+        try {
+          tags = JSON.parse(tags);
+        } catch (e) {
+          tags = tags.split(",").map((t) => t.trim()).filter(Boolean);
+        }
+      }
+      if (!Array.isArray(tags)) {
+        tags = [];
+      }
+      return {
+        templateReferenceId,
+        name: rawData.name || "Imported Template",
+        subject: rawData.subject || "",
+        design: rawData.design || null,
+        bodyHtml: rawData.bodyHtml || rawData.message || "",
+        bodyText: rawData.bodyText || "",
+        category,
+        tags,
+        isActive
+      };
+    },
     // ============================================================
     // STATISTICS
     // ============================================================

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.1",
+  "version": "2.3.3",
   "keywords": [
     "strapi",
     "strapi-plugin",