batchkit 0.2.0 → 0.3.1

package/dist/batch.d.ts

@@ -0,0 +1,3 @@
+import type { Batcher, BatchFn, BatchOptions, Match } from './types';
+export declare function batch<K, V>(fn: BatchFn<K, V>, match: Match<K, V>, options?: BatchOptions<K>): Batcher<K, V>;
+//# sourceMappingURL=batch.d.ts.map

package/dist/batch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../src/batch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,YAAY,EAEZ,KAAK,EAIN,MAAM,SAAS,CAAC;AAEjB,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EACxB,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EACjB,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAClB,OAAO,GAAE,YAAY,CAAC,CAAC,CAAM,GAC5B,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAiTf"}

package/dist/errors.d.ts

@@ -0,0 +1,4 @@
+export declare class BatchError extends Error {
+    constructor(message: string);
+}
+//# sourceMappingURL=errors.d.ts.map

package/dist/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAW,SAAQ,KAAK;gBACvB,OAAO,EAAE,MAAM;CAI5B"}

package/dist/index.d.ts

@@ -0,0 +1,8 @@
+export { batch } from './batch';
+export { BatchError } from './errors';
+export { indexed } from './indexed';
+export { onAnimationFrame, onIdle } from './schedulers';
+export type { DevtoolsHook } from './trace';
+export { __setDevtoolsHook } from './trace';
+export type { Batcher, BatchFn, BatchOptions, GetOptions, Match, MatchFn, Scheduler, TraceEvent, TraceEventData, TraceHandler, } from './types';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,YAAY,EACV,OAAO,EACP,OAAO,EACP,YAAY,EACZ,UAAU,EACV,KAAK,EACL,OAAO,EACP,SAAS,EACT,UAAU,EACV,cAAc,EACd,YAAY,GACb,MAAM,SAAS,CAAC"}

package/dist/index.js

@@ -14,7 +14,7 @@ function isIndexed(match) {
   return match === indexed;
 }
 function isKeyMatch(match) {
-  return typeof match === "string";
+  return typeof match === "string" || typeof match === "number";
 }
 function normalizeMatch(match) {
   if (isIndexed(match)) {
@@ -66,15 +66,34 @@ function onIdle(options) {
 }
 
 // src/trace.ts
-function getDevtools() {
-  if (typeof window !== "undefined" && window.__BATCHKIT_DEVTOOLS__) {
-    return window.__BATCHKIT_DEVTOOLS__;
+var devtoolsHook = null;
+var pendingBatchers = [];
+function __setDevtoolsHook(hook) {
+  devtoolsHook = hook;
+  if (hook && pendingBatchers.length > 0) {
+    for (const pending of pendingBatchers) {
+      const emitter = hook.onBatcherCreated({
+        fn: pending.fn,
+        name: pending.name,
+        stack: pending.stack
+      });
+      pending.setEmitter(emitter);
+    }
+    pendingBatchers.length = 0;
+  } else if (!hook) {
+    pendingBatchers.length = 0;
+  }
+}
+function registerBatcher(info, setEmitter) {
+  if (devtoolsHook) {
+    const emitter = devtoolsHook.onBatcherCreated(info);
+    setEmitter(emitter);
+  } else {
+    pendingBatchers.push({ ...info, setEmitter });
   }
-  return;
 }
-function createTracer(name, handler) {
+function createTracer(name, handler, getDevtoolsEmitter) {
   let batchCounter = 0;
-  let registeredWithDevtools = false;
   function emit(event) {
     const timestamp = performance.now();
     const fullEvent = {
@@ -84,13 +103,9 @@ function createTracer(name, handler) {
     if (handler) {
       handler(fullEvent);
     }
-    const devtools = getDevtools();
-    if (devtools && name) {
-      if (!registeredWithDevtools) {
-        devtools.register({ name, registeredAt: timestamp });
-        registeredWithDevtools = true;
-      }
-      devtools.emit(name, fullEvent);
+    const devtoolsEmitter = getDevtoolsEmitter?.();
+    if (devtoolsEmitter) {
+      devtoolsEmitter(fullEvent);
     }
   }
   function nextBatchId() {
@@ -110,7 +125,12 @@ function batch(fn, match, options = {}) {
     trace: traceHandler
   } = options;
   const scheduler = schedule ?? (waitMs ? wait(waitMs) : microtask);
-  const tracer = createTracer(name, traceHandler);
+  let devtoolsEmitter;
+  const creationStack = new Error().stack;
+  registerBatcher({ fn, name, stack: creationStack }, (emitter) => {
+    devtoolsEmitter = emitter;
+  });
+  const tracer = createTracer(name, traceHandler, () => devtoolsEmitter);
   const matchFn = normalizeMatch(match);
   const isIndexedMatch = isIndexed(match);
   const indexedMatcher = isIndexedMatch ? createIndexedMatcher() : null;
@@ -119,6 +139,7 @@ function batch(fn, match, options = {}) {
   let cleanup = null;
   let isScheduled = false;
   let currentAbortController = null;
+  let inFlightRequests = [];
   function scheduleDispatch() {
     if (isScheduled || queue.length === 0)
       return;
@@ -179,6 +200,7 @@ function batch(fn, match, options = {}) {
     }
     if (uniqueKeys.length === 0)
       return;
+    inFlightRequests = chunk;
     tracer.emit({
       type: "dispatch",
       batchId,
@@ -259,6 +281,7 @@ function batch(fn, match, options = {}) {
       }
     } finally {
       currentAbortController = null;
+      inFlightRequests = [];
     }
   }
   function getSingle(key, options2) {
@@ -286,8 +309,9 @@ function batch(fn, match, options = {}) {
         const onAbort = () => {
           request.aborted = true;
           reject(new DOMException("Aborted", "AbortError"));
-          const allAborted = queue.every((r) => r.aborted);
-          if (allAborted && currentAbortController) {
+          const allPendingAborted = queue.every((r) => r.aborted);
+          const allInFlightAborted = inFlightRequests.length > 0 && inFlightRequests.every((r) => r.aborted);
+          if (allPendingAborted && allInFlightAborted && currentAbortController) {
             currentAbortController.abort();
           }
         };
@@ -338,5 +362,6 @@ export {
   onAnimationFrame,
   indexed,
   batch,
+  __setDevtoolsHook,
   BatchError
 };

package/dist/indexed.d.ts

@@ -0,0 +1,2 @@
+export declare const indexed: unique symbol;
+//# sourceMappingURL=indexed.d.ts.map

package/dist/indexed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"indexed.d.ts","sourceRoot":"","sources":["../src/indexed.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,EAAE,OAAO,MAA0B,CAAC"}

package/dist/match.d.ts

@@ -0,0 +1,6 @@
+import type { Match, MatchFn } from './types';
+export declare function isIndexed<K, V>(match: Match<K, V>): match is symbol;
+export declare function isKeyMatch<K, V>(match: Match<K, V>): match is keyof V;
+export declare function normalizeMatch<K, V>(match: Match<K, V>): MatchFn<K, V> | null;
+export declare function createIndexedMatcher<K, V>(): (results: Record<string, V>, key: K) => V | undefined;
+//# sourceMappingURL=match.d.ts.map

package/dist/match.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../src/match.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,IAAI,MAAM,CAEnE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,CAErE;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAkB7E;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,CAAC,KAAK,CAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAC1B,GAAG,EAAE,CAAC,KACH,CAAC,GAAG,SAAS,CAEjB"}

package/dist/schedulers.d.ts

@@ -0,0 +1,8 @@
+import type { Scheduler } from './types';
+export declare const microtask: Scheduler;
+export declare function wait(ms: number): Scheduler;
+export declare const onAnimationFrame: Scheduler;
+export declare function onIdle(options?: {
+    timeout?: number;
+}): Scheduler;
+//# sourceMappingURL=schedulers.d.ts.map

package/dist/schedulers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schedulers.d.ts","sourceRoot":"","sources":["../src/schedulers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,eAAO,MAAM,SAAS,EAAE,SAYvB,CAAC;AAEF,wBAAgB,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAK1C;AAED,eAAO,MAAM,gBAAgB,EAAE,SAG9B,CAAC;AAEF,wBAAgB,MAAM,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAahE"}

package/dist/trace.d.ts

@@ -0,0 +1,23 @@
+import type { TraceEvent, TraceEventData, TraceHandler } from './types';
+export interface DevtoolsHook {
+    onBatcherCreated(info: {
+        fn: {
+            toString(): string;
+        };
+        name: string | undefined;
+        stack: string | undefined;
+    }): ((event: TraceEvent) => void) | undefined;
+}
+export declare function __setDevtoolsHook(hook: DevtoolsHook | null): void;
+export declare function registerBatcher(info: {
+    fn: {
+        toString(): string;
+    };
+    name: string | undefined;
+    stack: string | undefined;
+}, setEmitter: (emitter: ((event: TraceEvent) => void) | undefined) => void): void;
+export declare function createTracer<K>(name: string | undefined, handler: TraceHandler<K> | undefined, getDevtoolsEmitter: (() => ((event: TraceEvent<K>) => void) | undefined) | undefined): {
+    emit: (event: TraceEventData<K>) => void;
+    nextBatchId: () => string;
+};
+//# sourceMappingURL=trace.d.ts.map

package/dist/trace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAExE,MAAM,WAAW,YAAY;IAC3B,gBAAgB,CAAC,IAAI,EAAE;QACrB,EAAE,EAAE;YAAE,QAAQ,IAAI,MAAM,CAAA;SAAE,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CAC/C;AAYD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAiBjE;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE;IACJ,EAAE,EAAE;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,EACD,UAAU,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,KAAK,IAAI,GACvE,IAAI,CAON;AAED,wBAAgB,YAAY,CAAC,CAAC,EAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,EACpC,kBAAkB,EACd,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,GACpD,SAAS;kBAIQ,eAAe,CAAC,CAAC;uBAiBd,MAAM;EAK/B"}

package/dist/types.d.ts

@@ -0,0 +1,61 @@
+export type BatchFn<K, V> = (keys: K[], signal: AbortSignal) => Promise<V[] | Record<string, V>>;
+export type Match<K, V> = keyof V | symbol | MatchFn<K, V>;
+export type MatchFn<K, V> = (results: V[], key: K) => V | undefined;
+export type IndexedMatchFn<K, V> = (results: Record<string, V>, key: K) => V | undefined;
+export type Scheduler = (dispatch: () => void) => () => void;
+export type TraceHandler<K = unknown> = (event: TraceEvent<K>) => void;
+export type TraceEventData<K = unknown> = {
+    type: 'get';
+    key: K;
+} | {
+    type: 'dedup';
+    key: K;
+} | {
+    type: 'schedule';
+    batchId: string;
+    size: number;
+} | {
+    type: 'dispatch';
+    batchId: string;
+    keys: K[];
+} | {
+    type: 'resolve';
+    batchId: string;
+    duration: number;
+} | {
+    type: 'error';
+    batchId: string;
+    error: Error;
+} | {
+    type: 'abort';
+    batchId: string;
+};
+export type TraceEvent<K = unknown> = TraceEventData<K> & {
+    timestamp: number;
+};
+export interface BatchOptions<K = unknown> {
+    wait?: number;
+    schedule?: Scheduler;
+    max?: number;
+    key?: (k: K) => unknown;
+    name?: string;
+    trace?: TraceHandler<K>;
+}
+export interface GetOptions {
+    signal?: AbortSignal;
+}
+export interface Batcher<K, V> {
+    get(key: K, options?: GetOptions): Promise<V>;
+    get(keys: K[], options?: GetOptions): Promise<V[]>;
+    flush(): Promise<void>;
+    abort(): void;
+    readonly name?: string;
+}
+export interface PendingRequest<K, V> {
+    key: K;
+    resolve: (value: V) => void;
+    reject: (error: Error) => void;
+    signal?: AbortSignal;
+    aborted: boolean;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "batchkit",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "A modern TypeScript library for batching async operations",
   "type": "module",
   "main": "./dist/index.js",

package/src/batch.ts

@@ -1,7 +1,7 @@
 import { BatchError } from './errors';
 import { createIndexedMatcher, isIndexed, normalizeMatch } from './match';
 import { microtask, wait } from './schedulers';
-import { createTracer } from './trace';
+import { createTracer, registerBatcher } from './trace';
 import type {
   Batcher,
   BatchFn,
@@ -10,6 +10,7 @@ import type {
   Match,
   PendingRequest,
   Scheduler,
+  TraceEvent,
 } from './types';
 
 export function batch<K, V>(
@@ -27,7 +28,15 @@ export function batch<K, V>(
   } = options;
 
   const scheduler: Scheduler = schedule ?? (waitMs ? wait(waitMs) : microtask);
-  const tracer = createTracer(name, traceHandler);
+
+  let devtoolsEmitter: ((event: TraceEvent) => void) | undefined;
+  const creationStack = new Error().stack;
+
+  registerBatcher({ fn, name, stack: creationStack }, (emitter) => {
+    devtoolsEmitter = emitter;
+  });
+
+  const tracer = createTracer(name, traceHandler, () => devtoolsEmitter);
 
   const matchFn = normalizeMatch(match);
   const isIndexedMatch = isIndexed(match);
@@ -38,6 +47,7 @@ export function batch<K, V>(
   let cleanup: (() => void) | null = null;
   let isScheduled = false;
   let currentAbortController: AbortController | null = null;
+  let inFlightRequests: PendingRequest<K, V>[] = [];
 
   function scheduleDispatch(): void {
     if (isScheduled || queue.length === 0) return;
@@ -115,6 +125,8 @@ export function batch<K, V>(
 
     if (uniqueKeys.length === 0) return;
 
+    inFlightRequests = chunk;
+
     tracer.emit({
       type: 'dispatch',
       batchId,
@@ -210,6 +222,7 @@ export function batch<K, V>(
       }
     } finally {
       currentAbortController = null;
+      inFlightRequests = [];
     }
   }
 
@@ -246,8 +259,15 @@ export function batch<K, V>(
           request.aborted = true;
           reject(new DOMException('Aborted', 'AbortError'));
 
-          const allAborted = queue.every((r) => r.aborted);
-          if (allAborted && currentAbortController) {
+          const allPendingAborted = queue.every((r) => r.aborted);
+          const allInFlightAborted =
+            inFlightRequests.length > 0 &&
+            inFlightRequests.every((r) => r.aborted);
+          if (
+            allPendingAborted &&
+            allInFlightAborted &&
+            currentAbortController
+          ) {
             currentAbortController.abort();
           }
         };

package/src/index.ts

@@ -2,6 +2,8 @@ export { batch } from './batch';
 export { BatchError } from './errors';
 export { indexed } from './indexed';
 export { onAnimationFrame, onIdle } from './schedulers';
+export type { DevtoolsHook } from './trace';
+export { __setDevtoolsHook } from './trace';
 
 export type {
   Batcher,
@@ -12,5 +14,6 @@ export type {
   MatchFn,
   Scheduler,
   TraceEvent,
+  TraceEventData,
   TraceHandler,
 } from './types';

package/src/match.ts

@@ -6,7 +6,7 @@ export function isIndexed<K, V>(match: Match<K, V>): match is symbol {
 }
 
 export function isKeyMatch<K, V>(match: Match<K, V>): match is keyof V {
-  return typeof match === 'string';
+  return typeof match === 'string' || typeof match === 'number';
 }
 
 export function normalizeMatch<K, V>(match: Match<K, V>): MatchFn<K, V> | null {
@@ -16,11 +16,11 @@ export function normalizeMatch<K, V>(match: Match<K, V>): MatchFn<K, V> | null {
   }
 
   if (isKeyMatch<K, V>(match)) {
-    const key = match;
+    const key = match as string | number;
     return (results: V[], requestedKey: K) => {
       return results.find(
         (item) =>
-          (item as Record<string, unknown>)[key as string] === requestedKey,
+          (item as Record<string | number, unknown>)[key] === requestedKey,
       );
     };
   }

package/src/trace.ts

@@ -1,30 +1,69 @@
 import type { TraceEvent, TraceEventData, TraceHandler } from './types';
 
-interface DevtoolsRegistry {
-  register(info: { name: string; registeredAt: number }): void;
-  emit(name: string, event: unknown): void;
+export interface DevtoolsHook {
+  onBatcherCreated(info: {
+    fn: { toString(): string };
+    name: string | undefined;
+    stack: string | undefined;
+  }): ((event: TraceEvent) => void) | undefined;
 }
 
-declare const window: { __BATCHKIT_DEVTOOLS__?: DevtoolsRegistry } | undefined;
+interface PendingBatcher {
+  fn: { toString(): string };
+  name: string | undefined;
+  stack: string | undefined;
+  setEmitter: (emitter: ((event: TraceEvent) => void) | undefined) => void;
+}
+
+let devtoolsHook: DevtoolsHook | null = null;
+const pendingBatchers: PendingBatcher[] = [];
+
+export function __setDevtoolsHook(hook: DevtoolsHook | null): void {
+  devtoolsHook = hook;
+
+  if (hook && pendingBatchers.length > 0) {
+    for (const pending of pendingBatchers) {
+      const emitter = hook.onBatcherCreated({
+        fn: pending.fn,
+        name: pending.name,
+        stack: pending.stack,
+      });
+      pending.setEmitter(emitter);
+    }
+    pendingBatchers.length = 0;
+  } else if (!hook) {
+    // clear pending batchers when hook is removed
+    pendingBatchers.length = 0;
+  }
+}
 
-function getDevtools(): DevtoolsRegistry | undefined {
-  // biome-ignore lint/complexity/useOptionalChain: need typeof check for Node.js
-  if (typeof window !== 'undefined' && window.__BATCHKIT_DEVTOOLS__) {
-    return window.__BATCHKIT_DEVTOOLS__;
+export function registerBatcher(
+  info: {
+    fn: { toString(): string };
+    name: string | undefined;
+    stack: string | undefined;
+  },
+  setEmitter: (emitter: ((event: TraceEvent) => void) | undefined) => void,
+): void {
+  if (devtoolsHook) {
+    const emitter = devtoolsHook.onBatcherCreated(info);
+    setEmitter(emitter);
+  } else {
+    pendingBatchers.push({ ...info, setEmitter });
   }
-  return undefined;
 }
 
 export function createTracer<K>(
   name: string | undefined,
   handler: TraceHandler<K> | undefined,
+  getDevtoolsEmitter:
+    | (() => ((event: TraceEvent<K>) => void) | undefined)
+    | undefined,
 ) {
   let batchCounter = 0;
-  let registeredWithDevtools = false;
 
   function emit(event: TraceEventData<K>) {
     const timestamp = performance.now();
-
     const fullEvent = {
       ...event,
       timestamp,
@@ -34,13 +73,9 @@ export function createTracer<K>(
       handler(fullEvent);
     }
 
-    const devtools = getDevtools();
-    if (devtools && name) {
-      if (!registeredWithDevtools) {
-        devtools.register({ name, registeredAt: timestamp });
-        registeredWithDevtools = true;
-      }
-      devtools.emit(name, fullEvent);
+    const devtoolsEmitter = getDevtoolsEmitter?.();
+    if (devtoolsEmitter) {
+      devtoolsEmitter(fullEvent);
     }
   }