@raketa-cloud/next 1.0.0 → 1.0.3

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@raketa-cloud/next",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "main": "src/index.js",
   "scripts": {
-    "check-types": "tsc --noEmit"
+    "check-types": "tsc --noEmit",
+    "format": "prettier --write src/**/*.js"
   },
   "devDependencies": {
     "@repo/typescript-config": "*",
@@ -11,12 +12,14 @@
     "@types/node": "^20.11.24",
     "@types/react": "18.3.0",
     "@types/react-dom": "18.3.1",
+    "prettier": "^3.8.3",
     "typescript": "5.5.4"
   },
   "dependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
     "graphql-request": "7.1.2",
-    "lru-cache": "11.0.2"
+    "lru-cache": "11.0.2",
+    "object-sizeof": "^2.6.5",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   }
 }

package/src/Cache.js

@@ -1,20 +1,49 @@
 import { LRUCache } from "lru-cache";
+import sizeof from "object-sizeof";
 
-const UNDEFINED_VALUE = Symbol("udef");
+const NULL_SENTINEL = Symbol.for("raketa_cache_null");
+
+function getKeySize(key) {
+  if (typeof key === 'string') {
+    // Account for UTF-16 encoding
+    return Buffer.from(key, 'utf16le').length;
+  }
+
+  if (typeof key === 'number') {
+    return 8; // 64-bit number
+  }
+
+  if (typeof key === 'object') {
+    return sizeof(key);
+  }
+
+  return 0;
+}
 
 export default class Cache {
   constructor(opts = {}) {
     const cacheOptions = {
-      max: opts.max || 5000,
-      ttl: opts.ttl || 1000 * 60 * 2,
+      max: opts.max || 5000, // Items count
+      ttl: opts.ttl || 1000 * 60 * 5, // 5 minutes
+      maxSize: opts.maxSize || 500 * 1024 * 1024, // 500 MB
       allowStale: true,
       noDeleteOnStaleGet: true,
     };
 
+    cacheOptions.sizeCalculation = (value, key) => {
+      const keySize = getKeySize(key);
+
+      if (value === null || value === undefined) {
+        return keySize;
+      }
+
+      if (value === NULL_SENTINEL) return keySize + 1;
+
+      return keySize + sizeof(value);
+    };
+
     this.debugMode = opts.debugMode || false;
-    this.cacheInstance = new LRUCache({
-      ...cacheOptions,
-    });
+    this.cacheInstance = new LRUCache(cacheOptions);
   }
 
   _debug(msg) {
@@ -29,12 +58,22 @@ export default class Cache {
     const cachedValue = this.cacheInstance.get(key, { status });
 
     return {
-      cachedValue: cachedValue === UNDEFINED_VALUE ? null : cachedValue,
+      cachedValue: cachedValue === NULL_SENTINEL ? null : cachedValue,
       status,
     };
   }
 
   _cloneObject(obj) {
+    if (obj === null || obj === undefined) {
+      return obj;
+    }
+
+    const type = typeof obj;
+
+    if (type !== "function" || type !== "obj") {
+      return obj;
+    }
+
     // Ah the JS world! See the official docs https://developer.mozilla.org/en-US/docs/Glossary/Deep_copy.
     // Important note - this works only for objects with primitive types to copy. If an object property is
     // a function - well it will not work correctly...
@@ -44,10 +83,30 @@ export default class Cache {
   _setInCache(key, value) {
     this.cacheInstance.set(
       key,
-      value ? this._cloneObject(value) : UNDEFINED_VALUE
+      value ? this._cloneObject(value) : NULL_SENTINEL
     );
   }
 
+  clear() {
+    this.cacheInstance.clear();
+  }
+
+  forEach(callback) {
+    this.cacheInstance.forEach(callback);
+  }
+
+  getRemainingTTL(key) {
+    return this.cacheInstance.getRemainingTTL(key);
+  }
+
+  get calculatedSize() {
+    return this.cacheInstance.calculatedSize;
+  }
+
+  get maxSize() {
+    return this.cacheInstance.maxSize;
+  }
+
   async fetch(cacheKey, fetcher) {
     const { cachedValue, status } = this._fetchFromCache(cacheKey);
 

package/src/dxp/public/Articles.js

@@ -2,7 +2,7 @@ import DxpModel from "./DxpModel";
 import { ArticleBySlugDocument, ArticlesDocument } from "./documents";
 
 export default class Articles extends DxpModel {
-  async find(locale, slug, opts = {}) {
+  async find(locale, slug, resourceType = null, opts = {}) {
     const response = await this.fetch(
       `article-${locale}-${slug}`,
       async () =>
@@ -12,6 +12,7 @@ export default class Articles extends DxpModel {
             input: {
               locale,
               slug,
+              resourceType
             },
           },
           opts

package/src/dxp/public/Events.js

@@ -2,7 +2,7 @@ import DxpModel from "./DxpModel";
 import { EventBySlugDocument, EventsDocument } from "./documents";
 
 export default class Events extends DxpModel {
-  async find(locale, slug, opts = {}) {
+  async find(locale, slug, resourceType = null, opts = {}) {
     const response = await this.fetch(
       `event-${locale}-${slug}`,
       async () =>
@@ -12,6 +12,7 @@ export default class Events extends DxpModel {
             input: {
               locale,
               slug,
+              resourceType
             },
           },
           opts

package/src/dxp/public/Pages.js

@@ -2,7 +2,7 @@ import DxpModel from "./DxpModel";
 import { PageBySlugDocument, PagesDocument } from "./documents";
 
 export default class Pages extends DxpModel {
-  async find(locale, slug, opts = {}) {
+  async find(locale, slug, resourceType, opts = {}) {
     const response = await this.fetch(
       `page-${locale}-${slug}`,
       async () =>
@@ -12,6 +12,7 @@ export default class Pages extends DxpModel {
             input: {
               locale,
               slug,
+              resourceType
             },
           },
           opts