@prezly/theme-kit-nextjs 10.8.0 → 10.9.1

package/build/adapters/prezly/server.mjs

@@ -3,38 +3,61 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { sha256 } from '@noble/hashes/sha256';
+import { bytesToHex } from '@noble/hashes/utils';
+import stableStringify from 'json-stable-stringify';
 import { createPrezlyClient } from '@prezly/sdk';
 import { ContentDelivery, Resolvable } from '@prezly/theme-kit-core';
 import { configure as configureCache } from "./cache/index.mjs";
+import { createBoundedFetch } from "./requests.mjs";
 export var PrezlyAdapter;
 (function (_PrezlyAdapter) {
   function connect(config) {
-    var {
-      cache: cacheConfig,
-      fetch
-    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+      cacheConfig = _ref.cache,
+      fetch = _ref.fetch;
     function usePrezlyClient() {
-      var {
-        // sdk client properties
-        accessToken,
-        baseUrl,
-        headers,
-        // contentDelivery client properties
-        newsroom,
-        theme,
-        formats
-      } = Resolvable.resolve(config);
+      var _cacheConfig$namespac, _cacheConfig$memory;
+      var _Resolvable$resolve = Resolvable.resolve(config),
+        accessToken = _Resolvable$resolve.accessToken,
+        baseUrl = _Resolvable$resolve.baseUrl,
+        headers = _Resolvable$resolve.headers,
+        newsroom = _Resolvable$resolve.newsroom,
+        theme = _Resolvable$resolve.theme,
+        formats = _Resolvable$resolve.formats;
       var client = createPrezlyClient({
         fetch,
         accessToken,
         baseUrl,
         headers
       });
-      var contentDelivery = ContentDelivery.createClient(client, newsroom, theme, {
+      var cache = cacheConfig ? configureCache(_objectSpread({
+        namespace: 'content:'
+      }, cacheConfig)) : undefined;
+      // Custom fetches may depend on hidden request context. Preserve their
+      // existing cache behavior unless the caller declares that identity.
+      var scope = cache && (!fetch || (cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.requestScope) !== undefined) ? bytesToHex(sha256(stableStringify({
+        baseUrl: baseUrl !== null && baseUrl !== void 0 ? baseUrl : 'https://api.prezly.com',
+        accessToken,
+        headers: headers !== null && headers !== void 0 ? headers : {},
+        cache: {
+          namespace: (_cacheConfig$namespac = cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.namespace) !== null && _cacheConfig$namespac !== void 0 ? _cacheConfig$namespac : 'content:',
+          memory: (_cacheConfig$memory = cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.memory) !== null && _cacheConfig$memory !== void 0 ? _cacheConfig$memory : false,
+          redis: cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.redis
+        },
+        requestScope: cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.requestScope
+      }))) : undefined;
+      var contentClient = cache ? createPrezlyClient({
+        accessToken,
+        baseUrl,
+        headers,
+        fetch: createBoundedFetch(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch)
+      }) : client;
+      var contentDelivery = ContentDelivery.createClient(contentClient, newsroom, theme, {
         formats,
-        cache: cacheConfig ? configureCache(_objectSpread({
-          namespace: 'content:'
-        }, cacheConfig)) : undefined
+        cache: cache ? _objectSpread(_objectSpread({}, cache), {}, {
+          scope
+        }) : undefined
       });
       return {
         client,

package/build/adapters/prezly/server.test.cjs

@@ -0,0 +1,304 @@
+"use strict";
+
+var _sdk = require("@prezly/sdk");
+var _themeKitCore = require("@prezly/theme-kit-core");
+var _requests = require("./requests.cjs");
+var _server = require("./server.cjs");
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+var tick = () => new Promise(resolve => setImmediate(resolve));
+var nativeFetch = globalThis.fetch;
+var sequence = 0;
+var config = {
+  newsroom: 'room',
+  accessToken: 'test-token',
+  baseUrl: 'https://example.test'
+};
+var cache = () => ({
+  memory: true,
+  latestVersion: 1,
+  namespace: "adapter-test-".concat(sequence++)
+});
+function response(name) {
+  return new Response(JSON.stringify({
+    newsroom: {
+      name,
+      stories_number: 600
+    }
+  }), {
+    headers: {
+      'content-type': 'application/json'
+    }
+  });
+}
+afterEach(() => {
+  globalThis.fetch = nativeFetch;
+});
+it('coalesces 20 independently constructed adapters and then uses the warm cache', /*#__PURE__*/_asyncToGenerator(function* () {
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return response('room');
+  }));
+  globalThis.fetch = fetchMock;
+  var caching = cache();
+  var client = () => _server.PrezlyAdapter.connect(config, {
+    cache: caching
+  }).usePrezlyClient().contentDelivery;
+  var values = yield Promise.all(Array.from({
+    length: 20
+  }, () => client().newsroom()));
+  expect(values.every(value => value.name === 'room')).toBe(true);
+  expect(fetchMock).toHaveBeenCalledTimes(1);
+  yield tick();
+  yield client().newsroom();
+  expect(fetchMock).toHaveBeenCalledTimes(1);
+}));
+it.each([['token', {
+  accessToken: 'second-token'
+}], ['source', {
+  baseUrl: 'https://another.example.test'
+}], ['headers', {
+  headers: {
+    'x-test-scope': 'second'
+  }
+}]])('isolates concurrent and warm values by %s', /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(function* (_label, change) {
+    var fetchMock = jest.fn(/*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator(function* (url, init) {
+        return response(JSON.stringify([url, init === null || init === void 0 ? void 0 : init.headers]));
+      });
+      return function (_x3, _x4) {
+        return _ref4.apply(this, arguments);
+      };
+    }());
+    globalThis.fetch = fetchMock;
+    var caching = cache();
+    var a = () => _server.PrezlyAdapter.connect(config, {
+      cache: caching
+    }).usePrezlyClient().contentDelivery;
+    var b = () => _server.PrezlyAdapter.connect(_objectSpread(_objectSpread({}, config), change), {
+      cache: caching
+    }).usePrezlyClient().contentDelivery;
+    var _yield$Promise$all = yield Promise.all([a().newsroom(), b().newsroom()]),
+      _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2),
+      first = _yield$Promise$all2[0],
+      second = _yield$Promise$all2[1];
+    expect(first.name).not.toBe(second.name);
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    yield tick();
+    expect((yield a().newsroom()).name).toBe(first.name);
+    yield tick();
+    expect((yield b().newsroom()).name).toBe(second.name);
+  });
+  return function (_x, _x2) {
+    return _ref3.apply(this, arguments);
+  };
+}());
+it('isolates newsroom, theme, formats, namespace and invalidation version', /*#__PURE__*/_asyncToGenerator(function* () {
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return response('room');
+  }));
+  globalThis.fetch = fetchMock;
+  var caching = cache();
+  var variants = [[config, caching], [_objectSpread(_objectSpread({}, config), {}, {
+    newsroom: 'another'
+  }), caching], [_objectSpread(_objectSpread({}, config), {}, {
+    theme: 'theme'
+  }), caching], [_objectSpread(_objectSpread({}, config), {}, {
+    formats: [_sdk.Story.FormatVersion.SLATEJS_V6]
+  }), caching], [config, _objectSpread(_objectSpread({}, caching), {}, {
+    namespace: "".concat(caching.namespace, "-other")
+  })], [config, _objectSpread(_objectSpread({}, caching), {}, {
+    latestVersion: 2
+  })]];
+  yield Promise.all(variants.map(_ref7 => {
+    var _ref8 = _slicedToArray(_ref7, 2),
+      cfg = _ref8[0],
+      storage = _ref8[1];
+    return _server.PrezlyAdapter.connect(cfg, {
+      cache: storage
+    }).usePrezlyClient().contentDelivery.newsroom();
+  }));
+  expect(fetchMock).toHaveBeenCalledTimes(6);
+  yield tick();
+  yield _server.PrezlyAdapter.connect(config, {
+    cache: _objectSpread(_objectSpread({}, caching), {}, {
+      latestVersion: 3
+    })
+  }).usePrezlyClient().contentDelivery.newsroom();
+  expect(fetchMock).toHaveBeenCalledTimes(7);
+}));
+it('requires explicit scope to share custom fetch across adapter instances', /*#__PURE__*/_asyncToGenerator(function* () {
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return response('room');
+  }));
+  var create = caching => _server.PrezlyAdapter.connect(config, {
+    cache: caching,
+    fetch: fetchMock
+  }).usePrezlyClient().contentDelivery;
+  var unscoped = cache();
+  yield Promise.all([create(unscoped).newsroom(), create(unscoped).newsroom()]);
+  expect(fetchMock).toHaveBeenCalledTimes(2);
+  var scoped = _objectSpread(_objectSpread({}, cache()), {}, {
+    requestScope: 'immutable-custom-transport'
+  });
+  yield Promise.all([create(scoped).newsroom(), create(scoped).newsroom()]);
+  expect(fetchMock).toHaveBeenCalledTimes(3);
+}));
+it('does not buffer or change calls made using the raw SDK client', /*#__PURE__*/_asyncToGenerator(function* () {
+  var result = response('raw');
+  var read = jest.spyOn(result, 'arrayBuffer');
+  var fetchMock = jest.fn(/*#__PURE__*/function () {
+    var _ref10 = _asyncToGenerator(function* (_input, _init) {
+      return result;
+    });
+    return function (_x5, _x6) {
+      return _ref10.apply(this, arguments);
+    };
+  }());
+  var _PrezlyAdapter$connec = _server.PrezlyAdapter.connect(config, {
+      cache: cache(),
+      fetch: fetchMock
+    }).usePrezlyClient(),
+    client = _PrezlyAdapter$connec.client;
+  expect((yield client.newsrooms.get('room')).name).toBe('raw');
+  expect(read).not.toHaveBeenCalled();
+  expect(fetchMock.mock.calls[0][1]).not.toHaveProperty('signal');
+}));
+it('recovers from an actual SDK error without poisoning the shared key', /*#__PURE__*/_asyncToGenerator(function* () {
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return response('recovered');
+  }));
+  fetchMock.mockRejectedValueOnce(new Error('offline'));
+  globalThis.fetch = fetchMock;
+  var caching = cache();
+  var client = () => _server.PrezlyAdapter.connect(config, {
+    cache: caching
+  }).usePrezlyClient().contentDelivery;
+  var failed = yield Promise.allSettled(Array.from({
+    length: 20
+  }, () => client().newsroom()));
+  expect(failed.every(value => value.status === 'rejected')).toBe(true);
+  expect(fetchMock).toHaveBeenCalledTimes(1);
+  expect((yield client().newsroom()).name).toBe('recovered');
+  expect(fetchMock).toHaveBeenCalledTimes(2);
+}));
+it('fetches every allStories page through the SDK with only one transport slot', /*#__PURE__*/_asyncToGenerator(function* () {
+  var fetchMock = jest.fn(/*#__PURE__*/function () {
+    var _ref14 = _asyncToGenerator(function* (url, init) {
+      if (String(url).endsWith('/room')) return response('room');
+      var _JSON$parse = JSON.parse(init.body),
+        offset = _JSON$parse.offset;
+      return new Response(JSON.stringify({
+        stories: [offset]
+      }));
+    });
+    return function (_x7, _x8) {
+      return _ref14.apply(this, arguments);
+    };
+  }());
+  var sdk = (0, _sdk.createPrezlyClient)(_objectSpread(_objectSpread({}, config), {}, {
+    fetch: (0, _requests.createBoundedFetch)(fetchMock, new _requests.FetchScheduler({
+      concurrency: 1
+    }))
+  }));
+  var caching = {
+    storage: _themeKitCore.ContentDelivery.createSharedMemoryCache(),
+    scope: "aggregate-".concat(sequence++),
+    latestVersion: 1
+  };
+  var clients = Array.from({
+    length: 20
+  }, () => _themeKitCore.ContentDelivery.createClient(sdk, 'room', undefined, {
+    cache: caching
+  }));
+  expect(yield Promise.all(clients.map(client => client.allStories()))).toEqual(Array.from({
+    length: 20
+  }, () => [0, 200, 400]));
+  expect(fetchMock).toHaveBeenCalledTimes(4);
+}));
+it('handles a large newsroom without overflowing its own global transport queue', /*#__PURE__*/_asyncToGenerator(function* () {
+  var active = 0;
+  var peak = 0;
+  var fetchMock = jest.fn(/*#__PURE__*/function () {
+    var _ref16 = _asyncToGenerator(function* (url, init) {
+      if (String(url).endsWith('/room')) {
+        return new Response(JSON.stringify({
+          newsroom: {
+            name: 'large',
+            stories_number: 60000
+          }
+        }));
+      }
+      active++;
+      peak = Math.max(active, peak);
+      yield tick();
+      active--;
+      var _JSON$parse2 = JSON.parse(init.body),
+        offset = _JSON$parse2.offset;
+      return new Response(JSON.stringify({
+        stories: [offset]
+      }));
+    });
+    return function (_x9, _x0) {
+      return _ref16.apply(this, arguments);
+    };
+  }());
+  globalThis.fetch = fetchMock;
+  var caching = cache();
+  var request = () => _server.PrezlyAdapter.connect(config, {
+    cache: caching
+  }).usePrezlyClient().contentDelivery.allStories();
+  var expected = Array.from({
+    length: 300
+  }, (_, index) => index * 200);
+  expect(yield Promise.all(Array.from({
+    length: 20
+  }, request))).toEqual(Array.from({
+    length: 20
+  }, () => expected));
+  expect(fetchMock).toHaveBeenCalledTimes(301);
+  expect(peak).toBeLessThanOrEqual(8);
+}));
+it('stops producing later story batches on failure and can retry the aggregate', /*#__PURE__*/_asyncToGenerator(function* () {
+  var fail = true;
+  var fetchMock = jest.fn(/*#__PURE__*/function () {
+    var _ref18 = _asyncToGenerator(function* (url, init) {
+      if (String(url).endsWith('/room')) {
+        return new Response(JSON.stringify({
+          newsroom: {
+            stories_number: 60000
+          }
+        }));
+      }
+      var _JSON$parse3 = JSON.parse(init.body),
+        offset = _JSON$parse3.offset;
+      if (offset === 0 && fail) throw new Error('page unavailable');
+      return new Response(JSON.stringify({
+        stories: [offset]
+      }));
+    });
+    return function (_x1, _x10) {
+      return _ref18.apply(this, arguments);
+    };
+  }());
+  globalThis.fetch = fetchMock;
+  var adapter = _server.PrezlyAdapter.connect(config, {
+    cache: cache()
+  });
+  yield expect(adapter.usePrezlyClient().contentDelivery.allStories()).rejects.toThrow('page unavailable');
+  yield tick();
+  expect(fetchMock).toHaveBeenCalledTimes(9); // newsroom + the first bounded batch only
+  fail = false;
+  expect(yield adapter.usePrezlyClient().contentDelivery.allStories()).toHaveLength(300);
+}));