@f0rbit/corpus 0.1.8 → 0.1.9

package/dist/observations/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../observations/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAuB,cAAc,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAExF,OAAO,KAAK,EAAE,mBAAmB,EAAoB,MAAM,WAAW,CAAC;AAuBvE;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,GAAG,kBAAkB,CAmHrH"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../observations/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAuB,cAAc,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAExF,OAAO,KAAK,EAAE,mBAAmB,EAAoB,MAAM,WAAW,CAAC;AA6BvE;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,GAAG,kBAAkB,CAiGrH"}

package/dist/observations/client.js

@@ -5,6 +5,13 @@
 import { row_to_observation, row_to_meta, create_observation_row } from "./storage";
 import { generate_observation_id } from "./utils";
 import { ok, err } from "../types";
+async function apply_version_filter(filter, store_id, version) {
+    if (typeof filter === "function")
+        return filter(store_id, version);
+    if (filter instanceof Set)
+        return filter.has(version);
+    return filter.includes(version);
+}
 /**
  * Convert client query opts to storage query opts.
  * Handles Date -> ISO string conversion.
@@ -31,14 +38,6 @@ export function create_observations_client(storage, metadata) {
         const result = await metadata.get_latest(store_id);
         return result.ok ? result.value.version : null;
     }
-    async function resolve_version(store_id, resolver) {
-        if (resolver) {
-            const resolved = await resolver(store_id);
-            if (resolved !== null)
-                return resolved;
-        }
-        return get_latest_version(store_id);
-    }
     return {
         async put(type, opts) {
             const validation = type.schema.safeParse(opts.content);
@@ -81,15 +80,10 @@ export function create_observations_client(storage, metadata) {
         },
         async *query(opts = {}) {
             const storageOpts = to_storage_opts(opts);
-            const version_cache = new Map();
             for await (const row of storage.query_rows(storageOpts)) {
-                if (!opts.include_stale) {
-                    let canonical_version = version_cache.get(row.source_store_id);
-                    if (canonical_version === undefined) {
-                        canonical_version = await resolve_version(row.source_store_id, opts.version_resolver);
-                        version_cache.set(row.source_store_id, canonical_version);
-                    }
-                    if (canonical_version && row.source_version !== canonical_version)
+                if (opts.version_filter !== undefined) {
+                    const included = await apply_version_filter(opts.version_filter, row.source_store_id, row.source_version);
+                    if (!included)
                         continue;
                 }
                 yield row_to_observation(row);
@@ -97,15 +91,10 @@ export function create_observations_client(storage, metadata) {
         },
         async *query_meta(opts = {}) {
             const storageOpts = to_storage_opts(opts);
-            const version_cache = new Map();
             for await (const row of storage.query_rows(storageOpts)) {
-                if (!opts.include_stale) {
-                    let canonical_version = version_cache.get(row.source_store_id);
-                    if (canonical_version === undefined) {
-                        canonical_version = await resolve_version(row.source_store_id, opts.version_resolver);
-                        version_cache.set(row.source_store_id, canonical_version);
-                    }
-                    if (canonical_version && row.source_version !== canonical_version)
+                if (opts.version_filter !== undefined) {
+                    const included = await apply_version_filter(opts.version_filter, row.source_store_id, row.source_version);
+                    if (!included)
                         continue;
                 }
                 yield row_to_meta(row);

package/dist/observations/types.d.ts

@@ -120,23 +120,31 @@ export type ObservationPutOpts<T> = {
     derived_from?: SnapshotPointer[];
 };
 /**
- * Function that resolves which version is "canonical" for a given store.
- * Return null to fall back to default behavior (most recent by created_at).
+ * Filter for version-based observation filtering.
+ * - Set<string> or string[]: Include if version is in the collection
+ * - Function: Called with (store_id, version), return true to include
  *
  * @category Types
  * @group Observation Types
  *
  * @example
  * ```ts
- * const resolver: VersionResolver = async (store_id) => {
+ * // Filter to specific versions
+ * const filter: VersionFilter = new Set(['v1', 'v2', 'v3'])
+ *
+ * // Or use an array
+ * const filter: VersionFilter = ['v1', 'v2', 'v3']
+ *
+ * // Or use a function for dynamic filtering
+ * const filter: VersionFilter = async (store_id, version) => {
  *   const published = await db.query.published_reports.findFirst({
- *     where: eq(published_reports.store_id, store_id)
+ *     where: eq(published_reports.version, version)
  *   });
- *   return published?.version ?? null;
+ *   return published !== null;
  * };
  * ```
  */
-export type VersionResolver = (store_id: string) => Promise<string | null>;
+export type VersionFilter = Set<string> | string[] | ((store_id: string, version: string) => boolean | Promise<boolean>);
 /**
  * Query options for filtering observations.
  *
@@ -153,11 +161,10 @@ export type VersionResolver = (store_id: string) => Promise<string | null>;
  *   limit: 100
  * }
  *
- * // Find all observations for a specific version
+ * // Filter to only published versions
  * const versionOpts: ObservationQueryOpts = {
  *   source_store: 'hansard',
- *   source_version: 'AZJx4vM',
- *   include_stale: true
+ *   version_filter: new Set(['v1', 'v2'])
  * }
  * ```
  */
@@ -170,17 +177,16 @@ export type ObservationQueryOpts = {
     before?: Date;
     created_after?: Date;
     created_before?: Date;
-    include_stale?: boolean;
     limit?: number;
     cursor?: string;
     /**
-     * Custom function to resolve which version is "current" for a given store.
-     * When provided and include_stale is false, this takes precedence over
-     * the default "most recent by created_at" staleness logic.
+     * Filter observations by version.
+     * When provided, only observations whose source version passes the filter are included.
      *
-     * If the resolver returns null for a store_id, falls back to default behavior.
+     * - Set<string> or string[]: Include if version is in the collection
+     * - Function: Called with (store_id, version), return true to include
      */
-    version_resolver?: VersionResolver;
+    version_filter?: VersionFilter;
 };
 /**
  * Utility type to extract the content type from an ObservationTypeDef.

package/dist/observations/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../observations/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;KACZ,CAAC;CACF,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,CAAC,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;AAElE;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,CAAC,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAE3E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAClC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE3F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAElG"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../observations/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;KACZ,CAAC;CACF,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CAC5B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,CAAC,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;AAElE;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,CAAC,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAClC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,cAAc,CAAC,EAAE,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE3F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAElG"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@f0rbit/corpus",
-	"version": "0.1.8",
+	"version": "0.1.9",
 	"description": "A functional snapshotting library for TypeScript with versioned data storage, lineage tracking, and multiple backend support",
 	"module": "dist/index.js",
 	"main": "dist/index.js",