n8n-nodes-notion-advanced 1.2.1-beta → 1.2.2-beta

package/nodes/NotionAdvanced/NotionAITool.node.d.ts

@@ -10,6 +10,7 @@ export declare class NotionAITool implements INodeType {
     static queryDatabase(executeFunctions: IExecuteFunctions, itemIndex: number): Promise<IDataObject>;
     static parseContentToBlocks(content: string): IDataObject[];
     static processXmlTags(content: string, blocks: IDataObject[]): string;
+    static cleanupRemainingHtml(content: string): string;
     static getCalloutEmoji(type: string): string;
     static getCalloutColor(type: string): string;
     static parseBasicMarkdown(text: string): IDataObject[];

package/nodes/NotionAdvanced/NotionAITool.node.js

@@ -828,51 +828,42 @@ class NotionAITool {
                     return `__XML_BLOCK_${blockCounter++}__`;
                 }
             },
-            // Bulleted lists: <ul><li>item</li></ul>
+            // Process complete bulleted lists first: <ul><li>item</li></ul>
             {
-                regex: /<ul>(.*?)<\/ul>/gis,
+                regex: /<ul\s*[^>]*>(.*?)<\/ul>/gis,
                 processor: (match, listContent) => {
-                    // Extract individual list items
-                    const items = listContent.match(/<li>(.*?)<\/li>/gis) || [];
+                    // Extract individual list items and process them
+                    const items = listContent.match(/<li\s*[^>]*>(.*?)<\/li>/gis) || [];
                     items.forEach(item => {
-                        const itemContent = item.replace(/<\/?li>/gi, '').trim();
-                        blocks.push({
-                            type: 'bulleted_list_item',
-                            bulleted_list_item: {
-                                rich_text: NotionAITool.parseBasicMarkdown(itemContent),
-                            },
-                        });
+                        const itemContent = item.replace(/<\/?li[^>]*>/gi, '').trim();
+                        if (itemContent) {
+                            blocks.push({
+                                type: 'bulleted_list_item',
+                                bulleted_list_item: {
+                                    rich_text: NotionAITool.parseBasicMarkdown(itemContent),
+                                },
+                            });
+                        }
                     });
                     return `__XML_BLOCK_${blockCounter++}__`;
                 }
             },
-            // Numbered lists: <ol><li>item</li></ol>
+            // Process complete numbered lists first: <ol><li>item</li></ol>
             {
-                regex: /<ol>(.*?)<\/ol>/gis,
+                regex: /<ol\s*[^>]*>(.*?)<\/ol>/gis,
                 processor: (match, listContent) => {
-                    // Extract individual list items
-                    const items = listContent.match(/<li>(.*?)<\/li>/gis) || [];
+                    // Extract individual list items and process them
+                    const items = listContent.match(/<li\s*[^>]*>(.*?)<\/li>/gis) || [];
                     items.forEach(item => {
-                        const itemContent = item.replace(/<\/?li>/gi, '').trim();
-                        blocks.push({
-                            type: 'numbered_list_item',
-                            numbered_list_item: {
-                                rich_text: NotionAITool.parseBasicMarkdown(itemContent),
-                            },
-                        });
-                    });
-                    return `__XML_BLOCK_${blockCounter++}__`;
-                }
-            },
-            // Standalone list items: <li>content</li>
-            {
-                regex: /<li>(.*?)<\/li>/gis,
-                processor: (match, content) => {
-                    blocks.push({
-                        type: 'bulleted_list_item',
-                        bulleted_list_item: {
-                            rich_text: NotionAITool.parseBasicMarkdown(content.trim()),
-                        },
+                        const itemContent = item.replace(/<\/?li[^>]*>/gi, '').trim();
+                        if (itemContent) {
+                            blocks.push({
+                                type: 'numbered_list_item',
+                                numbered_list_item: {
+                                    rich_text: NotionAITool.parseBasicMarkdown(itemContent),
+                                },
+                            });
+                        }
                     });
                     return `__XML_BLOCK_${blockCounter++}__`;
                 }
@@ -904,9 +895,24 @@ class NotionAITool {
                     return `__XML_BLOCK_${blockCounter++}__`;
                 }
             },
-            // Strong/Bold: <strong>content</strong> or <b>content</b>
+            // Standalone list items (only if not already processed in lists): <li>content</li>
             {
-                regex: /<(strong|b)>(.*?)<\/(strong|b)>/gis,
+                regex: /<li\s*[^>]*>(.*?)<\/li>/gis,
+                processor: (match, content) => {
+                    if (content.trim()) {
+                        blocks.push({
+                            type: 'bulleted_list_item',
+                            bulleted_list_item: {
+                                rich_text: NotionAITool.parseBasicMarkdown(content.trim()),
+                            },
+                        });
+                    }
+                    return `__XML_BLOCK_${blockCounter++}__`;
+                }
+            },
+            // Strong/Bold: <strong>content</strong> or <b>content</b> (only as standalone)
+            {
+                regex: /(?:^|>|\s)<(strong|b)>(.*?)<\/(strong|b)>(?=<|$|\s)/gis,
                 processor: (match, tag, content) => {
                     blocks.push({
                         type: 'paragraph',
@@ -917,9 +923,9 @@ class NotionAITool {
                     return `__XML_BLOCK_${blockCounter++}__`;
                 }
             },
-            // Emphasis/Italic: <em>content</em> or <i>content</i>
+            // Emphasis/Italic: <em>content</em> or <i>content</i> (only as standalone)
             {
-                regex: /<(em|i)>(.*?)<\/(em|i)>/gis,
+                regex: /(?:^|>|\s)<(em|i)>(.*?)<\/(em|i)>(?=<|$|\s)/gis,
                 processor: (match, tag, content) => {
                     blocks.push({
                         type: 'paragraph',
@@ -950,8 +956,35 @@ class NotionAITool {
                 return processor(match, group1 || '', group2 || '', group3 || '');
             });
         });
+        // Clean up any remaining HTML tags that weren't processed
+        processedContent = NotionAITool.cleanupRemainingHtml(processedContent);
         return processedContent;
     }
+    // Cleanup function to remove remaining HTML tags
+    static cleanupRemainingHtml(content) {
+        let cleaned = content;
+        // Remove common HTML tags that might be left behind
+        const htmlTagsToRemove = [
+            /<\/?ul\s*[^>]*>/gi,
+            /<\/?ol\s*[^>]*>/gi,
+            /<\/?li\s*[^>]*>/gi,
+            /<\/?strong\s*[^>]*>/gi,
+            /<\/?b\s*[^>]*>/gi,
+            /<\/?em\s*[^>]*>/gi,
+            /<\/?i\s*[^>]*>/gi,
+            /<\/?div\s*[^>]*>/gi,
+            /<\/?span\s*[^>]*>/gi,
+            /<br\s*\/?>/gi,
+        ];
+        htmlTagsToRemove.forEach(regex => {
+            cleaned = cleaned.replace(regex, '');
+        });
+        // Remove empty lines created by tag removal
+        cleaned = cleaned.replace(/^\s*[\r\n]/gm, '');
+        // Remove multiple consecutive line breaks
+        cleaned = cleaned.replace(/\n{3,}/g, '\n\n');
+        return cleaned.trim();
+    }
     // Helper function to get callout emoji based on type
     static getCalloutEmoji(type) {
         const emojiMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-notion-advanced",
-  "version": "1.2.1-beta",
+  "version": "1.2.2-beta",
   "description": "Advanced n8n Notion nodes: Full-featured workflow node + AI Agent Tool for intelligent Notion automation with 25+ block types (BETA)",
   "scripts": {
     "build": "echo 'Already built'",