@owlmeans/client-resource 0.1.18-rc.1 → 0.1.18-rc.11

package/README.md

@@ -33,9 +33,14 @@ import type { ClientResource } from '@owlmeans/client-resource'
 const res = context.resource<ClientResource<MyRecord>>('my-resource')
 await res.save({ id: 'key', ...data })
 const record = await res.load('key')
+const { items } = await res.list({ status: 'draft' })
 await res.erase() // clear all stored data
 ```
 
+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 over the stored records.
+
 ## API
 
 ### `appendClientResource<C, T>(context, alias): T`
@@ -51,7 +56,7 @@ Extends `Resource<T>` with:
 ### `ClientDb`
 
 Low-level browser storage interface:
-- `get<T>(id): Promise<T>`
+- `get<T>(id): Promise<T | undefined>` — a miss is `undefined`, not an error at this level
 - `set<T>(id, value): Promise<void>`
 - `has(id): Promise<boolean>`
 - `del(id): Promise<boolean>`

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/client-resource",
-  "version": "0.1.18-rc.0",
-  "generatedAt": "2026-08-16T22:20:50.511Z",
+  "version": "0.1.18-rc.11",
+  "generatedAt": "2026-09-01T16:28:56.993Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

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

@@ -8,23 +8,52 @@ user-invocable: false
 # @owlmeans/client-resource
 
 **Layer:** Client
-**Install:** `"@owlmeans/client-resource": "^0.1.18-rc.0"` in `dependencies`
+**Install:** `"@owlmeans/client-resource": "^0.1.18-rc.11"` in `dependencies`
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `makeClientResource<T>()` | Factory for an in-memory client resource |
-| `ClientResource<T>` types | Resource interface |
-| Constants | Default cache aliases |
+| `appendClientResource<C, T, R>(context, alias)` | Register a client-side `Resource<R>` on the context and return the context |
+| `ClientResource<T>` | `Resource<T>` + `db` (the key-value handle) and `erase()` |
+| `ClientDb`, `ClientDbService` | What a storage backend implements — `get`/`set`/`has`/`del`, and the service that hands out one store per alias |
+| `DEFAULT_DB_ALIAS` (`client-db`), `LIST_KEY` (`_list`) | Constants |
 
 ## Usage
 
 ```typescript
-import { makeClientResource } from '@owlmeans/client-resource'
-context.registerResource(makeClientResource<Project>('projects'))
+import { appendClientResource } from '@owlmeans/client-resource'
+
+appendClientResource<Config, Context, Project>(context, 'projects')
+
+const projects = context.resource<ClientResource<Project>>('projects')
+await projects.list({ status: ['open', 'blocked'] }, { sort: ['createdAt'] })
 ```
 
+The backing store comes from `cfg.dbs` — the entry whose `alias` matches the resource's, with
+`schema` naming the store (`@owlmeans/web-db` supplies the browser one). Without an entry the
+resource falls back to the default `client-db` service under its own alias.
+
+## A key-value store dressed as a resource
+
+Records live under their own id and a list of those ids under `LIST_KEY` is the only index there
+is. So:
+
+- `load(id)` / `get(id)` / `delete(id)` / `take(id)` address the key directly, no walk.
+- `load(where)`, `get(where)`, `list`, `count` and `purge` read the whole set and evaluate through
+  the shared in-memory engine from `@owlmeans/resource`, which is what makes a criteria object mean
+  here exactly what it means against a relational store. `{ sort }` orders the result the same way.
+- **Unpaged**: `list(where)` with no `size` returns every match; `size: 0` says the same thing
+  explicitly, and `page` without `size` throws `UnsupportedArgumentError('page-without-size')`.
+- `create` mints an id when the record carries none and throws `RecordExists` for one already
+  stored; `update` **replaces** the whole record and throws `UnknownRecordError` for an unknown id;
+  `save` creates or replaces. `take(id)` **deletes** the record it returns.
+- `purge(where)` refuses an empty criteria object. `erase()` empties the store, index included.
+
 ## Depends On
 
-- `@owlmeans/resource`, `@owlmeans/client-context`
+- `@owlmeans/resource`, `@owlmeans/client-context`, `@scure/base`, `@noble/hashes`
+
+## Related
+
+- [[web-db]] — the browser IndexedDB backend behind `ClientDbService`

package/build/resource.d.ts

@@ -1,7 +1,14 @@
 import type { ClientConfig, ClientContext } from '@owlmeans/client-context';
+import type { ResourceRecord } from '@owlmeans/resource';
 type Config = ClientConfig;
 interface Context<C extends Config = Config> extends ClientContext<C> {
 }
-export declare const appendClientResource: <C extends Config, T extends Context<C>>(context: T, alias: string) => T;
+/**
+ * A key-value client store dressed as a resource: records live under their own id and a list of
+ * those ids under {@link LIST_KEY} is the only index there is. Queries therefore read the whole
+ * set and run through the shared in-memory engine, which is what makes a criteria object mean
+ * here exactly what it means against a relational store.
+ */
+export declare const appendClientResource: <C extends Config, T extends Context<C>, R extends ResourceRecord = ResourceRecord>(context: T, alias: string) => T;
 export {};
 //# 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":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAS3E,KAAK,MAAM,GAAG,YAAY,CAAA;AAC1B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;CAAI;AAEzE,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,MAAM,KAAG,CA2LxG,CAAA"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAM3E,OAAO,KAAK,EAAuC,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAM7F,KAAK,MAAM,GAAG,YAAY,CAAA;AAC1B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;CAAI;AAEzE;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,cAAc,GAAG,cAAc,EACjF,SAAS,CAAC,EAAE,OAAO,MAAM,KAAG,CAuJ7B,CAAA"}

package/build/resource.js

@@ -1,8 +1,14 @@
 import { appendContextual, assertContext } from '@owlmeans/context';
-import { RecordExists, ResourceError, UnknownRecordError } from '@owlmeans/resource';
+import { applyQuery, filterRecords, firstMatch, MisshapedRecord, RecordExists, ResourceError, UnknownRecordError, UnsupportedArgumentError } from '@owlmeans/resource';
 import { DEFAULT_DB_ALIAS, LIST_KEY } from './consts.js';
 import { base58 } from '@scure/base';
 import { randomBytes } from '@noble/hashes/utils';
+/**
+ * A key-value client store dressed as a resource: records live under their own id and a list of
+ * those ids under {@link LIST_KEY} is the only index there is. Queries therefore read the whole
+ * set and run through the shared in-memory engine, which is what makes a criteria object mean
+ * here exactly what it means against a relational store.
+ */
 export const appendClientResource = (context, alias) => {
     const location = `client-resource:${alias}`;
     const assert = () => {
@@ -11,6 +17,24 @@ export const appendClientResource = (context, alias) => {
         }
         return resource.db;
     };
+    const ids = async () => await assert().get(LIST_KEY) ?? [];
+    const readAll = async () => {
+        const db = assert();
+        const records = await Promise.all((await ids()).map(id => db.get(id)));
+        return records.filter((record) => record != null);
+    };
+    const dropId = async (id) => {
+        const list = await ids();
+        const idx = list.indexOf(id);
+        if (idx > -1) {
+            list.splice(idx, 1);
+            await assert().set(LIST_KEY, list);
+        }
+    };
+    /** An id is a direct key read; criteria have to walk the set. */
+    const first = async (idOrWhere, opts) => typeof idOrWhere === 'string'
+        ? await assert().get(idOrWhere) ?? null
+        : firstMatch(await readAll(), idOrWhere, opts);
     const resource = appendContextual(alias, {
         init: async () => {
             const context = assertContext(resource.ctx, location);
@@ -18,59 +42,27 @@ export const appendClientResource = (context, alias) => {
             const dbService = context.service(config.service);
             resource.db = await dbService.initialize(config.schema ?? alias);
         },
-        get: async (id) => {
-            const record = await resource.load(id);
+        get: async (idOrWhere, opts) => {
+            const record = await first(idOrWhere, opts);
             if (record == null) {
-                throw new UnknownRecordError(id);
+                throw new UnknownRecordError(typeof idOrWhere === 'string' ? idOrWhere : 'criteria');
             }
             return record;
         },
-        load: async (id) => {
-            const db = assert();
-            return await db.get(id);
-        },
-        list: async (criteria, opts) => {
-            if (criteria == null) {
-                criteria = {};
-                opts = { pager: { page: 0, size: 10 } };
+        load: async (idOrWhere, opts) => await first(idOrWhere, opts),
+        /** Unpaged unless a size is asked for. */
+        list: async (where, opts) => {
+            if (opts?.page != null && opts.size == null) {
+                throw new UnsupportedArgumentError('page-without-size');
             }
-            if ("pager" in criteria) {
-                opts = criteria;
-                criteria = criteria.criteria;
-            }
-            const db = assert();
-            const list = await db.get(LIST_KEY);
-            const pager = opts?.pager ?? { page: 0, size: 10 };
-            const conditions = Object.entries(criteria ?? {});
-            pager.page = pager.page ?? 0;
-            pager.size = pager.size ?? 10;
-            const result = [];
-            let skip = pager.page * pager.size;
-            let total = 0;
-            let added = 0;
-            for (const id of list) {
-                const record = await db.get(id);
-                if (record != null) {
-                    if (!(conditions.length === 0 || conditions.every(([key, value]) => record[key] === value))) {
-                        continue;
-                    }
-                    if (skip-- <= 0 && added < pager.size) {
-                        added++;
-                        result.push(record);
-                    }
-                    ++total;
-                }
-            }
-            return { items: result, pager: { ...pager, total } };
+            return applyQuery(await readAll(), where, opts);
         },
+        count: async (where) => filterRecords(await readAll(), where).length,
         create: async (record) => {
             const db = assert();
             record.id = record.id ?? base58.encode(randomBytes(32));
-            if (await db.has(record.id)) {
-                throw new RecordExists(record.id);
-            }
-            const list = await db.get(LIST_KEY) ?? [];
-            if (list.includes(record.id)) {
+            const list = await ids();
+            if (list.includes(record.id) || await db.has(record.id)) {
                 throw new RecordExists(record.id);
             }
             list.push(record.id);
@@ -78,76 +70,57 @@ export const appendClientResource = (context, alias) => {
             await db.set(record.id, record);
             return record;
         },
+        /** Replaces the stored record rather than merging into it, as the contract says. */
         update: async (record) => {
             const db = assert();
             if (record.id == null) {
-                throw new UnknownRecordError('update');
+                throw new MisshapedRecord('id');
             }
-            const update = await resource.load(record.id);
-            if (update == null) {
+            if (!await db.has(record.id)) {
                 throw new UnknownRecordError(record.id);
             }
-            Object.assign(update, record);
-            await db.set(record.id, update);
+            await db.set(record.id, record);
             return record;
         },
+        save: async (record) => record.id == null || !await assert().has(record.id)
+            ? await resource.create(record)
+            : await resource.update(record),
         delete: async (id) => {
-            if (typeof id === 'object') {
-                if (id.id == null) {
-                    throw new UnknownRecordError('delete');
-                }
-                return resource.delete(id.id);
-            }
             const db = assert();
-            if (!await db.has(id)) {
-                return null;
-            }
             const record = await db.get(id);
             if (record == null) {
-                throw new SyntaxError('We should not try to delete record that we know that not exists');
+                return null;
             }
             await db.del(id);
-            const list = await db.get(LIST_KEY) ?? [];
-            const idx = list.indexOf(id);
-            if (idx > -1) {
-                list.splice(idx, 1);
-                await db.set(LIST_KEY, list);
-            }
+            await dropId(id);
             return record;
         },
-        pick: async (id) => {
-            if (typeof id === 'object') {
-                if (id.id == null) {
-                    throw new UnknownRecordError('pick');
-                }
-                return resource.pick(id.id);
-            }
-            const db = assert();
-            const record = await db.get(id);
-            if (record != null) {
-                await db.del(id);
-            }
-            else {
+        take: async (id) => {
+            const record = await resource.delete(id);
+            if (record == null) {
                 throw new UnknownRecordError(id);
             }
-            const list = await db.get(LIST_KEY) ?? [];
-            const idx = list.indexOf(id);
-            if (idx > -1) {
-                list.splice(idx, 1);
-                await db.set(LIST_KEY, list);
-            }
             return record;
         },
-        save: async (record) => {
-            if (record.id == null || (await resource.load(record.id) == null)) {
-                return resource.create(record);
+        purge: async (where) => {
+            if (where == null || Object.keys(where).length < 1) {
+                throw new UnsupportedArgumentError('purge:empty-criteria');
+            }
+            const matched = filterRecords(await readAll(), where);
+            for (const record of matched) {
+                if (record.id != null) {
+                    await resource.delete(record.id);
+                }
             }
-            return resource.update(record);
+            return matched.length;
         },
         erase: async () => {
             const db = assert();
-            const list = await db.get(LIST_KEY) ?? [];
-            await Promise.all(list.map(id => resource.delete(id)));
+            /** The index is emptied in one write, so a failed pass cannot leave it naming dead ids. */
+            for (const id of await ids()) {
+                await db.del(id);
+            }
+            await db.set(LIST_KEY, []);
         }
     });
     context.registerResource(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/build/types.d.ts

@@ -5,7 +5,8 @@ export interface ClientDbService extends InitializedService {
     erase: () => Promise<void>;
 }
 export interface ClientDb {
-    get: <T>(id: string) => Promise<T>;
+    /** `undefined` for a key the store does not hold — a miss is not an error at this level. */
+    get: <T>(id: string) => Promise<T | undefined>;
     set: <T>(id: string, value: T) => Promise<void>;
     has: (id: string) => Promise<boolean>;
     del: (id: string) => Promise<boolean>;

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAElE,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACzD,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IACjD,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IAClC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACrC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,QAAQ,CAAC,CAAC,CAAC;IAC5F,EAAE,CAAC,EAAE,QAAQ,CAAA;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAElE,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACzD,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IACjD,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,4FAA4F;IAC5F,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;IAC9C,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACrC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,QAAQ,CAAC,CAAC,CAAC;IAC5F,EAAE,CAAC,EAAE,QAAQ,CAAA;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-resource",
-  "version": "0.1.18-rc.1",
+  "version": "0.1.18-rc.11",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.5.0",
-    "@owlmeans/client-context": "^0.1.18-rc.1",
-    "@owlmeans/context": "^0.1.18-rc.1",
-    "@owlmeans/resource": "^0.1.18-rc.1",
+    "@owlmeans/client-context": "^0.1.18-rc.11",
+    "@owlmeans/context": "^0.1.18-rc.7",
+    "@owlmeans/resource": "^0.1.18-rc.8",
     "@scure/base": "^2.3.0"
   },
   "devDependencies": {

package/src/resource.ts

@@ -1,7 +1,10 @@
 import type { ClientConfig, ClientContext } from '@owlmeans/client-context'
 import { appendContextual, assertContext } from '@owlmeans/context'
-import { RecordExists, ResourceError, UnknownRecordError } from '@owlmeans/resource'
-import type { ListCriteria, ListPager, ResourceRecord } from '@owlmeans/resource'
+import {
+  applyQuery, filterRecords, firstMatch, MisshapedRecord, RecordExists, ResourceError,
+  UnknownRecordError, UnsupportedArgumentError
+} from '@owlmeans/resource'
+import type { Criteria, FirstOptions, ListOptions, ResourceRecord } from '@owlmeans/resource'
 import { DEFAULT_DB_ALIAS, LIST_KEY } from './consts.js'
 import type { ClientDb, ClientDbService, ClientResource } from './types.js'
 import { base58 } from '@scure/base'
@@ -10,7 +13,15 @@ import { randomBytes } from '@noble/hashes/utils'
 type Config = ClientConfig
 interface Context<C extends Config = Config> extends ClientContext<C> { }
 
-export const appendClientResource = <C extends Config, T extends Context<C>>(context: T, alias: string): T => {
+/**
+ * A key-value client store dressed as a resource: records live under their own id and a list of
+ * those ids under {@link LIST_KEY} is the only index there is. Queries therefore read the whole
+ * set and run through the shared in-memory engine, which is what makes a criteria object mean
+ * here exactly what it means against a relational store.
+ */
+export const appendClientResource = <
+  C extends Config, T extends Context<C>, R extends ResourceRecord = ResourceRecord
+>(context: T, alias: string): T => {
 
   const location = `client-resource:${alias}`
 
@@ -22,7 +33,32 @@ export const appendClientResource = <C extends Config, T extends Context<C>>(con
     return resource.db
   }
 
-  const resource: ClientResource<ResourceRecord> = appendContextual<ClientResource<ResourceRecord>>(alias, {
+  const ids = async (): Promise<string[]> => await assert().get<string[]>(LIST_KEY) ?? []
+
+  const readAll = async (): Promise<R[]> => {
+    const db = assert()
+    const records = await Promise.all((await ids()).map(id => db.get<R>(id)))
+
+    return records.filter((record): record is Awaited<R> => record != null) as R[]
+  }
+
+  const dropId = async (id: string): Promise<void> => {
+    const list = await ids()
+    const idx = list.indexOf(id)
+    if (idx > -1) {
+      list.splice(idx, 1)
+      await assert().set(LIST_KEY, list)
+    }
+  }
+
+  /** An id is a direct key read; criteria have to walk the set. */
+  const first = async (
+    idOrWhere: string | Criteria<R>, opts?: FirstOptions<R>
+  ): Promise<R | null> => typeof idOrWhere === 'string'
+    ? await assert().get<R>(idOrWhere) ?? null
+    : firstMatch(await readAll(), idOrWhere, opts)
+
+  const resource: ClientResource<R> = appendContextual<ClientResource<R>>(alias, {
     init: async () => {
       const context = assertContext<Config, Context>(resource.ctx as Context, location)
       const config = context.cfg.dbs?.find(db => db.alias === alias) ?? { service: DEFAULT_DB_ALIAS, host: [] }
@@ -30,167 +66,106 @@ export const appendClientResource = <C extends Config, T extends Context<C>>(con
       resource.db = await dbService.initialize(config.schema ?? alias)
     },
 
-    get: async id => {
-      const record = await resource.load(id)
-
+    get: async (idOrWhere: string | Criteria<R>, opts?: FirstOptions<R>): Promise<R> => {
+      const record = await first(idOrWhere, opts)
       if (record == null) {
-        throw new UnknownRecordError(id)
+        throw new UnknownRecordError(typeof idOrWhere === 'string' ? idOrWhere : 'criteria')
       }
 
-      return record as any
+      return record
     },
 
+    load: async (idOrWhere: string | Criteria<R>, opts?: FirstOptions<R>): Promise<R | null> =>
+      await first(idOrWhere, opts),
 
-    load: async id => {
-      const db = assert()
-
-      return await db.get(id) as any | null
-    },
-
-    list: async (criteria, opts) => {
-      if (criteria == null) {
-        criteria = {}
-        opts = { pager: { page: 0, size: 10 } }
-      }
-      if ("pager" in criteria) {
-        opts = criteria
-        criteria = criteria.criteria as ListCriteria
-      }
-      const db = assert()
-      const list = await db.get<string[]>(LIST_KEY)
-
-      const pager: ListPager = opts?.pager ?? { page: 0, size: 10 }
-      const conditions = Object.entries(criteria as ListCriteria ?? {})
-      pager.page = pager.page ?? 0
-      pager.size = pager.size ?? 10
-
-      const result: ResourceRecord[] = []
-      let skip = pager.page * pager.size
-      let total = 0
-      let added = 0
-      for (const id of list) {
-        const record = await db.get<ResourceRecord>(id)
-        if (record != null) {
-          if (!(conditions.length === 0 || conditions.every(
-            ([key, value]) => record[key as keyof typeof record] === value
-          ))) {
-            continue
-          }
-          if (skip-- <= 0 && added < pager.size) {
-            added++
-            result.push(record)
-          }
-          ++total
-        }
+    /** Unpaged unless a size is asked for. */
+    list: async (where?: Criteria<R>, opts?: ListOptions<R>) => {
+      if (opts?.page != null && opts.size == null) {
+        throw new UnsupportedArgumentError('page-without-size')
       }
 
-      return { items: result as any[], pager: { ...pager, total } }
+      return applyQuery(await readAll(), where, opts)
     },
 
-    create: async record => {
+    count: async (where?: Criteria<R>) => filterRecords(await readAll(), where).length,
+
+    create: async (record: Partial<R>) => {
       const db = assert()
 
       record.id = record.id ?? base58.encode(randomBytes(32))
 
-      if (await db.has(record.id)) {
-        throw new RecordExists(record.id)
-      }
-
-      const list: string[] = await db.get(LIST_KEY) ?? []
-      if (list.includes(record.id)) {
+      const list = await ids()
+      if (list.includes(record.id) || await db.has(record.id)) {
         throw new RecordExists(record.id)
       }
       list.push(record.id)
       await db.set(LIST_KEY, list)
       await db.set(record.id, record)
 
-      return record as any
+      return record as R
     },
 
-    update: async record => {
+    /** Replaces the stored record rather than merging into it, as the contract says. */
+    update: async (record: Partial<R>) => {
       const db = assert()
 
       if (record.id == null) {
-        throw new UnknownRecordError('update')
+        throw new MisshapedRecord('id')
       }
-
-      const update = await resource.load(record.id)
-      if (update == null) {
+      if (!await db.has(record.id)) {
         throw new UnknownRecordError(record.id)
       }
+      await db.set(record.id, record)
 
-      Object.assign(update, record)
-
-      await db.set(record.id, update)
-
-      return record as any
+      return record as R
     },
 
-    delete: async id => {
-      if (typeof id === 'object') {
-        if (id.id == null) {
-          throw new UnknownRecordError('delete')
-        }
-        return resource.delete(id.id)
-      }
+    save: async (record: Partial<R>) => record.id == null || !await assert().has(record.id)
+      ? await resource.create(record)
+      : await resource.update(record),
 
+    delete: async (id: string) => {
       const db = assert()
-      if (!await db.has(id)) {
-        return null
-      }
-
-      const record = await db.get(id)
+      const record = await db.get<R>(id)
       if (record == null) {
-        throw new SyntaxError('We should not try to delete record that we know that not exists')
+        return null
       }
       await db.del(id)
-      const list: string[] = await db.get(LIST_KEY) ?? []
-      const idx = list.indexOf(id)
-      if (idx > -1) {
-        list.splice(idx, 1)
-        await db.set(LIST_KEY, list)
-      }
+      await dropId(id)
 
-      return record as any
+      return record
     },
 
-    pick: async id => {
-      if (typeof id === 'object') {
-        if (id.id == null) {
-          throw new UnknownRecordError('pick')
-        }
-        return resource.pick(id.id)
-      }
-
-      const db = assert()
-      const record = await db.get(id)
-      if (record != null) {
-        await db.del(id)
-      } else {
+    take: async (id: string) => {
+      const record = await resource.delete(id)
+      if (record == null) {
         throw new UnknownRecordError(id)
       }
-      const list: string[] = await db.get(LIST_KEY) ?? []
-      const idx = list.indexOf(id)
-      if (idx > -1) {
-        list.splice(idx, 1)
-        await db.set(LIST_KEY, list)
-      }
 
-      return record as any
+      return record
     },
 
-    save: async record => {
-      if (record.id == null || (await resource.load(record.id) == null)) {
-        return resource.create(record)
+    purge: async (where: Criteria<R>) => {
+      if (where == null || Object.keys(where).length < 1) {
+        throw new UnsupportedArgumentError('purge:empty-criteria')
+      }
+      const matched = filterRecords(await readAll(), where)
+      for (const record of matched) {
+        if (record.id != null) {
+          await resource.delete(record.id)
+        }
       }
 
-      return resource.update(record)
+      return matched.length
     },
 
     erase: async () => {
       const db = assert()
-      const list: string[] = await db.get(LIST_KEY) ?? []
-      await Promise.all(list.map(id => resource.delete(id)))
+      /** The index is emptied in one write, so a failed pass cannot leave it naming dead ids. */
+      for (const id of await ids()) {
+        await db.del(id)
+      }
+      await db.set(LIST_KEY, [])
     }
   })
 

package/src/types.ts

@@ -7,7 +7,8 @@ export interface ClientDbService extends InitializedService {
 }
 
 export interface ClientDb {
-  get: <T>(id: string) => Promise<T>
+  /** `undefined` for a key the store does not hold — a miss is not an error at this level. */
+  get: <T>(id: string) => Promise<T | undefined>
   set: <T>(id: string, value: T) => Promise<void>
   has: (id: string) => Promise<boolean>
   del: (id: string) => Promise<boolean>