@osdk/client 2.2.0-beta.7 → 2.2.0-beta.9

package/build/types/observable/internal/ObjectQuery.d.ts

@@ -1,5 +1,6 @@
-import type { ObjectTypeDefinition, Osdk, PrimaryKeyType } from "@osdk/api";
+import type { ObjectTypeDefinition, PrimaryKeyType } from "@osdk/api";
 import type { Connectable, Observable, Subject } from "rxjs";
+import type { ObjectHolder } from "../../object/convertWireToOsdkObjects/ObjectHolder.js";
 import type { ObjectPayload } from "../ObjectPayload.js";
 import type { CommonObserveOptions, Status } from "../ObservableClient.js";
 import type { CacheKey } from "./CacheKey.js";
@@ -7,13 +8,11 @@ import type { Entry } from "./Layer.js";
 import { Query } from "./Query.js";
 import type { BatchContext, Store, SubjectPayload } from "./Store.js";
 export interface ObjectEntry extends Entry<ObjectCacheKey> {}
-type ObjectStorageData = Osdk.Instance<ObjectTypeDefinition>;
-export interface ObjectCacheKey extends CacheKey<"object", ObjectStorageData, ObjectQuery, [string, pk: PrimaryKeyType<ObjectTypeDefinition>]> {}
+export interface ObjectCacheKey extends CacheKey<"object", ObjectHolder, ObjectQuery, [string, pk: PrimaryKeyType<ObjectTypeDefinition>]> {}
 export declare class ObjectQuery extends Query<ObjectCacheKey, ObjectPayload, CommonObserveOptions> {
 	#private;
 	constructor(store: Store, subject: Subject<SubjectPayload<ObjectCacheKey>>, type: string, pk: PrimaryKeyType<ObjectTypeDefinition>, cacheKey: ObjectCacheKey, opts: CommonObserveOptions);
 	protected _createConnectable(subject: Observable<SubjectPayload<ObjectCacheKey>>): Connectable<ObjectPayload>;
-	_fetch(): Promise<void>;
-	writeToStore(data: Osdk.Instance<ObjectTypeDefinition>, status: Status, batch: BatchContext): Entry<ObjectCacheKey>;
+	_fetchAndStore(): Promise<void>;
+	writeToStore(data: ObjectHolder, status: Status, batch: BatchContext): Entry<ObjectCacheKey>;
 }
-export {};

package/build/types/observable/internal/ObjectQuery.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAEE,sBACA,MACA,sBACK,WAAY;AAEnB,cAAc,aAAa,YAAY,eAAe,MAAO;AAG7D,cAAc,qBAAqB,qBAAsB;AACzD,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,SAAS,aAAa,YAAa;AACnC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,iBAAiB,oBAAoB,MAAM,gBAAgB,CAAE;KAExD,oBAAoB,KAAK,SAAS;AAEvC,iBAAiB,uBACf,SACE,UACA,mBACA,sBACS,IAAI,eAAe,wBAEhC,CAAE;AAEF,OAAO,cAAM,oBAAoB,MAC/B,gBACA,eACA,sBACA;;CAIA,YACEA,OAAO,OACPC,SAAS,QAAQ,eAAe,kBAChCC,cACAC,IAAI,eAAe,uBACnBC,UAAU,gBACVC,MAAM;CAqBR,UAAU,mBACRC,SAAS,WAAW,eAAe,mBAClC,YAAY;CAwBf,AAAM,UAAU;CAmBhB,aACEC,MAAM,KAAK,SAAS,uBACpBC,QAAQ,QACRC,OAAO,eACN,MAAM;AAyBV","names":["store: Store","subject: Subject<SubjectPayload<ObjectCacheKey>>","type: string","pk: PrimaryKeyType<ObjectTypeDefinition>","cacheKey: ObjectCacheKey","opts: CommonObserveOptions","subject: Observable<SubjectPayload<ObjectCacheKey>>","data: Osdk.Instance<ObjectTypeDefinition>","status: Status","batch: BatchContext"],"sources":["../../../../src/observable/internal/ObjectQuery.ts"],"version":3,"file":"ObjectQuery.d.ts"}
+{"mappings":"AAgBA,cAEE,sBAEA,sBACK,WAAY;AAEnB,cAAc,aAAa,YAAY,eAAe,MAAO;AAG7D,cAAc,oBAAoB,uDAAwD;AAC1F,cAAc,qBAAqB,qBAAsB;AACzD,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,SAAS,aAAa,YAAa;AACnC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,iBAAiB,oBAAoB,MAAM,gBAAgB,CAAE;AAE7D,iBAAiB,uBACf,SACE,UACA,cACA,sBACS,IAAI,eAAe,wBAEhC,CAAE;AAEF,OAAO,cAAM,oBAAoB,MAC/B,gBACA,eACA,sBACA;;CAIA,YACEA,OAAO,OACPC,SAAS,QAAQ,eAAe,kBAChCC,cACAC,IAAI,eAAe,uBACnBC,UAAU,gBACVC,MAAM;CAqBR,UAAU,mBACRC,SAAS,WAAW,eAAe,mBAClC,YAAY;CAwBf,AAAM,kBAAkB;CAqBxB,aACEC,MAAM,cACNC,QAAQ,QACRC,OAAO,eACN,MAAM;AAyBV","names":["store: Store","subject: Subject<SubjectPayload<ObjectCacheKey>>","type: string","pk: PrimaryKeyType<ObjectTypeDefinition>","cacheKey: ObjectCacheKey","opts: CommonObserveOptions","subject: Observable<SubjectPayload<ObjectCacheKey>>","data: ObjectHolder","status: Status","batch: BatchContext"],"sources":["../../../../src/observable/internal/ObjectQuery.ts"],"version":3,"file":"ObjectQuery.d.ts"}

package/build/types/observable/internal/OptimisticJob.d.ts

@@ -1,5 +1,5 @@
 import type { OptimisticBuilder } from "../OptimisticBuilder.js";
-import { type Changes } from "./ChangedObjects.js";
+import { type Changes } from "./Changes.js";
 import { type OptimisticId } from "./OptimisticId.js";
 import type { Store } from "./Store.js";
 export declare class OptimisticJob {

package/build/types/observable/internal/OptimisticJob.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAkBA,cAAc,yBAAyB,yBAA0B;AACjE,cAAc,eAAe,qBAAsB;AACnD,cAAkC,oBAAoB,mBAAoB;AAC1E,cAAc,aAAa,YAAa;AAExC,OAAO,cAAM,cAAc;;CACzB,SAAS;CACT,iBAAiB,QAAQ;CAGzB,YAAYA,OAAO,OAAOC,cAAc;AAmEzC;AAED,OAAO,iBAAS,iBACdD,OAAO,OACPE,gCAAgCC,KAAK,oCAC9B","names":["store: Store","optimisticId: OptimisticId","optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void)","ctx: OptimisticBuilder"],"sources":["../../../../src/observable/internal/OptimisticJob.ts"],"version":3,"file":"OptimisticJob.d.ts"}
+{"mappings":"AAkBA,cAAc,yBAAyB,yBAA0B;AACjE,cAAc,eAAe,cAAe;AAC5C,cAAkC,oBAAoB,mBAAoB;AAC1E,cAAc,aAAa,YAAa;AAExC,OAAO,cAAM,cAAc;;CACzB,SAAS;CACT,iBAAiB,QAAQ;CAGzB,YAAYA,OAAO,OAAOC,cAAc;AAmEzC;AAED,OAAO,iBAAS,iBACdD,OAAO,OACPE,gCAAgCC,KAAK,oCAC9B","names":["store: Store","optimisticId: OptimisticId","optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void)","ctx: OptimisticBuilder"],"sources":["../../../../src/observable/internal/OptimisticJob.ts"],"version":3,"file":"OptimisticJob.d.ts"}

package/build/types/observable/internal/OrderByCanonicalizer.d.ts

@@ -0,0 +1,12 @@
+import type { Canonical } from "./Canonical.js";
+export declare class WeakRefTrie<X extends object> {
+	#private;
+	constructor(makeData?: (array: any[]) => X);
+	lookupArray<T extends IArguments | any[]>(array: T): X;
+	peekArray<T extends IArguments | any[]>(array: T): X | undefined;
+	removeArray<T extends IArguments | any[]>(array: T): X | undefined;
+}
+export declare class OrderByCanonicalizer {
+	#private;
+	canonicalize: (orderBy: Record<string, "asc" | "desc" | undefined>) => Canonical<Record<string, "asc" | "desc" | undefined>>;
+}

package/build/types/observable/internal/OrderByCanonicalizer.d.ts.map

@@ -0,0 +1 @@
+{"mappings":"AAmBA,cAAc,iBAAiB,gBAAiB;AAIhD,OAAO,cAAM,YAAY,kBAAkB;;CAWzC,YAAYA,YAAWC,iBAAiB;CAWxC,YAAY,UAAU,oBAAoBC,OAAO,IAAI;CAWrD,UAAU,UAAU,oBAAoBA,OAAO,IAAI;CAUnD,YAAY,UAAU,oBAAoBA,OAAO,IAAI;AAGtD;AAED,OAAO,cAAM,qBAAqB;;CA0BhC,eACEC,SAAS,eAAe,QAAQ,wBAC7B,UAAU,eAAe,QAAQ;AAMvC","names":["makeData: (array: any[]) => X","array: any[]","array: T","orderBy: Record<string, \"asc\" | \"desc\" | undefined>"],"sources":["../../../../src/observable/internal/OrderByCanonicalizer.ts"],"version":3,"file":"OrderByCanonicalizer.d.ts"}

package/build/types/observable/internal/OrderByCanonicalizer.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/types/observable/internal/OrderByCanonicalizer.test.d.ts.map

@@ -0,0 +1 @@
+{"mappings":"","names":[],"sources":["../../../../src/observable/internal/OrderByCanonicalizer.test.ts"],"version":3,"file":"OrderByCanonicalizer.test.d.ts"}

package/build/types/observable/internal/Query.d.ts

@@ -2,7 +2,9 @@ import type { Connectable, Observable, Observer, Subscribable, Subscription } fr
 import type { Logger } from "../../Logger.js";
 import type { CommonObserveOptions, Status } from "../ObservableClient.js";
 import type { CacheKey } from "./CacheKey.js";
+import type { Changes } from "./Changes.js";
 import type { Entry } from "./Layer.js";
+import type { OptimisticId } from "./OptimisticId.js";
 import type { BatchContext, Store, SubjectPayload } from "./Store.js";
 export declare abstract class Query<
 	KEY extends CacheKey,
@@ -20,11 +22,44 @@ export declare abstract class Query<
 	constructor(store: Store, observable: Observable<SubjectPayload<KEY>>, opts: O, cacheKey: KEY, logger?: Logger);
 	protected abstract _createConnectable(subject: Observable<SubjectPayload<KEY>>): Connectable<PAYLOAD>;
 	subscribe(observer: Partial<Observer<PAYLOAD>>): Subscription;
-	revalidate(force?: boolean): Promise<unknown>;
-	_preFetch(): void;
-	abstract _fetch(): Promise<unknown>;
+	/**
+	* Causes the query to revalidate. This will cause the query to fetch
+	* the latest data from the server and update the store if it is deemed
+	* "stale" or if `force` is true.
+	*
+	* @param force
+	* @returns
+	*/
+	revalidate(force?: boolean): Promise<void>;
+	protected _preFetch(): void;
+	protected abstract _fetchAndStore(): Promise<unknown>;
+	/**
+	* Sets the status of the query in the store (but does not store that in `changes`).
+	*
+	* @param status
+	* @param batch
+	* @returns
+	*/
 	setStatus(status: Status, batch: BatchContext): void;
 	dispose(): void;
-	_dispose(): void;
+	/**
+	* Per query type dispose functionality
+	*/
+	protected _dispose(): void;
+	/**
+	* The purpose of this method is to provide a way for others to write
+	* directly into the store for this query.
+	*
+	* @param data
+	* @param status
+	* @param batch
+	*/
 	abstract writeToStore(data: KEY["__cacheKey"]["value"], status: Status, batch: BatchContext): Entry<KEY>;
+	/**
+	* @param changes
+	* @param optimisticId
+	* @returns If revalidation is needed, a promise that resolves after the
+	*          revalidation is complete. Otherwise, undefined.
+	*/
+	maybeUpdateAndRevalidate?: (changes: Changes, optimisticId: OptimisticId | undefined) => Promise<void> | undefined;
 }

package/build/types/observable/internal/Query.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,aACA,YACA,UACA,cACA,oBACK,MAAO;AAEd,cAAc,cAAc,iBAAkB;AAC9C,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,OAAO,uBAAe;CACpB,YAAY;CACZ;CACA,UAAU;aACC,aAAa,SAAS;;CACjC;CACA,eAAe;CACf;CACA,SAAS;CACT,UAAU;CACV,OAAO;CACP,kBAAkB;CAQlB,YACEA,OAAO,OACPC,YAAY,WAAW,eAAe,OACtCC,MAAM,GACNC,UAAU,KACVC,SAAS;CAoBX,mBAAmB,mBACjBC,SAAS,WAAW,eAAe,QAClC,YAAY;CAEf,AAAO,UACLC,UAAU,QAAQ,SAAS,YAC1B;CAMH,WAAWC,kBAAkB;CAwD7B;CACA,SAAS,UAAU;CAEnB,UACEC,QAAQ,QACRC,OAAO;CAWT;CAQA;CAEA,SAAS,aACPC,MAAM,IAAI,cAAc,UACxBF,QAAQ,QACRC,OAAO,eACN,MAAM;AACV","names":["store: Store","observable: Observable<SubjectPayload<KEY>>","opts: O","cacheKey: KEY","logger?: Logger","subject: Observable<SubjectPayload<KEY>>","observer: Partial<Observer<PAYLOAD>>","force?: boolean","status: Status","batch: BatchContext","data: KEY[\"__cacheKey\"][\"value\"]"],"sources":["../../../../src/observable/internal/Query.ts"],"version":3,"file":"Query.d.ts"}
+{"mappings":"AAgBA,cACE,aACA,YACA,UACA,cACA,oBACK,MAAO;AAEd,cAAc,cAAc,iBAAkB;AAC9C,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,eAAe,cAAe;AAC5C,cAAc,aAAa,YAAa;AACxC,cAAc,oBAAoB,mBAAoB;AACtD,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,OAAO,uBAAe;CACpB,YAAY;CACZ;CACA,UAAU;aACC,aAAa,SAAS;;CACjC;CACA,eAAe;CACf;CACA,SAAS;CACT,UAAU;CACV,OAAO;CACP,kBAAkB;CAQlB,YACEA,OAAO,OACPC,YAAY,WAAW,eAAe,OACtCC,MAAM,GACNC,UAAU,KACVC,SAAS;CAoBX,mBAAmB,mBACjBC,SAAS,WAAW,eAAe,QAClC,YAAY;CAEf,AAAO,UACLC,UAAU,QAAQ,SAAS,YAC1B;;;;;;;;;CAcH,AAAM,WAAWC,kBAAkB;CAiEnC,UAAU;CAEV,mBAAmB,kBAAkB;;;;;;;;CASrC,UACEC,QAAQ,QACRC,OAAO;CAWT;;;;CAWA,UAAU;;;;;;;;;CAUV,SAAS,aACPC,MAAM,IAAI,cAAc,UACxBF,QAAQ,QACRC,OAAO,eACN,MAAM;;;;;;;CAQT,4BACEE,SAAS,SACTC,cAAc,6BACX;AACN","names":["store: Store","observable: Observable<SubjectPayload<KEY>>","opts: O","cacheKey: KEY","logger?: Logger","subject: Observable<SubjectPayload<KEY>>","observer: Partial<Observer<PAYLOAD>>","force?: boolean","status: Status","batch: BatchContext","data: KEY[\"__cacheKey\"][\"value\"]","changes: Changes","optimisticId: OptimisticId | undefined"],"sources":["../../../../src/observable/internal/Query.ts"],"version":3,"file":"Query.d.ts"}

package/build/types/observable/internal/RefCounts.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAkBA,OAAO,cAAM,UAAU,UAAU,CAAE,GAAE;CAOvB;CAA2B;CANvC,QAAQ;CAIR,QAAQ;CAER,YAAoBA,mBAA2BC,UAAUC,KAAK;CAG9D,SAAS,UAAU,GAAGC,KAAK,IAAI;CAQ/B,OAAOD,KAAK;CAQZ,QAAQA,KAAK;CAUb,IAAIA,KAAK;CAIT;AAiCD","names":["keepAlive: number","cleanup: (key: T) => void","key: T","key: X"],"sources":["../../../../src/observable/internal/RefCounts.ts"],"version":3,"file":"RefCounts.d.ts"}
+{"mappings":"AAkBA,OAAO,cAAM,UAAU,UAAU,CAAE,GAAE;CAOvB;CAA2B;CANvC,QAAQ;CAIR,QAAQ;CAER,YAAoBA,mBAA2BC,UAAUC,KAAK;CAG9D,SAAS,UAAU,GAAGC,KAAK,IAAI;CAQ/B,OAAOD,KAAK;CAQZ,QAAQA,KAAK;CAgBb,IAAIA,KAAK;CAIT;AAiCD","names":["keepAlive: number","cleanup: (key: T) => void","key: T","key: X"],"sources":["../../../../src/observable/internal/RefCounts.ts"],"version":3,"file":"RefCounts.d.ts"}

package/build/types/observable/internal/SimpleWhereClause.d.ts

@@ -0,0 +1,2 @@
+import type { WhereClause } from "@osdk/api";
+export type SimpleWhereClause = WhereClause<any>;

package/build/types/observable/internal/SimpleWhereClause.d.ts.map

@@ -0,0 +1 @@
+{"mappings":"AAgBA,cAAc,mBAAmB,WAAY;AAE7C,YAAY,oBAAoB","names":[],"sources":["../../../../src/observable/internal/SimpleWhereClause.ts"],"version":3,"file":"SimpleWhereClause.d.ts"}

package/build/types/observable/internal/Store.d.ts

@@ -1,4 +1,5 @@
-import type { ActionDefinition, ObjectTypeDefinition, Osdk, PrimaryKeyType, WhereClause } from "@osdk/api";
+import type { ActionDefinition, InterfaceDefinition, ObjectTypeDefinition, PrimaryKeyType, WhereClause } from "@osdk/api";
+import type { Observer } from "rxjs";
 import { BehaviorSubject } from "rxjs";
 import type { ActionSignatureFromDef } from "../../actions/applyAction.js";
 import { type Client } from "../../Client.js";
@@ -6,16 +7,16 @@ import type { ListPayload } from "../ListPayload.js";
 import type { ObjectPayload } from "../ObjectPayload.js";
 import type { ObserveListOptions, ObserveObjectOptions, OrderBy, Unsubscribable } from "../ObservableClient.js";
 import type { OptimisticBuilder } from "../OptimisticBuilder.js";
-import type { SubFn } from "../types.js";
 import type { CacheKey } from "./CacheKey.js";
 import type { Canonical } from "./Canonical.js";
-import { type Changes } from "./ChangedObjects.js";
+import { type Changes } from "./Changes.js";
 import { Entry } from "./Layer.js";
 import type { ListQueryOptions } from "./ListQuery.js";
 import { ListQuery } from "./ListQuery.js";
-import type { ObjectCacheKey } from "./ObjectQuery.js";
 import { ObjectQuery } from "./ObjectQuery.js";
 import { type OptimisticId } from "./OptimisticId.js";
+import { OrderByCanonicalizer } from "./OrderByCanonicalizer.js";
+import type { SimpleWhereClause } from "./SimpleWhereClause.js";
 import { WhereClauseCanonicalizer } from "./WhereClauseCanonicalizer.js";
 export interface SubjectPayload<KEY extends CacheKey> extends Entry<KEY> {
 	isOptimistic: boolean;
@@ -27,18 +28,11 @@ export interface BatchContext {
 	write: <K extends CacheKey<string, any, any>>(k: K, v: Entry<K>["value"], status: Entry<K>["status"]) => Entry<K>;
 	read: <K extends CacheKey<string, any, any>>(k: K) => Entry<K> | undefined;
 }
-interface UpdateOptions {
-	optimisticId?: OptimisticId;
-}
 export declare namespace Store {
 	interface ApplyActionOptions {
 		optimisticUpdate?: (ctx: OptimisticBuilder) => void;
 	}
 }
-export declare class OrderByCanonicalizer {
-	#private;
-	canonicalize: <T>(orderBy: Record<string, "asc" | "desc" | undefined>) => Canonical<Record<string, "asc" | "desc" | undefined>>;
-}
 export declare class Store {
 	#private;
 	whereCanonicalizer: WhereClauseCanonicalizer;
@@ -50,52 +44,34 @@ export declare class Store {
 	getCacheKey<K extends CacheKey<string, any, any>>(type: K["type"], ...args: K["__cacheKey"]["args"]): K;
 	peekSubject: <KEY extends CacheKey<string, any, any>>(cacheKey: KEY) => BehaviorSubject<SubjectPayload<KEY>> | undefined;
 	getSubject: <KEY extends CacheKey<string, any, any>>(cacheKey: KEY) => BehaviorSubject<SubjectPayload<KEY>>;
-	observeObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>, options: ObserveObjectOptions<T>, subFn: SubFn<ObjectPayload>): Unsubscribable;
-	observeList<T extends ObjectTypeDefinition>(options: ObserveListOptions<T>, subFn: SubFn<ListPayload>): Unsubscribable;
-	getListQuery<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>, orderBy: Record<string, "asc" | "desc" | undefined>, opts: ListQueryOptions): ListQuery;
+	canonicalizeWhereClause<T extends ObjectTypeDefinition | InterfaceDefinition>(where: WhereClause<T>): Canonical<SimpleWhereClause>;
+	observeObject<T extends ObjectTypeDefinition | InterfaceDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>, options: ObserveObjectOptions<T>, subFn: Observer<ObjectPayload>): Unsubscribable;
+	observeList<T extends ObjectTypeDefinition | InterfaceDefinition>(options: ObserveListOptions<T>, subFn: Observer<ListPayload>): Unsubscribable;
+	peekQuery<K extends CacheKey>(cacheKey: K): K["__cacheKey"]["query"] | undefined;
+	getListQuery<T extends ObjectTypeDefinition | InterfaceDefinition>(def: Pick<T, "type" | "apiName">, where: WhereClause<T>, orderBy: Record<string, "asc" | "desc" | undefined>, opts: ListQueryOptions): ListQuery;
 	getObjectQuery<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>): ObjectQuery;
-	getObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: string | number): Osdk.Instance<T> | undefined;
+	getValue<K extends CacheKey<string, any, any>>(cacheKey: K): Entry<K> | undefined;
 	batch: <X>({ optimisticId, changes }: {
 		optimisticId?: OptimisticId
 		changes?: Changes
 	}, batchFn: (batchContext: BatchContext) => X) => {
 		batchResult: BatchContext
 		retVal: X
+		changes: Changes
 	};
 	invalidateObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>): Promise<unknown>;
-	maybeRevalidateLists(changes: Changes): Promise<void>;
-	maybeUpdateLists(changes: Changes, optimisticId: OptimisticId | undefined): Promise<(void | undefined)[]>;
+	maybeRevalidateQueries(changes: Changes, optimisticId?: OptimisticId | undefined): Promise<void>;
 	/**
 	* @param apiName
 	* @param changes The changes we know about / to update
 	* @returns
 	*/
-	invalidateObjectType<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, changes: Changes | undefined): Promise<unknown[]>;
-	invalidateList<T extends ObjectTypeDefinition>({ objectType, where, orderBy }: {
-		objectType: T["apiName"] | T
-		where?: WhereClause<T>
-		orderBy?: OrderBy<T>
-	}): void;
-	updateObject(apiName: string | ObjectTypeDefinition, value: Osdk.Instance<ObjectTypeDefinition>, { optimisticId }?: UpdateOptions): Osdk.Instance<ObjectTypeDefinition>;
-	updateObjects(values: Array<Osdk.Instance<ObjectTypeDefinition>>, batch: BatchContext): ObjectCacheKey[];
-	/**
-	* Updates the internal state of a list and will create a new internal query if needed.
-	*
-	* Helper method only for tests right now. May be removed later.
-	*
-	* @param apiName
-	* @param where
-	* @param orderBy
-	* @param objects
-	* @param param4
-	* @param opts
-	*/
-	updateList<T extends ObjectTypeDefinition>({ objectType: apiName, where, orderBy }: {
-		objectType: T["apiName"] | T
-		where: WhereClause<T>
-		orderBy: OrderBy<T>
-	}, objects: Osdk.Instance<T>[], { optimisticId }?: UpdateOptions, opts?: ListQueryOptions): void;
+	invalidateObjectType<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, changes: Changes | undefined): Promise<void>;
 	retain(cacheKey: CacheKey<string, any, any>): void;
 	release(cacheKey: CacheKey<string, any, any>): void;
 }
-export {};
+export declare function invalidateList<T extends ObjectTypeDefinition>(store: Store, args: {
+	type: Pick<T, "apiName" | "type">
+	where?: WhereClause<T> | SimpleWhereClause
+	orderBy?: OrderBy<T>
+}): Promise<void>;

package/build/types/observable/internal/Store.d.ts.map

@@ -1 +1 @@
-{"mappings":"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","names":["k: K","v: Entry<K>[\"value\"]","status: Entry<K>[\"status\"]","ctx: OptimisticBuilder","orderBy: Record<string, \"asc\" | \"desc\" | undefined>","client: Client","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: Store.ApplyActionOptions","layerId: OptimisticId","type: K[\"type\"]","cacheKey: KEY","apiName: T[\"apiName\"] | T","pk: PrimaryKeyType<T>","options: ObserveObjectOptions<T>","subFn: SubFn<ObjectPayload>","options: ObserveListOptions<T>","subFn: SubFn<ListPayload>","where: WhereClause<T>","opts: ListQueryOptions","pk: string | number","batchFn: (batchContext: BatchContext) => X","batchContext: BatchContext","changes: Changes","optimisticId: OptimisticId | undefined","changes: Changes | undefined","apiName: string | ObjectTypeDefinition","value: Osdk.Instance<ObjectTypeDefinition>","values: Array<Osdk.Instance<ObjectTypeDefinition>>","batch: BatchContext","objects: Osdk.Instance<T>[]","cacheKey: CacheKey<string, any, any>"],"sources":["../../../../src/observable/internal/Store.ts"],"version":3,"file":"Store.d.ts"}
+{"mappings":"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","names":["k: K","v: Entry<K>[\"value\"]","status: Entry<K>[\"status\"]","ctx: OptimisticBuilder","client: Client","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: Store.ApplyActionOptions","layerId: OptimisticId","type: K[\"type\"]","cacheKey: KEY","where: WhereClause<T>","apiName: T[\"apiName\"] | T","pk: PrimaryKeyType<T>","options: ObserveObjectOptions<T>","subFn: Observer<ObjectPayload>","options: ObserveListOptions<T>","subFn: Observer<ListPayload>","cacheKey: K","def: Pick<T, \"type\" | \"apiName\">","orderBy: Record<string, \"asc\" | \"desc\" | undefined>","opts: ListQueryOptions","batchFn: (batchContext: BatchContext) => X","batchContext: BatchContext","changes: Changes","optimisticId?: OptimisticId | undefined","changes: Changes | undefined","cacheKey: CacheKey<string, any, any>","store: Store","args: {\n    type: Pick<T, \"apiName\" | \"type\">;\n    where?: WhereClause<T> | SimpleWhereClause;\n    orderBy?: OrderBy<T>;\n  }"],"sources":["../../../../src/observable/internal/Store.ts"],"version":3,"file":"Store.d.ts"}

package/build/types/observable/internal/WhereClauseCanonicalizer.d.ts

@@ -1,6 +1,7 @@
 import type { ObjectOrInterfaceDefinition, WhereClause } from "@osdk/api";
 import type { Canonical } from "./Canonical.js";
+import type { SimpleWhereClause } from "./SimpleWhereClause.js";
 export declare class WhereClauseCanonicalizer {
 	#private;
-	canonicalize<T extends ObjectOrInterfaceDefinition>(where: WhereClause<T>): Canonical<WhereClause<T>>;
+	canonicalize<T extends ObjectOrInterfaceDefinition>(where: WhereClause<T> | SimpleWhereClause): Canonical<SimpleWhereClause>;
 }

package/build/types/observable/internal/WhereClauseCanonicalizer.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,6BAA6B,mBAAmB,WAAY;AAI1E,cAAc,iBAAiB,gBAAiB;AAEhD,OAAO,cAAM,yBAAyB;;CAkBpC,AAAO,aAAa,UAAU,6BAC5BA,OAAO,YAAY,KAClB,UAAU,YAAY;AAmE1B","names":["where: WhereClause<T>"],"sources":["../../../../src/observable/internal/WhereClauseCanonicalizer.ts"],"version":3,"file":"WhereClauseCanonicalizer.d.ts"}
+{"mappings":"AAgBA,cAAc,6BAA6B,mBAAmB,WAAY;AAI1E,cAAc,iBAAiB,gBAAiB;AAChD,cAAc,yBAAyB,wBAAyB;AAEhE,OAAO,cAAM,yBAAyB;;CA6BpC,AAAO,aAAa,UAAU,6BAC5BA,OAAO,YAAY,KAAK,oBACvB,UAAU;AAmEd","names":["where: WhereClause<T> | SimpleWhereClause"],"sources":["../../../../src/observable/internal/WhereClauseCanonicalizer.ts"],"version":3,"file":"WhereClauseCanonicalizer.d.ts"}

package/build/types/observable/internal/objectMatchesWhereClause.d.ts

@@ -1,2 +1,4 @@
-import type { ObjectTypeDefinition, Osdk, WhereClause } from "@osdk/api";
-export declare function objectSortaMatchesWhereClause(o: Osdk.Instance<ObjectTypeDefinition>, whereClause: WhereClause<ObjectTypeDefinition>, strict: boolean): boolean;
+import type { InterfaceHolder } from "../../object/convertWireToOsdkObjects/InterfaceHolder.js";
+import type { ObjectHolder } from "../../object/convertWireToOsdkObjects/ObjectHolder.js";
+import type { SimpleWhereClause } from "./SimpleWhereClause.js";
+export declare function objectSortaMatchesWhereClause(o: ObjectHolder | InterfaceHolder, whereClause: SimpleWhereClause, strict: boolean): boolean;

package/build/types/observable/internal/objectMatchesWhereClause.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,sBACA,MAEA,mBACK,WAAY;AAuDnB,OAAO,iBAAS,8BACdA,GAAG,KAAK,SAAS,uBACjBC,aAAa,YAAY,uBACzBC","names":["o: Osdk.Instance<ObjectTypeDefinition>","whereClause: WhereClause<ObjectTypeDefinition>","strict: boolean"],"sources":["../../../../src/observable/internal/objectMatchesWhereClause.ts"],"version":3,"file":"objectMatchesWhereClause.d.ts"}
+{"mappings":"AAmBA,cAAc,uBAAuB,0DAA2D;AAChG,cAAc,oBAAoB,uDAAwD;AAC1F,cAAc,yBAAyB,wBAAyB;AAqDhE,OAAO,iBAAS,8BACdA,GAAG,eAAe,iBAClBC,aAAa,mBACbC","names":["o: ObjectHolder | InterfaceHolder","whereClause: SimpleWhereClause","strict: boolean"],"sources":["../../../../src/observable/internal/objectMatchesWhereClause.ts"],"version":3,"file":"objectMatchesWhereClause.d.ts"}

package/build/types/observable/internal/testUtils.d.ts

@@ -1,17 +1,22 @@
-import type { ActionEditResponse, ObjectOrInterfaceDefinition, ObjectTypeDefinition, Osdk, PageResult, WhereClause } from "@osdk/api";
+import type { ActionEditResponse, InterfaceDefinition, ObjectOrInterfaceDefinition, ObjectTypeDefinition, Osdk, PageResult, WhereClause } from "@osdk/api";
 import type { DeferredPromise } from "p-defer";
-import type { Mock } from "vitest";
+import type { Observer } from "rxjs";
+import type { Mock, MockedObject } from "vitest";
 import type { Client } from "../../Client.js";
 import type { Logger } from "../../Logger.js";
+import type { ObjectHolder } from "../../object/convertWireToOsdkObjects/ObjectHolder.js";
 import type { ListPayload } from "../ListPayload.js";
 import type { ObjectPayload } from "../ObjectPayload.js";
-import type { Status, Unsubscribable } from "../ObservableClient.js";
+import type { OrderBy, Status, Unsubscribable } from "../ObservableClient.js";
 import type { Entry } from "./Layer.js";
+import type { ListQueryOptions } from "./ListQuery.js";
+import type { OptimisticId } from "./OptimisticId.js";
+import type { Store } from "./Store.js";
 export interface MockClientHelper {
 	client: Mock<Client> & Client;
 	mockApplyActionOnce: () => DeferredPromise<Partial<ActionEditResponse>>;
 	mockFetchOneOnce: <Q extends ObjectTypeDefinition>(expectedId?: string | number | boolean) => DeferredPromise<Partial<Osdk.Instance<Q>>>;
-	mockObjectFactory2Once: () => DeferredPromise<Osdk.Instance<ObjectOrInterfaceDefinition, never, any, {}>[]>;
+	mockObjectFactory2Once: () => DeferredPromise<Array<Osdk.Instance<ObjectOrInterfaceDefinition, never, any, {}> | ObjectHolder>>;
 	mockFetchPageOnce: <Q extends ObjectTypeDefinition>(expected?: {
 		where: WhereClause<any>
 		orderBy: Record<string, "asc" | "desc" | undefined>
@@ -23,16 +28,18 @@ export declare function createTestLogger(bindings: Record<string, any>, options?
 }): Logger;
 export declare function createClientMockHelper(): MockClientHelper;
 export declare function createDefer(): (x: Unsubscribable) => Unsubscribable;
-export declare function expectSingleListCallAndClear<T extends ObjectTypeDefinition>(subFn: Mock<(e: ListPayload | undefined) => void>, resolvedList: Osdk.Instance<T>[], payloadOptions?: Omit<Partial<ListPayload>, "resolvedList">): void;
-export declare function expectSingleObjectCallAndClear<T extends ObjectTypeDefinition>(subFn: Mock<(e: ObjectPayload | undefined) => void>, object: Osdk.Instance<T>, status?: Status): void;
-export declare function waitForCall(subFn: Mock<(e: any) => void>, times?: number): Promise<void>;
-export declare function mockSingleSubCallback(): Mock<(e: ObjectPayload | undefined) => void> & {
+export declare function expectSingleListCallAndClear<T extends ObjectTypeDefinition>(subFn: MockedObject<Observer<ListPayload | undefined>>, resolvedList: ObjectHolder[] | Osdk.Instance<T>[], payloadOptions?: Omit<Partial<ListPayload>, "resolvedList">): void;
+export declare function expectSingleObjectCallAndClear<T extends ObjectTypeDefinition>(subFn: MockedObject<Observer<ObjectPayload | undefined>>, object: Osdk.Instance<T>, status?: Status): void;
+export declare function waitForCall(subFn: Mock<(e: any) => void> | MockedObject<Observer<any>>, times?: number): Promise<void>;
+export declare function expectNoMoreCalls(observer: MockedObject<Observer<any>>): void;
+export declare function mockSingleSubCallback(): MockedObject<Observer<ObjectPayload | undefined>> & {
 	expectLoadingAndLoaded: (q: {
 		loading?: unknown
 		loaded: unknown
 	}) => Promise<void>
 };
-export declare function mockListSubCallback(): Mock<(x: ListPayload | undefined) => void>;
+export declare function mockObserver<T>(): MockedObject<Observer<T>>;
+export declare function mockListSubCallback(): MockedObject<Observer<ListPayload | undefined>>;
 export declare function cacheEntryContaining(x: Partial<Entry<any>>): Entry<any>;
 export declare function objectPayloadContaining(x: Partial<ObjectPayload>): ObjectPayload;
 export declare function listPayloadContaining(x: Partial<ListPayload>): ListPayload;
@@ -47,4 +54,27 @@ declare module "vitest" {
 	interface Assertion<T = any> extends CustomMatchers<T> {}
 	interface AsymmetricMatchersContaining extends CustomAsymmetricMatchers {}
 }
+/**
+* Updates the internal state of a list and will create a new internal query if needed.
+*
+* Helper method only for tests right now. May be removed later.
+*
+* @param apiName
+* @param where
+* @param orderBy
+* @param objects
+* @param param4
+* @param opts
+*/
+export declare function updateList<T extends ObjectTypeDefinition | InterfaceDefinition>(store: Store, { type, where, orderBy }: {
+	type: Pick<T, "apiName" | "type">
+	where: WhereClause<T>
+	orderBy: OrderBy<T>
+}, objects: ObjectHolder[] | Osdk.Instance<T>[], { optimisticId }?: {
+	optimisticId?: OptimisticId
+}, opts?: ListQueryOptions): void;
+export declare function getObject(store: Store, type: string, pk: number): ObjectHolder | undefined;
+export declare function updateObject<T extends ObjectOrInterfaceDefinition>(store: Store, value: Osdk.Instance<T>, { optimisticId }?: {
+	optimisticId?: OptimisticId
+}): Osdk.Instance<T>;
 export {};

package/build/types/observable/internal/testUtils.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAEE,oBACA,6BAEA,sBACA,MAEA,YACA,mBACK,WAAY;AAEnB,cAAc,uBAAuB,SAAU;AAG/C,cAAc,YAAY,QAAS;AAGnC,cAAc,cAAc,iBAAkB;AAE9C,cAAqB,cAAc,iBAAkB;AACrD,cAAc,mBAAmB,mBAAoB;AACrD,cAAc,qBAAqB,qBAAsB;AACzD,cAAc,QAAQ,sBAAsB,wBAAyB;AACrE,cAAc,aAAa,YAAa;AAIxC,iBAAiB,iBAAiB;CAChC,QAAQ,KAAK,UAAU;CAEvB,2BAA2B,gBAAgB,QAAQ;CAEnD,mBAAmB,UAAU,sBAC3BA,2CACG,gBACH,QACE,KAAK,SAAS;CAIlB,8BAA8B,gBAC5B,KAAK,SAAS,yCAAyC,CAAE;CAG3D,oBACE,UAAU,sBAEVC,WAAW;EACT,OAAO;EACP,SAAS,eAAe,QAAQ;CACjC,MACE,gBACH,WAAW,QAAQ,KAAK,SAAS;AAEpC;AAcD,OAAO,iBAAS,iBACdC,UAAU,qBACVC,UAAU;CAAE;CAAgB;AAAoB,IAC/C;AA+DH,OAAO,iBAAS,0BAA0B;AAoJ1C,OAAO,iBAAS,gBAcQC,GAAG,mBAAiB;AAM5C,OAAO,iBAAS,6BAA6B,UAAU,sBACrDC,OAAO,MAAMC,GAAG,mCAChBC,cAAc,KAAK,SAAS,MAC5BC,iBAAgB,KAAK,QAAQ,cAAc;AAc7C,OAAO,iBAAS,+BAA+B,UAAU,sBACvDC,OAAO,MAAMC,GAAG,qCAChBC,QAAQ,KAAK,SAAS,IACtBC,SAAS;AAWX,OAAO,iBAAe,YACpBC,OAAO,MAAMC,kBACbC,iBACC;AAiBH,OAAO,iBAAS,yBACZ,MACCL,GAAG,sCAEJ;CAGA,yBAAyBM,GAAG;EAC1B;EACA;CACD,MAAK;AACP;AAmDH,OAAO,iBAAS,uBAAuB,MACpCC,GAAG;AAON,OAAO,iBAAS,qBAAqBC,GAAG,QAAQ,cAAc;AAoB9D,OAAO,iBAAS,wBACdC,GAAG,QAAQ,iBACV;AASH,OAAO,iBAAS,sBACdC,GAAG,QAAQ,eACV;AAWH,OAAO,iBAAS;UAWN,eAAe,SAAS;CAChC,kBAAkBC,cAAc;AACjC;UAES,yBAAyB,SAAS;CAC1C,kBAAkBA,cAAc;AACjC;eAEc,SAAS;WACZ,UAAU,iBAAiB,eAAe,GAAG,CAAE;WAC/C,qCAAqC,yBAAyB,CAAE;AAC3E","names":["expectedId?: string | number | boolean","expected?: {\n      where: WhereClause<any>;\n      orderBy: Record<string, \"asc\" | \"desc\" | undefined>;\n    }","bindings: Record<string, any>","options?: { level?: string; msgPrefix?: string }","x: Unsubscribable","subFn: Mock<(e: ListPayload | undefined) => void>","e: ListPayload | undefined","resolvedList: Osdk.Instance<T>[]","payloadOptions: Omit<Partial<ListPayload>, \"resolvedList\">","subFn: Mock<(e: ObjectPayload | undefined) => void>","e: ObjectPayload | undefined","object: Osdk.Instance<T>","status?: Status","subFn: Mock<(e: any) => void>","e: any","times: number","q: {\n      loading?: unknown;\n      loaded: unknown;\n    }","x: ListPayload | undefined","x: Partial<Entry<any>>","x: Partial<ObjectPayload>","x: Partial<ListPayload>","n: number"],"sources":["../../../../src/observable/internal/testUtils.ts"],"version":3,"file":"testUtils.d.ts"}
+{"mappings":"AAgBA,cAEE,oBACA,qBACA,6BAEA,sBACA,MAEA,YACA,mBACK,WAAY;AAEnB,cAAc,uBAAuB,SAAU;AAE/C,cAAc,gBAAgB,MAAO;AAErC,cAAc,MAAM,oBAAoB,QAAS;AAGjD,cAAc,cAAc,iBAAkB;AAE9C,cAAqB,cAAc,iBAAkB;AACrD,cAAc,oBAAoB,uDAAwD;AAC1F,cAAc,mBAAmB,mBAAoB;AACrD,cAAc,qBAAqB,qBAAsB;AACzD,cAAc,SAAS,QAAQ,sBAAsB,wBAAyB;AAC9E,cAAc,aAAa,YAAa;AACxC,cAAc,wBAAwB,gBAAiB;AAGvD,cAAc,oBAAoB,mBAAoB;AACtD,cAAc,aAAa,YAAa;AAIxC,iBAAiB,iBAAiB;CAChC,QAAQ,KAAK,UAAU;CAEvB,2BAA2B,gBAAgB,QAAQ;CAEnD,mBAAmB,UAAU,sBAC3BA,2CACG,gBACH,QACE,KAAK,SAAS;CAIlB,8BAA8B,gBAC5B,MACI,KAAK,SAAS,yCAAyC,CAAE,KACzD;CAIN,oBACE,UAAU,sBAEVC,WAAW;EACT,OAAO;EACP,SAAS,eAAe,QAAQ;CACjC,MACE,gBACH,WAAW,QAAQ,KAAK,SAAS;AAEpC;AAcD,OAAO,iBAAS,iBACdC,UAAU,qBACVC,UAAU;CAAE;CAAgB;AAAoB,IAC/C;AA+DH,OAAO,iBAAS,0BAA0B;AA2J1C,OAAO,iBAAS,gBAcQC,GAAG,mBAAiB;AAM5C,OAAO,iBAAS,6BAA6B,UAAU,sBACrDC,OAAO,aAAa,SAAS,2BAC7BC,cAAc,iBAAiB,KAAK,SAAS,MAC7CC,iBAAgB,KAAK,QAAQ,cAAc;AAgB7C,OAAO,iBAAS,+BAA+B,UAAU,sBACvDC,OAAO,aAAa,SAAS,6BAC7BC,QAAQ,KAAK,SAAS,IACtBC,SAAS;AAWX,OAAO,iBAAe,YACpBC,OAAO,MAAMC,mBAAmB,aAAa,gBAC7CC,iBACC;AAiBH,OAAO,iBAAS,kBACdC,UAAU,aACR;AAUJ,OAAO,iBAAS,yBACZ,aACA,SAAS,8BAET;CAGA,yBAAyBC,GAAG;EAC1B;EACA;CACD,MAAK;AACP;AAmDH,OAAO,iBAAS,aAAa,MAAM,aAAa,SAAS;AAUzD,OAAO,iBAAS,uBAAuB,aACrC,SAAS;AAKX,OAAO,iBAAS,qBAAqBC,GAAG,QAAQ,cAAc;AAoB9D,OAAO,iBAAS,wBACdC,GAAG,QAAQ,iBACV;AASH,OAAO,iBAAS,sBACdC,GAAG,QAAQ,eACV;AAWH,OAAO,iBAAS;UAWN,eAAe,SAAS;CAChC,kBAAkBC,cAAc;AACjC;UAES,yBAAyB,SAAS;CAC1C,kBAAkBA,cAAc;AACjC;eAEc,SAAS;WACZ,UAAU,iBAAiB,eAAe,GAAG,CAAE;WAC/C,qCAAqC,yBAAyB,CAAE;AAC3E;;;;;;;;;;;;;AAcD,OAAO,iBAAS,WACd,UAAU,uBAAuB,qBAEjCC,OAAO,OACP,EACE,MACA,OACA,SAKD,EAJE;CACD,MAAM,KAAK,GAAG,YAAY;CAC1B,OAAO,YAAY;CACnB,SAAS,QAAQ;AAClB,GACDC,SAAS,iBAAiB,KAAK,SAAS,MACxC,EAAE,cAA+C,GAA/B;CAAE,eAAe;AAAc,GACjDC,OAAM;AAsBR,OAAO,iBAAS,UACdF,OAAO,OACPG,cACAC,aACC;AAKH,OAAO,iBAAS,aAAa,UAAU,6BACrCJ,OAAO,OACPK,OAAO,KAAK,SAAS,IACrB,EAAE,cAA+C,GAA/B;CAAE,eAAe;AAAc,IAChD,KAAK,SAAS","names":["expectedId?: string | number | boolean","expected?: {\n      where: WhereClause<any>;\n      orderBy: Record<string, \"asc\" | \"desc\" | undefined>;\n    }","bindings: Record<string, any>","options?: { level?: string; msgPrefix?: string }","x: Unsubscribable","subFn: MockedObject<Observer<ListPayload | undefined>>","resolvedList: ObjectHolder[] | Osdk.Instance<T>[]","payloadOptions: Omit<Partial<ListPayload>, \"resolvedList\">","subFn: MockedObject<Observer<ObjectPayload | undefined>>","object: Osdk.Instance<T>","status?: Status","subFn: Mock<(e: any) => void> | MockedObject<Observer<any>>","e: any","times: number","observer: MockedObject<\n    Observer<any>\n  >","q: {\n      loading?: unknown;\n      loaded: unknown;\n    }","x: Partial<Entry<any>>","x: Partial<ObjectPayload>","x: Partial<ListPayload>","n: number","store: Store","objects: ObjectHolder[] | Osdk.Instance<T>[]","opts: ListQueryOptions","type: string","pk: number","value: Osdk.Instance<T>"],"sources":["../../../../src/observable/internal/testUtils.ts"],"version":3,"file":"testUtils.d.ts"}

package/build/types/public/unstable-do-not-use.d.ts

@@ -1,7 +1,4 @@
 export { augment } from "../object/fetchPage.js";
 export type  { ActionSignatureFromDef } from "../actions/applyAction.js";
-export type  { ListPayload } from "../observable/ListPayload.js";
-export type  { ObjectPayload } from "../observable/ObjectPayload.js";
-export type  { Unsubscribable } from "../observable/ObservableClient.js";
-export type  { ObservableClient } from "../observable/ObservableClient.js";
 export { createObservableClient } from "../observable/ObservableClient.js";
+export type  { ObservableClient, ObserveObjectArgs, ObserveObjectsArgs, Observer, Unsubscribable } from "../observable/ObservableClient.js";

package/build/types/public/unstable-do-not-use.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,SAAS,eAAe;AAGxB,eAAc,8BAA8B;AAC5C,eAAc,mBAAmB;AACjC,eAAc,qBAAqB;AACnC,eAAc,sBAAsB;AACpC,eAAc,wBAAwB;AACtC,SAAS,8BAA8B","names":[],"sources":["../../../src/public/unstable-do-not-use.ts"],"version":3,"file":"unstable-do-not-use.d.ts"}
+{"mappings":"AAgBA,SAAS,eAAe;AAGxB,eAAc,8BAA8B;AAC5C,SAAS,8BAA8B;AACvC,eACE,kBACA,mBACA,oBACA,UACA,sBACK","names":[],"sources":["../../../src/public/unstable-do-not-use.ts"],"version":3,"file":"unstable-do-not-use.d.ts"}

package/build/types/queries/applyQuery.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAGE,qBACA,6BAEA,UACA,gBAEA,uBAEK,WAAY;AAGnB,cAAc,qBAAqB,4BAA6B;AAMhE,cAAc,oBAAoB,uBAAuB,YAAa;AAEtE,OAAO,iBAAe;CACpB,WAAW;CACX,UAAU,mBAAmB,oBAAoB,IAAI;EAErDA,QAAQ,eACRC,OAAO,IACPC,SAAS,IACR,QACD,gBAAgB,oBAAoB,IAAI;AAqR1C,OAAO,iBAAS,0BACd,UAAU,6BAEVC,YAAY,eAAe,IAC3BC,WAAW,IACV,SAAS","names":["client: MinimalClient","query: QD","params?: P","primaryKey: PrimaryKeyType<Q>","objectDef: Q"],"sources":["../../../src/queries/applyQuery.ts"],"version":3,"file":"applyQuery.d.ts"}
+{"mappings":"AAgBA,cAGE,qBACA,6BAEA,UACA,gBAEA,uBAEK,WAAY;AAInB,cAAc,qBAAqB,4BAA6B;AAOhE,cAAc,oBAAoB,uBAAuB,YAAa;AAEtE,OAAO,iBAAe;CACpB,WAAW;CACX,UAAU,mBAAmB,oBAAoB,IAAI;EAErDA,QAAQ,eACRC,OAAO,IACPC,SAAS,IACR,QACD,gBAAgB,oBAAoB,IAAI;AA2U1C,OAAO,iBAAS,0BACd,UAAU,6BAEVC,YAAY,eAAe,IAC3BC,WAAW,IACV,SAAS","names":["client: MinimalClient","query: QD","params?: P","primaryKey: PrimaryKeyType<Q>","objectDef: Q"],"sources":["../../../src/queries/applyQuery.ts"],"version":3,"file":"applyQuery.d.ts"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/client",
-  "version": "2.2.0-beta.7",
+  "version": "2.2.0-beta.9",
   "description": "",
   "access": "public",
   "license": "Apache-2.0",
@@ -47,8 +47,8 @@
     }
   },
   "dependencies": {
-    "@osdk/foundry.core": "2.15.0",
-    "@osdk/foundry.ontologies": "2.15.0",
+    "@osdk/foundry.core": "2.16.0",
+    "@osdk/foundry.ontologies": "2.16.0",
     "@osdk/shared.client": "^1.0.1",
     "@osdk/shared.client2": "^1.0.0",
     "@types/geojson": "^7946.0.14",
@@ -59,21 +59,23 @@
     "find-up": "7.0.0",
     "isomorphic-ws": "^5.0.0",
     "mnemonist": "^0.40.2",
+    "object.groupby": "^1.0.3",
     "rxjs": "^7.8.1",
     "tiny-invariant": "^1.3.1",
     "type-fest": "^4.18.2",
     "ws": "^8.18.0",
-    "@osdk/api": "~2.2.0-beta.7",
-    "@osdk/client.unstable": "2.2.0-beta.7",
-    "@osdk/generator-converters": "2.2.0-beta.7",
-    "@osdk/shared.client.impl": "~1.2.0-beta.1",
-    "@osdk/shared.net.errors": "~2.2.0-beta.1",
-    "@osdk/shared.net.fetch": "~1.2.0-beta.1"
+    "@osdk/api": "~2.2.0-beta.9",
+    "@osdk/generator-converters": "2.2.0-beta.9",
+    "@osdk/shared.net.errors": "~2.2.0-beta.2",
+    "@osdk/client.unstable": "2.2.0-beta.9",
+    "@osdk/shared.net.fetch": "~1.2.0-beta.2",
+    "@osdk/shared.client.impl": "~1.2.0-beta.2"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "^7.26.5",
     "@microsoft/api-extractor": "^7.49.1",
     "@types/geojson": "^7946.0.14",
+    "@types/object.groupby": "^1.0.4",
     "@types/ws": "^8.5.11",
     "chalk": "^5.4.1",
     "execa": "^9.5.1",
@@ -90,8 +92,8 @@
     "zod": "^3.23.8",
     "@osdk/monorepo.api-extractor": "~0.1.0-beta.1",
     "@osdk/monorepo.tsconfig": "~0.1.0-beta.1",
-    "@osdk/shared.test": "~2.2.0-beta.7",
-    "@osdk/client.test.ontology": "~2.2.0-beta.7"
+    "@osdk/client.test.ontology": "~2.2.0-beta.9",
+    "@osdk/shared.test": "~2.2.0-beta.9"
   },
   "publishConfig": {
     "access": "public"

package/build/browser/observable/internal/ChangedObjects.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChangedObjects.js","names":["MultiMap","DEBUG_ONLY__cacheKeyToString","createChangedObjects","modifiedObjects","addedObjects","addedLists","Set","modifiedLists","DEBUG_ONLY__changesToString","changes","process","env","NODE_ENV","JSON","stringify","multimapHelper","listHelper","Error","set","Array","from","map","multimap","Object","fromEntries","associations","type","objects","o","$primaryKey"],"sources":["ChangedObjects.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { ObjectTypeDefinition, Osdk } from \"@osdk/api\";\nimport { MultiMap } from \"mnemonist\";\nimport { DEBUG_ONLY__cacheKeyToString } from \"./CacheKey.js\";\nimport type { ListCacheKey } from \"./ListQuery.js\";\n\nexport interface Changes {\n  modifiedObjects: MultiMap<string, Osdk.Instance<ObjectTypeDefinition>>;\n  addedObjects: MultiMap<string, Osdk.Instance<ObjectTypeDefinition>>;\n  addedLists: Set<ListCacheKey>;\n  modifiedLists: Set<ListCacheKey>;\n}\n\nexport function createChangedObjects(): Changes {\n  return {\n    modifiedObjects: new MultiMap<\n      string,\n      Osdk.Instance<ObjectTypeDefinition>\n    >(),\n    addedObjects: new MultiMap<string, Osdk.Instance<ObjectTypeDefinition>>(),\n    addedLists: new Set<ListCacheKey>(),\n    modifiedLists: new Set<ListCacheKey>(),\n  };\n}\n\nexport function DEBUG_ONLY__changesToString(changes: Changes): string {\n  if (process.env.NODE_ENV !== \"production\") {\n    return JSON.stringify(\n      {\n        modifiedObjects: multimapHelper(changes.modifiedObjects),\n        addedObjects: multimapHelper(changes.addedObjects),\n        addedLists: listHelper(changes.addedLists),\n        modifiedLists: listHelper(changes.modifiedLists),\n      },\n      null,\n      2,\n    );\n  } else {\n    throw new Error(\"not implemented\");\n  }\n}\n\nfunction listHelper(set: Set<ListCacheKey>) {\n  return Array.from(set).map(DEBUG_ONLY__cacheKeyToString);\n}\n\nfunction multimapHelper(\n  multimap: MultiMap<string, Osdk.Instance<ObjectTypeDefinition>>,\n) {\n  return Object.fromEntries(\n    Array.from(multimap.associations()).map(\n      ([type, objects]) => {\n        return [type, objects.map(o => o.$primaryKey)];\n      },\n    ),\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA,SAASA,QAAQ,QAAQ,WAAW;AACpC,SAASC,4BAA4B,QAAQ,eAAe;AAU5D,OAAO,SAASC,oBAAoBA,CAAA,EAAY;EAC9C,OAAO;IACLC,eAAe,EAAE,IAAIH,QAAQ,CAG3B,CAAC;IACHI,YAAY,EAAE,IAAIJ,QAAQ,CAA8C,CAAC;IACzEK,UAAU,EAAE,IAAIC,GAAG,CAAe,CAAC;IACnCC,aAAa,EAAE,IAAID,GAAG,CAAe;EACvC,CAAC;AACH;AAEA,OAAO,SAASE,2BAA2BA,CAACC,OAAgB,EAAU;EACpE,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,EAAE;IACzC,OAAOC,IAAI,CAACC,SAAS,CACnB;MACEX,eAAe,EAAEY,cAAc,CAACN,OAAO,CAACN,eAAe,CAAC;MACxDC,YAAY,EAAEW,cAAc,CAACN,OAAO,CAACL,YAAY,CAAC;MAClDC,UAAU,EAAEW,UAAU,CAACP,OAAO,CAACJ,UAAU,CAAC;MAC1CE,aAAa,EAAES,UAAU,CAACP,OAAO,CAACF,aAAa;IACjD,CAAC,EACD,IAAI,EACJ,CACF,CAAC;EACH,CAAC,MAAM;IACL,MAAM,IAAIU,KAAK,CAAC,iBAAiB,CAAC;EACpC;AACF;AAEA,SAASD,UAAUA,CAACE,GAAsB,EAAE;EAC1C,OAAOC,KAAK,CAACC,IAAI,CAACF,GAAG,CAAC,CAACG,GAAG,CAACpB,4BAA4B,CAAC;AAC1D;AAEA,SAASc,cAAcA,CACrBO,QAA+D,EAC/D;EACA,OAAOC,MAAM,CAACC,WAAW,CACvBL,KAAK,CAACC,IAAI,CAACE,QAAQ,CAACG,YAAY,CAAC,CAAC,CAAC,CAACJ,GAAG,CACrC,CAAC,CAACK,IAAI,EAAEC,OAAO,CAAC,KAAK;IACnB,OAAO,CAACD,IAAI,EAAEC,OAAO,CAACN,GAAG,CAACO,CAAC,IAAIA,CAAC,CAACC,WAAW,CAAC,CAAC;EAChD,CACF,CACF,CAAC;AACH","ignoreList":[]}