@adobe/spacecat-shared-tokowaka-client 1.1.0 → 1.2.0

package/test/mappers/base-mapper.test.js

@@ -227,34 +227,30 @@ describe('BaseOpportunityMapper', () => {
 
     it('should remove patches by suggestion IDs using default implementation', () => {
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-1',
-                op: 'replace',
-                value: 'value-1',
-              },
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-2',
-                op: 'replace',
-                value: 'value-2',
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-1',
+            op: 'replace',
+            value: 'value-1',
           },
-        },
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-2',
+            op: 'replace',
+            value: 'value-2',
+          },
+        ],
       };
 
       const result = testMapper.rollbackPatches(config, ['sugg-1'], 'opp-test');
 
-      expect(result.tokowakaOptimizations['/page1'].patches).to.have.lengthOf(1);
-      expect(result.tokowakaOptimizations['/page1'].patches[0].suggestionId).to.equal('sugg-2');
+      expect(result.patches).to.have.lengthOf(1);
+      expect(result.patches[0].suggestionId).to.equal('sugg-2');
       expect(result.removedCount).to.equal(1);
     });
 
@@ -268,101 +264,89 @@ describe('BaseOpportunityMapper', () => {
 
     it('should remove patches for multiple suggestion IDs', () => {
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-1',
-                op: 'replace',
-                value: 'value-1',
-              },
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-2',
-                op: 'replace',
-                value: 'value-2',
-              },
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-3',
-                op: 'replace',
-                value: 'value-3',
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-1',
+            op: 'replace',
+            value: 'value-1',
+          },
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-2',
+            op: 'replace',
+            value: 'value-2',
           },
-        },
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-3',
+            op: 'replace',
+            value: 'value-3',
+          },
+        ],
       };
 
       const result = testMapper.rollbackPatches(config, ['sugg-1', 'sugg-3'], 'opp-test');
 
-      expect(result.tokowakaOptimizations['/page1'].patches).to.have.lengthOf(1);
-      expect(result.tokowakaOptimizations['/page1'].patches[0].suggestionId).to.equal('sugg-2');
+      expect(result.patches).to.have.lengthOf(1);
+      expect(result.patches[0].suggestionId).to.equal('sugg-2');
       expect(result.removedCount).to.equal(2);
     });
 
     it('should remove URL path when all patches are removed', () => {
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-1',
-                op: 'replace',
-                value: 'value-1',
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-1',
+            op: 'replace',
+            value: 'value-1',
           },
-        },
+        ],
       };
 
       const result = testMapper.rollbackPatches(config, ['sugg-1'], 'opp-test');
 
-      // URL path should be removed when no patches remain
-      expect(result.tokowakaOptimizations).to.not.have.property('/page1');
+      // All patches removed, patches array should be empty
+      expect(result.patches).to.have.lengthOf(0);
       expect(result.removedCount).to.equal(1);
     });
 
     it('should preserve patches from other opportunities', () => {
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              {
-                opportunityId: 'opp-test',
-                suggestionId: 'sugg-1',
-                op: 'replace',
-                value: 'test-value',
-              },
-              {
-                opportunityId: 'opp-other',
-                suggestionId: 'sugg-2',
-                op: 'replace',
-                value: 'other-value',
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          {
+            opportunityId: 'opp-test',
+            suggestionId: 'sugg-1',
+            op: 'replace',
+            value: 'test-value',
+          },
+          {
+            opportunityId: 'opp-other',
+            suggestionId: 'sugg-2',
+            op: 'replace',
+            value: 'other-value',
           },
-        },
+        ],
       };
 
       // Default implementation removes by suggestionId regardless of opportunity
       const result = testMapper.rollbackPatches(config, ['sugg-1'], 'opp-test');
 
-      expect(result.tokowakaOptimizations['/page1'].patches).to.have.lengthOf(1);
-      expect(result.tokowakaOptimizations['/page1'].patches[0].suggestionId).to.equal('sugg-2');
+      expect(result.patches).to.have.lengthOf(1);
+      expect(result.patches[0].suggestionId).to.equal('sugg-2');
       expect(result.removedCount).to.equal(1);
     });
   });

package/test/mappers/faq-mapper.test.js

@@ -1325,132 +1325,96 @@ Overall, Bulk positions itself as a better choice for sports nutrition through i
   describe('rollbackPatches', () => {
     it('should remove FAQ heading when last FAQ suggestion is rolled back', () => {
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              {
-                opportunityId: 'opp-faq',
-                // FAQ heading patch (no suggestionId)
-                op: 'appendChild',
-                selector: 'body',
-                value: { type: 'element', tagName: 'h2', children: [{ type: 'text', value: 'FAQs' }] },
-              },
-              {
-                opportunityId: 'opp-faq',
-                suggestionId: 'sugg-1',
-                op: 'appendChild',
-                value: { type: 'element', tagName: 'div' },
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          {
+            opportunityId: 'opp-faq',
+            // FAQ heading patch (no suggestionId)
+            op: 'appendChild',
+            selector: 'body',
+            value: { type: 'element', tagName: 'h2', children: [{ type: 'text', value: 'FAQs' }] },
           },
-        },
+          {
+            opportunityId: 'opp-faq',
+            suggestionId: 'sugg-1',
+            op: 'appendChild',
+            value: { type: 'element', tagName: 'div' },
+          },
+        ],
       };
 
       const result = mapper.rollbackPatches(config, ['sugg-1'], 'opp-faq');
 
       // Both FAQ item and heading should be removed
-      expect(result.tokowakaOptimizations).to.not.have.property('/page1');
+      expect(result.patches).to.have.lengthOf(0);
       expect(result.removedCount).to.equal(2);
     });
 
     it('should keep FAQ heading when other FAQ suggestions remain', () => {
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              {
-                opportunityId: 'opp-faq',
-                // FAQ heading patch
-                op: 'appendChild',
-                selector: 'body',
-                value: { type: 'element', tagName: 'h2', children: [{ type: 'text', value: 'FAQs' }] },
-              },
-              {
-                opportunityId: 'opp-faq',
-                suggestionId: 'sugg-1',
-                op: 'appendChild',
-                value: { type: 'element', tagName: 'div' },
-              },
-              {
-                opportunityId: 'opp-faq',
-                suggestionId: 'sugg-2',
-                op: 'appendChild',
-                value: { type: 'element', tagName: 'div' },
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          {
+            opportunityId: 'opp-faq',
+            // FAQ heading patch
+            op: 'appendChild',
+            selector: 'body',
+            value: { type: 'element', tagName: 'h2', children: [{ type: 'text', value: 'FAQs' }] },
           },
-        },
+          {
+            opportunityId: 'opp-faq',
+            suggestionId: 'sugg-1',
+            op: 'appendChild',
+            value: { type: 'element', tagName: 'div' },
+          },
+          {
+            opportunityId: 'opp-faq',
+            suggestionId: 'sugg-2',
+            op: 'appendChild',
+            value: { type: 'element', tagName: 'div' },
+          },
+        ],
       };
 
       const result = mapper.rollbackPatches(config, ['sugg-1'], 'opp-faq');
 
       // Only sugg-1 removed, heading and sugg-2 remain
-      expect(result.tokowakaOptimizations['/page1'].patches).to.have.lengthOf(2);
-      expect(result.tokowakaOptimizations['/page1'].patches[0]).to.not.have.property('suggestionId'); // Heading
-      expect(result.tokowakaOptimizations['/page1'].patches[1].suggestionId).to.equal('sugg-2');
+      expect(result.patches).to.have.lengthOf(2);
+      expect(result.patches[0]).to.not.have.property('suggestionId'); // Heading
+      expect(result.patches[1].suggestionId).to.equal('sugg-2');
       expect(result.removedCount).to.equal(1);
     });
 
     it('should handle multiple URLs independently', () => {
+      // Note: With the new per-URL architecture, each URL has its own config
+      // This test validates that rollback works correctly for a single URL config
       const config = {
-        siteId: 'site-123',
-        baseURL: 'https://example.com',
+        url: 'https://example.com/page1',
         version: '1.0',
-        tokowakaOptimizations: {
-          '/page1': {
-            prerender: true,
-            patches: [
-              { opportunityId: 'opp-faq', op: 'appendChild', value: 'FAQs' },
-              {
-                opportunityId: 'opp-faq',
-                suggestionId: 'sugg-1',
-                op: 'appendChild',
-                value: 'FAQ1',
-              },
-            ],
-          },
-          '/page2': {
-            prerender: true,
-            patches: [
-              { opportunityId: 'opp-faq', op: 'appendChild', value: 'FAQs' },
-              {
-                opportunityId: 'opp-faq',
-                suggestionId: 'sugg-2',
-                op: 'appendChild',
-                value: 'FAQ2',
-              },
-              {
-                opportunityId: 'opp-faq',
-                suggestionId: 'sugg-3',
-                op: 'appendChild',
-                value: 'FAQ3',
-              },
-            ],
+        forceFail: false,
+        prerender: true,
+        patches: [
+          { opportunityId: 'opp-faq', op: 'appendChild', value: 'FAQs' },
+          {
+            opportunityId: 'opp-faq',
+            suggestionId: 'sugg-1',
+            op: 'appendChild',
+            value: 'FAQ1',
           },
-        },
+        ],
       };
 
-      // Remove sugg-1 from page1 (should remove heading too)
-      // Remove sugg-2 from page2 (should keep heading because sugg-3 remains)
-      const result = mapper.rollbackPatches(config, ['sugg-1', 'sugg-2'], 'opp-faq');
-
-      // page1 completely removed
-      expect(result.tokowakaOptimizations).to.not.have.property('/page1');
-
-      // page2 still has heading + sugg-3
-      expect(result.tokowakaOptimizations['/page2'].patches).to.have.lengthOf(2);
-      expect(result.tokowakaOptimizations['/page2'].patches[0]).to.not.have.property('suggestionId');
-      expect(result.tokowakaOptimizations['/page2'].patches[1].suggestionId).to.equal('sugg-3');
+      const result = mapper.rollbackPatches(config, ['sugg-1'], 'opp-faq');
 
-      expect(result.removedCount).to.equal(3); // page1: heading+sugg-1, page2: sugg-2
+      // All patches removed (heading + FAQ item)
+      expect(result.patches).to.have.lengthOf(0);
+      expect(result.removedCount).to.equal(2);
     });
 
     it('should handle null/undefined config gracefully', () => {

package/test/utils/html-utils.test.js

@@ -39,7 +39,6 @@ describe('HTML Utils', () => {
       try {
         await fetchHtmlWithWarmup(
           '',
-          'api-key',
           'host',
           'edge-url',
           log,
@@ -51,51 +50,51 @@ describe('HTML Utils', () => {
       }
     });
 
-    it('should throw error when apiKey is missing', async () => {
+    it('should throw error when forwardedHost is missing', async () => {
       try {
         await fetchHtmlWithWarmup(
           'https://example.com/page',
+          'api-key',
           '',
-          'host',
           'edge-url',
           log,
           false,
         );
         expect.fail('Should have thrown error');
       } catch (error) {
-        expect(error.message).to.equal('Tokowaka API key is required for fetching HTML');
+        expect(error.message).to.equal('Forwarded host is required for fetching HTML');
       }
     });
 
-    it('should throw error when forwardedHost is missing', async () => {
+    it('should throw error when tokowakaEdgeUrl is missing', async () => {
       try {
         await fetchHtmlWithWarmup(
           'https://example.com/page',
           'api-key',
+          'host',
           '',
-          'edge-url',
           log,
           false,
         );
         expect.fail('Should have thrown error');
       } catch (error) {
-        expect(error.message).to.equal('Forwarded host is required for fetching HTML');
+        expect(error.message).to.equal('TOKOWAKA_EDGE_URL is not configured');
       }
     });
 
-    it('should throw error when tokowakaEdgeUrl is missing', async () => {
+    it('should throw error when apiKey is missing', async () => {
       try {
         await fetchHtmlWithWarmup(
           'https://example.com/page',
-          'api-key',
-          'host',
           '',
+          'host',
+          'edge-url',
           log,
           false,
         );
         expect.fail('Should have thrown error');
       } catch (error) {
-        expect(error.message).to.equal('TOKOWAKA_EDGE_URL is not configured');
+        expect(error.message).to.equal('Tokowaka API key is required for fetching HTML');
       }
     });
 
@@ -273,7 +272,6 @@ describe('HTML Utils', () => {
         // This tests the defensive 'throw lastError' fallback
         await fetchHtmlWithWarmup(
           'https://example.com/page',
-          'api-key',
           'host',
           'https://edge.example.com',
           log,