@travetto/cache 5.1.0 → 6.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cache",
-  "version": "5.1.0",
+  "version": "6.0.0-rc.1",
   "description": "Caching functionality with decorators for declarative use.",
   "keywords": [
     "typescript",
@@ -25,12 +25,12 @@
     "directory": "module/cache"
   },
   "dependencies": {
-    "@travetto/di": "^5.1.0",
-    "@travetto/model": "^5.1.0"
+    "@travetto/di": "^6.0.0-rc.1",
+    "@travetto/model": "^6.0.0-rc.1"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.1.0",
-    "@travetto/transformer": "^5.1.0"
+    "@travetto/test": "^6.0.0-rc.1",
+    "@travetto/transformer": "^6.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/service.ts

@@ -1,7 +1,7 @@
 import { ExpiresAt, Index, Model, ModelExpirySupport, NotFoundError } from '@travetto/model';
 import { Text } from '@travetto/schema';
 import { Inject, Injectable } from '@travetto/di';
-import { AppError, Runtime, TimeUtil } from '@travetto/runtime';
+import { AppError, Runtime, TimeUtil, Util } from '@travetto/runtime';
 import { isIndexedSupported, isStorageSupported } from '@travetto/model/src/internal/service/common';
 
 import { CacheError } from './error';
@@ -75,7 +75,7 @@ export class CacheService {
     }
 
     const res = await this.#modelService.get(CacheRecord, id);
-    return CacheUtil.fromSafeJSON(res.entry);
+    return Util.decodeSafeJSON(res.entry);
   }
 
   /**
@@ -84,7 +84,7 @@ export class CacheService {
    * @returns
    */
   async set(id: string, keySpace: string, entry: unknown, maxAge?: number): Promise<unknown> {
-    const entryText = CacheUtil.toSafeJSON(entry);
+    const entryText = Util.encodeSafeJSON(entry);
 
     const store = await this.#modelService.upsert(CacheRecord,
       CacheRecord.from({
@@ -96,7 +96,7 @@ export class CacheService {
       }),
     );
 
-    return CacheUtil.fromSafeJSON(store.entry);
+    return Util.decodeSafeJSON(store.entry);
   }
 
   /**

package/src/util.ts

@@ -1,4 +1,4 @@
-import { BinaryUtil } from '@travetto/runtime';
+import { BinaryUtil, Util } from '@travetto/runtime';
 
 import { CoreCacheConfig } from './types';
 
@@ -7,34 +7,13 @@ import { CoreCacheConfig } from './types';
  */
 export class CacheUtil {
 
-  /**
-   * Convert value to safe JSON for persistence
-   * @param value The value to make safe for storage
-   * @param all Should functions and regex be included
-   */
-  static toSafeJSON(value: unknown, all = false): string {
-    const replacer = all ?
-      ((key: string, val: unknown): unknown => (val && val instanceof RegExp) ? val.source : (typeof val === 'function' ? val.toString() : val)) :
-      undefined;
-
-    return Buffer.from(JSON.stringify(value, replacer)).toString('base64');
-  }
-
-  /**
-   * Read safe JSON back into an object
-   * @param value The value to read as safe JSON
-   */
-  static fromSafeJSON(value: string | undefined): unknown {
-    return value ? JSON.parse(Buffer.from(value, 'base64').toString('utf8')) : undefined;
-  }
-
   /**
    * Generate key given config, cache source and input params
    */
   static generateKey(config: CoreCacheConfig, params: unknown[]): string {
     const input = config.params?.(params) ?? params;
     const keyParams = config.key?.(...input) ?? input;
-    const key = `${config.keySpace!}_${this.toSafeJSON(keyParams)}`;
+    const key = `${config.keySpace!}_${Util.encodeSafeJSON(keyParams)}`;
     return BinaryUtil.hash(key, 32);
   }
 }

package/support/test/service.ts

@@ -12,7 +12,6 @@ import { Schema } from '@travetto/schema';
 
 import { Cache, EvictCache } from '../../src/decorator';
 import { CacheModelSymbol, CacheService } from '../../src/service';
-import { CacheUtil } from '../../src/util';
 
 @Schema()
 class User { }
@@ -170,8 +169,6 @@ export abstract class CacheServiceSuite {
     const val5 = await service.complexInput({ a: /abc/ }, 20);
     assert(val3 !== val4);
     assert.deepStrictEqual(val3, val5);
-
-    assert(CacheUtil.toSafeJSON(/abc/, true) !== CacheUtil.toSafeJSON(/cde/, true));
   }
 
   @Test()