limited-cache 2.0.0 → 2.1.1

package/dist/types.d.ts

@@ -1,60 +1,58 @@
-export declare type DefaultItemType = any;
-export interface LimitedCacheOptionsFull {
-    /** Items will be removed to keep the cache within the maxCacheSize limit */
-    maxCacheSize: number;
-    /** Items will be removed and never returned if they were set more than maxCacheTime milliseconds ago */
-    maxCacheTime: number;
-    /** (dev only) A warning will be emitted if an item rotates out of the cache before this many milliseconds have passed, to indicate the size is too small */
-    warnIfItemPurgedBeforeTime: number;
-    /** (private) Internal cleanup of old keys will be performed after this many operations */
-    opLimit: number;
-    /** (private) Internal optimization to adjust how much searching will be done to find expired items, to avoid being O(n) */
-    scanLimit: number;
-}
-export declare type LimitedCacheOptions = Partial<LimitedCacheOptionsFull> | null;
-export declare type LimitedCacheOptionsReadonly = Readonly<LimitedCacheOptionsFull>;
-export interface LimitedCacheInstance<ItemType = DefaultItemType> {
-    /** Return the requested item, if it has not expired */
-    get: (cacheKey: string) => ItemType | undefined;
-    /** Return all non-expired items */
-    getAll: () => Record<string, ItemType>;
-    /** Indicate whether or not the requested item is present and has not expired */
-    has: (cacheKey: string) => boolean;
-    /** Add the item to the cache, or update its timestamp if it already exists */
-    set: (cacheKey: string, item: ItemType) => ItemType;
-    /** Remove the requested item from the cache, if necessary */
-    remove: (cacheKey: string) => true;
-    /** Remove all items and all timestamps from the cache */
-    reset: () => LimitedCacheMeta<ItemType>;
-    /** Return a serializable representation of the cache internals, suitable for long-term storage */
-    getCacheMeta: () => LimitedCacheMeta<ItemType>;
-    /** Return the cache's current values for all options */
-    getOptions: () => LimitedCacheOptionsFull;
-    /** Update one or more of the cache's options */
-    setOptions: (newOptions: LimitedCacheOptions) => LimitedCacheOptionsReadonly;
-    /** Reduces cache size by cleaning up old keys and expired items */
-    doMaintenance: () => LimitedCacheMeta<ItemType>;
-}
-export interface LimitedCacheObjectInstance<ItemType = DefaultItemType> {
-    [key: string]: ItemType;
-}
-/**
- *  A serializable representation of the cache internals, suitable for long-term storage
- */
-export interface LimitedCacheMeta<ItemType = DefaultItemType> {
-    /** Schema version: old versions will be upgraded if possible, or a warning will be emitted if not */
-    limitedCacheMetaVersion: number;
-    /** Options to control cache size, time, and behavior */
-    options: LimitedCacheOptionsReadonly;
-    /** The values in the cache, stored by key. Will include old keys not yet garbage collected */
-    cache: Record<string, ItemType | undefined>;
-    /** List of keys that have been set, in chronological order. Used to find cache items most likely to be expired */
-    keyList: Array<string>;
-    /** The [setTime, expirationTime] for each key that has been set. Removed on unset. */
-    keyInfo: Record<string, [
-        number,
-        number
-    ] | undefined>;
-    /** Number of operations remaining until internal cleanup of old keys is performed. Based on options.opLimit */
-    opsLeft: number;
-}
+export type DefaultItemType = any;
+export interface LimitedCacheOptionsFull {
+    /** Items will be removed to keep the cache within the maxCacheSize limit */
+    maxCacheSize: number;
+    /** Items will be removed and never returned if they were set more than maxCacheTime milliseconds ago */
+    maxCacheTime: number;
+    /** (dev only) A warning will be emitted if an item rotates out of the cache before this many milliseconds have passed, to indicate the size is too small */
+    warnIfItemPurgedBeforeTime: number;
+    /** (private) Internal cleanup of old keys will be performed after this many operations */
+    opLimit: number;
+    /** (private) Internal optimization to adjust how much searching will be done to find expired items, to avoid being O(n) */
+    scanLimit: number;
+}
+export type LimitedCacheOptions = Partial<LimitedCacheOptionsFull> | null;
+export type LimitedCacheOptionsReadonly = Readonly<LimitedCacheOptionsFull>;
+export interface LimitedCacheInstance<ItemType = DefaultItemType> {
+    /** Return the requested item, if it has not expired */
+    get: (cacheKey: string) => ItemType | undefined;
+    /** Return all non-expired items */
+    getAll: () => Record<string, ItemType>;
+    /** Indicate whether or not the requested item is present and has not expired */
+    has: (cacheKey: string) => boolean;
+    /** Add the item to the cache, or update its timestamp if it already exists */
+    set: (cacheKey: string, item: ItemType) => ItemType;
+    /** Remove the requested item from the cache, if necessary */
+    remove: (cacheKey: string) => true;
+    /** Remove all items and all timestamps from the cache */
+    reset: () => LimitedCacheMeta<ItemType>;
+    /** Return a serializable representation of the cache internals, suitable for long-term storage */
+    getCacheMeta: () => LimitedCacheMeta<ItemType>;
+    /** Return the cache's current values for all options */
+    getOptions: () => LimitedCacheOptionsFull;
+    /** Update one or more of the cache's options */
+    setOptions: (newOptions: LimitedCacheOptions) => LimitedCacheOptionsReadonly;
+    /** Reduces cache size by cleaning up old keys and expired items */
+    doMaintenance: () => LimitedCacheMeta<ItemType>;
+}
+export interface LimitedCacheObjectInstance<ItemType = DefaultItemType> {
+    [key: string]: ItemType;
+}
+/**
+ *  A serializable representation of the cache internals, suitable for long-term storage
+ */
+export interface LimitedCacheMeta<ItemType = DefaultItemType> {
+    /** Schema version: old versions will be upgraded if possible, or a warning will be emitted if not */
+    limitedCacheMetaVersion: number;
+    /** Options to control cache size, time, and behavior */
+    options: LimitedCacheOptionsReadonly;
+    /** The values in the cache, stored by key. Will include old keys not yet garbage collected */
+    cache: Record<string, ItemType | undefined>;
+    /** List of keys that have been set, in chronological order. Used to find cache items most likely to be expired */
+    keyList: Array<string>;
+    /** The [setTime, expirationTime] for each key that has been set. Removed on unset. */
+    keyInfo: Record<string, [number, number] | undefined>;
+    /** Number of operations remaining until internal cleanup of old keys is performed. Based on options.opLimit */
+    opsLeft: number;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC;AAElC,MAAM,WAAW,uBAAuB;IACtC,4EAA4E;IAC5E,YAAY,EAAE,MAAM,CAAC;IACrB,wGAAwG;IACxG,YAAY,EAAE,MAAM,CAAC;IAErB,4JAA4J;IAC5J,0BAA0B,EAAE,MAAM,CAAC;IACnC,0FAA0F;IAC1F,OAAO,EAAE,MAAM,CAAC;IAChB,2HAA2H;IAC3H,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC;AAC1E,MAAM,MAAM,2BAA2B,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAC;AAE5E,MAAM,WAAW,oBAAoB,CAAC,QAAQ,GAAG,eAAe;IAC9D,uDAAuD;IACvD,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,GAAG,SAAS,CAAC;IAChD,mCAAmC;IACnC,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,gFAAgF;IAChF,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,8EAA8E;IAC9E,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,KAAK,QAAQ,CAAC;IACpD,6DAA6D;IAC7D,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,yDAAyD;IACzD,KAAK,EAAE,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,kGAAkG;IAClG,YAAY,EAAE,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC/C,wDAAwD;IACxD,UAAU,EAAE,MAAM,uBAAuB,CAAC;IAC1C,gDAAgD;IAChD,UAAU,EAAE,CAAC,UAAU,EAAE,mBAAmB,KAAK,2BAA2B,CAAC;IAC7E,mEAAmE;IACnE,aAAa,EAAE,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,0BAA0B,CAAC,QAAQ,GAAG,eAAe;IACpE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB,CAAC,QAAQ,GAAG,eAAe;IAC1D,qGAAqG;IACrG,uBAAuB,EAAE,MAAM,CAAC;IAChC,wDAAwD;IACxD,OAAO,EAAE,2BAA2B,CAAC;IACrC,8FAA8F;IAC9F,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;IAC5C,kHAAkH;IAClH,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,sFAAsF;IACtF,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC;IACtD,+GAA+G;IAC/G,OAAO,EAAE,MAAM,CAAC;CACjB"}

package/dist/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "limited-cache",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "A minimal JS cache: like using an object, except it won't grow forever",
   "keywords": [
     "limited cache",
@@ -14,104 +14,112 @@
     "autoexpire"
   ],
   "license": "MIT",
-  "homepage": "https://github.com/spautz/limited-cache#readme",
+  "homepage": "https://github.com/spautz/limited-cache/tree/main/packages/limited-cache#readme",
   "bugs": "https://github.com/spautz/limited-cache/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/spautz/limited-cache.git"
+    "url": "git+https://github.com/spautz/limited-cache.git",
+    "directory": "packages/limited-cache"
   },
   "author": {
     "name": "Steven Pautz",
-    "url": "http://stevenpautz.com/"
+    "url": "https://github.com/spautz"
   },
   "publishConfig": {
     "access": "public",
+    "provenance": true,
     "tag": "next"
   },
   "files": [
     "dist/",
+    "docs/",
     "legacy-types/",
     "src/",
     "LICENSE",
     "*.md"
   ],
-  "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "jsnext:main": "dist/index.esm.js",
-  "types": "dist/index.d.ts",
-  "sideEffects": false,
-  "engines": {
-    "node": "^12 || ^14 || ^15 || ^16 || ^17",
-    "yarn": "1.*"
-  },
-  "scripts": {
-    "____ LIFECYCLE HOOKS _______________________________________________": "",
-    "prepare": "yon run build && husky install",
-    "prerelease": "yon run build:clean",
-    "prepublishOnly": "yarn run dev:readonly && yarn run build",
-    "____ INTEGRATION ___________________________________________________": "",
-    "clean": "yon run build:clean && yon run test:clean && rimraf ./node_modules/.cache/ *.log",
-    "dev": "yon run format && yon run types && yon run lint",
-    "dev:readonly": "yon run format:verify && yon run types && yon run lint",
-    "all": "yon run clean && yon run dev && yon run test:coverage && yon run build",
-    "all:readonly": "yon run dev:readonly && yon run test:coverage",
-    "____ ALIASES _______________________________________________________": "",
-    "test": "yon run test:coverage",
-    "____ INDIVIDUAL COMMANDS ___________________________________________": "",
-    "build": "yon run build:clean && yon run build:main && yon run build:verify && yon run build:types",
-    "build:clean": "rimraf ./dist ./legacy-types",
-    "build:main": "tsdx build",
-    "build:types": "yon run build:types:3.x && yon run build:types:4.x",
-    "build:types:3.x": "downlevel-dts ./dist ./legacy-types/ts3.x/dist --to=3.0",
-    "build:types:4.x": "downlevel-dts ./dist ./dist --to=4.0",
-    "build:verify": "node ./scripts/verify-build.js",
-    "build:watch": "tsdx watch",
-    "format": "prettier --write \"**/*.*\"",
-    "format:verify": "prettier --list-different \"**/*.*\"",
-    "lint": "tsdx lint . --max-warnings 0",
-    "lint-staged": "lint-staged",
-    "release:changelog": "standard-version --skip.commit --skip.tag --release-as ",
-    "release:tag": "standard-version --commit-all --sign --skip.changelog --release-as ",
-    "test:clean": "rimraf ./coverage",
-    "test:coverage": "yon run test:clean && tsdx test --coverage",
-    "test:nowatch": "yon run test:clean && tsdx test",
-    "test:watch": "yon run test:clean && tsdx test --watch",
-    "test:watchcoverage": "yon run test:clean && tsdx test --watchAll --coverage",
-    "types": "tsc --noEmit --p tsconfig.json"
+  "source": "./src/index.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": "./package.json"
   },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "jsnext:main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "sideEffects": false,
   "dependencies": {},
   "devDependencies": {
-    "@types/jest": "26.0.23",
-    "@types/node": "16.11.4",
-    "downlevel-dts": "0.7.0",
-    "husky": "7.0.4",
-    "lint-staged": "11.2.3",
-    "rimraf": "3.0.2",
-    "standard-version": "9.3.2",
-    "tsdx": "0.14.1",
-    "typescript": "4.4.4",
-    "yarn-or-npm": "3.0.1"
-  },
-  "resolutions": {
-    "**/@typescript-eslint/eslint-plugin": "^4.33.0",
-    "**/@typescript-eslint/parser": "^4.33.0"
+    "@types/node": "20.1.1"
   },
-  "lint-staged": {
-    "**/*.{css,html,js,jsx,json,less,md,scss,ts,tsx}": [
-      "prettier --write"
-    ]
-  },
-  "standard-version": {
-    "scripts": {
-      "postchangelog": "yon run format"
+  "peerDependencies": {},
+  "size-limit": [
+    {
+      "path": "dist/index.js",
+      "import": "{}",
+      "limit": "20 B"
+    },
+    {
+      "path": "dist/index.js",
+      "limit": "2 kB"
     }
-  },
+  ],
   "typesVersions": {
-    "<4": {
+    "<4.0": {
       "*": [
-        "legacy-types/ts3.x/*"
+        "legacy-types/ts3.5/index.d.ts"
+      ]
+    },
+    "<4.5": {
+      "*": [
+        "legacy-types/ts4.0/index.d.ts"
+      ]
+    },
+    "<4.7": {
+      "*": [
+        "legacy-types/ts4.5/index.d.ts"
+      ]
+    },
+    "*": {
+      "*": [
+        "dist/index.d.ts"
       ]
     }
+  },
+  "scripts": {
+    "____ HOOKS _________________________________________________________": "",
+    "____ INTEGRATION ___________________________________________________": "",
+    "clean": "pnpm run build:clean && pnpm run test:clean && rimraf --glob ./node_modules/.cache *.log",
+    "all": "pnpm run format                 && pnpm run typecheck && pnpm run lint:fix && pnpm run test:coverage && pnpm run build",
+    "all:readonly": "pnpm run format:verify && pnpm run typecheck && pnpm run lint     && pnpm run test:quick",
+    "all:quick": "pnpm run format           && pnpm run typecheck && pnpm run lint:fix",
+    "all:ci": "pnpm run format:verify       && pnpm run typecheck && pnpm run lint     && pnpm run test:ci && pnpm run build",
+    "____ INDIVIDUAL COMMANDS ___________________________________________": "",
+    "build": "pnpm run build:main && pnpm run sizecheck && pnpm run build:legacytypes",
+    "build:clean": "rimraf ./dist ./legacy-types",
+    "build:main": "pnpm run build:clean && tsup src/index.ts --format cjs && tsc -p ./tsconfig.build.json",
+    "build:legacytypes": "pnpm run build:legacytypes:3.5 && pnpm run build:legacytypes:4.0 && pnpm run build:legacytypes:4.5",
+    "build:legacytypes:3.5": "downlevel-dts ./dist ./legacy-types/ts3.5 --to=3.5",
+    "build:legacytypes:4.0": "downlevel-dts ./dist ./legacy-types/ts4.0 --to=4.0",
+    "build:legacytypes:4.5": "downlevel-dts ./dist ./legacy-types/ts4.5 --to=4.5",
+    "build:watch": "pnpm run build:clean && tsup src/index.ts --format esm,cjs --dts --watch",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
+    "lint:fix": "eslint . --max-warnings 0 --fix",
+    "sizecheck": "size-limit",
+    "test": "pnpm run test:coverage",
+    "test:clean": "rimraf ./coverage",
+    "test:ci": "pnpm run test:clean            && vitest run --coverage",
+    "test:coverage": "pnpm run test:clean      && vitest run --coverage",
+    "test:quick": "pnpm run test:clean         && vitest run --coverage=false",
+    "test:watch": "pnpm run test:clean         && vitest watch --coverage=false",
+    "test:watchcoverage": "pnpm run test:clean && vitest watch --coverage",
+    "typecheck": "tsc -p ./tsconfig.json --noEmit"
   }
-}
+}

package/src/__tests__/LimitedCache.test.ts

@@ -1,7 +1,7 @@
-/* eslint-env jest */
-import { defaultOptions } from '../core/defaultOptions';
-import { LimitedCache } from '../core/LimitedCache';
-import { LimitedCacheInstance } from '../types';
+import { describe, beforeEach, expect, it } from 'vitest';
+import { defaultOptions } from '../core/defaultOptions.js';
+import { LimitedCache } from '../core/LimitedCache.js';
+import { LimitedCacheInstance } from '../types.js';
 
 describe('LimitedCache', () => {
   it('initializes without options', () => {
@@ -23,9 +23,9 @@ describe('LimitedCache', () => {
   });
 
   describe('works as a standard cache', () => {
-    let myCache: LimitedCacheInstance<any>;
+    let myCache: LimitedCacheInstance<number | undefined>;
     beforeEach(() => {
-      myCache = LimitedCache<any>();
+      myCache = LimitedCache<number | undefined>();
     });
 
     it('has: when missing', () => {
@@ -115,9 +115,9 @@ describe('LimitedCache', () => {
   });
 
   describe('provides functions for managing options and meta', () => {
-    let myCache: LimitedCacheInstance<any>;
+    let myCache: LimitedCacheInstance<unknown>;
     beforeEach(() => {
-      myCache = LimitedCache<any>();
+      myCache = LimitedCache<unknown>();
     });
 
     it('getCacheMeta', () => {

package/src/__tests__/LimitedCacheObject.test.ts

@@ -1,7 +1,7 @@
-/* eslint-env jest */
-import { defaultOptions } from '../core/defaultOptions';
-import { LimitedCacheObject, getCacheMetaFromObject } from '../core/LimitedCacheObject';
-import { LimitedCacheObjectInstance } from '../types';
+import { describe, beforeEach, expect, it } from 'vitest';
+import { defaultOptions } from '../core/defaultOptions.js';
+import { LimitedCacheObject, getCacheMetaFromObject } from '../core/LimitedCacheObject.js';
+import { LimitedCacheObjectInstance } from '../types.js';
 
 describe('LimitedCacheObject', () => {
   it('initializes without options', () => {
@@ -23,9 +23,9 @@ describe('LimitedCacheObject', () => {
   });
 
   describe('look like a standard object', () => {
-    let myCache: LimitedCacheObjectInstance<any>;
+    let myCache: LimitedCacheObjectInstance<number>;
     beforeEach(() => {
-      myCache = LimitedCacheObject<any>();
+      myCache = LimitedCacheObject<number>();
     });
 
     it('has: when missing, via prototype hasOwnProperty', () => {
@@ -34,6 +34,7 @@ describe('LimitedCacheObject', () => {
     });
 
     it('has: when missing, via local hasOwnProperty', () => {
+      // eslint-disable-next-line no-prototype-builtins
       const result = myCache.hasOwnProperty('asdf');
       expect(result).toEqual(false);
     });
@@ -53,6 +54,7 @@ describe('LimitedCacheObject', () => {
     it('has: when present, via local hasOwnProperty', () => {
       myCache.abc = 123;
 
+      // eslint-disable-next-line no-prototype-builtins
       const result = myCache.hasOwnProperty('abc');
       expect(result).toEqual(true);
     });
@@ -132,7 +134,7 @@ describe('LimitedCacheObject', () => {
     });
   });
 
-  describe('offers a way to get the cacheMeta', () => {
+  it('offers a way to get the cacheMeta', () => {
     const myCache = LimitedCacheObject<number>();
     const result = getCacheMetaFromObject(myCache);
 

package/src/__tests__/lowLevelFunctions.test.ts

@@ -1,5 +1,5 @@
-/* eslint-env jest */
-import { defaultOptions } from '../core/defaultOptions';
+import { describe, beforeEach, expect, it, vitest } from 'vitest';
+import { defaultOptions } from '../core/defaultOptions.js';
 import {
   isCacheMeta,
   upgradeCacheMeta,
@@ -10,22 +10,26 @@ import {
   lowLevelSet,
   lowLevelRemove,
   lowLevelReset,
-} from '../core/lowLevelFunctions';
-import { LimitedCacheMeta } from '../types';
+} from '../core/lowLevelFunctions.js';
+import { LimitedCacheMeta } from '../types.js';
 
 describe('lowLevelFunctions', () => {
   describe('isCacheMeta', () => {
     it('accepts cacheMeta shapes', () => {
       expect(
-        // @ts-expect-error
         isCacheMeta({
           limitedCacheMetaVersion: 123,
+          options: defaultOptions,
+          cache: {},
+          keyList: [],
+          keyInfo: {},
+          opsLeft: 100,
         }),
       ).toBe(true);
     });
     it('rejects invalid cacheMeta shapes', () => {
       expect(
-        // @ts-expect-error
+        // @ts-expect-error Invalid cacheMeta shape
         isCacheMeta({
           cache: {},
         }),
@@ -35,7 +39,7 @@ describe('lowLevelFunctions', () => {
 
   describe('upgradeCacheMeta', () => {
     it('warns and upgrades if given an older, incompatible cacheMeta', () => {
-      const consoleWarnSpy = jest.spyOn(console, 'warn').mockReturnValueOnce();
+      const consoleWarnSpy = vitest.spyOn(console, 'warn').mockReturnValueOnce();
 
       const cacheMeta = lowLevelInit();
       cacheMeta.limitedCacheMetaVersion = 1;
@@ -49,7 +53,7 @@ describe('lowLevelFunctions', () => {
 
     it('throws if given an invalid cacheMeta', () => {
       expect(() => {
-        // @ts-expect-error
+        // @ts-expect-error Invalid cacheMeta shape
         upgradeCacheMeta({
           cache: {},
         });
@@ -59,7 +63,7 @@ describe('lowLevelFunctions', () => {
 
   describe('lowLevelInit', () => {
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
     });
 
     it('clones the default options', () => {
@@ -109,7 +113,7 @@ describe('lowLevelFunctions', () => {
     });
 
     it('warns and upgrades if given an older, incompatible cacheMeta', () => {
-      const consoleWarnSpy = jest.spyOn(console, 'warn').mockReturnValueOnce();
+      const consoleWarnSpy = vitest.spyOn(console, 'warn').mockReturnValueOnce();
 
       const existingCacheMeta = lowLevelInit();
       existingCacheMeta.limitedCacheMetaVersion = 1;
@@ -126,7 +130,7 @@ describe('lowLevelFunctions', () => {
   describe('lowLevelHas', () => {
     let myCacheMeta: LimitedCacheMeta;
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
       myCacheMeta = lowLevelInit({
         maxCacheTime: 1000,
       });
@@ -157,7 +161,7 @@ describe('lowLevelFunctions', () => {
   describe('lowLevelGetOne', () => {
     let myCacheMeta: LimitedCacheMeta;
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
       myCacheMeta = lowLevelInit({
         maxCacheTime: 1000,
       });
@@ -192,7 +196,7 @@ describe('lowLevelFunctions', () => {
   describe('lowLevelGetAll', () => {
     let myCacheMeta: LimitedCacheMeta;
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
       myCacheMeta = lowLevelInit({
         maxCacheTime: 1000,
       });
@@ -243,7 +247,7 @@ describe('lowLevelFunctions', () => {
   describe('lowLevelSet', () => {
     let myCacheMeta: LimitedCacheMeta;
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
       myCacheMeta = lowLevelInit({
         maxCacheTime: 1000,
       });
@@ -383,7 +387,7 @@ describe('lowLevelFunctions', () => {
   describe('lowLevelRemove', () => {
     let myCacheMeta: LimitedCacheMeta;
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
       myCacheMeta = lowLevelInit();
       myCacheMeta = lowLevelSet(myCacheMeta, 'abc', 123);
     });
@@ -412,7 +416,7 @@ describe('lowLevelFunctions', () => {
   describe('lowLevelReset', () => {
     let myCacheMeta: LimitedCacheMeta;
     beforeEach(() => {
-      jest.restoreAllMocks();
+      vitest.restoreAllMocks();
       myCacheMeta = lowLevelInit();
       myCacheMeta = lowLevelSet(myCacheMeta, 'abc', 123);
     });

package/src/__tests__/scenarios/keys.test.ts

@@ -1,5 +1,5 @@
-/* eslint-env jest */
-import { limitedCacheUtil, LimitedCacheMeta } from '../../index';
+import { describe, beforeEach, expect, it } from 'vitest';
+import { limitedCacheUtil, LimitedCacheMeta } from '../../index.js';
 
 describe('key names', () => {
   let myCacheMeta: LimitedCacheMeta;

package/src/__tests__/scenarios/maxCacheSize.test.ts

@@ -1,5 +1,5 @@
-/* eslint-env jest */
-import { LimitedCache, LimitedCacheInstance } from '../../index';
+import { describe, beforeEach, expect, it, vitest } from 'vitest';
+import { LimitedCache, LimitedCacheInstance } from '../../index.js';
 
 // To avoid race conditions or timing issues, since some expect() checks can take 10+ ms when busy,
 // we use a long cache timeout even for 'immediate' expiration, and use delays slightly longer than that
@@ -10,7 +10,7 @@ const timeoutPromise = (): Promise<null> =>
 describe('maxCacheSize scenarios', () => {
   let myCache: LimitedCacheInstance;
   beforeEach(() => {
-    jest.restoreAllMocks();
+    vitest.restoreAllMocks();
     myCache = LimitedCache({
       maxCacheSize: 20,
       maxCacheTime: Number.MAX_SAFE_INTEGER,
@@ -103,7 +103,7 @@ describe('maxCacheSize scenarios', () => {
       warnIfItemPurgedBeforeTime: 1000,
     });
 
-    const consoleWarnSpy = jest.spyOn(console, 'warn').mockReturnValueOnce();
+    const consoleWarnSpy = vitest.spyOn(console, 'warn').mockReturnValueOnce();
 
     for (let n = 1; n <= 5; n++) {
       myCache.set(`n=${n}`, n);

package/src/__tests__/scenarios/maxCacheTime.test.ts

@@ -1,5 +1,5 @@
-/* eslint-env jest */
-import { LimitedCacheObject, LimitedCacheObjectInstance } from '../../index';
+import { describe, beforeEach, expect, it, vitest } from 'vitest';
+import { LimitedCacheObject, LimitedCacheObjectInstance } from '../../index.js';
 
 // To avoid race conditions or timing issues, since some expect() checks can take 10+ ms when busy,
 // we use a long cache timeout even for 'immediate' expiration, and use delays slightly longer than that
@@ -10,7 +10,7 @@ const timeoutPromise = (): Promise<null> =>
 describe('maxCacheTime scenarios', () => {
   let myCache: LimitedCacheObjectInstance;
   beforeEach(() => {
-    jest.restoreAllMocks();
+    vitest.restoreAllMocks();
     myCache = LimitedCacheObject({
       maxCacheTime: CACHE_TIMEOUT,
       maxCacheSize: Number.MAX_SAFE_INTEGER,

package/src/__tests__/scenarios/values.test.ts

@@ -1,5 +1,5 @@
-/* eslint-env jest */
-import { limitedCacheUtil, LimitedCacheMeta } from '../../index';
+import { describe, beforeEach, expect, it } from 'vitest';
+import { limitedCacheUtil, LimitedCacheMeta } from '../../index.js';
 
 describe('value types', () => {
   let myCacheMeta: LimitedCacheMeta;

package/src/__tests__/typeChecks/LimitedCacheObjectTypes.test.ts

@@ -1,4 +1,6 @@
-import { LimitedCacheObject } from '../../index';
+import { describe, it } from 'vitest';
+
+import { LimitedCacheObject } from '../../index.js';
 
 /**
  * This is not a source file or test file.
@@ -59,9 +61,9 @@ value = arrayCache.number as number;
 // @ts-expect-error Invalid type
 value = arrayCache.string as string;
 
-// Fake test, to make Jest happy
+// Fake test, to make Vitest happy
 describe('fake typeCheck test', () => {
-  it.todo('does nothing');
+  it('does nothing', () => null);
 });
 
 // Fake export, to make the linter happy

package/src/__tests__/typeChecks/LimitedCacheTypes.test.ts

@@ -1,4 +1,6 @@
-import { LimitedCache } from '../../index';
+import { describe, it } from 'vitest';
+
+import { LimitedCache } from '../../index.js';
 
 /**
  * This is not a source file or test file.
@@ -59,9 +61,9 @@ value = arrayCache.get('number') as number;
 // @ts-expect-error Invalid type
 value = arrayCache.get('string') as string;
 
-// Fake test, to make Jest happy
+// Fake test, to make Vitest happy
 describe('fake typeCheck test', () => {
-  it.todo('does nothing');
+  it('does nothing', () => null);
 });
 
 // Fake export, to make the linter happy