@prezly/theme-kit-core 8.0.0 → 8.0.1

package/build/content-delivery/cache/memory.cjs

@@ -3,39 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.RECORDS_LIMIT = void 0;
 exports.createSharedMemoryCache = createSharedMemoryCache;
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
-var RECORDS_LIMIT = 10000;
+var RECORDS_LIMIT = exports.RECORDS_LIMIT = 10000;
 var GC_PROBABILITY = 1 / 100;
 var CACHE = new Map();
 function createSharedMemoryCache() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  function gc() {
-    Array.from(CACHE.entries()).sort((_ref, _ref2) => {
-      var [, a] = _ref;
-      var [, b] = _ref2;
-      return cmp(a.accessed, b.accessed);
-    }).slice(RECORDS_LIMIT).forEach(_ref3 => {
-      var [key] = _ref3;
-      CACHE.delete("".concat(prefix).concat(key));
-    });
-  }
   return {
     get(key, latestVersion) {
-      var entry = CACHE.get(key);
+      var entry = CACHE.get("".concat(prefix).concat(key));
       if (!entry) {
         return undefined;
       }
       if (entry.version < latestVersion) {
-        CACHE.delete(key);
+        CACHE.delete("".concat(prefix).concat(key));
         return undefined;
       }
       var {
         value,
         version
       } = entry;
-      CACHE.set(key, {
+      CACHE.set("".concat(prefix).concat(key), {
         value,
         version,
         accessed: new Date().getTime()
@@ -48,7 +39,7 @@ function createSharedMemoryCache() {
         version,
         accessed: new Date().getTime()
       };
-      CACHE.set(key, entry);
+      CACHE.set("".concat(prefix).concat(key), entry);
       if (CACHE.size > RECORDS_LIMIT && Math.random() < GC_PROBABILITY) {
         gc();
       }
@@ -58,6 +49,16 @@ function createSharedMemoryCache() {
     }
   };
 }
+function gc() {
+  Array.from(CACHE.entries()).sort((_ref, _ref2) => {
+    var [, a] = _ref;
+    var [, b] = _ref2;
+    return -cmp(a.accessed, b.accessed);
+  }).slice(RECORDS_LIMIT).forEach(_ref3 => {
+    var [key] = _ref3;
+    CACHE.delete(key);
+  });
+}
 function cmp(a, b) {
   if (a === b) return 0;
   return a < b ? -1 : 1;

package/build/content-delivery/cache/memory.d.ts

@@ -1,2 +1,3 @@
 import type { Cache } from './type';
+export declare const RECORDS_LIMIT = 10000;
 export declare function createSharedMemoryCache(prefix?: string): Cache;

package/build/content-delivery/cache/memory.mjs

@@ -1,35 +1,25 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
-var RECORDS_LIMIT = 10000;
+export var RECORDS_LIMIT = 10000;
 var GC_PROBABILITY = 1 / 100;
 var CACHE = new Map();
 export function createSharedMemoryCache() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  function gc() {
-    Array.from(CACHE.entries()).sort((_ref, _ref2) => {
-      var [, a] = _ref;
-      var [, b] = _ref2;
-      return cmp(a.accessed, b.accessed);
-    }).slice(RECORDS_LIMIT).forEach(_ref3 => {
-      var [key] = _ref3;
-      CACHE.delete("".concat(prefix).concat(key));
-    });
-  }
   return {
     get(key, latestVersion) {
-      var entry = CACHE.get(key);
+      var entry = CACHE.get("".concat(prefix).concat(key));
       if (!entry) {
         return undefined;
       }
       if (entry.version < latestVersion) {
-        CACHE.delete(key);
+        CACHE.delete("".concat(prefix).concat(key));
         return undefined;
       }
       var {
         value,
         version
       } = entry;
-      CACHE.set(key, {
+      CACHE.set("".concat(prefix).concat(key), {
         value,
         version,
         accessed: new Date().getTime()
@@ -42,7 +32,7 @@ export function createSharedMemoryCache() {
         version,
         accessed: new Date().getTime()
       };
-      CACHE.set(key, entry);
+      CACHE.set("".concat(prefix).concat(key), entry);
       if (CACHE.size > RECORDS_LIMIT && Math.random() < GC_PROBABILITY) {
         gc();
       }
@@ -52,6 +42,16 @@ export function createSharedMemoryCache() {
     }
   };
 }
+function gc() {
+  Array.from(CACHE.entries()).sort((_ref, _ref2) => {
+    var [, a] = _ref;
+    var [, b] = _ref2;
+    return -cmp(a.accessed, b.accessed);
+  }).slice(RECORDS_LIMIT).forEach(_ref3 => {
+    var [key] = _ref3;
+    CACHE.delete(key);
+  });
+}
 function cmp(a, b) {
   if (a === b) return 0;
   return a < b ? -1 : 1;

package/build/content-delivery/cache/memory.test.cjs

@@ -0,0 +1,54 @@
+"use strict";
+
+var _memory = require("./memory.cjs");
+describe('createSharedMemoryCache', () => {
+  it('should write and read keys', () => {
+    var cache = (0, _memory.createSharedMemoryCache)();
+    expect(cache.get('hello', 0)).toBeUndefined();
+    cache.set('hello', 'world', 0);
+    expect(cache.get('hello', 0)).toBe('world');
+  });
+  it('should delete accessed records if the current version is higher', () => {
+    var cache = (0, _memory.createSharedMemoryCache)();
+    cache.set('hello', 'world', 0);
+    expect(cache.get('hello', 0)).toBe('world');
+    expect(cache.get('hello', 1)).toBeUndefined();
+    expect(cache.get('hello', 0)).toBeUndefined();
+  });
+  it('should separate datasets by namespace', () => {
+    var cache = (0, _memory.createSharedMemoryCache)();
+    var a = cache.namespace('a:');
+    var b = cache.namespace('b:');
+    a.set('hello', 'world', 0);
+    b.set('hello', 'universe', 0);
+    expect(cache.get('hello', 0)).toBeUndefined();
+    expect(a.get('hello', 0)).toBe('world');
+    expect(b.get('hello', 0)).toBe('universe');
+  });
+  it('should garbage-collect old cache records when threshold is reached (with a chance of 1/100)', () => {
+    var cache = (0, _memory.createSharedMemoryCache)();
+    for (var i = 0; i < _memory.RECORDS_LIMIT; i += 1) {
+      cache.set("record-".concat(i), "value-".concat(i), 0);
+    }
+    for (var _i = 0; _i < _memory.RECORDS_LIMIT; _i += 1) {
+      expect(cache.get("record-".concat(_i), 0)).toBe("value-".concat(_i));
+    }
+
+    // Write 10% more records, 10 times to trigger CG
+    for (var repeat = 0; repeat < 10; repeat += 1) {
+      for (var _i2 = _memory.RECORDS_LIMIT; _i2 < _memory.RECORDS_LIMIT * 1.1; _i2 += 1) {
+        cache.set("record-".concat(_i2), "value-".concat(_i2), 0);
+      }
+    }
+
+    // the oldest part of the cache should be removed already
+    for (var _i3 = 0; _i3 < _memory.RECORDS_LIMIT * 0.09; _i3 += 1) {
+      expect(cache.get("record-".concat(_i3), 0)).toBeUndefined();
+    }
+
+    // and the rest kept
+    for (var _i4 = _memory.RECORDS_LIMIT * 0.11; _i4 < _memory.RECORDS_LIMIT * 1.1; _i4 += 1) {
+      expect(cache.get("record-".concat(_i4), 0)).toBe("value-".concat(_i4));
+    }
+  });
+});

package/build/content-delivery/cache/memory.test.mjs

@@ -0,0 +1,52 @@
+import { createSharedMemoryCache, RECORDS_LIMIT } from "./memory.mjs";
+describe('createSharedMemoryCache', () => {
+  it('should write and read keys', () => {
+    var cache = createSharedMemoryCache();
+    expect(cache.get('hello', 0)).toBeUndefined();
+    cache.set('hello', 'world', 0);
+    expect(cache.get('hello', 0)).toBe('world');
+  });
+  it('should delete accessed records if the current version is higher', () => {
+    var cache = createSharedMemoryCache();
+    cache.set('hello', 'world', 0);
+    expect(cache.get('hello', 0)).toBe('world');
+    expect(cache.get('hello', 1)).toBeUndefined();
+    expect(cache.get('hello', 0)).toBeUndefined();
+  });
+  it('should separate datasets by namespace', () => {
+    var cache = createSharedMemoryCache();
+    var a = cache.namespace('a:');
+    var b = cache.namespace('b:');
+    a.set('hello', 'world', 0);
+    b.set('hello', 'universe', 0);
+    expect(cache.get('hello', 0)).toBeUndefined();
+    expect(a.get('hello', 0)).toBe('world');
+    expect(b.get('hello', 0)).toBe('universe');
+  });
+  it('should garbage-collect old cache records when threshold is reached (with a chance of 1/100)', () => {
+    var cache = createSharedMemoryCache();
+    for (var i = 0; i < RECORDS_LIMIT; i += 1) {
+      cache.set("record-".concat(i), "value-".concat(i), 0);
+    }
+    for (var _i = 0; _i < RECORDS_LIMIT; _i += 1) {
+      expect(cache.get("record-".concat(_i), 0)).toBe("value-".concat(_i));
+    }
+
+    // Write 10% more records, 10 times to trigger CG
+    for (var repeat = 0; repeat < 10; repeat += 1) {
+      for (var _i2 = RECORDS_LIMIT; _i2 < RECORDS_LIMIT * 1.1; _i2 += 1) {
+        cache.set("record-".concat(_i2), "value-".concat(_i2), 0);
+      }
+    }
+
+    // the oldest part of the cache should be removed already
+    for (var _i3 = 0; _i3 < RECORDS_LIMIT * 0.09; _i3 += 1) {
+      expect(cache.get("record-".concat(_i3), 0)).toBeUndefined();
+    }
+
+    // and the rest kept
+    for (var _i4 = RECORDS_LIMIT * 0.11; _i4 < RECORDS_LIMIT * 1.1; _i4 += 1) {
+      expect(cache.get("record-".concat(_i4), 0)).toBe("value-".concat(_i4));
+    }
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prezly/theme-kit-core",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Data layer and utility library for developing Prezly themes with JavaScript",
   "main": "build/index.mjs",
   "types": "build/index.d.ts",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2561eeb2181adf7e01783ac5bddaafab70a04b44"
+  "gitHead": "3068afdd286035a4d0cf106ca25070114a779b25"
 }