@owlmeans/static-resource 0.1.18-rc.7 → 0.1.18-rc.8

package/README.md

@@ -26,8 +26,13 @@ appendStaticResource<C, T>(context, 'products')
 // Access from context
 const resource = context.getStaticResource<Product>('products')
 const product = await resource.load('product-sku')
+const active = await resource.list({ status: 'active' })
 ```
 
+Reads are unpaged: `list(where)` returns every match, and `list(where, { page })` without a `size`
+throws `UnsupportedArgumentError('page-without-size')`. Criteria and sorting are the shared
+vocabulary from [`@owlmeans/resource`](../resource), evaluated in memory.
+
 ## API
 
 ### `createStaticResource(alias?, key?): Resource<ResourceRecord>`

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/static-resource",
-  "version": "0.1.18-rc.7",
-  "generatedAt": "2026-08-24T21:14:00.143Z",
+  "version": "0.1.18-rc.8",
+  "generatedAt": "2026-09-01T16:28:56.999Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/static-resource/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: static-resource
-description: How to use @owlmeans/static-resource — Resource for serving static files from a server (e.g. uploaded assets, generated reports). Auto-invoked when serving static files via the framework.
+description: How to use @owlmeans/static-resource — in-process Resource over a module-scope Map, for records an app holds in memory (fixtures, caches, short-lived handshake state). Auto-invoked when registering an in-memory resource on a context.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,27 +8,54 @@ user-invocable: false
 # @owlmeans/static-resource
 
 **Layer:** Infra
-**Install:** `"@owlmeans/static-resource": "^0.1.18-rc.7"` in `dependencies`
+**Install:** `"@owlmeans/static-resource": "^0.1.18-rc.8"` in `dependencies`
+
+The whole `Resource` contract over a `Map` held at module scope. Use it where records must be
+reachable through the context like any other resource but have no database behind them — fixtures,
+a process-local cache, short-lived handshake state.
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `makeStaticResource(options)` | Static-file Resource factory |
-| `StaticResource` types | Resource interface |
-| Constants | Default cache headers |
+| `appendStaticResource(context, alias?, key?)` | Register one on the context and add `getStaticResource(alias?)` to it |
+| `createStaticResource<T>(alias?, key?)` | The bare `Resource<T>`, when you register it yourself |
+| `StaticResourceAppend` | The `getStaticResource` accessor the append adds |
+| `DEFAULT_ALIAS` (`static`) | Constant |
+
+`key` names the underlying store, defaulting to the alias — two resources sharing a `key` share
+records, which is how two contexts in one process see the same set.
 
 ## Usage
 
 ```typescript
-import { makeStaticResource } from '@owlmeans/static-resource'
+import { appendStaticResource } from '@owlmeans/static-resource'
 
-context.registerResource(makeStaticResource({
-  alias: 'public',
-  root: '/var/lib/app/public',
-}))
+appendStaticResource(context, 'fixtures')
+
+const fixtures = context.getStaticResource<Fixture>('fixtures')
+await fixtures.save({ id: 'seed', name: 'Owl' })
+await fixtures.list({ name: { $startsWith: 'Owl' } }, { sort: ['name'] })
 ```
 
+## Semantics
+
+- The store is a map keyed by id and there is nothing here to mint one from, so **every write
+  needs an id**: `create`, `update` and `save` all throw `MisshapedRecord('id')` without one.
+  `create` additionally throws `RecordExists`, `update` `UnknownRecordError`; `save` is the upsert.
+- `load(id)` / `get(id)` / `delete(id)` / `take(id)` hit the map directly. `take(id)` **deletes**
+  the record it returns and throws `UnknownRecordError` on a miss.
+- `load(where)`, `get(where)`, `list`, `count` and `purge` go through the shared in-memory engine
+  from `@owlmeans/resource`, so criteria and `{ sort }` mean exactly what they mean against a
+  database. `purge(where)` refuses an empty criteria object.
+- **Unpaged**: `list(where)` with no `size` returns every match — the whole store is already in
+  memory; `size: 0` says the same explicitly, and `page` without `size` throws
+  `UnsupportedArgumentError('page-without-size')`.
+- `opts.ttl` is honoured on writes — a number is seconds from now, a `Date` the instant to expire
+  at, and the record is dropped from the map when it elapses. An expiry already armed keeps its
+  appointment: rewriting the record without a ttl does not cancel it, so a renewal passes the ttl
+  again and a record that must survive gets a fresh id.
+
 ## Depends On
 
-- `@owlmeans/resource`, `@owlmeans/server-context`
+- `@owlmeans/resource`, `@owlmeans/context`

package/build/resource.d.ts

@@ -1,5 +1,5 @@
 import type { Resource, ResourceRecord } from '@owlmeans/resource';
 import type { Config, Context, StaticResourceAppend } from './types.js';
-export declare const createStaticResource: (alias?: string, key?: string) => Resource<ResourceRecord>;
+export declare const createStaticResource: <T extends ResourceRecord = ResourceRecord>(alias?: string, key?: string) => Resource<T>;
 export declare const appendStaticResource: <C extends Config, T extends Context<C>>(ctx: T, alias?: string, key?: string) => T & StaticResourceAppend;
 //# sourceMappingURL=resource.d.ts.map

package/build/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAC8D,QAAQ,EAChF,cAAc,EACf,MAAM,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAMvE,eAAO,MAAM,oBAAoB,WAAW,MAAM,QAAwB,MAAM,6BA2J/E,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,OACpE,CAAC,UAAS,MAAM,QAAwB,MAAM,KAClD,CAAC,GAAG,oBAWN,CAAA"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAC2B,QAAQ,EAAE,cAAc,EAC9D,MAAM,oBAAoB,CAAA;AAK3B,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAYvE,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,cAAc,GAAG,cAAc,EAC5E,QAAO,MAAsB,EAAE,MAAM,MAAM,KAC1C,QAAQ,CAAC,CAAC,CA4HZ,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,EACzE,KAAK,CAAC,EAAE,QAAO,MAAsB,EAAE,MAAM,MAAM,KAClD,CAAC,GAAG,oBAWN,CAAA"}

package/build/resource.js

@@ -1,134 +1,107 @@
 import { appendContextual } from '@owlmeans/context';
 import { DEFAULT_ALIAS } from './consts.js';
-import { MisshapedRecord, RecordExists, UnknownRecordError, UnsupportedArgumentError } from '@owlmeans/resource';
+import { applyQuery, filterRecords, firstMatch, MisshapedRecord, RecordExists, UnknownRecordError, UnsupportedArgumentError } from '@owlmeans/resource';
 const stores = {};
+/**
+ * Milliseconds until the record expires, which is what `setTimeout` wants. A number is seconds
+ * from now and a Date is the instant to expire at — the two spellings have to land on the same
+ * moment, or the same ttl means an hour through one and a second through the other.
+ */
+const expiresIn = (ttl) => ttl instanceof Date ? ttl.getTime() - Date.now() : ttl * 1000;
 export const createStaticResource = (alias = DEFAULT_ALIAS, key) => {
-    key = key ?? alias;
+    const storeKey = key ?? alias;
     const getStore = () => {
-        if (stores[key] == null) {
-            stores[key] = new Map();
+        if (stores[storeKey] == null) {
+            stores[storeKey] = new Map();
         }
-        return stores[key];
+        return stores[storeKey];
+    };
+    const records = () => [...getStore().values()];
+    const expire = (id, opts) => {
+        if (opts?.ttl == null) {
+            return;
+        }
+        const store = getStore();
+        setTimeout(() => void store.delete(id), expiresIn(opts.ttl));
+    };
+    /** An id hits the map directly; criteria go through the shared in-memory engine. */
+    const first = (idOrWhere, opts) => typeof idOrWhere === 'string'
+        ? getStore().get(idOrWhere) ?? null
+        : firstMatch(records(), idOrWhere, opts);
+    const write = (record, opts) => {
+        if (record.id == null) {
+            /**
+             * The store is a map keyed by id and there is nothing here to mint one from, so a record
+             * without an id is misshaped rather than new — `save` cannot create it.
+             */
+            throw new MisshapedRecord('id');
+        }
+        getStore().set(record.id, record);
+        expire(record.id, opts);
+        return record;
     };
     const resource = appendContextual(alias, {
-        get: async (id, field, opts) => {
-            const record = await resource.load(id, field, opts);
+        get: async (idOrWhere, opts) => {
+            const record = first(idOrWhere, opts);
             if (record == null) {
-                throw new UnknownRecordError(id);
+                throw new UnknownRecordError(typeof idOrWhere === 'string' ? idOrWhere : 'criteria');
             }
             return record;
         },
-        load: async (id, field, opts) => {
-            field = field ?? 'id';
-            if (opts != null) {
-                throw new UnsupportedArgumentError('static:get:opts');
+        load: async (idOrWhere, opts) => first(idOrWhere, opts),
+        /** Unpaged unless a size is asked for — the whole store is already in memory. */
+        list: async (where, opts) => {
+            if (opts?.page != null && opts.size == null) {
+                throw new UnsupportedArgumentError('page-without-size');
             }
-            const store = getStore();
-            const record = field === 'id'
-                ? store.get(id)
-                : [...store.values()].find(record => record[field] === id);
-            if (record == null) {
-                return null;
-            }
-            return record;
-        },
-        list: async (criteria, opts) => {
-            if (criteria != null) {
-                throw new UnsupportedArgumentError('static:list:criteria');
-            }
-            if (opts != null) {
-                throw new UnsupportedArgumentError('static:list:opts');
-            }
-            const result = {
-                items: [...getStore().values()]
-            };
-            return result;
-        },
-        save: async (record, opts) => {
-            const store = getStore();
-            if (record.id == null) {
-                throw new MisshapedRecord('id');
-            }
-            store.set(record.id, record);
-            if (typeof opts === 'object' && opts?.ttl != null) {
-                const ttl = opts.ttl instanceof Date
-                    ? (opts.ttl.getTime() - Date.now()) / 1000
-                    : typeof opts.ttl === 'number'
-                        ? opts.ttl * 1000
-                        : null;
-                if (ttl == null) {
-                    throw new UnsupportedArgumentError('static:opts:ttl-string');
-                }
-                setTimeout(() => record.id != null && void store.delete(record.id), ttl);
-            }
-            return record;
+            return applyQuery(records(), where, opts);
         },
+        count: async (where) => filterRecords(records(), where).length,
         create: async (record, opts) => {
-            const store = getStore();
             if (record.id == null) {
-                throw new UnknownRecordError('id');
+                throw new MisshapedRecord('id');
             }
-            if (store.has(record.id)) {
+            if (getStore().has(record.id)) {
                 throw new RecordExists(record.id);
             }
-            store.set(record.id, record);
-            if (opts?.ttl != null) {
-                const ttl = opts.ttl instanceof Date
-                    ? (opts.ttl.getTime() - Date.now()) / 1000
-                    : typeof opts.ttl === 'number'
-                        ? opts.ttl * 1000
-                        : null;
-                if (ttl == null) {
-                    throw new UnsupportedArgumentError('static:opts:ttl-string');
-                }
-                setTimeout(() => record.id != null && void store.delete(record.id), ttl);
-            }
-            return record;
+            return write(record, opts);
         },
         update: async (record, opts) => {
-            return resource.save(record, opts);
-        },
-        delete: async (id, opts) => {
-            let record = null;
-            if (typeof id === 'object') {
-                if (id.id == null) {
-                    throw new MisshapedRecord('id');
-                }
-                record = await resource.load(id.id);
-            }
-            else if (typeof opts === 'string') {
-                record = await resource.load(id, opts);
+            if (record.id == null) {
+                throw new MisshapedRecord('id');
             }
-            else if (typeof id === 'string') {
-                record = await resource.load(id);
+            if (!getStore().has(record.id)) {
+                throw new UnknownRecordError(record.id);
             }
+            return write(record, opts);
+        },
+        save: async (record, opts) => write(record, opts),
+        delete: async (id) => {
+            const store = getStore();
+            const record = store.get(id) ?? null;
             if (record == null) {
                 return null;
             }
-            let field = 'id';
-            if (typeof opts === 'string') {
-                field = opts;
-                opts = undefined;
-            }
-            else if (typeof opts === 'object') {
-                field = opts.field ?? field;
-            }
-            id = record.id ?? '';
-            if (id === '') {
-                throw new MisshapedRecord('id');
-            }
-            const store = getStore();
-            if (store.delete(id)) {
-                return record;
-            }
-            return null;
+            store.delete(id);
+            return record;
         },
-        pick: async (id, opts) => {
-            const record = await resource.delete(id, opts);
+        take: async (id) => {
+            const store = getStore();
+            const record = store.get(id);
             if (record == null) {
-                throw new UnknownRecordError((typeof id === 'string' ? id : id.id) ?? 'unknown');
+                throw new UnknownRecordError(id);
             }
+            store.delete(id);
             return record;
+        },
+        purge: async (where) => {
+            if (where == null || Object.keys(where).length < 1) {
+                throw new UnsupportedArgumentError('purge:empty-criteria');
+            }
+            const store = getStore();
+            const matched = filterRecords(records(), where);
+            matched.forEach(record => record.id != null && store.delete(record.id));
+            return matched.length;
         }
     });
     return resource;

package/build/resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/static-resource",
-  "version": "0.1.18-rc.7",
+  "version": "0.1.18-rc.8",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -21,9 +21,9 @@
     }
   },
   "dependencies": {
-    "@owlmeans/context": "^0.1.18-rc.6",
-    "@owlmeans/error": "^0.1.18-rc.6",
-    "@owlmeans/resource": "^0.1.18-rc.7"
+    "@owlmeans/context": "^0.1.18-rc.7",
+    "@owlmeans/error": "^0.1.18-rc.7",
+    "@owlmeans/resource": "^0.1.18-rc.8"
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",

package/src/resource.ts

@@ -1,167 +1,146 @@
 import { appendContextual } from '@owlmeans/context'
 import { DEFAULT_ALIAS } from './consts.js'
 import type {
-  GetterOptions, ListOptions, ListResult, LifecycleOptions, ListCriteria, Resource,
-  ResourceRecord
+  Criteria, FirstOptions, ListOptions, Resource, ResourceRecord, Ttl, WriteOptions
+} from '@owlmeans/resource'
+import {
+  applyQuery, filterRecords, firstMatch, MisshapedRecord, RecordExists, UnknownRecordError,
+  UnsupportedArgumentError
 } from '@owlmeans/resource'
-import { MisshapedRecord, RecordExists, UnknownRecordError, UnsupportedArgumentError } from '@owlmeans/resource'
 import type { Config, Context, StaticResourceAppend } from './types.js'
 
-type Getter = string | GetterOptions
-type ResourceType = Resource<ResourceRecord>
-
 const stores: Record<string, Map<string, ResourceRecord>> = {}
-export const createStaticResource = (alias: string = DEFAULT_ALIAS, key?: string) => {
-  key = key ?? alias
 
-  const getStore = () => {
-    if (stores[key] == null) {
-      stores[key] = new Map()
+/**
+ * Milliseconds until the record expires, which is what `setTimeout` wants. A number is seconds
+ * from now and a Date is the instant to expire at — the two spellings have to land on the same
+ * moment, or the same ttl means an hour through one and a second through the other.
+ */
+const expiresIn = (ttl: Ttl): number =>
+  ttl instanceof Date ? ttl.getTime() - Date.now() : ttl * 1000
+
+export const createStaticResource = <T extends ResourceRecord = ResourceRecord>(
+  alias: string = DEFAULT_ALIAS, key?: string
+): Resource<T> => {
+  const storeKey = key ?? alias
+
+  const getStore = (): Map<string, T> => {
+    if (stores[storeKey] == null) {
+      stores[storeKey] = new Map()
     }
 
-    return stores[key]
+    return stores[storeKey] as Map<string, T>
   }
 
-  const resource: Resource<ResourceRecord> = appendContextual<ResourceType>(alias, {
-    get: async <T extends ResourceRecord>(id: string, field?: Getter, opts?: LifecycleOptions) => {
-      const record = await resource.load<T>(id, field, opts)
-      if (record == null) {
-        throw new UnknownRecordError(id)
-      }
+  const records = (): T[] => [...getStore().values()]
 
-      return record
-    },
+  const expire = (id: string, opts?: WriteOptions): void => {
+    if (opts?.ttl == null) {
+      return
+    }
+    const store = getStore()
+    setTimeout(() => void store.delete(id), expiresIn(opts.ttl))
+  }
 
-    load: async <T extends ResourceRecord>(id: string, field?: Getter, opts?: LifecycleOptions) => {
-      field = field ?? 'id'
-      if (opts != null) {
-        throw new UnsupportedArgumentError('static:get:opts')
-      }
-      const store = getStore()
-      const record = field === 'id'
-        ? store.get(id) as T | null
-        : [...store.values()].find(
-          record => record[field as keyof typeof record] === id
-        ) as T | undefined
+  /** An id hits the map directly; criteria go through the shared in-memory engine. */
+  const first = (idOrWhere: string | Criteria<T>, opts?: FirstOptions<T>): T | null =>
+    typeof idOrWhere === 'string'
+      ? getStore().get(idOrWhere) ?? null
+      : firstMatch(records(), idOrWhere, opts)
+
+  const write = (record: Partial<T>, opts?: WriteOptions): T => {
+    if (record.id == null) {
+      /**
+       * The store is a map keyed by id and there is nothing here to mint one from, so a record
+       * without an id is misshaped rather than new — `save` cannot create it.
+       */
+      throw new MisshapedRecord('id')
+    }
+    getStore().set(record.id, record as T)
+    expire(record.id, opts)
 
+    return record as T
+  }
+
+  const resource: Resource<T> = appendContextual<Resource<T>>(alias, {
+    get: async (idOrWhere: string | Criteria<T>, opts?: FirstOptions<T>): Promise<T> => {
+      const record = first(idOrWhere, opts)
       if (record == null) {
-        return null
+        throw new UnknownRecordError(typeof idOrWhere === 'string' ? idOrWhere : 'criteria')
       }
 
       return record
     },
 
-    list: async <T extends ResourceRecord>(criteria?: ListOptions | ListCriteria, opts?: ListOptions) => {
-      if (criteria != null) {
-        throw new UnsupportedArgumentError('static:list:criteria')
-      }
-      if (opts != null) {
-        throw new UnsupportedArgumentError('static:list:opts')
-      }
+    load: async (idOrWhere: string | Criteria<T>, opts?: FirstOptions<T>): Promise<T | null> =>
+      first(idOrWhere, opts),
 
-      const result: ListResult<T> = {
-        items: [...getStore().values()] as T[]
+    /** Unpaged unless a size is asked for — the whole store is already in memory. */
+    list: async (where?: Criteria<T>, opts?: ListOptions<T>) => {
+      if (opts?.page != null && opts.size == null) {
+        throw new UnsupportedArgumentError('page-without-size')
       }
 
-      return result
+      return applyQuery(records(), where, opts)
     },
 
-    save: async <T extends ResourceRecord>(record: Partial<T>, opts?: Getter) => {
-      const store = getStore()
+    count: async (where?: Criteria<T>) => filterRecords(records(), where).length,
+
+    create: async (record: Partial<T>, opts?: WriteOptions) => {
       if (record.id == null) {
         throw new MisshapedRecord('id')
       }
-      store.set(record.id, record as ResourceRecord)
-
-      if (typeof opts === 'object' && opts?.ttl != null) {
-        const ttl = opts.ttl instanceof Date
-          ? (opts.ttl.getTime() - Date.now()) / 1000
-          : typeof opts.ttl === 'number'
-            ? opts.ttl * 1000
-            : null
-        if (ttl == null) {
-          throw new UnsupportedArgumentError('static:opts:ttl-string')
-        }
-        setTimeout(() => record.id != null && void store.delete(record.id), ttl)
+      if (getStore().has(record.id)) {
+        throw new RecordExists(record.id)
       }
 
-      return record as T
+      return write(record, opts)
     },
 
-    create: async (record, opts) => {
-      const store = getStore()
+    update: async (record: Partial<T>, opts?: WriteOptions) => {
       if (record.id == null) {
-        throw new UnknownRecordError('id')
-      }
-      if (store.has(record.id)) {
-        throw new RecordExists(record.id)
+        throw new MisshapedRecord('id')
       }
-      store.set(record.id, record)
-      if (opts?.ttl != null) {
-        const ttl = opts.ttl instanceof Date
-          ? (opts.ttl.getTime() - Date.now()) / 1000
-          : typeof opts.ttl === 'number'
-            ? opts.ttl * 1000
-            : null
-        if (ttl == null) {
-          throw new UnsupportedArgumentError('static:opts:ttl-string')
-        }
-        setTimeout(() => record.id != null && void store.delete(record.id), ttl)
+      if (!getStore().has(record.id)) {
+        throw new UnknownRecordError(record.id)
       }
 
-      return record as any
-    },
-
-    update: async (record, opts) => {
-      return resource.save(record, opts)
+      return write(record, opts)
     },
 
-    delete: async (id, opts) => {
-      let record: ResourceRecord | null = null
-      if (typeof id === 'object') {
-        if (id.id == null) {
-          throw new MisshapedRecord('id')
-        }
-        record = await resource.load(id.id)
-      } else if (typeof opts === 'string') {
-        record = await resource.load(id, opts)
-      } else if (typeof id === 'string') {
-        record = await resource.load(id)
-      }
+    save: async (record: Partial<T>, opts?: WriteOptions) => write(record, opts),
 
+    delete: async (id: string) => {
+      const store = getStore()
+      const record = store.get(id) ?? null
       if (record == null) {
         return null
       }
+      store.delete(id)
 
-      let field = 'id'
-      if (typeof opts === 'string') {
-        field = opts
-        opts = undefined
-      } else if (typeof opts === 'object') {
-        field = opts.field ?? field
-      }
-
-      id = record.id ?? ''
-
-      if (id === '') {
-        throw new MisshapedRecord('id')
-      }
+      return record
+    },
 
+    take: async (id: string) => {
       const store = getStore()
-      if (store.delete(id)) {
-        return record as any
+      const record = store.get(id)
+      if (record == null) {
+        throw new UnknownRecordError(id)
       }
+      store.delete(id)
 
-      return null
+      return record
     },
 
-    pick: async (id, opts) => {
-      const record = await resource.delete(id, opts)
-      if (record == null) {
-        throw new UnknownRecordError((typeof id === 'string' ? id : id.id) ?? 'unknown')
+    purge: async (where: Criteria<T>) => {
+      if (where == null || Object.keys(where).length < 1) {
+        throw new UnsupportedArgumentError('purge:empty-criteria')
       }
+      const store = getStore()
+      const matched = filterRecords(records(), where)
+      matched.forEach(record => record.id != null && store.delete(record.id))
 
-      return record as any
+      return matched.length
     }
   })