@fufulog/brevomorphic-cms-sdk 1.0.5 → 1.0.6

package/dist/index.d.ts

@@ -3,3 +3,4 @@ export { EmailTemplateRepository } from './repository.js';
 export { EmailTemplateService } from './service.js';
 export { EmailTemplateController } from './controller.js';
 export * from './types.js';
+export { restoreTwigTags } from './twig.js';

package/dist/index.js

@@ -3,3 +3,4 @@ export { EmailTemplateRepository } from './repository.js';
 export { EmailTemplateService } from './service.js';
 export { EmailTemplateController } from './controller.js';
 export * from './types.js';
+export { restoreTwigTags } from './twig.js';

package/dist/service.js

@@ -1,4 +1,5 @@
 import { BrevoClient } from './brevoClient.js';
+import { restoreTwigTags } from './twig.js';
 import { EmailTemplateRepository } from './repository.js';
 export class EmailTemplateService {
     brevoClient;
@@ -108,6 +109,8 @@ export class EmailTemplateService {
         if (!input.htmlContent || input.htmlContent.length <= 10) {
             throw new Error('HTML content must be greater than 10 characters');
         }
+        // Editors that read innerHTML send Twig operators as entities (&gt;), which Brevo rejects
+        const htmlContent = restoreTwigTags(input.htmlContent);
         const sender = {
             email: input.sender?.email || this.defaultSender.email,
             name: input.sender?.name || this.defaultSender.name || '',
@@ -117,7 +120,7 @@ export class EmailTemplateService {
             templateName: input.templateName,
             subject: input.subject,
             sender: sender,
-            htmlContent: input.htmlContent,
+            htmlContent,
             isActive: input.isActive,
         });
         // 2. Update local mapping DB
@@ -129,7 +132,7 @@ export class EmailTemplateService {
             eventName: input.eventName || '',
             isActive: input.isActive,
             sender: sender,
-            htmlContent: input.htmlContent,
+            htmlContent,
         };
     }
     /**
@@ -143,7 +146,7 @@ export class EmailTemplateService {
             templateName: bt.name,
             subject: bt.subject,
             sender: bt.sender || this.defaultSender,
-            htmlContent: bt.htmlContent || '',
+            htmlContent: restoreTwigTags(bt.htmlContent || ''),
             isActive: isActive,
         });
         // 3. Update local DB mapping status

package/dist/twig.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Undo HTML entity encoding that breaks Brevo's Twig parser.
+ *
+ * Reading a contentEditable element's innerHTML escapes text, so a condition like
+ * `{% if params.count > 1 %}` comes back as `{% if params.count > 1 %}` and Brevo
+ * rejects it as a malformed if-condition. Brackets are restored everywhere; operators,
+ * quotes and ampersands only inside `{% ... %}` and `{{ ... }}` tags, so the rest of
+ * the HTML keeps its escaping.
+ */
+export declare function restoreTwigTags(html: string): string;

package/dist/twig.js

@@ -0,0 +1,25 @@
+/**
+ * Undo HTML entity encoding that breaks Brevo's Twig parser.
+ *
+ * Reading a contentEditable element's innerHTML escapes text, so a condition like
+ * `{% if params.count > 1 %}` comes back as `{% if params.count > 1 %}` and Brevo
+ * rejects it as a malformed if-condition. Brackets are restored everywhere; operators,
+ * quotes and ampersands only inside `{% ... %}` and `{{ ... }}` tags, so the rest of
+ * the HTML keeps its escaping.
+ */
+export function restoreTwigTags(html) {
+    return html
+        .replace(/{/g, '{')
+        .replace(/}/g, '}')
+        .replace(/{/g, '{')
+        .replace(/}/g, '}')
+        .replace(/%/g, '%')
+        .replace(/%/g, '%')
+        .replace(/\{%[\s\S]*?%\}|\{\{[\s\S]*?\}\}/g, (tag) => tag
+        .replace(/>/g, '>')
+        .replace(/&lt;/g, '<')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'")
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&amp;/g, '&'));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fufulog/brevomorphic-cms-sdk",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "description": "SDK library to bootstrap Brevo email templates and manage local mappings in Postgres, MySQL, or Firestore",
   "main": "dist/index.js",

package/react/BrevoWysiwyg.tsx

@@ -85,7 +85,17 @@ export default function BrevoWysiwyg({
       .replace(/{/g, '{')
       .replace(/}/g, '}')
       .replace(/%/g, '%')
-      .replace(/%/g, '%');
+      .replace(/%/g, '%')
+      // innerHTML escapes > < & and quotes in text, which breaks Twig conditions like {% if x > 1 %}
+      .replace(/\{%[\s\S]*?%\}|\{\{[\s\S]*?\}\}/g, (tag) =>
+        tag
+          .replace(/&gt;/g, '>')
+          .replace(/&lt;/g, '<')
+          .replace(/&quot;/g, '"')
+          .replace(/&#39;/g, "'")
+          .replace(/&nbsp;/g, ' ')
+          .replace(/&amp;/g, '&')
+      );
   }, []);
 
   const syncFromEditor = useCallback(() => {

package/src/index.ts

@@ -3,3 +3,4 @@ export { EmailTemplateRepository } from './repository.js';
 export { EmailTemplateService } from './service.js';
 export { EmailTemplateController } from './controller.js';
 export * from './types.js';
+export { restoreTwigTags } from './twig.js';

package/src/service.ts

@@ -1,4 +1,5 @@
 import { BrevoClient } from './brevoClient.js';
+import { restoreTwigTags } from './twig.js';
 import { EmailTemplateRepository } from './repository.js';
 import { SDKConfig, CombinedTemplate, CreateTemplateInput, UpdateTemplateInput, BrevoSender } from './types.js';
 
@@ -129,6 +130,9 @@ export class EmailTemplateService {
       throw new Error('HTML content must be greater than 10 characters');
     }
 
+    // Editors that read innerHTML send Twig operators as entities (>), which Brevo rejects
+    const htmlContent = restoreTwigTags(input.htmlContent);
+
     const sender: BrevoSender = {
       email: input.sender?.email || this.defaultSender.email,
       name: input.sender?.name || this.defaultSender.name || '',
@@ -139,7 +143,7 @@ export class EmailTemplateService {
       templateName: input.templateName,
       subject: input.subject,
       sender: sender,
-      htmlContent: input.htmlContent,
+      htmlContent,
       isActive: input.isActive,
     });
 
@@ -153,7 +157,7 @@ export class EmailTemplateService {
       eventName: input.eventName || '',
       isActive: input.isActive,
       sender: sender,
-      htmlContent: input.htmlContent,
+      htmlContent,
     };
   }
 
@@ -169,7 +173,7 @@ export class EmailTemplateService {
       templateName: bt.name,
       subject: bt.subject,
       sender: bt.sender || this.defaultSender,
-      htmlContent: bt.htmlContent || '',
+      htmlContent: restoreTwigTags(bt.htmlContent || ''),
       isActive: isActive,
     });
 

package/src/twig.ts

@@ -0,0 +1,27 @@
+/**
+ * Undo HTML entity encoding that breaks Brevo's Twig parser.
+ *
+ * Reading a contentEditable element's innerHTML escapes text, so a condition like
+ * `{% if params.count > 1 %}` comes back as `{% if params.count > 1 %}` and Brevo
+ * rejects it as a malformed if-condition. Brackets are restored everywhere; operators,
+ * quotes and ampersands only inside `{% ... %}` and `{{ ... }}` tags, so the rest of
+ * the HTML keeps its escaping.
+ */
+export function restoreTwigTags(html: string): string {
+  return html
+    .replace(/{/g, '{')
+    .replace(/}/g, '}')
+    .replace(/{/g, '{')
+    .replace(/}/g, '}')
+    .replace(/%/g, '%')
+    .replace(/%/g, '%')
+    .replace(/\{%[\s\S]*?%\}|\{\{[\s\S]*?\}\}/g, (tag) =>
+      tag
+        .replace(/>/g, '>')
+        .replace(/&lt;/g, '<')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'")
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&amp;/g, '&')
+    );
+}

package/svelte/BrevoWysiwyg.svelte

@@ -70,7 +70,17 @@
       .replace(/{/g, "{")
       .replace(/}/g, "}")
       .replace(/%/g, "%")
-      .replace(/%/g, "%");
+      .replace(/%/g, "%")
+      // innerHTML escapes > < & and quotes in text, which breaks Twig conditions like {% if x > 1 %}
+      .replace(/\{%[\s\S]*?%\}|\{\{[\s\S]*?\}\}/g, (tag) =>
+        tag
+          .replace(/&gt;/g, ">")
+          .replace(/&lt;/g, "<")
+          .replace(/&quot;/g, '"')
+          .replace(/&#39;/g, "'")
+          .replace(/&nbsp;/g, " ")
+          .replace(/&amp;/g, "&")
+      );
     value = cleaned;
     dispatch("change", cleaned);
   }

package/tests/sdk.test.ts

@@ -2,6 +2,7 @@ import { EmailTemplateRepository } from '../src/repository.js';
 import { EmailTemplateService } from '../src/service.js';
 import { EmailTemplateController } from '../src/controller.js';
 import { SQLClient, LocalMapping } from '../src/types.js';
+import { restoreTwigTags } from '../src/twig.js';
 
 // Setup basic assertion helper
 function assert(condition: boolean, message: string) {
@@ -221,7 +222,43 @@ async function runTests() {
     }
   });
 
-  // 5. CONTROLLER TESTS
+  // 5. TWIG ENTITY RESTORE TESTS
+  runTest('restoreTwigTags - Decodes operators inside Twig tags only', () => {
+    const input = '<p>A &gt; B &amp; C</p>{% if params.count &gt; 1 %}x{% endif %}{{ params.a &amp;&amp; params.b }}{% if params.name == &quot;Jo&quot; %}y{% endif %}';
+    const output = restoreTwigTags(input);
+    assert(output.includes('<p>A &gt; B &amp; C</p>'), 'HTML text outside tags keeps its escaping');
+    assert(output.includes('{% if params.count > 1 %}'), 'Comparison operator is restored');
+    assert(output.includes('{{ params.a && params.b }}'), 'Ampersands are restored inside output tags');
+    assert(output.includes('{% if params.name == "Jo" %}'), 'Quotes are restored');
+  });
+
+  runTest('restoreTwigTags - Restores encoded brackets', () => {
+    assert(restoreTwigTags('&#123;&#123; params.x &#125;&#125;') === '{{ params.x }}', 'Numeric brace entities are restored');
+    assert(restoreTwigTags('&lbrace;&#37; if a &gt; 1 &#37;&rbrace;') === '{% if a > 1 %}', 'Encoded tag delimiters and operators are restored');
+  });
+
+  runTest('Service - updateTemplate sends restored Twig to Brevo', async () => {
+    const mockPgClient: SQLClient = { query: async () => ({ rows: [] }) };
+    const service = new EmailTemplateService({
+      brevoApiKey: 'dummy-key',
+      defaultSender: { email: 'test@example.com' },
+      dbType: 'postgres',
+      dbClient: mockPgClient
+    });
+    let sentHtml = '';
+    (service as any).brevoClient = { updateTemplate: async (_id: number, params: { htmlContent: string }) => { sentHtml = params.htmlContent; } };
+    const result = await service.updateTemplate(7, {
+      templateName: 'Invite',
+      subject: 'You have a ticket',
+      htmlContent: '<h1>{% if params.ticketCount &gt; 1 %}Tickets{% else %}Ticket{% endif %}</h1>',
+      eventName: 'ticket.invite',
+      isActive: true
+    });
+    assert(sentHtml === '<h1>{% if params.ticketCount > 1 %}Tickets{% else %}Ticket{% endif %}</h1>', 'Brevo receives the decoded condition');
+    assert(result.htmlContent === sentHtml, 'Returned template matches what was sent');
+  });
+
+  // 6. CONTROLLER TESTS
   runTest('Controller - getRouter with Express', async () => {
     const mockPgClient: SQLClient = { query: async () => ({ rows: [] }) };
     const service = new EmailTemplateService({