@travetto/cache 3.4.5 → 4.0.0-rc.0

package/package.json

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

package/src/service.ts

@@ -1,7 +1,7 @@
 import { ExpiresAt, Model, ModelExpirySupport, NotFoundError } from '@travetto/model';
 import { Text } from '@travetto/schema';
 import { Inject, Injectable } from '@travetto/di';
-import { GlobalEnv } from '@travetto/base';
+import { Env } from '@travetto/base';
 import { isStorageSupported } from '@travetto/model/src/internal/service/common';
 
 import { CacheError } from './error';
@@ -35,7 +35,7 @@ export class CacheService {
   }
 
   async postConstruct(): Promise<void> {
-    if (isStorageSupported(this.#modelService) && GlobalEnv.dynamic) {
+    if (isStorageSupported(this.#modelService) && Env.dynamic) {
       await this.#modelService.createModel?.(CacheRecord);
     }
   }

package/src/util.ts

@@ -1,4 +1,4 @@
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 
 import { ObjectUtil } from '@travetto/base';
 import { CoreCacheConfig } from './types';

package/support/test/service.ts

@@ -1,11 +1,12 @@
-import assert from 'assert';
+import assert from 'node:assert';
+import timers from 'node:timers/promises';
 
 import { Suite, Test } from '@travetto/test';
 import { ModelExpirySupport } from '@travetto/model';
 import { Inject, Injectable } from '@travetto/di';
 import { InjectableSuite } from '@travetto/di/support/test/suite';
 import { ModelSuite } from '@travetto/model/support/test/suite';
-import { Class, TimeUtil } from '@travetto/base';
+import { Class } from '@travetto/base';
 import { Schema } from '@travetto/schema';
 
 import { Cache, EvictCache } from '../../src/decorator';
@@ -28,37 +29,37 @@ class SampleService {
 
   @Cache('source')
   async basic(num: number) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
     return num * 2;
   }
 
   @Cache('source', '.5s')
   async agesQuickly(num: number) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
     return num * 3;
   }
 
   @Cache('source', 200, { extendOnAccess: true })
   async ageExtension(num: number) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
     return num * 3;
   }
 
   @Cache('source')
   async complexInput(config: object, size: number) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
     return { length: Object.keys(config).length, size };
   }
 
   @Cache('source', { key: config => config.a })
   async customKey(config: object, size: number) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
     return { length: Object.keys(config).length, size };
   }
 
   @Cache('source', { keySpace: 'user.id', reinstate: x => User.from(x as User) })
   async getUser(userId: string) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
 
     return {
       id: userId,
@@ -68,7 +69,7 @@ class SampleService {
 
   @EvictCache('source', { keySpace: 'user.id' })
   async deleteUser(userId: string) {
-    await TimeUtil.wait(100);
+    await timers.setTimeout(100);
     return true;
   }
 }
@@ -112,7 +113,7 @@ export abstract class CacheServiceSuite {
     assert(diff > 75);
     assert(res === 30);
 
-    await TimeUtil.wait(510);
+    await timers.setTimeout(510);
 
     start = Date.now();
     res = await service.agesQuickly(10);
@@ -132,7 +133,7 @@ export abstract class CacheServiceSuite {
     assert(res === 30);
 
     for (let i = 0; i < 2; i += 1) {
-      await TimeUtil.wait(55);
+      await timers.setTimeout(55);
 
       start = Date.now();
       res = await service.ageExtension(10);
@@ -141,7 +142,7 @@ export abstract class CacheServiceSuite {
       assert(res === 30);
     }
 
-    await TimeUtil.wait(210);
+    await timers.setTimeout(210);
     start = Date.now();
     res = await service.ageExtension(10);
     diff = Date.now() - start;