@atproto/tap 0.0.3 → 0.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atproto/tap
 
+## 0.1.0
+
+### Minor Changes
+
+- [#4483](https://github.com/bluesky-social/atproto/pull/4483) [`e3357e9`](https://github.com/bluesky-social/atproto/commit/e3357e9c781ff84430556f4c891639acfcef3486) Thanks [@dholms](https://github.com/dholms)! - Add LexIndexer
+
 ## 0.0.3
 
 ### Patch Changes

package/README.md

@@ -105,6 +105,53 @@ indexer.error((err: Error) => { ... })
 
 If no error handler is registered, errors will throw as unhandled exceptions.
 
+### `LexIndexer`
+
+A typed indexer that uses `@atproto/lex` schemas for type-safe event handling. Register handlers for specific record types and actions:
+
+```ts
+import { LexIndexer } from '@atproto/tap'
+import * as com from './lexicons/com'
+
+const indexer = new LexIndexer()
+
+// Handle creates for a specific record type
+indexer.create(com.example.post, async (evt) => {
+  // evt.record is fully typed as com.example.post.Main
+  console.log(`New post: ${evt.record.text}`)
+})
+
+// Handle updates
+indexer.update(com.example.post, async (evt) => {
+  console.log(`Updated post: ${evt.record.text}`)
+})
+
+// Handle deletes (no record on delete events)
+indexer.delete(com.example.post, async (evt) => {
+  console.log(`Deleted: at://${evt.did}/${evt.collection}/${evt.rkey}`)
+})
+
+// Handle both creates and updates with put()
+indexer.put(com.example.like, async (evt) => {
+  console.log(`Like ${evt.action}: ${evt.record.subject.uri}`)
+})
+
+// Fallback for unhandled record types/actions
+indexer.other(async (evt) => {
+  console.log(`Unhandled: ${evt.action}, ${evt.collection}`)
+})
+
+// Identity and error handlers
+indexer.identity(async (evt) => { ... })
+indexer.error((err) => { ... })
+
+const channel = tap.channel(indexer)
+```
+
+Records are validated against their schemas before handlers are called. If validation fails, an error is thrown which will be picked up through the `error` handler..
+
+Duplicate handler registration throws an error, including conflicts between `put()` and `create()`/`update()` for the same schema.
+
 ### `TapHandler`
 
 You can create your own custom handler by creating a class that implements the `TapHandler` interface:

package/dist/index.d.ts

@@ -2,5 +2,6 @@ export * from './types';
 export * from './client';
 export * from './channel';
 export * from './simple-indexer';
+export * from './lex-indexer';
 export * from './util';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA"}

package/dist/index.js

@@ -18,5 +18,6 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./client"), exports);
 __exportStar(require("./channel"), exports);
 __exportStar(require("./simple-indexer"), exports);
+__exportStar(require("./lex-indexer"), exports);
 __exportStar(require("./util"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,2CAAwB;AACxB,4CAAyB;AACzB,mDAAgC;AAChC,yCAAsB","sourcesContent":["export * from './types'\nexport * from './client'\nexport * from './channel'\nexport * from './simple-indexer'\nexport * from './util'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,2CAAwB;AACxB,4CAAyB;AACzB,mDAAgC;AAChC,gDAA6B;AAC7B,yCAAsB","sourcesContent":["export * from './types'\nexport * from './client'\nexport * from './channel'\nexport * from './simple-indexer'\nexport * from './lex-indexer'\nexport * from './util'\n"]}

package/dist/lex-indexer.d.ts

@@ -0,0 +1,46 @@
+import { Infer, Main, RecordSchema } from '@atproto/lex';
+import { HandlerOpts, TapHandler } from './channel';
+import { IdentityEvent, RecordEvent, TapEvent } from './types';
+type BaseRecordEvent = Omit<RecordEvent, 'record' | 'action' | 'cid'>;
+export type CreateEvent<R> = BaseRecordEvent & {
+    action: 'create';
+    record: R;
+    cid: string;
+};
+export type UpdateEvent<R> = BaseRecordEvent & {
+    action: 'update';
+    record: R;
+    cid: string;
+};
+export type PutEvent<R> = CreateEvent<R> | UpdateEvent<R>;
+export type DeleteEvent = BaseRecordEvent & {
+    action: 'delete';
+};
+export type CreateHandler<R> = (evt: CreateEvent<R>, opts: HandlerOpts) => Promise<void>;
+export type UpdateHandler<R> = (evt: UpdateEvent<R>, opts: HandlerOpts) => Promise<void>;
+export type PutHandler<R> = (evt: PutEvent<R>, opts: HandlerOpts) => Promise<void>;
+export type DeleteHandler = (evt: DeleteEvent, opts: HandlerOpts) => Promise<void>;
+export type UntypedHandler = (evt: RecordEvent, opts: HandlerOpts) => Promise<void>;
+export type IdentityHandler = (evt: IdentityEvent, opts: HandlerOpts) => Promise<void>;
+export type ErrorHandler = (err: Error) => void;
+export type RecordHandler<R> = CreateHandler<R> | UpdateHandler<R> | PutHandler<R> | DeleteHandler;
+export declare class LexIndexer implements TapHandler {
+    private handlers;
+    private otherHandler;
+    private identityHandler;
+    private errorHandler;
+    private handlerKey;
+    private register;
+    create<const T extends RecordSchema>(ns: Main<T>, handler: CreateHandler<Infer<T>>): this;
+    update<const T extends RecordSchema>(ns: Main<T>, handler: UpdateHandler<Infer<T>>): this;
+    delete<const T extends RecordSchema>(ns: Main<T>, handler: DeleteHandler): this;
+    put<const T extends RecordSchema>(ns: Main<T>, handler: PutHandler<Infer<T>>): this;
+    other(fn: UntypedHandler): this;
+    identity(fn: IdentityHandler): this;
+    error(fn: ErrorHandler): this;
+    onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void>;
+    private handleRecordEvent;
+    onError(err: Error): void;
+}
+export {};
+//# sourceMappingURL=lex-indexer.d.ts.map

package/dist/lex-indexer.d.ts.map

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

package/dist/lex-indexer.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LexIndexer = void 0;
+const lex_1 = require("@atproto/lex");
+const syntax_1 = require("@atproto/syntax");
+class LexIndexer {
+    constructor() {
+        Object.defineProperty(this, "handlers", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "otherHandler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "identityHandler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "errorHandler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+    }
+    handlerKey(collection, action) {
+        return `${collection}:${action}`;
+    }
+    register(action, ns, handler) {
+        const schema = (0, lex_1.getMain)(ns);
+        const key = this.handlerKey(schema.$type, action);
+        if (this.handlers.has(key)) {
+            throw new Error(`Handler already registered for ${key}`);
+        }
+        this.handlers.set(key, { schema, handler });
+        return this;
+    }
+    create(ns, handler) {
+        return this.register('create', ns, handler);
+    }
+    update(ns, handler) {
+        return this.register('update', ns, handler);
+    }
+    delete(ns, handler) {
+        return this.register('delete', ns, handler);
+    }
+    put(ns, handler) {
+        this.register('create', ns, handler);
+        return this.register('update', ns, handler);
+    }
+    other(fn) {
+        if (this.otherHandler) {
+            throw new Error(`Handler already registered for "other"`);
+        }
+        this.otherHandler = fn;
+        return this;
+    }
+    identity(fn) {
+        if (this.identityHandler) {
+            throw new Error(`Handler already registered for "identity"`);
+        }
+        this.identityHandler = fn;
+        return this;
+    }
+    error(fn) {
+        if (this.errorHandler) {
+            throw new Error(`Handler already registered for "error"`);
+        }
+        this.errorHandler = fn;
+        return this;
+    }
+    async onEvent(evt, opts) {
+        if (evt.type === 'identity') {
+            await this.identityHandler?.(evt, opts);
+        }
+        else {
+            await this.handleRecordEvent(evt, opts);
+        }
+        await opts.ack();
+    }
+    async handleRecordEvent(evt, opts) {
+        const { collection, action } = evt;
+        const key = this.handlerKey(collection, action);
+        const registered = this.handlers.get(key);
+        if (!registered) {
+            await this.otherHandler?.(evt, opts);
+            return;
+        }
+        if (action === 'create' || action === 'update') {
+            const match = registered.schema.matches(evt.record);
+            if (!match) {
+                const uriStr = syntax_1.AtUri.make(evt.did, evt.collection, evt.rkey).toString();
+                throw new Error(`Record validation failed for ${uriStr}`);
+            }
+        }
+        await registered.handler(evt, opts);
+    }
+    onError(err) {
+        if (this.errorHandler) {
+            this.errorHandler(err);
+        }
+        else {
+            throw err;
+        }
+    }
+}
+exports.LexIndexer = LexIndexer;
+//# sourceMappingURL=lex-indexer.js.map

package/dist/lex-indexer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lex-indexer.js","sourceRoot":"","sources":["../src/lex-indexer.ts"],"names":[],"mappings":"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","sourcesContent":["import { Infer, Main, RecordSchema, getMain } from '@atproto/lex'\nimport { AtUri } from '@atproto/syntax'\nimport { HandlerOpts, TapHandler } from './channel'\nimport { IdentityEvent, RecordEvent, TapEvent } from './types'\n\ntype BaseRecordEvent = Omit<RecordEvent, 'record' | 'action' | 'cid'>\n\nexport type CreateEvent<R> = BaseRecordEvent & {\n  action: 'create'\n  record: R\n  cid: string\n}\n\nexport type UpdateEvent<R> = BaseRecordEvent & {\n  action: 'update'\n  record: R\n  cid: string\n}\n\nexport type PutEvent<R> = CreateEvent<R> | UpdateEvent<R>\n\nexport type DeleteEvent = BaseRecordEvent & {\n  action: 'delete'\n}\n\nexport type CreateHandler<R> = (\n  evt: CreateEvent<R>,\n  opts: HandlerOpts,\n) => Promise<void>\n\nexport type UpdateHandler<R> = (\n  evt: UpdateEvent<R>,\n  opts: HandlerOpts,\n) => Promise<void>\n\nexport type PutHandler<R> = (\n  evt: PutEvent<R>,\n  opts: HandlerOpts,\n) => Promise<void>\n\nexport type DeleteHandler = (\n  evt: DeleteEvent,\n  opts: HandlerOpts,\n) => Promise<void>\n\nexport type UntypedHandler = (\n  evt: RecordEvent,\n  opts: HandlerOpts,\n) => Promise<void>\n\nexport type IdentityHandler = (\n  evt: IdentityEvent,\n  opts: HandlerOpts,\n) => Promise<void>\n\nexport type ErrorHandler = (err: Error) => void\n\nexport type RecordHandler<R> =\n  | CreateHandler<R>\n  | UpdateHandler<R>\n  | PutHandler<R>\n  | DeleteHandler\n\ninterface RegisteredHandler {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  handler: RecordHandler<any>\n  schema: RecordSchema\n}\n\nexport class LexIndexer implements TapHandler {\n  private handlers = new Map<string, RegisteredHandler>()\n  private otherHandler: UntypedHandler | undefined\n  private identityHandler: IdentityHandler | undefined\n  private errorHandler: ErrorHandler | undefined\n\n  private handlerKey(collection: string, action: string): string {\n    return `${collection}:${action}`\n  }\n\n  private register<const T extends RecordSchema>(\n    action: string,\n    ns: Main<T>,\n    handler: RecordHandler<Infer<T>>,\n  ): this {\n    const schema = getMain(ns)\n    const key = this.handlerKey(schema.$type, action)\n    if (this.handlers.has(key)) {\n      throw new Error(`Handler already registered for ${key}`)\n    }\n    this.handlers.set(key, { schema, handler })\n    return this\n  }\n\n  create<const T extends RecordSchema>(\n    ns: Main<T>,\n    handler: CreateHandler<Infer<T>>,\n  ): this {\n    return this.register('create', ns, handler)\n  }\n\n  update<const T extends RecordSchema>(\n    ns: Main<T>,\n    handler: UpdateHandler<Infer<T>>,\n  ): this {\n    return this.register('update', ns, handler)\n  }\n\n  delete<const T extends RecordSchema>(\n    ns: Main<T>,\n    handler: DeleteHandler,\n  ): this {\n    return this.register('delete', ns, handler)\n  }\n\n  put<const T extends RecordSchema>(\n    ns: Main<T>,\n    handler: PutHandler<Infer<T>>,\n  ): this {\n    this.register('create', ns, handler)\n    return this.register('update', ns, handler)\n  }\n\n  other(fn: UntypedHandler): this {\n    if (this.otherHandler) {\n      throw new Error(`Handler already registered for \"other\"`)\n    }\n    this.otherHandler = fn\n    return this\n  }\n\n  identity(fn: IdentityHandler): this {\n    if (this.identityHandler) {\n      throw new Error(`Handler already registered for \"identity\"`)\n    }\n    this.identityHandler = fn\n    return this\n  }\n\n  error(fn: ErrorHandler): this {\n    if (this.errorHandler) {\n      throw new Error(`Handler already registered for \"error\"`)\n    }\n    this.errorHandler = fn\n    return this\n  }\n\n  async onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void> {\n    if (evt.type === 'identity') {\n      await this.identityHandler?.(evt, opts)\n    } else {\n      await this.handleRecordEvent(evt, opts)\n    }\n    await opts.ack()\n  }\n\n  private async handleRecordEvent(\n    evt: RecordEvent,\n    opts: HandlerOpts,\n  ): Promise<void> {\n    const { collection, action } = evt\n    const key = this.handlerKey(collection, action)\n    const registered = this.handlers.get(key)\n\n    if (!registered) {\n      await this.otherHandler?.(evt, opts)\n      return\n    }\n\n    if (action === 'create' || action === 'update') {\n      const match = registered.schema.matches(evt.record)\n      if (!match) {\n        const uriStr = AtUri.make(evt.did, evt.collection, evt.rkey).toString()\n        throw new Error(`Record validation failed for ${uriStr}`)\n      }\n    }\n\n    await (registered.handler as UntypedHandler)(evt, opts)\n  }\n\n  onError(err: Error): void {\n    if (this.errorHandler) {\n      this.errorHandler(err)\n    } else {\n      throw err\n    }\n  }\n}\n"]}

package/dist/simple-indexer.d.ts

@@ -7,9 +7,9 @@ export declare class SimpleIndexer implements TapHandler {
     private identityHandler;
     private recordHandler;
     private errorHandler;
-    identity(fn: IdentityEventHandler): void;
-    record(fn: RecordEventHandler): void;
-    error(fn: ErrorHandler): void;
+    identity(fn: IdentityEventHandler): this;
+    record(fn: RecordEventHandler): this;
+    error(fn: ErrorHandler): this;
     onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void>;
     onError(err: Error): void;
 }

package/dist/simple-indexer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple-indexer.d.ts","sourceRoot":"","sources":["../src/simple-indexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9D,KAAK,oBAAoB,GAAG,CAC1B,GAAG,EAAE,aAAa,EAClB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,KAAK,kBAAkB,GAAG,CACxB,GAAG,EAAE,WAAW,EAChB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,KAAK,YAAY,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;AAExC,qBAAa,aAAc,YAAW,UAAU;IAC9C,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,YAAY,CAA0B;IAE9C,QAAQ,CAAC,EAAE,EAAE,oBAAoB;IAIjC,MAAM,CAAC,EAAE,EAAE,kBAAkB;IAI7B,KAAK,CAAC,EAAE,EAAE,YAAY;IAIhB,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,OAAO,CAAC,GAAG,EAAE,KAAK;CAOnB"}
+{"version":3,"file":"simple-indexer.d.ts","sourceRoot":"","sources":["../src/simple-indexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9D,KAAK,oBAAoB,GAAG,CAC1B,GAAG,EAAE,aAAa,EAClB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,IAAI,CAAC,CAAA;AAElB,KAAK,kBAAkB,GAAG,CACxB,GAAG,EAAE,WAAW,EAChB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,IAAI,CAAC,CAAA;AAElB,KAAK,YAAY,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;AAExC,qBAAa,aAAc,YAAW,UAAU;IAC9C,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,YAAY,CAA0B;IAE9C,QAAQ,CAAC,EAAE,EAAE,oBAAoB,GAAG,IAAI;IAKxC,MAAM,CAAC,EAAE,EAAE,kBAAkB,GAAG,IAAI;IAKpC,KAAK,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI;IAKvB,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,OAAO,CAAC,GAAG,EAAE,KAAK;CAOnB"}

package/dist/simple-indexer.js

@@ -24,12 +24,15 @@ class SimpleIndexer {
     }
     identity(fn) {
         this.identityHandler = fn;
+        return this;
     }
     record(fn) {
         this.recordHandler = fn;
+        return this;
     }
     error(fn) {
         this.errorHandler = fn;
+        return this;
     }
     async onEvent(evt, opts) {
         if (evt.type === 'record') {

package/dist/simple-indexer.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple-indexer.js","sourceRoot":"","sources":["../src/simple-indexer.ts"],"names":[],"mappings":";;;AAaA,MAAa,aAAa;IAA1B;QACU;;;;;WAAiD;QACjD;;;;;WAA6C;QAC7C;;;;;WAAsC;IA8BhD,CAAC;IA5BC,QAAQ,CAAC,EAAwB;QAC/B,IAAI,CAAC,eAAe,GAAG,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,CAAC,EAAsB;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;IACzB,CAAC;IAED,KAAK,CAAC,EAAgB;QACpB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAa,EAAE,IAAiB;QAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACvC,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,EAAE,CAAA;IAClB,CAAC;IAED,OAAO,CAAC,GAAU;QAChB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;CACF;AAjCD,sCAiCC","sourcesContent":["import { HandlerOpts, TapHandler } from './channel'\nimport { IdentityEvent, RecordEvent, TapEvent } from './types'\n\ntype IdentityEventHandler = (\n  evt: IdentityEvent,\n  opts?: HandlerOpts,\n) => Promise<void>\ntype RecordEventHandler = (\n  evt: RecordEvent,\n  opts?: HandlerOpts,\n) => Promise<void>\ntype ErrorHandler = (err: Error) => void\n\nexport class SimpleIndexer implements TapHandler {\n  private identityHandler: IdentityEventHandler | undefined\n  private recordHandler: RecordEventHandler | undefined\n  private errorHandler: ErrorHandler | undefined\n\n  identity(fn: IdentityEventHandler) {\n    this.identityHandler = fn\n  }\n\n  record(fn: RecordEventHandler) {\n    this.recordHandler = fn\n  }\n\n  error(fn: ErrorHandler) {\n    this.errorHandler = fn\n  }\n\n  async onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void> {\n    if (evt.type === 'record') {\n      await this.recordHandler?.(evt, opts)\n    } else {\n      await this.identityHandler?.(evt, opts)\n    }\n    await opts.ack()\n  }\n\n  onError(err: Error) {\n    if (this.errorHandler) {\n      this.errorHandler(err)\n    } else {\n      throw err\n    }\n  }\n}\n"]}
+{"version":3,"file":"simple-indexer.js","sourceRoot":"","sources":["../src/simple-indexer.ts"],"names":[],"mappings":";;;AAeA,MAAa,aAAa;IAA1B;QACU;;;;;WAAiD;QACjD;;;;;WAA6C;QAC7C;;;;;WAAsC;IAiChD,CAAC;IA/BC,QAAQ,CAAC,EAAwB;QAC/B,IAAI,CAAC,eAAe,GAAG,EAAE,CAAA;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,EAAsB;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;QACvB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,EAAgB;QACpB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAa,EAAE,IAAiB;QAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACvC,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,EAAE,CAAA;IAClB,CAAC;IAED,OAAO,CAAC,GAAU;QAChB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;CACF;AApCD,sCAoCC","sourcesContent":["import { HandlerOpts, TapHandler } from './channel'\nimport { IdentityEvent, RecordEvent, TapEvent } from './types'\n\ntype IdentityEventHandler = (\n  evt: IdentityEvent,\n  opts?: HandlerOpts,\n) => Promise<void>\n\ntype RecordEventHandler = (\n  evt: RecordEvent,\n  opts?: HandlerOpts,\n) => Promise<void>\n\ntype ErrorHandler = (err: Error) => void\n\nexport class SimpleIndexer implements TapHandler {\n  private identityHandler: IdentityEventHandler | undefined\n  private recordHandler: RecordEventHandler | undefined\n  private errorHandler: ErrorHandler | undefined\n\n  identity(fn: IdentityEventHandler): this {\n    this.identityHandler = fn\n    return this\n  }\n\n  record(fn: RecordEventHandler): this {\n    this.recordHandler = fn\n    return this\n  }\n\n  error(fn: ErrorHandler): this {\n    this.errorHandler = fn\n    return this\n  }\n\n  async onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void> {\n    if (evt.type === 'record') {\n      await this.recordHandler?.(evt, opts)\n    } else {\n      await this.identityHandler?.(evt, opts)\n    }\n    await opts.ack()\n  }\n\n  onError(err: Error) {\n    if (this.errorHandler) {\n      this.errorHandler(err)\n    } else {\n      throw err\n    }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/tap",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "license": "MIT",
   "description": "atproto tap client",
   "keywords": [
@@ -24,7 +24,8 @@
   "dependencies": {
     "ws": "^8.12.0",
     "zod": "^3.23.8",
-    "@atproto/common": "^0.5.4",
+    "@atproto/common": "^0.5.5",
+    "@atproto/lex": "^0.0.8",
     "@atproto/syntax": "^0.4.2",
     "@atproto/ws-client": "^0.0.4"
   },

package/src/index.ts

@@ -2,4 +2,5 @@ export * from './types'
 export * from './client'
 export * from './channel'
 export * from './simple-indexer'
+export * from './lex-indexer'
 export * from './util'

package/src/lex-indexer.ts

@@ -0,0 +1,187 @@
+import { Infer, Main, RecordSchema, getMain } from '@atproto/lex'
+import { AtUri } from '@atproto/syntax'
+import { HandlerOpts, TapHandler } from './channel'
+import { IdentityEvent, RecordEvent, TapEvent } from './types'
+
+type BaseRecordEvent = Omit<RecordEvent, 'record' | 'action' | 'cid'>
+
+export type CreateEvent<R> = BaseRecordEvent & {
+  action: 'create'
+  record: R
+  cid: string
+}
+
+export type UpdateEvent<R> = BaseRecordEvent & {
+  action: 'update'
+  record: R
+  cid: string
+}
+
+export type PutEvent<R> = CreateEvent<R> | UpdateEvent<R>
+
+export type DeleteEvent = BaseRecordEvent & {
+  action: 'delete'
+}
+
+export type CreateHandler<R> = (
+  evt: CreateEvent<R>,
+  opts: HandlerOpts,
+) => Promise<void>
+
+export type UpdateHandler<R> = (
+  evt: UpdateEvent<R>,
+  opts: HandlerOpts,
+) => Promise<void>
+
+export type PutHandler<R> = (
+  evt: PutEvent<R>,
+  opts: HandlerOpts,
+) => Promise<void>
+
+export type DeleteHandler = (
+  evt: DeleteEvent,
+  opts: HandlerOpts,
+) => Promise<void>
+
+export type UntypedHandler = (
+  evt: RecordEvent,
+  opts: HandlerOpts,
+) => Promise<void>
+
+export type IdentityHandler = (
+  evt: IdentityEvent,
+  opts: HandlerOpts,
+) => Promise<void>
+
+export type ErrorHandler = (err: Error) => void
+
+export type RecordHandler<R> =
+  | CreateHandler<R>
+  | UpdateHandler<R>
+  | PutHandler<R>
+  | DeleteHandler
+
+interface RegisteredHandler {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  handler: RecordHandler<any>
+  schema: RecordSchema
+}
+
+export class LexIndexer implements TapHandler {
+  private handlers = new Map<string, RegisteredHandler>()
+  private otherHandler: UntypedHandler | undefined
+  private identityHandler: IdentityHandler | undefined
+  private errorHandler: ErrorHandler | undefined
+
+  private handlerKey(collection: string, action: string): string {
+    return `${collection}:${action}`
+  }
+
+  private register<const T extends RecordSchema>(
+    action: string,
+    ns: Main<T>,
+    handler: RecordHandler<Infer<T>>,
+  ): this {
+    const schema = getMain(ns)
+    const key = this.handlerKey(schema.$type, action)
+    if (this.handlers.has(key)) {
+      throw new Error(`Handler already registered for ${key}`)
+    }
+    this.handlers.set(key, { schema, handler })
+    return this
+  }
+
+  create<const T extends RecordSchema>(
+    ns: Main<T>,
+    handler: CreateHandler<Infer<T>>,
+  ): this {
+    return this.register('create', ns, handler)
+  }
+
+  update<const T extends RecordSchema>(
+    ns: Main<T>,
+    handler: UpdateHandler<Infer<T>>,
+  ): this {
+    return this.register('update', ns, handler)
+  }
+
+  delete<const T extends RecordSchema>(
+    ns: Main<T>,
+    handler: DeleteHandler,
+  ): this {
+    return this.register('delete', ns, handler)
+  }
+
+  put<const T extends RecordSchema>(
+    ns: Main<T>,
+    handler: PutHandler<Infer<T>>,
+  ): this {
+    this.register('create', ns, handler)
+    return this.register('update', ns, handler)
+  }
+
+  other(fn: UntypedHandler): this {
+    if (this.otherHandler) {
+      throw new Error(`Handler already registered for "other"`)
+    }
+    this.otherHandler = fn
+    return this
+  }
+
+  identity(fn: IdentityHandler): this {
+    if (this.identityHandler) {
+      throw new Error(`Handler already registered for "identity"`)
+    }
+    this.identityHandler = fn
+    return this
+  }
+
+  error(fn: ErrorHandler): this {
+    if (this.errorHandler) {
+      throw new Error(`Handler already registered for "error"`)
+    }
+    this.errorHandler = fn
+    return this
+  }
+
+  async onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void> {
+    if (evt.type === 'identity') {
+      await this.identityHandler?.(evt, opts)
+    } else {
+      await this.handleRecordEvent(evt, opts)
+    }
+    await opts.ack()
+  }
+
+  private async handleRecordEvent(
+    evt: RecordEvent,
+    opts: HandlerOpts,
+  ): Promise<void> {
+    const { collection, action } = evt
+    const key = this.handlerKey(collection, action)
+    const registered = this.handlers.get(key)
+
+    if (!registered) {
+      await this.otherHandler?.(evt, opts)
+      return
+    }
+
+    if (action === 'create' || action === 'update') {
+      const match = registered.schema.matches(evt.record)
+      if (!match) {
+        const uriStr = AtUri.make(evt.did, evt.collection, evt.rkey).toString()
+        throw new Error(`Record validation failed for ${uriStr}`)
+      }
+    }
+
+    await (registered.handler as UntypedHandler)(evt, opts)
+  }
+
+  onError(err: Error): void {
+    if (this.errorHandler) {
+      this.errorHandler(err)
+    } else {
+      throw err
+    }
+  }
+}

package/src/simple-indexer.ts

@@ -5,10 +5,12 @@ type IdentityEventHandler = (
   evt: IdentityEvent,
   opts?: HandlerOpts,
 ) => Promise<void>
+
 type RecordEventHandler = (
   evt: RecordEvent,
   opts?: HandlerOpts,
 ) => Promise<void>
+
 type ErrorHandler = (err: Error) => void
 
 export class SimpleIndexer implements TapHandler {
@@ -16,16 +18,19 @@ export class SimpleIndexer implements TapHandler {
   private recordHandler: RecordEventHandler | undefined
   private errorHandler: ErrorHandler | undefined
 
-  identity(fn: IdentityEventHandler) {
+  identity(fn: IdentityEventHandler): this {
     this.identityHandler = fn
+    return this
   }
 
-  record(fn: RecordEventHandler) {
+  record(fn: RecordEventHandler): this {
     this.recordHandler = fn
+    return this
   }
 
-  error(fn: ErrorHandler) {
+  error(fn: ErrorHandler): this {
     this.errorHandler = fn
+    return this
   }
 
   async onEvent(evt: TapEvent, opts: HandlerOpts): Promise<void> {

package/tests/_util.ts

@@ -0,0 +1,40 @@
+import { HandlerOpts } from '../src/channel'
+import { IdentityEvent, RecordEvent } from '../src/types'
+
+export type MockOpts = HandlerOpts & { acked: boolean }
+
+export const createMockOpts = (): MockOpts => {
+  const opts = {
+    signal: new AbortController().signal,
+    acked: false,
+    ack: async () => {
+      opts.acked = true
+    },
+  }
+  return opts
+}
+
+export const createRecordEvent = (
+  overrides: Partial<RecordEvent> = {},
+): RecordEvent => ({
+  id: 1,
+  type: 'record',
+  did: 'did:example:alice',
+  rev: 'abc123',
+  collection: 'com.example.post',
+  rkey: 'abc123',
+  action: 'create',
+  record: { text: 'hello' },
+  cid: 'bafyabc',
+  live: true,
+  ...overrides,
+})
+
+export const createIdentityEvent = (): IdentityEvent => ({
+  id: 2,
+  type: 'identity',
+  did: 'did:example:alice',
+  handle: 'alice.test',
+  isActive: true,
+  status: 'active',
+})

package/tests/lex-indexer.test.ts

@@ -0,0 +1,340 @@
+import { l } from '@atproto/lex'
+import {
+  CreateEvent,
+  DeleteEvent,
+  LexIndexer,
+  UpdateEvent,
+} from '../src/lex-indexer'
+import { IdentityEvent, RecordEvent } from '../src/types'
+import {
+  createIdentityEvent,
+  createMockOpts,
+  createRecordEvent as baseCreateRecordEvent,
+} from './_util'
+
+// Test lexicon definitions
+const postNsid = 'com.example.post'
+type Post = {
+  $type: 'com.example.post'
+  text: string
+}
+const post = {
+  main: l.record<'tid', Post>('tid', postNsid, l.object({ text: l.string() })),
+}
+
+const likeNsid = 'com.example.like'
+type Like = {
+  $type: 'com.example.like'
+  subject: string
+}
+const like = {
+  main: l.record<'tid', Like>(
+    'tid',
+    likeNsid,
+    l.object({ subject: l.string() }),
+  ),
+}
+
+const createRecordEvent = (overrides: Partial<RecordEvent> = {}): RecordEvent =>
+  baseCreateRecordEvent({
+    collection: postNsid,
+    record: { $type: postNsid, text: 'hello' },
+    ...overrides,
+  })
+
+describe('LexIndexer', () => {
+  describe('handler registration', () => {
+    it('registers create handler', async () => {
+      const indexer = new LexIndexer()
+      const received: CreateEvent<Post>[] = []
+
+      indexer.create(post, async (evt) => {
+        received.push(evt)
+      })
+
+      const opts = createMockOpts()
+      await indexer.onEvent(createRecordEvent(), opts)
+
+      expect(received).toHaveLength(1)
+      expect(received[0].action).toBe('create')
+      expect(received[0].record.text).toBe('hello')
+      expect(received[0].cid).toBe('bafyabc')
+    })
+
+    it('registers update handler', async () => {
+      const indexer = new LexIndexer()
+      const received: UpdateEvent<Post>[] = []
+
+      indexer.update(post, async (evt) => {
+        received.push(evt)
+      })
+
+      const opts = createMockOpts()
+      await indexer.onEvent(
+        createRecordEvent({
+          action: 'update',
+          record: { $type: postNsid, text: 'updated' },
+        }),
+        opts,
+      )
+
+      expect(received).toHaveLength(1)
+      expect(received[0].action).toBe('update')
+      expect(received[0].record.text).toBe('updated')
+    })
+
+    it('registers delete handler', async () => {
+      const indexer = new LexIndexer()
+      const received: DeleteEvent[] = []
+
+      indexer.delete(post, async (evt) => {
+        received.push(evt)
+      })
+
+      const opts = createMockOpts()
+      await indexer.onEvent(
+        createRecordEvent({
+          action: 'delete',
+          record: undefined,
+          cid: undefined,
+        }),
+        opts,
+      )
+
+      expect(received).toHaveLength(1)
+      expect(received[0].action).toBe('delete')
+    })
+
+    it('registers put handler for both create and update', async () => {
+      const indexer = new LexIndexer()
+      const received: Array<{ action: string; text: string }> = []
+
+      indexer.put(post, async (evt) => {
+        received.push({ action: evt.action, text: evt.record.text })
+      })
+
+      const opts1 = createMockOpts()
+      await indexer.onEvent(createRecordEvent({ action: 'create' }), opts1)
+
+      const opts2 = createMockOpts()
+      await indexer.onEvent(
+        createRecordEvent({
+          action: 'update',
+          record: { $type: postNsid, text: 'updated' },
+        }),
+        opts2,
+      )
+
+      expect(received).toHaveLength(2)
+      expect(received[0].action).toBe('create')
+      expect(received[1].action).toBe('update')
+    })
+  })
+
+  describe('handler routing', () => {
+    it('routes to correct handler by collection', async () => {
+      const indexer = new LexIndexer()
+      const postEvents: CreateEvent<Post>[] = []
+      const likeEvents: CreateEvent<Like>[] = []
+
+      indexer.create(post, async (evt) => {
+        postEvents.push(evt)
+      })
+      indexer.create(like, async (evt) => {
+        likeEvents.push(evt)
+      })
+
+      const opts1 = createMockOpts()
+      await indexer.onEvent(createRecordEvent(), opts1)
+
+      const opts2 = createMockOpts()
+      await indexer.onEvent(
+        createRecordEvent({
+          collection: likeNsid,
+          record: { $type: likeNsid, subject: 'at://did:example:bob/post/123' },
+        }),
+        opts2,
+      )
+
+      expect(postEvents).toHaveLength(1)
+      expect(likeEvents).toHaveLength(1)
+    })
+
+    it('routes to other handler for unregistered collections', async () => {
+      const indexer = new LexIndexer()
+      const otherEvents: RecordEvent[] = []
+
+      indexer.create(post, async () => {})
+      indexer.other(async (evt) => {
+        otherEvents.push(evt)
+      })
+
+      const opts = createMockOpts()
+      await indexer.onEvent(
+        createRecordEvent({ collection: 'com.example.unknown' }),
+        opts,
+      )
+
+      expect(otherEvents).toHaveLength(1)
+      expect(otherEvents[0].collection).toBe('com.example.unknown')
+    })
+
+    it('routes to other handler for unregistered actions', async () => {
+      const indexer = new LexIndexer()
+      const otherEvents: RecordEvent[] = []
+
+      indexer.create(post, async () => {})
+      indexer.other(async (evt) => {
+        otherEvents.push(evt)
+      })
+
+      const opts = createMockOpts()
+      await indexer.onEvent(createRecordEvent({ action: 'delete' }), opts)
+
+      expect(otherEvents).toHaveLength(1)
+      expect(otherEvents[0].action).toBe('delete')
+    })
+
+    it('routes identity events to identity handler', async () => {
+      const indexer = new LexIndexer()
+      const received: IdentityEvent[] = []
+
+      indexer.identity(async (evt) => {
+        received.push(evt)
+      })
+
+      const opts = createMockOpts()
+      await indexer.onEvent(createIdentityEvent(), opts)
+
+      expect(received).toHaveLength(1)
+      expect(received[0].handle).toBe('alice.test')
+    })
+  })
+
+  describe('duplicate registration', () => {
+    it('throws on duplicate create handler', () => {
+      const indexer = new LexIndexer()
+      indexer.create(post, async () => {})
+
+      expect(() => indexer.create(post, async () => {})).toThrow(
+        'Handler already registered',
+      )
+    })
+
+    it('throws on duplicate update handler', () => {
+      const indexer = new LexIndexer()
+      indexer.update(post, async () => {})
+
+      expect(() => indexer.update(post, async () => {})).toThrow(
+        'Handler already registered',
+      )
+    })
+
+    it('throws on duplicate delete handler', () => {
+      const indexer = new LexIndexer()
+      indexer.delete(post, async () => {})
+
+      expect(() => indexer.delete(post, async () => {})).toThrow(
+        'Handler already registered',
+      )
+    })
+
+    it('throws when put conflicts with create', () => {
+      const indexer = new LexIndexer()
+      indexer.create(post, async () => {})
+
+      expect(() => indexer.put(post, async () => {})).toThrow(
+        'Handler already registered',
+      )
+    })
+
+    it('throws when create conflicts with put', () => {
+      const indexer = new LexIndexer()
+      indexer.put(post, async () => {})
+
+      expect(() => indexer.create(post, async () => {})).toThrow(
+        'Handler already registered',
+      )
+    })
+  })
+
+  describe('schema validation', () => {
+    it('validates record on create', async () => {
+      const indexer = new LexIndexer()
+      indexer.create(post, async () => {})
+
+      const opts = createMockOpts()
+      await expect(
+        indexer.onEvent(createRecordEvent({ record: { text: 123 } }), opts),
+      ).rejects.toThrow('Record validation failed')
+    })
+
+    it('validates record on update', async () => {
+      const indexer = new LexIndexer()
+      indexer.update(post, async () => {})
+
+      const opts = createMockOpts()
+      await expect(
+        indexer.onEvent(
+          createRecordEvent({ action: 'update', record: { invalid: true } }),
+          opts,
+        ),
+      ).rejects.toThrow('Record validation failed')
+    })
+  })
+
+  describe('ack behavior', () => {
+    it('calls ack after handler completes', async () => {
+      const indexer = new LexIndexer()
+      indexer.create(post, async () => {})
+
+      const opts = createMockOpts()
+      await indexer.onEvent(createRecordEvent(), opts)
+
+      expect(opts.acked).toBe(true)
+    })
+
+    it('calls ack when routed to other handler', async () => {
+      const indexer = new LexIndexer()
+      indexer.other(async () => {})
+
+      const opts = createMockOpts()
+      await indexer.onEvent(createRecordEvent(), opts)
+
+      expect(opts.acked).toBe(true)
+    })
+
+    it('calls ack even when no handler matches', async () => {
+      const indexer = new LexIndexer()
+
+      const opts = createMockOpts()
+      await indexer.onEvent(createRecordEvent(), opts)
+
+      expect(opts.acked).toBe(true)
+    })
+  })
+
+  describe('error handling', () => {
+    it('calls error handler when provided', () => {
+      const indexer = new LexIndexer()
+      const errors: Error[] = []
+
+      indexer.error((err) => {
+        errors.push(err)
+      })
+
+      const testError = new Error('test error')
+      indexer.onError(testError)
+
+      expect(errors).toHaveLength(1)
+      expect(errors[0]).toBe(testError)
+    })
+
+    it('throws when no error handler is registered', () => {
+      const indexer = new LexIndexer()
+      const testError = new Error('test error')
+
+      expect(() => indexer.onError(testError)).toThrow('test error')
+    })
+  })
+})

package/tests/simple-indexer.test.ts

@@ -1,39 +1,7 @@
 import { HandlerOpts } from '../src/channel'
 import { SimpleIndexer } from '../src/simple-indexer'
 import { IdentityEvent, RecordEvent } from '../src/types'
-
-const createMockOpts = (): HandlerOpts & { acked: boolean } => {
-  const opts = {
-    signal: new AbortController().signal,
-    acked: false,
-    ack: async () => {
-      opts.acked = true
-    },
-  }
-  return opts
-}
-
-const createRecordEvent = (): RecordEvent => ({
-  id: 1,
-  type: 'record',
-  did: 'did:example:alice',
-  rev: 'abc123',
-  collection: 'com.example.post',
-  rkey: 'abc123',
-  action: 'create',
-  record: { text: 'hello' },
-  cid: 'bafyabc',
-  live: true,
-})
-
-const createIdentityEvent = (): IdentityEvent => ({
-  id: 2,
-  type: 'identity',
-  did: 'did:example:alice',
-  handle: 'alice.test',
-  isActive: true,
-  status: 'active',
-})
+import { createIdentityEvent, createMockOpts, createRecordEvent } from './_util'
 
 describe('SimpleIndexer', () => {
   describe('event routing', () => {

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/channel.ts","./src/client.ts","./src/index.ts","./src/simple-indexer.ts","./src/types.ts","./src/util.ts"],"version":"5.8.3"}
+{"root":["./src/channel.ts","./src/client.ts","./src/index.ts","./src/lex-indexer.ts","./src/simple-indexer.ts","./src/types.ts","./src/util.ts"],"version":"5.8.3"}