@wise/dynamic-flow-client-internal 3.11.2-experimental-7d4fc19 → 3.11.2-experimental-26093dd

package/build/dynamicFlow/DynamicFlow.test.js

@@ -49,34 +49,78 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { waitFor } from '@testing-library/react';
 import { renderWithProviders } from '../test-utils/rtl-utils';
 import { DynamicFlowLegacy, DynamicFlowRevamp, DynamicFragment } from './DynamicFlow';
+import { makeCustomFetch } from '..';
 describe.each([
     { name: 'DynamicFlowLegacy', DFComponent: DynamicFlowLegacy },
     { name: 'DynamicFlowRevamp', DFComponent: DynamicFlowRevamp },
     { name: 'DynamicFragment', DFComponent: DynamicFragment },
 ])('Wise-Specific Headers', function (_a) {
     var name = _a.name, DFComponent = _a.DFComponent;
+    var originalFetch;
+    var spyFetch;
+    beforeEach(function () {
+        originalFetch = global.fetch;
+        spyFetch = jest.spyOn(global, 'fetch').mockImplementation();
+    });
+    afterEach(function () {
+        global.fetch = originalFetch;
+        jest.clearAllMocks();
+    });
     it("".concat(name, " - makes an initial request with additional RequestInit parameters, as specified in the wise-specific fetcher"), function () { return __awaiter(void 0, void 0, void 0, function () {
-        var props, customFetch, requestInit, credentials;
+        var props, requestInit, credentials;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     props = {
                         flowId: 'test',
-                        customFetch: jest.fn(),
                         initialAction: { url: '/initial' },
                         onCompletion: jest.fn(),
                         onError: jest.fn(),
                     };
-                    customFetch = jest.fn();
-                    renderWithProviders(_jsx(DFComponent, __assign({}, props, { customFetch: customFetch })));
+                    renderWithProviders(_jsx(DFComponent, __assign({}, props)));
                     return [4 /*yield*/, waitFor(function () {
-                            expect(customFetch).toHaveBeenCalledWith('/initial', expect.anything());
+                            expect(spyFetch).toHaveBeenCalledWith('/initial', expect.anything());
                         })];
                 case 1:
                     _a.sent();
-                    requestInit = customFetch.mock.calls[0][1];
+                    requestInit = spyFetch.mock.calls[0][1];
                     credentials = requestInit === null || requestInit === void 0 ? void 0 : requestInit.credentials;
                     expect(credentials).toBe('include');
+                    expect(requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers).toEqual({
+                        'content-type': 'application/json',
+                        'accept-language': 'en-GB',
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("".concat(name, " - makes an initial reques with the 'content-type': 'application/json' header, regardless of the additional headers from makeCustomFetch"), function () { return __awaiter(void 0, void 0, void 0, function () {
+        var props, requestInit;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    props = {
+                        flowId: 'test',
+                        initialAction: { url: '/initial' },
+                        customFetch: makeCustomFetch('', {
+                            'content-type': 'WRONG-CONTENT-TYPE',
+                            'x-other': 'something else',
+                        }),
+                        onCompletion: jest.fn(),
+                        onError: jest.fn(),
+                    };
+                    renderWithProviders(_jsx(DFComponent, __assign({}, props)));
+                    return [4 /*yield*/, waitFor(function () {
+                            expect(spyFetch).toHaveBeenCalledWith('/initial', expect.anything());
+                        })];
+                case 1:
+                    _a.sent();
+                    requestInit = spyFetch.mock.calls[0][1];
+                    expect(requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers).toEqual({
+                        'content-type': 'application/json',
+                        'accept-language': 'en-GB',
+                        'x-other': 'something else',
+                    });
                     return [2 /*return*/];
             }
         });

package/build/dynamicFlow/utils/mergeRequestInit.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-export var mergeRequestInit = function (init, additionalInit) { return (__assign(__assign(__assign({}, init), additionalInit), { headers: mergeHeaders(init === null || init === void 0 ? void 0 : init.headers, additionalInit === null || additionalInit === void 0 ? void 0 : additionalInit.headers) })); };
+export var mergeRequestInit = function (lhs, rhs) { return (__assign(__assign(__assign({}, lhs), rhs), { headers: mergeHeaders(lhs === null || lhs === void 0 ? void 0 : lhs.headers, rhs === null || rhs === void 0 ? void 0 : rhs.headers) })); };
 var mergeHeaders = function () {
     var headersInits = [];
     for (var _i = 0; _i < arguments.length; _i++) {

package/build/dynamicFlow/utils/mergeRequestInit.test.js

@@ -13,6 +13,36 @@ describe('mergeRequestInit', function () {
             });
         });
     });
+    it('merges the two objects and the headers, prioritising the additionalInit headers in case they match', function () {
+        var result = mergeRequestInit({ credentials: 'include', headers: { 'Content-Type': 'lhs-header' } }, { method: 'POST', headers: { 'Content-Type': 'rhs-header' } });
+        expect(result).toMatchObject({
+            credentials: 'include',
+            method: 'POST',
+        });
+        expect(result.headers).toMatchObject({
+            'content-type': 'rhs-header',
+        });
+    });
+    describe('when called with RequestInits with Headers instances', function () {
+        it('merges the two objects and the headers, prioritising the init headers in case they match', function () {
+            var result = mergeRequestInit({ headers: new Headers([['Content-Type', 'lhs-header']]) }, {
+                headers: new Headers([['Content-Type', 'rhs-header']]),
+            });
+            expect(result.headers).toMatchObject({
+                'content-type': 'rhs-header',
+            });
+        });
+    });
+    describe('when called with RequestInits with Array headers', function () {
+        it('merges the two objects and the headers, prioritising the init headers in case they match', function () {
+            var result = mergeRequestInit({ headers: [['Content-Type', 'lhs-header']] }, {
+                headers: [['Content-Type', 'rhs-header']],
+            });
+            expect(result.headers).toMatchObject({
+                'content-type': 'rhs-header',
+            });
+        });
+    });
     describe('when called with undefined as a first argument', function () {
         it('returns the second argument and empty headers', function () {
             var result = mergeRequestInit(undefined, { method: 'POST' });

package/build/main.js

@@ -56,8 +56,8 @@ var import_react_intl = require("react-intl");
 var import_dynamic_flow_client = require("@wise/dynamic-flow-client");
 
 // src/dynamicFlow/utils/mergeRequestInit.ts
-var mergeRequestInit = (init, additionalInit) => __spreadProps(__spreadValues(__spreadValues({}, init), additionalInit), {
-  headers: mergeHeaders(init == null ? void 0 : init.headers, additionalInit == null ? void 0 : additionalInit.headers)
+var mergeRequestInit = (lhs, rhs) => __spreadProps(__spreadValues(__spreadValues({}, lhs), rhs), {
+  headers: mergeHeaders(lhs == null ? void 0 : lhs.headers, rhs == null ? void 0 : rhs.headers)
 });
 var mergeHeaders = (...headersInits) => headersInits.reduce(
   (acc, headers) => __spreadValues(__spreadValues({}, acc), Object.fromEntries(new Headers(headers).entries())),

package/build/main.min.js

@@ -1 +1 @@
-"use strict";var s=Object.defineProperty,d=Object.defineProperties,v=Object.getOwnPropertyDescriptor,I=Object.getOwnPropertyDescriptors,W=Object.getOwnPropertyNames,w=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,x=Object.prototype.propertyIsEnumerable;var D=(t,e,o)=>e in t?s(t,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):t[e]=o,n=(t,e)=>{for(var o in e||(e={}))h.call(e,o)&&D(t,o,e[o]);if(w)for(var o of w(e))x.call(e,o)&&D(t,o,e[o]);return t},r=(t,e)=>d(t,I(e));var L=(t,e)=>{for(var o in e)s(t,o,{get:e[o],enumerable:!0})},b=(t,e,o,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let c of W(e))!h.call(t,c)&&c!==o&&s(t,c,{get:()=>e[c],enumerable:!(a=v(e,c))||a.enumerable});return t};var S=t=>b(s({},"__esModule",{value:!0}),t);var H={};L(H,{DynamicFlow:()=>y,DynamicFlowLegacy:()=>y,DynamicFlowRevamp:()=>P,DynamicFragment:()=>u,JsonSchemaForm:()=>m.JsonSchemaForm,isValidSchema:()=>m.isValidSchema,makeCustomFetch:()=>A,translations:()=>m.translations});module.exports=S(H);var R=require("@wise/dynamic-flow-client"),m=require("@wise/dynamic-flow-client");var l=require("react"),f=require("react-intl"),i=require("@wise/dynamic-flow-client");var g=(t,e)=>r(n(n({},t),e),{headers:q(t==null?void 0:t.headers,e==null?void 0:e.headers)}),q=(...t)=>t.reduce((e,o)=>n(n({},e),Object.fromEntries(new Headers(o).entries())),{});var p=require("react/jsx-runtime");function y(t){let{customFetch:e=globalThis.fetch}=t,o=F(e),a=r(n({},t),{httpClient:o});return(0,p.jsx)(i.DynamicFlow,n({},a))}function P(t){let{customFetch:e=globalThis.fetch}=t,o=F(e),a=r(n({},t),{httpClient:o});return(0,p.jsx)(i.DynamicFlowRevamp,n({},a))}var u=(0,l.forwardRef)(function(e,o){let{customFetch:a=globalThis.fetch}=e,c=F(a),C=r(n({},e),{httpClient:c});return(0,p.jsx)(i.DynamicFragmentWise,r(n({},C),{ref:o}))}),F=t=>{let{locale:e}=(0,f.useIntl)();return(0,l.useCallback)(async(o,a)=>t(o,g(a,{credentials:"include",headers:{"accept-language":e}})),[t,e])};var A=R.makeHttpClient;
+"use strict";var l=Object.defineProperty,C=Object.defineProperties,v=Object.getOwnPropertyDescriptor,I=Object.getOwnPropertyDescriptors,W=Object.getOwnPropertyNames,w=Object.getOwnPropertySymbols;var g=Object.prototype.hasOwnProperty,x=Object.prototype.propertyIsEnumerable;var D=(t,e,o)=>e in t?l(t,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):t[e]=o,i=(t,e)=>{for(var o in e||(e={}))g.call(e,o)&&D(t,o,e[o]);if(w)for(var o of w(e))x.call(e,o)&&D(t,o,e[o]);return t},c=(t,e)=>C(t,I(e));var L=(t,e)=>{for(var o in e)l(t,o,{get:e[o],enumerable:!0})},b=(t,e,o,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of W(e))!g.call(t,a)&&a!==o&&l(t,a,{get:()=>e[a],enumerable:!(n=v(e,a))||n.enumerable});return t};var S=t=>b(l({},"__esModule",{value:!0}),t);var H={};L(H,{DynamicFlow:()=>y,DynamicFlowLegacy:()=>y,DynamicFlowRevamp:()=>P,DynamicFragment:()=>d,JsonSchemaForm:()=>m.JsonSchemaForm,isValidSchema:()=>m.isValidSchema,makeCustomFetch:()=>A,translations:()=>m.translations});module.exports=S(H);var u=require("@wise/dynamic-flow-client"),m=require("@wise/dynamic-flow-client");var p=require("react"),h=require("react-intl"),r=require("@wise/dynamic-flow-client");var f=(t,e)=>c(i(i({},t),e),{headers:q(t==null?void 0:t.headers,e==null?void 0:e.headers)}),q=(...t)=>t.reduce((e,o)=>i(i({},e),Object.fromEntries(new Headers(o).entries())),{});var s=require("react/jsx-runtime");function y(t){let{customFetch:e=globalThis.fetch}=t,o=F(e),n=c(i({},t),{httpClient:o});return(0,s.jsx)(r.DynamicFlow,i({},n))}function P(t){let{customFetch:e=globalThis.fetch}=t,o=F(e),n=c(i({},t),{httpClient:o});return(0,s.jsx)(r.DynamicFlowRevamp,i({},n))}var d=(0,p.forwardRef)(function(e,o){let{customFetch:n=globalThis.fetch}=e,a=F(n),R=c(i({},e),{httpClient:a});return(0,s.jsx)(r.DynamicFragmentWise,c(i({},R),{ref:o}))}),F=t=>{let{locale:e}=(0,h.useIntl)();return(0,p.useCallback)(async(o,n)=>t(o,f(n,{credentials:"include",headers:{"accept-language":e}})),[t,e])};var A=u.makeHttpClient;

package/build/main.mjs

@@ -32,8 +32,8 @@ import {
 } from "@wise/dynamic-flow-client";
 
 // src/dynamicFlow/utils/mergeRequestInit.ts
-var mergeRequestInit = (init, additionalInit) => __spreadProps(__spreadValues(__spreadValues({}, init), additionalInit), {
-  headers: mergeHeaders(init == null ? void 0 : init.headers, additionalInit == null ? void 0 : additionalInit.headers)
+var mergeRequestInit = (lhs, rhs) => __spreadProps(__spreadValues(__spreadValues({}, lhs), rhs), {
+  headers: mergeHeaders(lhs == null ? void 0 : lhs.headers, rhs == null ? void 0 : rhs.headers)
 });
 var mergeHeaders = (...headersInits) => headersInits.reduce(
   (acc, headers) => __spreadValues(__spreadValues({}, acc), Object.fromEntries(new Headers(headers).entries())),

package/build/types/dynamicFlow/utils/mergeRequestInit.d.ts

@@ -1 +1 @@
-export declare const mergeRequestInit: (init?: RequestInit, additionalInit?: RequestInit) => RequestInit;
+export declare const mergeRequestInit: (lhs?: RequestInit, rhs?: RequestInit) => RequestInit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise/dynamic-flow-client-internal",
-  "version": "3.11.2-experimental-7d4fc19",
+  "version": "3.11.2-experimental-26093dd",
   "description": "Dynamic Flow web client for Wise",
   "license": "Apache-2.0",
   "main": "./build/main.min.js",
@@ -80,7 +80,7 @@
     "react-intl": "^6"
   },
   "dependencies": {
-    "@wise/dynamic-flow-client": "3.11.2-experimental-7d4fc19"
+    "@wise/dynamic-flow-client": "3.11.2-experimental-26093dd"
   },
   "scripts": {
     "dev": "storybook dev -p 3005",