@osdk/api 2.2.0-beta.9 → 2.2.0-rc.24

package/build/types/object/FetchPageArgs.d.ts

@@ -4,6 +4,36 @@ export type NullabilityAdherence = false | "throw" | "drop";
 export declare namespace NullabilityAdherence {
 	type Default = "throw";
 }
+export declare namespace ObjectSetArgs {
+	interface Select<
+		OBJECT_KEYS extends string = never,
+		RDP_KEYS extends string = never
+	> {
+		$select?: readonly (OBJECT_KEYS | RDP_KEYS)[];
+		$includeRid?: boolean;
+	}
+	interface OrderBy<L extends string = never> {
+		$orderBy?: { [K in L]? : "asc" | "desc" };
+	}
+	interface AsyncIter<
+		Q extends ObjectOrInterfaceDefinition,
+		K extends PropertyKeys<Q> = never,
+		T extends boolean = false,
+		RDP_KEYS extends string = never
+	> extends Select<K, RDP_KEYS>, OrderBy<K> {
+		$__UNSTABLE_useOldInterfaceApis?: boolean;
+		$includeAllBaseObjectProperties?: PropertyKeys<Q> extends K ? T : never;
+	}
+	interface FetchPage<
+		Q extends ObjectOrInterfaceDefinition,
+		K extends PropertyKeys<Q> = never,
+		T extends boolean = false,
+		RDP_KEYS extends string = never
+	> extends AsyncIter<Q, K, T, RDP_KEYS> {
+		$nextPageToken?: string;
+		$pageSize?: number;
+	}
+}
 export interface SelectArg<
 	Q extends ObjectOrInterfaceDefinition,
 	L extends PropertyKeys<Q> = PropertyKeys<Q>,
@@ -16,9 +46,7 @@ export interface SelectArg<
 export interface OrderByArg<
 	Q extends ObjectOrInterfaceDefinition,
 	L extends PropertyKeys<Q> = PropertyKeys<Q>
-> {
-	$orderBy?: { [K in L]? : "asc" | "desc" };
-}
+> extends ObjectSetArgs.OrderBy<L> {}
 export type SelectArgToKeys<
 	Q extends ObjectOrInterfaceDefinition,
 	A extends SelectArg<Q, any, any>
@@ -29,8 +57,9 @@ export interface FetchPageArgs<
 	R extends boolean = false,
 	A extends Augments = never,
 	S extends NullabilityAdherence = NullabilityAdherence.Default,
-	T extends boolean = false
-> extends AsyncIterArgs<Q, K, R, A, S, T> {
+	T extends boolean = false,
+	RDP_KEYS extends string = never
+> extends AsyncIterArgs<Q, K, R, A, S, T, RDP_KEYS> {
 	$nextPageToken?: string;
 	$pageSize?: number;
 }
@@ -40,10 +69,11 @@ export interface AsyncIterArgs<
 	R extends boolean = false,
 	A extends Augments = never,
 	S extends NullabilityAdherence = NullabilityAdherence.Default,
-	T extends boolean = false
+	T extends boolean = false,
+	RDP_KEYS extends string = never
 > extends SelectArg<Q, K, R, S>, OrderByArg<Q, PropertyKeys<Q>> {
 	$__UNSTABLE_useOldInterfaceApis?: boolean;
-	$includeAllBaseObjectProperties?: T;
+	$includeAllBaseObjectProperties?: PropertyKeys<Q> extends K ? T : never;
 }
 export type Augment<
 	X extends ObjectOrInterfaceDefinition,

package/build/types/object/FetchPageArgs.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,2BAA2B,qCAAsC;AAE/E,YAAY,uBAAuB,QAAQ,UAAU;AACrD,yBAAiB;MACH,UAAU;;AAGxB,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;CACzC,oBAAoB;CACpB,UAAU,uBAAuB,qBAAqB;EACtD;CACA,mBAAmB;CACnB,cAAc;AACf;AAED,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;EACzC;CACA,cACG,KAAK,MAAK,QAAQ;AAEtB;AAED,YAAY;CACV,UAAU;CACV,UAAU,UAAU;IAClB,UAAU,UAAU,YAAY,aAAa,KAC7C,EAAE,uCAAuC,EAAE,qBAC3C,aAAa;AAEjB,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;CACzC,oBAAoB;CACpB,UAAU;CACV,UAAU,uBAAuB,qBAAqB;CACtD,oBAAoB;UACZ,cAAc,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG;CACxC;CACA;AACD;AAED,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;CACzC,oBAAoB;CACpB,UAAU;CACV,UAAU,uBAAuB,qBAAqB;CACtD,oBAAoB;UACZ,UAAU,GAAG,GAAG,GAAG,IAAI,WAAW,GAAG,aAAa,IAAI;CAC9D;CACA,kCAAkC;AACnC;AAED,YAAY;CACV,UAAU;CACV;OACK,KAAK,oBAAoB,GAAG,cAAa;AAEhD,YAAY,WAAW","names":[],"sources":["../../../src/object/FetchPageArgs.ts"],"version":3,"file":"FetchPageArgs.d.ts"}
+{"mappings":"AAgBA,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,2BAA2B,qCAAsC;AAE/E,YAAY,uBAAuB,QAAQ,UAAU;AACrD,yBAAiB;MACH,UAAU;;AAGxB,yBAAiB;WACE;EACf;EACA;GACA;EACA,oBAAoB,cAAc;EAClC;CACD;WAEgB,QACf,0BACA;EACA,cACG,KAAK,MAAK,QAAQ;CAEtB;WAEgB;EACf,UAAU;EACV,UAAU,aAAa;EACvB,oBAAoB;EACpB;WACQ,OAAO,GAAG,WAAW,QAAQ,GAAG;EACxC;EACA,kCAAkC,aAAa,WAAW,IAAI;CAC/D;WAEgB;EACf,UAAU;EACV,UAAU,aAAa;EACvB,oBAAoB;EACpB;WACQ,UAAU,GAAG,GAAG,GAAG,UAAU;EACrC;EACA;CACD;;AAGH,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;CACzC,oBAAoB;CACpB,UAAU,uBAAuB,qBAAqB;EACtD;CACA,mBAAmB;CACnB,cAAc;AACf;AAED,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;UACjC,cAAc,QAAQ,GAAG,CAClC;AAED,YAAY;CACV,UAAU;CACV,UAAU,UAAU;IAClB,UAAU,UAAU,YAAY,aAAa,KAC7C,EAAE,uCAAuC,EAAE,qBAC3C,aAAa;AAEjB,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;CACzC,oBAAoB;CACpB,UAAU;CACV,UAAU,uBAAuB,qBAAqB;CACtD,oBAAoB;CACpB;UACQ,cAAc,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,UAAU;CAClD;CACA;AACD;AAED,iBAAiB;CACf,UAAU;CACV,UAAU,aAAa,KAAK,aAAa;CACzC,oBAAoB;CACpB,UAAU;CACV,UAAU,uBAAuB,qBAAqB;CACtD,oBAAoB;CACpB;UACQ,UAAU,GAAG,GAAG,GAAG,IAAI,WAAW,GAAG,aAAa,IAAI;CAC9D;CACA,kCAAkC,aAAa,WAAW,IAAI;AAC/D;AAED,YAAY;CACV,UAAU;CACV;OACK,KAAK,oBAAoB,GAAG,cAAa;AAEhD,YAAY,WAAW","names":[],"sources":["../../../src/object/FetchPageArgs.ts"],"version":3,"file":"FetchPageArgs.d.ts"}

package/build/types/object/FetchPageResult.d.ts

@@ -25,7 +25,7 @@ export type FetchPageResult<
 	L extends PropertyKeys<Q>,
 	R extends boolean,
 	S extends NullabilityAdherence,
-	T extends boolean
+	T extends boolean = false
 > = PageResult<PropertyKeys<Q> extends L ? Osdk.Instance<Q, ExtractOptions<R, S, T>> : Osdk.Instance<Q, ExtractOptions<R, S, T>, L>>;
 /**
 * Helper type for converting fetch options into an Osdk object

package/build/types/object/FetchPageResult.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,yBAAyB,kCAAmC;AAC1E,cAAc,gBAAgB,SAAS,YAAY,sBAAuB;AAC1E,cAAc,kBAAkB,kBAAmB;AACnD,cAAc,4BAA4B,oBAAqB;;AAG/D,YAAY,mBAAmB,UAAU,wBAAwB,UAAU,QACvE,QACA;;AAGJ,YAAY;CAAa;CAAkB;CAAgC;IACzE,QAAQ,WAAW,eACf,uBAAuB,OAAO,IAC9B,IAAI;;AAGV,YAAY;CACV;CACA;CACA;IACE,QAAQ,WAAW,eACnB,sBAAsB,OAAO,IAAI,IACjC;;;;AAKJ,YAAY;CACV,UAAU;CACV,UAAU,aAAa;CACvB;CACA,UAAU;CACV;IACE,WACF,aAAa,WAAW,IAAI,KAAK,SAAS,GAAG,eAAe,GAAG,GAAG,MAC9D,KAAK,SAAS,GAAG,eAAe,GAAG,GAAG,IAAI;;;;AAMhD,YAAY;CACV,UAAU;CACV,UAAU,aAAa,YAAY;CACnC;CACA,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;CACnD,oBAAoB;IAClB,KAAK,SACP,GACA,eAAe,GAAG,GAAG,IACrB,aAAa,WAAW,IAAI,aAAa,KAAK,aAAa,KAAK,MAC7D,KAAK,cAAc,MAAM,MAAK,KAAK;AAGxC,YAAY,MAAM,qBAAqB,WAC5B,qBAAqB,QAAQ,OACpC","names":[],"sources":["../../../src/object/FetchPageResult.ts"],"version":3,"file":"FetchPageResult.d.ts"}
+{"mappings":"AAgBA,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,yBAAyB,kCAAmC;AAC1E,cAAc,gBAAgB,SAAS,YAAY,sBAAuB;AAC1E,cAAc,kBAAkB,kBAAmB;AACnD,cAAc,4BAA4B,oBAAqB;;AAG/D,YAAY,mBAAmB,UAAU,wBAAwB,UAAU,QACvE,QACA;;AAGJ,YAAY;CAAa;CAAkB;CAAgC;IACzE,QAAQ,WAAW,eACf,uBAAuB,OAAO,IAC9B,IAAI;;AAGV,YAAY;CACV;CACA;CACA;IACE,QAAQ,WAAW,eACnB,sBAAsB,OAAO,IAAI,IACjC;;;;AAKJ,YAAY;CACV,UAAU;CACV,UAAU,aAAa;CACvB;CACA,UAAU;CACV,oBAAoB;IAClB,WACF,aAAa,WAAW,IAAI,KAAK,SAAS,GAAG,eAAe,GAAG,GAAG,MAC9D,KAAK,SAAS,GAAG,eAAe,GAAG,GAAG,IAAI;;;;AAMhD,YAAY;CACV,UAAU;CACV,UAAU,aAAa,YAAY;CACnC;CACA,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;CACnD,oBAAoB;IAClB,KAAK,SACP,GACA,eAAe,GAAG,GAAG,IACrB,aAAa,WAAW,IAAI,aAAa,KAAK,aAAa,KAAK,MAC7D,KAAK,cAAc,MAAM,MAAK,KAAK;AAGxC,YAAY,MAAM,qBAAqB,WAC5B,qBAAqB,QAAQ,OACpC","names":[],"sources":["../../../src/object/FetchPageResult.ts"],"version":3,"file":"FetchPageResult.d.ts"}

package/build/types/objectSet/BulkLinkResult.d.ts

@@ -2,6 +2,6 @@ import type { OsdkBase } from "../OsdkBase.js";
 export interface EXPERIMENTAL_BulkLinkResult {
 	object: OsdkBase<any>;
 	linkApiName: string;
-	otherObjectApiName: string | undefined;
+	otherObjectApiName: string | null | undefined;
 	otherObjectPk: unknown;
 }

package/build/types/objectSet/ObjectSet.d.ts

@@ -2,30 +2,68 @@ import type { AggregateOpts } from "../aggregate/AggregateOpts.js";
 import type { AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy } from "../aggregate/AggregateOptsThatErrors.js";
 import type { AggregationsResults } from "../aggregate/AggregationsResults.js";
 import type { WhereClause } from "../aggregate/WhereClause.js";
-import type { DerivedProperty } from "../derivedProperties/DerivedProperty.js";
-import type { AsyncIterArgs, Augments, FetchPageArgs, NullabilityAdherence, SelectArg } from "../object/FetchPageArgs.js";
+import type { DerivedPropertyCreator } from "../derivedProperties/DerivedProperty.js";
+import type { AsyncIterArgs, Augments, FetchPageArgs, NullabilityAdherence, ObjectSetArgs, SelectArg } from "../object/FetchPageArgs.js";
 import type { Result } from "../object/Result.js";
 import type { DerivedObjectOrInterfaceDefinition, ObjectOrInterfaceDefinition, PropertyKeys } from "../ontology/ObjectOrInterface.js";
 import type { CompileTimeMetadata, ObjectTypeDefinition } from "../ontology/ObjectTypeDefinition.js";
 import type { SimplePropertyDef } from "../ontology/SimplePropertyDef.js";
 import type { PrimaryKeyType } from "../OsdkBase.js";
-import type { ExtractOptions, Osdk } from "../OsdkObjectFrom.js";
+import type { ExtractAllPropertiesOption, ExtractOptions, ExtractRidOption, Osdk } from "../OsdkObjectFrom.js";
 import type { PageResult } from "../PageResult.js";
 import type { LinkedType, LinkNames } from "../util/LinkUtils.js";
 import type { BaseObjectSet } from "./BaseObjectSet.js";
 import type { ObjectSetSubscription } from "./ObjectSetListener.js";
 type MergeObjectSet<
 	Q extends ObjectOrInterfaceDefinition,
-	D extends ObjectSet<Q> | Record<string, SimplePropertyDef> = {}
-> = D extends Record<string, SimplePropertyDef> ? DerivedObjectOrInterfaceDefinition.WithDerivedProperties<Q, D> : Q;
-type ExtractRdp<D extends ObjectSet<any, any> | Record<string, SimplePropertyDef>> = D extends Record<string, SimplePropertyDef> ? D : {};
+	D extends Record<string, SimplePropertyDef> = {}
+> = DerivedObjectOrInterfaceDefinition.WithDerivedProperties<Q, D>;
+type ExtractRdp<D extends BaseObjectSet<any> | Record<string, SimplePropertyDef>> = [D] extends [never] ? {} : D extends BaseObjectSet<any> ? {} : D extends Record<string, SimplePropertyDef> ? D : {};
+type MaybeSimplifyPropertyKeys<
+	Q extends ObjectOrInterfaceDefinition,
+	L extends PropertyKeys<Q>
+> = PropertyKeys<Q> extends L ? PropertyKeys<Q> : L;
+type SubSelectKeysHelper<
+	Q extends ObjectOrInterfaceDefinition,
+	L extends string
+> = [L] extends [never] ? PropertyKeys<Q> : PropertyKeys<Q> extends L ? PropertyKeys<Q> : L & PropertyKeys<Q>;
+type SubSelectKeys<
+	Q extends ObjectOrInterfaceDefinition,
+	X extends SelectArg<Q, PropertyKeys<Q>, any, any> = never
+> = SubSelectKeysHelper<Q, Extract$Select<X>>;
+type NOOP<T> = T extends (...args: any[]) => any ? T : T extends abstract new (...args: any[]) => any ? T : { [K in keyof T] : T[K] };
+type SubSelectRDPsHelper<
+	X extends ValidFetchPageArgs<any, any> | ValidAsyncIterArgs<any, any>,
+	DEFAULT extends string
+> = [X] extends [never] ? DEFAULT : (X["$select"] & string[])[number] & DEFAULT;
+type SubSelectRDPs<
+	RDPs extends Record<string, SimplePropertyDef>,
+	X extends ValidFetchPageArgs<any, RDPs> | ValidAsyncIterArgs<any, RDPs>
+> = [RDPs] extends [never] ? never : NOOP<{ [K in SubSelectRDPsHelper<X, string & keyof RDPs>] : RDPs[K] }>;
 export interface MinimalObjectSet<
 	Q extends ObjectOrInterfaceDefinition,
 	RDPs extends Record<string, SimplePropertyDef> = {}
 > extends BaseObjectSet<Q>, FetchPage<Q, RDPs>, AsyncIter<Q, RDPs>, Where<Q, RDPs> {}
+export type ExtractOptions2<X extends FetchPageArgs<any, any, any, any, any, any, any>> = [X] extends [never] ? never : ExtractRidOption<X["$includeRid"] extends true ? true : false> | ExtractAllPropertiesOption<X["$includeAllBaseObjectProperties"] extends true ? true : false>;
+type Extract$Select<X extends FetchPageArgs<any, any>> = NonNullable<X["$select"]>[number];
 interface FetchPage<
 	Q extends ObjectOrInterfaceDefinition,
 	RDPs extends Record<string, SimplePropertyDef> = {}
+> {
+	readonly fetchPage: FetchPageSignature<Q, RDPs>;
+	readonly fetchPageWithErrors: FetchPageWithErrorsSignature<Q, RDPs>;
+}
+type ValidFetchPageArgs<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef>
+> = ObjectSetArgs.FetchPage<Q, PropertyKeys<Q>, false, string & keyof RDPs> | ObjectSetArgs.FetchPage<Q, never, true, string & keyof RDPs>;
+type ValidAsyncIterArgs<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef>
+> = ObjectSetArgs.AsyncIter<Q, PropertyKeys<Q>, false, string & keyof RDPs> | AsyncIterArgs<Q, never, any, any, any, true, string & keyof RDPs>;
+interface FetchPageSignature<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef> = {}
 > {
 	/**
 	* Gets a page of objects of this type, with a result wrapper
@@ -39,13 +77,46 @@ interface FetchPage<
 	
 	* @returns a page of objects
 	*/
-	readonly fetchPage: <
-		L extends PropertyKeys<Q, RDPs>,
+	<const X extends ValidFetchPageArgs<Q, RDPs> = never>(args?: X): Promise<PageResult<Osdk.Instance<Q, ExtractOptions2<X>, SubSelectKeys<Q, X>, SubSelectRDPs<RDPs, X>>>>;
+	/**
+	* Gets a page of objects of this type, with a result wrapper
+	* @param args - Args to specify next page token and page size, if applicable
+	* @example
+	*  const myObjs = await objectSet.fetchPage({
+	$pageSize: 10,
+	$nextPageToken: "nextPage"
+	});
+	const myObjsResult = myObjs.data;
+	
+	* @returns a page of objects
+	*/
+	<
+		L extends PropertyKeys<Q>,
 		R extends boolean,
 		const A extends Augments,
 		S extends NullabilityAdherence = NullabilityAdherence.Default,
 		T extends boolean = false
-	>(args?: FetchPageArgs<Q, L, R, A, S, T>) => Promise<PageResult<Osdk.Instance<Q, ExtractOptions<R, S, T>, PropertyKeys<Q> extends L ? PropertyKeys<Q> : PropertyKeys<Q> & L, { [K in Extract<keyof RDPs, L>] : RDPs[K] }>>>;
+	>(args?: FetchPageArgs<Q, L, R, A, S, T>): Promise<PageResult<Osdk.Instance<Q, ExtractOptions<R, S, T>, MaybeSimplifyPropertyKeys<Q, L>>>>;
+}
+interface FetchPageWithErrorsSignature<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef> = {}
+> {
+	/**
+	* Gets a page of objects of this type, with a result wrapper
+	* @param args - Args to specify next page token and page size, if applicable
+	* @example
+	*  const myObjs = await objectSet.fetchPage({
+	$pageSize: 10,
+	$nextPageToken: "nextPage"
+	});
+	
+	if(isOk(myObjs)){
+	const myObjsResult = myObjs.value.data;
+	}
+	* @returns a page of objects, wrapped in a result wrapper
+	*/
+	<X extends ValidFetchPageArgs<Q, RDPs> = never>(args?: X): Promise<Result<PageResult<Osdk.Instance<Q, ExtractOptions2<X>, SubSelectKeys<Q, X>, SubSelectRDPs<RDPs, X>>>>>;
 	/**
 	* Gets a page of objects of this type, with a result wrapper
 	* @param args - Args to specify next page token and page size, if applicable
@@ -60,13 +131,13 @@ interface FetchPage<
 	}
 	* @returns a page of objects, wrapped in a result wrapper
 	*/
-	readonly fetchPageWithErrors: <
-		L extends PropertyKeys<Q, RDPs>,
+	<
+		L extends PropertyKeys<Q>,
 		R extends boolean,
 		const A extends Augments,
 		S extends NullabilityAdherence = NullabilityAdherence.Default,
 		T extends boolean = false
-	>(args?: FetchPageArgs<Q, L, R, A, S, T>) => Promise<Result<PageResult<Osdk.Instance<Q, ExtractOptions<R, S, T>, PropertyKeys<Q> extends L ? PropertyKeys<Q> : PropertyKeys<Q> & L, { [K in Extract<keyof RDPs, L>] : RDPs[K] }>>>>;
+	>(args?: FetchPageArgs<Q, L, R, A, S, T>): Promise<Result<PageResult<Osdk.Instance<Q, ExtractOptions<R, S, T>, MaybeSimplifyPropertyKeys<Q, L>>>>>;
 }
 interface Where<
 	Q extends ObjectOrInterfaceDefinition,
@@ -84,7 +155,7 @@ interface Where<
 	*/
 	readonly where: (clause: WhereClause<MergeObjectSet<Q, RDPs>>) => this;
 }
-interface AsyncIter<
+interface AsyncIterSignature<
 	Q extends ObjectOrInterfaceDefinition,
 	RDPs extends Record<string, SimplePropertyDef> = {}
 > {
@@ -96,24 +167,39 @@ interface AsyncIter<
 	* }
 	* @returns an async iterator to load all objects
 	*/
-	readonly asyncIter: <
-		L extends PropertyKeys<Q, RDPs>,
+	<X extends ValidAsyncIterArgs<Q, RDPs> = never>(args?: X): AsyncIterableIterator<Osdk.Instance<Q, ExtractOptions2<X>, SubSelectKeys<Q, X>, SubSelectRDPs<RDPs, X>>>;
+	/**
+	* Returns an async iterator to load all objects of this type
+	* @example
+	* for await (const obj of myObjectSet.asyncIter()){
+	* // Handle obj
+	* }
+	* @returns an async iterator to load all objects
+	*/
+	<
+		L extends PropertyKeys<Q>,
 		R extends boolean,
 		const A extends Augments,
 		S extends NullabilityAdherence = NullabilityAdherence.Default,
 		T extends boolean = false
-	>(args?: AsyncIterArgs<Q, L, R, A, S, T>) => AsyncIterableIterator<Osdk.Instance<Q, ExtractOptions<R, S, T>, PropertyKeys<Q> extends L ? PropertyKeys<Q> : PropertyKeys<Q> & L, { [K in Extract<keyof RDPs, L>] : RDPs[K] }>>;
+	>(args?: AsyncIterArgs<Q, L, R, A, S, T>): AsyncIterableIterator<Osdk.Instance<Q, ExtractOptions<R, S, T>, MaybeSimplifyPropertyKeys<Q, L>>>;
+}
+interface AsyncIter<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef> = {}
+> {
+	asyncIter: AsyncIterSignature<Q, RDPs>;
 }
 interface WithProperties<
 	Q extends ObjectOrInterfaceDefinition = any,
 	RDPs extends Record<string, SimplePropertyDef> = {}
 > {
-	readonly withProperties: <NEW extends Record<string, SimplePropertyDef>>(clause: { [K in keyof NEW] : DerivedProperty.Selector<Q, NEW[K]> }) => ObjectSet<Q, { [NN in keyof NEW | keyof RDPs] : NN extends keyof NEW ? NEW[NN] : NN extends keyof RDPs ? RDPs[NN] : never }>;
+	readonly withProperties: <NEW extends Record<string, SimplePropertyDef>>(clause: { [K in keyof NEW] : DerivedPropertyCreator<Q, NEW[K]> }) => ObjectSet<Q, { [NN in keyof NEW | keyof RDPs] : NN extends keyof NEW ? NEW[NN] : NN extends keyof RDPs ? RDPs[NN] : never }>;
 }
 export interface ObjectSet<
 	Q extends ObjectOrInterfaceDefinition = any,
-	UNUSED_OR_RDP extends ObjectSet<Q, any> | Record<string, SimplePropertyDef> = ObjectSet<Q, any>
-> extends ObjectSetCleanedTypes<Q, ExtractRdp<UNUSED_OR_RDP>, MergeObjectSet<Q, UNUSED_OR_RDP>> {}
+	UNUSED_OR_RDP extends BaseObjectSet<Q> | Record<string, SimplePropertyDef> = never
+> extends ObjectSetCleanedTypes<Q, ExtractRdp<UNUSED_OR_RDP>, MergeObjectSet<Q, ExtractRdp<UNUSED_OR_RDP>>> {}
 interface Aggregate<Q extends ObjectOrInterfaceDefinition> {
 	/**
 	* Aggregate on a field in an object type
@@ -178,28 +264,48 @@ interface PivotTo<Q extends ObjectOrInterfaceDefinition> {
 	* @param type - The linked object type you want to pivot to
 	* @returns an object set of the specified linked type
 	*/
-	readonly pivotTo: <L extends LinkNames<Q>>(type: L) => CompileTimeMetadata<LinkedType<Q, L>>["objectSet"];
+	readonly pivotTo: <L extends LinkNames<Q>>(type: L) => ObjectSet<LinkedType<Q, L>>;
 }
-interface FetchOne<
-	Q extends ObjectOrInterfaceDefinition,
+interface FetchOneSignature<
+	Q extends ObjectTypeDefinition,
 	RDPs extends Record<string, SimplePropertyDef>
 > {
 	/**
 	* Fetches one object with the specified primary key, without a result wrapper
 	*/
-	readonly fetchOne: Q extends ObjectTypeDefinition ? <
-		const L extends PropertyKeys<Q, RDPs>,
+	<X extends ObjectSetArgs.Select<PropertyKeys<Q>, string & keyof RDPs> = never>(primaryKey: PrimaryKeyType<Q>, options?: X): Promise<Osdk.Instance<Q, ExtractOptions2<X>, SubSelectKeys<Q, X>, SubSelectRDPs<RDPs, X>>>;
+	/**
+	* Fetches one object with the specified primary key, without a result wrapper
+	*/
+	<
+		const L extends PropertyKeys<Q>,
 		const R extends boolean,
 		const S extends false | "throw" = NullabilityAdherence.Default
-	>(primaryKey: PrimaryKeyType<Q>, options?: SelectArg<Q, L, R, S>) => Promise<Osdk.Instance<Q, ExtractOptions<R, S>, PropertyKeys<Q> extends L ? PropertyKeys<Q> : PropertyKeys<Q> & L, { [K in Extract<keyof RDPs, L>] : RDPs[K] }>> : never;
+	>(primaryKey: PrimaryKeyType<Q>, options?: SelectArg<Q, L, R, S>): Promise<Osdk.Instance<Q, ExtractOptions<R, S>, MaybeSimplifyPropertyKeys<Q, L>>>;
+}
+interface FetchOneWithErrorsSignature<
+	Q extends ObjectTypeDefinition,
+	RDPs extends Record<string, SimplePropertyDef>
+> {
 	/**
 	* Fetches one object with the specified primary key, with a result wrapper
 	*/
-	readonly fetchOneWithErrors: Q extends ObjectTypeDefinition ? <
-		L extends PropertyKeys<Q, RDPs>,
-		R extends boolean,
-		S extends false | "throw" = NullabilityAdherence.Default
-	>(primaryKey: PrimaryKeyType<Q>, options?: SelectArg<Q, L, R, S>) => Promise<Result<Osdk.Instance<Q, ExtractOptions<R, S>, PropertyKeys<Q> extends L ? PropertyKeys<Q> : PropertyKeys<Q> & L, { [K in Extract<keyof RDPs, L>] : RDPs[K] }>>> : never;
+	<X extends ObjectSetArgs.Select<PropertyKeys<Q>, string & keyof RDPs>>(primaryKey: PrimaryKeyType<Q>, options?: X): Promise<Result<Osdk.Instance<Q, ExtractOptions2<X>, SubSelectKeys<Q, X>, SubSelectRDPs<RDPs, X>>>>;
+	/**
+	* Fetches one object with the specified primary key, with a result wrapper
+	*/
+	<
+		const L extends PropertyKeys<Q>,
+		const R extends boolean,
+		const S extends false | "throw" = NullabilityAdherence.Default
+	>(primaryKey: PrimaryKeyType<Q>, options?: SelectArg<Q, L, R, S>): Promise<Result<Osdk.Instance<Q, ExtractOptions<R, S>, MaybeSimplifyPropertyKeys<Q, L>>>>;
+}
+interface FetchOne<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef>
+> {
+	fetchOne: Q extends ObjectTypeDefinition ? FetchOneSignature<Q, RDPs> : never;
+	fetchOneWithErrors: Q extends ObjectTypeDefinition ? FetchOneWithErrorsSignature<Q, RDPs> : never;
 }
 interface Subscribe<Q extends ObjectOrInterfaceDefinition> {
 	/**
@@ -215,6 +321,6 @@ interface Subscribe<Q extends ObjectOrInterfaceDefinition> {
 interface ObjectSetCleanedTypes<
 	Q extends ObjectOrInterfaceDefinition,
 	D extends Record<string, SimplePropertyDef>,
-	MERGED extends ObjectOrInterfaceDefinition
-> extends MinimalObjectSet<Q, D>, WithProperties<Q, D>, Aggregate<MERGED>, SetArithmetic<MERGED>, PivotTo<MERGED>, FetchOne<Q, D>, Subscribe<MERGED> {}
+	MERGED extends ObjectOrInterfaceDefinition & Q
+> extends MinimalObjectSet<Q, D>, WithProperties<Q, D>, Aggregate<MERGED>, SetArithmetic<MERGED>, PivotTo<Q>, FetchOne<Q, D>, Subscribe<MERGED> {}
 export {};

package/build/types/objectSet/ObjectSet.d.ts.map

@@ -1 +1 @@
-{"mappings":"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","names":["args?: FetchPageArgs<Q, L, R, A, S, T>","clause: WhereClause<MergeObjectSet<Q, RDPs>>","args?: AsyncIterArgs<Q, L, R, A, S, T>","clause: { [K in keyof NEW]: DerivedProperty.Selector<Q, NEW[K]> }","req: AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy<Q, AO>","type: L","primaryKey: PrimaryKeyType<Q>","options?: SelectArg<Q, L, R, S>","listener: ObjectSetSubscription.Listener<Q, P>","opts?: ObjectSetSubscription.Options<Q, P>"],"sources":["../../../src/objectSet/ObjectSet.ts"],"version":3,"file":"ObjectSet.d.ts"}
+{"mappings":"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","names":["args?: X","args?: FetchPageArgs<Q, L, R, A, S, T>","clause: WhereClause<MergeObjectSet<Q, RDPs>>","args?: AsyncIterArgs<Q, L, R, A, S, T>","clause: { [K in keyof NEW]: DerivedPropertyCreator<Q, NEW[K]> }","req: AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy<Q, AO>","type: L","primaryKey: PrimaryKeyType<Q>","options?: X","options?: SelectArg<Q, L, R, S>","listener: ObjectSetSubscription.Listener<Q, P>","opts?: ObjectSetSubscription.Options<Q, P>"],"sources":["../../../src/objectSet/ObjectSet.ts"],"version":3,"file":"ObjectSet.d.ts"}

package/build/types/objectSet/ObjectSet.test.d.ts

@@ -1 +1,2 @@
-export {};
+import type { ObjectOrInterfaceDefinition, ObjectSet as $ObjectSet } from "../index.js";
+export declare function createMockObjectSet<Q extends ObjectOrInterfaceDefinition>(): $ObjectSet<Q, never>;

package/build/types/objectSet/ObjectSet.test.d.ts.map

@@ -1 +1 @@
-{"mappings":"","names":[],"sources":["../../../src/objectSet/ObjectSet.test.ts"],"version":3,"file":"ObjectSet.test.d.ts"}
+{"mappings":"AAkBA,cAEE,6BACA,aAAa,kBAIR,aAAc;AAGrB,OAAO,iBAAS,oBACd,UAAU,gCACP,WAAW","names":[],"sources":["../../../src/objectSet/ObjectSet.test.ts"],"version":3,"file":"ObjectSet.test.d.ts"}

package/build/types/ontology/ActionDefinition.d.ts

@@ -22,7 +22,7 @@ export declare namespace ActionMetadata {
 		nullable?: boolean;
 	}
 	namespace DataType {
-		type BaseActionParameterTypes = "boolean" | "string" | "integer" | "long" | "double" | "datetime" | "timestamp" | "attachment" | "marking" | "mediaReference" | "objectType";
+		type BaseActionParameterTypes = "boolean" | "string" | "integer" | "long" | "double" | "datetime" | "timestamp" | "attachment" | "marking" | "mediaReference" | "objectType" | "geoshape" | "geohash";
 		interface Object<T_Target extends ObjectTypeDefinition = never> {
 			__OsdkTargetType?: T_Target;
 			type: "object";

package/build/types/ontology/ActionDefinition.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,oBAAoB,oBAAqB;AACvD,cAAc,2BAA2B,0BAA2B;AACpE,cACE,sBACA,qBACK,2BAA4B;AAEnC,iBAAiB,eAAe;CAC9B,MAAM;CACN;CACA;CACA;CACA,YAAY,YAAY,eAAe;CACvC,mBAAmB,QACjB,YAAY;EACV;EACA;CACD;CAEH,QAAQ;CACR;AACD;AAED,yBAAiB;WACE,UACf,iBAAiB,8BACjB;EACA,MACI,SAAS,2BACT,SAAS,cACT,SAAS,iBACT,SAAS,iBACT,SAAS;EACb;EACA;EACA;CACD;WAEgB;OACH,2BACR,YACA,WACA,YACA,SACA,WACA,aACA,cACA,eACA,YACA,mBACA;YAEa,OACf,iBAAiB,8BACjB;GACA,mBAAmB;GACnB,MAAM;GACN,QAAQ,SAAS;EAClB;YAEgB,UAAU,iBAAiB,6BAA6B;GACvE,mBAAmB;GACnB,MAAM;GACN,WAAW,SAAS;EACrB;YAEgB,UACf,iBAAiB,8BACjB;GACA,mBAAmB;GACnB,MAAM;GACN,WAAW,SAAS;EACrB;YAEgB,OACf,UAAU,eAAe,SAAS,2BAClC;GACA,MAAM;GACN,QAAQ;EACT;;;AAIL,iBAAiB,0BAA0B,GAAG;CAC5C,YAAY;AACb;AAED,iBAAiB,iBACf,sBACA;CACA,MAAM;CACN;CACA,eAAe;CACf,uBACI,0BAA0B,gBAC1B;AACL","names":[],"sources":["../../../src/ontology/ActionDefinition.ts"],"version":3,"file":"ActionDefinition.d.ts"}
+{"mappings":"AAgBA,cAAc,oBAAoB,oBAAqB;AACvD,cAAc,2BAA2B,0BAA2B;AACpE,cACE,sBACA,qBACK,2BAA4B;AAEnC,iBAAiB,eAAe;CAC9B,MAAM;CACN;CACA;CACA;CACA,YAAY,YAAY,eAAe;CACvC,mBAAmB,QACjB,YAAY;EACV;EACA;CACD;CAEH,QAAQ;CACR;AACD;AAED,yBAAiB;WACE,UACf,iBAAiB,8BACjB;EACA,MACI,SAAS,2BACT,SAAS,cACT,SAAS,iBACT,SAAS,iBACT,SAAS;EACb;EACA;EACA;CACD;WAEgB;OACH,2BACR,YACA,WACA,YACA,SACA,WACA,aACA,cACA,eACA,YACA,mBACA,eACA,aACA;YAEa,OACf,iBAAiB,8BACjB;GACA,mBAAmB;GACnB,MAAM;GACN,QAAQ,SAAS;EAClB;YAEgB,UAAU,iBAAiB,6BAA6B;GACvE,mBAAmB;GACnB,MAAM;GACN,WAAW,SAAS;EACrB;YAEgB,UACf,iBAAiB,8BACjB;GACA,mBAAmB;GACnB,MAAM;GACN,WAAW,SAAS;EACrB;YAEgB,OACf,UAAU,eAAe,SAAS,2BAClC;GACA,MAAM;GACN,QAAQ;EACT;;;AAIL,iBAAiB,0BAA0B,GAAG;CAC5C,YAAY;AACb;AAED,iBAAiB,iBACf,sBACA;CACA,MAAM;CACN;CACA,eAAe;CACf,uBACI,0BAA0B,gBAC1B;AACL","names":[],"sources":["../../../src/ontology/ActionDefinition.ts"],"version":3,"file":"ActionDefinition.d.ts"}

package/build/types/ontology/ObjectOrInterface.d.ts

@@ -1,6 +1,8 @@
+import type { IncludeValuesExtending } from "../util/IncludeValuesExtending.js";
 import type { InterfaceDefinition } from "./InterfaceDefinition.js";
-import type { ObjectTypeDefinition } from "./ObjectTypeDefinition.js";
+import type { CompileTimeMetadata, ObjectTypeDefinition } from "./ObjectTypeDefinition.js";
 import type { SimplePropertyDef } from "./SimplePropertyDef.js";
+import type { WirePropertyTypes } from "./WirePropertyTypes.js";
 export type ObjectOrInterfaceDefinition = ObjectTypeDefinition | InterfaceDefinition;
 export declare namespace DerivedObjectOrInterfaceDefinition {
 	type WithDerivedProperties<
@@ -13,7 +15,12 @@ export declare namespace DerivedObjectOrInterfaceDefinition {
 		}
 	} & K;
 }
-export type PropertyKeys<
-	O extends ObjectOrInterfaceDefinition,
-	RDPs extends Record<string, SimplePropertyDef> = {}
-> = (keyof NonNullable<O["__DefinitionMetadata"]>["properties"] | keyof RDPs) & string;
+export type PropertyKeys<O extends ObjectOrInterfaceDefinition> = (keyof CompileTimeMetadata<O>["properties"]) & string;
+export declare namespace PropertyKeys {
+	type Filtered<
+		Q extends ObjectOrInterfaceDefinition,
+		T extends WirePropertyTypes
+	> = keyof IncludeValuesExtending<CompileTimeMetadata<Q>["properties"], {
+		type: T
+	}>;
+}

package/build/types/ontology/ObjectOrInterface.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,2BAA2B,0BAA2B;AACpE,cAAc,4BAA4B,2BAA4B;AACtE,cAAc,yBAAyB,wBAAyB;AAEhE,YAAY,8BACR,uBACA;AAEJ,yBAAiB;MACH;EACV,UAAU;EACV,UAAU,eAAe;KACvB;EACF,sBAAsB;GACpB,eACG,WAAW,KAAI,kBAAkB,cAAc,EAAE;GAEpD,UACG,WAAW,KAAI,kBAAkB,kBAAkB,EAAE;EAEzD;CACF,IAAG;;AAGN,YAAY;CACV,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;WAE1C,YAAY,EAAE,yBAAyB,sBAAsB","names":[],"sources":["../../../src/ontology/ObjectOrInterface.ts"],"version":3,"file":"ObjectOrInterface.d.ts"}
+{"mappings":"AAgBA,cAAc,8BAA8B,mCAAoC;AAChF,cAAc,2BAA2B,0BAA2B;AACpE,cACE,qBACA,4BACK,2BAA4B;AACnC,cAAc,yBAAyB,wBAAyB;AAChE,cAAc,yBAAyB,wBAAyB;AAEhE,YAAY,8BACR,uBACA;AAEJ,yBAAiB;MACH;EACV,UAAU;EACV,UAAU,eAAe;KACvB;EACF,sBAAsB;GACpB,eACG,WAAW,KAAI,kBAAkB,cAAc,EAAE;GAEpD,UACG,WAAW,KAAI,kBAAkB,kBAAkB,EAAE;EAEzD;CACF,IAAG;;AAGN,YAAY,aACV,UAAU,sCAED,oBAAoB,GAAG;AAGlC,yBAAiB;MACH;EACV,UAAU;EACV,UAAU;WACF,uBACR,oBAAoB,GAAG,eACvB;EAAE,MAAM;CAAG","names":[],"sources":["../../../src/ontology/ObjectOrInterface.ts"],"version":3,"file":"ObjectOrInterface.d.ts"}

package/build/types/ontology/ObjectSpecifier.d.ts

@@ -1,5 +1,6 @@
 import type { InterfaceDefinition, InterfaceMetadata } from "./InterfaceDefinition.js";
 import type { ObjectOrInterfaceDefinition } from "./ObjectOrInterface.js";
+import type { CompileTimeMetadata } from "./ObjectTypeDefinition.js";
 export type ObjectSpecifier<Q extends ObjectOrInterfaceDefinition> = string & {
-	__apiName: Q["apiName"] | (Q extends InterfaceDefinition ? NonNullable<Q["__DefinitionMetadata"]> extends InterfaceMetadata ? NonNullable<NonNullable<Q["__DefinitionMetadata"]>["implementedBy"]>[number] : never : never)
+	__apiName: Q["apiName"] | (Q extends InterfaceDefinition ? CompileTimeMetadata<Q> extends InterfaceMetadata ? NonNullable<CompileTimeMetadata<Q>["implementedBy"]>[number] : never : never)
 };

package/build/types/ontology/ObjectSpecifier.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,qBACA,yBACK,0BAA2B;AAClC,cAAc,mCAAmC,wBAAyB;AAE1E,YAAY,gBAAgB,UAAU,wCAAwC;CAC5E,WACI,EAAE,cACD,UAAU,sBACT,YAAY,EAAE,iCAAiC,oBAC7C,YACA,YAAY,EAAE,yBAAyB;AAIhD","names":[],"sources":["../../../src/ontology/ObjectSpecifier.ts"],"version":3,"file":"ObjectSpecifier.d.ts"}
+{"mappings":"AAgBA,cACE,qBACA,yBACK,0BAA2B;AAClC,cAAc,mCAAmC,wBAAyB;AAC1E,cAAc,2BAA2B,2BAA4B;AAErE,YAAY,gBAAgB,UAAU,wCAAwC;CAC5E,WACI,EAAE,cACD,UAAU,sBACT,oBAAoB,WAAW,oBAC7B,YAAY,oBAAoB,GAAG;AAG5C","names":[],"sources":["../../../src/ontology/ObjectSpecifier.ts"],"version":3,"file":"ObjectSpecifier.d.ts"}

package/build/types/ontology/PrimaryKeyTypes.d.ts

@@ -1 +1 @@
-export type PrimaryKeyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "byte";
+export type PrimaryKeyTypes = "string" | "datetime" | "double" | "integer" | "timestamp" | "short" | "long" | "byte";

package/build/types/ontology/PrimaryKeyTypes.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,YAAY,kBACR,WACA,aACA,WACA,YACA,YACA,cACA,UACA,SACA","names":[],"sources":["../../../src/ontology/PrimaryKeyTypes.ts"],"version":3,"file":"PrimaryKeyTypes.d.ts"}
+{"mappings":"AAgBA,YAAY,kBACR,WACA,aACA,WACA,YACA,cACA,UACA,SACA","names":[],"sources":["../../../src/ontology/PrimaryKeyTypes.ts"],"version":3,"file":"PrimaryKeyTypes.d.ts"}

package/build/types/ontology/QueryDefinition.d.ts

@@ -16,6 +16,8 @@ export interface QueryCompileTimeMetadata<T> {
 export interface QueryDefinition<T = any> {
 	type: "query";
 	apiName: string;
+	version?: string;
+	isFixedVersion?: boolean;
 	osdkMetadata?: OsdkMetadata;
 	__DefinitionMetadata?: QueryCompileTimeMetadata<T> & QueryMetadata;
 }

package/build/types/ontology/QueryDefinition.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,oBAAoB,oBAAqB;AACvD,cAAc,4BAA4B,2BAA4B;AAEtE,iBAAiB,cAAc;CAC7B,MAAM;CACN;CACA;CACA;CACA;CACA,YAAY,eAAe;CAC3B,QAAQ;CACR;AACD;AAED,iBAAiB,yBAAyB,GAAG;CAC3C,WAAW;AACZ;AAED,iBAAiB,gBAAgB,SAAS;CACxC,MAAM;CACN;CACA,eAAe;CACf,uBACI,yBAAyB,KACzB;AACL;AAED,YAAY,yBACV,iBAAiB,8BACf;CACF;AACD,IAAG,wBAAwB;AAE5B,YAAY,wBACV,iBAAiB,8BAEf,oBACA,oBAAoB,YACpB,uBAAuB,YACvB,mBACA,qBACA,sBACA,oCACA,sCACA;AAEJ,YAAY,4BAA4B,oBAAoB;CAC1D;CACA;CACA,MAAM;AACP;AAED,YAAY,qBACR,WACA,UACA,YACA,SACA,YACA,WACA,SACA,cACA;AAEJ,YAAY,kBACV,UAAU,qBAAqB,sBAC7B,4BAA4B;AAEhC,iBAAiB,oBACf,iBAAiB,sCACT,4BAA4B,UAAU;CAC9C;CACA,mBAAmB;AACpB;AAED,iBAAiB,uBACf,iBAAiB,sCACT,4BAA4B,aAAa;CACjD;CACA,mBAAmB;AACpB;AAED,iBAAiB,yBAAyB,4BAA4B,OAAO;CAC3E,KAAK;AACN;AAED,iBAAiB,2BACP,4BAA4B,SACtC;CACE,OAAO,cAAc;AACtB;AAED,iBAAiB,4BACP,4BAA4B,UACtC;CACE,QAAQ,eAAe;AACxB;AAED,iBAAiB,0CACP,4BAA4B,6BACtC;CACE,2BAA2B;AAC5B;AAED,iBAAiB,4CACP,4BAA4B,+BACtC;CACE,6BAA6B;AAC9B;AAED,iBAAiB,oBAAoB,4BAA4B,OAAO;CACtE,SAAS;CACT,WAAW;AACZ;AAED,YAAY,uBAAuB,WAC/B,6BAA6B,KAC7B,4BAA4B;AAEhC,iBAAiB,6BAA6B,SAAS;CACrD,SAAS,QAAQ,qBAAqB;CACtC,WAAW;AACZ;AACD,iBAAiB,4BAA4B,SAAS;CACpD,SAAS;CACT,YAAY;CACZ,WAAW;AACZ;AAED,YAAY,2CAA2C,uBACrD;AAGF,YAAY,6CAA6C,uBACvD;AAGF,YAAY,sBACR,YACA,WACA,SACA,WACA,YACA,cACA;AAEJ,YAAY,2BACR,SACA,WACA,YACA;AAEJ,YAAY,wBAAwB,SAAS,WAAW","names":[],"sources":["../../../src/ontology/QueryDefinition.ts"],"version":3,"file":"QueryDefinition.d.ts"}
+{"mappings":"AAgBA,cAAc,oBAAoB,oBAAqB;AACvD,cAAc,4BAA4B,2BAA4B;AAEtE,iBAAiB,cAAc;CAC7B,MAAM;CACN;CACA;CACA;CACA;CACA,YAAY,eAAe;CAC3B,QAAQ;CACR;AACD;AAED,iBAAiB,yBAAyB,GAAG;CAC3C,WAAW;AACZ;AAED,iBAAiB,gBAAgB,SAAS;CACxC,MAAM;CACN;CACA;CACA;CACA,eAAe;CACf,uBACI,yBAAyB,KACzB;AACL;AAED,YAAY,yBACV,iBAAiB,8BACf;CACF;AACD,IAAG,wBAAwB;AAE5B,YAAY,wBACV,iBAAiB,8BAEf,oBACA,oBAAoB,YACpB,uBAAuB,YACvB,mBACA,qBACA,sBACA,oCACA,sCACA;AAEJ,YAAY,4BAA4B,oBAAoB;CAC1D;CACA;CACA,MAAM;AACP;AAED,YAAY,qBACR,WACA,UACA,YACA,SACA,YACA,WACA,SACA,cACA;AAEJ,YAAY,kBACV,UAAU,qBAAqB,sBAC7B,4BAA4B;AAEhC,iBAAiB,oBACf,iBAAiB,sCACT,4BAA4B,UAAU;CAC9C;CACA,mBAAmB;AACpB;AAED,iBAAiB,uBACf,iBAAiB,sCACT,4BAA4B,aAAa;CACjD;CACA,mBAAmB;AACpB;AAED,iBAAiB,yBAAyB,4BAA4B,OAAO;CAC3E,KAAK;AACN;AAED,iBAAiB,2BACP,4BAA4B,SACtC;CACE,OAAO,cAAc;AACtB;AAED,iBAAiB,4BACP,4BAA4B,UACtC;CACE,QAAQ,eAAe;AACxB;AAED,iBAAiB,0CACP,4BAA4B,6BACtC;CACE,2BAA2B;AAC5B;AAED,iBAAiB,4CACP,4BAA4B,+BACtC;CACE,6BAA6B;AAC9B;AAED,iBAAiB,oBAAoB,4BAA4B,OAAO;CACtE,SAAS;CACT,WAAW;AACZ;AAED,YAAY,uBAAuB,WAC/B,6BAA6B,KAC7B,4BAA4B;AAEhC,iBAAiB,6BAA6B,SAAS;CACrD,SAAS,QAAQ,qBAAqB;CACtC,WAAW;AACZ;AACD,iBAAiB,4BAA4B,SAAS;CACpD,SAAS;CACT,YAAY;CACZ,WAAW;AACZ;AAED,YAAY,2CAA2C,uBACrD;AAGF,YAAY,6CAA6C,uBACvD;AAGF,YAAY,sBACR,YACA,WACA,SACA,WACA,YACA,cACA;AAEJ,YAAY,2BACR,SACA,WACA,YACA;AAEJ,YAAY,wBAAwB,SAAS,WAAW","names":[],"sources":["../../../src/ontology/QueryDefinition.ts"],"version":3,"file":"QueryDefinition.d.ts"}

package/build/types/ontology/SimplePropertyDef.d.ts

@@ -5,10 +5,10 @@ export type SimplePropertyDef = WirePropertyTypes | undefined | Array<WireProper
 export declare namespace SimplePropertyDef {
 	type Make<
 		T extends WirePropertyTypes,
-		N extends boolean | undefined,
-		M extends boolean | undefined
-	> = M extends true ? N extends true ? Array<T> | undefined : Array<T> : N extends true ? T | undefined : T;
-	type FromPropertyMetadata<P extends ObjectMetadata.Property> = Make<P["type"], P["nullable"], P["multiplicity"]>;
+		N extends "nullable" | "non-nullable",
+		M extends "array" | "single"
+	> = M extends "array" ? N extends "nullable" ? Array<T> | undefined : Array<T> : N extends "nullable" ? T | undefined : T;
+	type FromPropertyMetadata<P extends ObjectMetadata.Property> = Make<P["type"], P["nullable"] extends true ? "nullable" : "non-nullable", P["multiplicity"] extends true ? "array" : "single">;
 	type ExtractMultiplicity<T extends WirePropertyTypes | undefined | Array<WirePropertyTypes>> = NonNullable<T> extends Array<any> ? "array" : "single";
 	type ExtractWirePropertyType<T extends SimplePropertyDef> = T extends Array<infer Z> ? NonNullable<Z> : NonNullable<T>;
 	type ExtractNullable<T extends SimplePropertyDef> = [undefined] extends [T] ? "nullable" : [[undefined]] extends [T] ? "nullable" : "non-nullable";

package/build/types/ontology/SimplePropertyDef.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,sCAAsC,oCAAqC;AACzF,cAAc,gBAAgB,mBAAmB,2BAA4B;AAC7E,cAAc,yBAAyB,wBAAyB;AAEhE,YAAY,oBACR,gCAEA,MAAM;AAEV,yBAAiB;MACH;EACV,UAAU;EACV;EACA;KAQA,UAAU,OAAO,UAAU,OAAO,MAAM,iBACpC,MAAM,KACN,UAAU,OAAO,gBACjB;MAEM,qBACV,UAAU,eAAe,YACvB,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE;MAGzB,oBACV,UACI,gCAEA,MAAM,sBACR,YAAY,WAAW,aAAa,UAAU;MAGtC,wBACV,UAAU,qBACR,UAAU,YAAY,KAAK,YAAY,KAAK,YAAY;MAGhD,gBACV,UAAU,0CACa,KAAK,oCACH,KAAK,aAC5B;MAEQ,cAAc,UAAU,qBAAqB,YACvD,kBAAkB,wBAAwB,IAC1C,kBAAkB,gBAAgB,IAClC,kBAAkB,oBAAoB;MAG5B,uBAAuB,UAAU,qBAC3C,+BACE,kBAAkB,wBAAwB;MAGlC,kBAAkB,UAAU,qBACtC,oBAAoB,WAAW,UAC3B,gBAAgB,WAAW,aACzB,MAAM,uBAAuB,kBAC/B,MAAM,uBAAuB,MAC7B,gBAAgB,WAAW,aACzB,uBAAuB,iBACzB,uBAAuB","names":[],"sources":["../../../src/ontology/SimplePropertyDef.ts"],"version":3,"file":"SimplePropertyDef.d.ts"}
+{"mappings":"AAgBA,cAAc,sCAAsC,oCAAqC;AACzF,cAAc,gBAAgB,mBAAmB,2BAA4B;AAC7E,cAAc,yBAAyB,wBAAyB;AAEhE,YAAY,oBACR,gCAEA,MAAM;AAEV,yBAAiB;MACH;EACV,UAAU;EACV,UAAU,aAAa;EACvB,UAAU,UAAU;KAQpB,UAAU,UAAU,UAAU,aAAa,MAAM,iBAC7C,MAAM,KACN,UAAU,aAAa,gBACvB;MAEM,qBACV,UAAU,eAAe,YACvB,KACF,EAAE,SACF,EAAE,oBAAoB,OAAO,aAAa,gBAC1C,EAAE,wBAAwB,OAAO,UAAU;MAIjC,oBACV,UACI,gCAEA,MAAM,sBACR,YAAY,WAAW,aAAa,UAAU;MAGtC,wBACV,UAAU,qBACR,UAAU,YAAY,KAAK,YAAY,KAAK,YAAY;MAGhD,gBACV,UAAU,0CACa,KAAK,oCACH,KAAK,aAC5B;MAEQ,cAAc,UAAU,qBAAqB,YACvD,kBAAkB,wBAAwB,IAC1C,kBAAkB,gBAAgB,IAClC,kBAAkB,oBAAoB;MAG5B,uBAAuB,UAAU,qBAC3C,+BACE,kBAAkB,wBAAwB;MAGlC,kBAAkB,UAAU,qBACtC,oBAAoB,WAAW,UAC3B,gBAAgB,WAAW,aACzB,MAAM,uBAAuB,kBAC/B,MAAM,uBAAuB,MAC7B,gBAAgB,WAAW,aACzB,uBAAuB,iBACzB,uBAAuB","names":[],"sources":["../../../src/ontology/SimplePropertyDef.ts"],"version":3,"file":"SimplePropertyDef.d.ts"}

package/build/types/public/unstable.d.ts

@@ -1,7 +1,7 @@
-export type  { Experiment, ExperimentFns } from "../experimental/Experiment.js";
+export type { Experiment, ExperimentFns } from "../experimental/Experiment.js";
 export { __EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference } from "../experimental/createMediaReference.js";
 export { __EXPERIMENTAL__NOT_SUPPORTED_YET__fetchOneByRid } from "../experimental/fetchOneByRid.js";
 export { __EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid } from "../experimental/fetchPageByRid.js";
 export { __EXPERIMENTAL__NOT_SUPPORTED_YET__getBulkLinks } from "../experimental/getBulkLinks.js";
-export type  { EXPERIMENTAL_BulkLinkResult } from "../objectSet/BulkLinkResult.js";
-export type  { MinimalObjectSet } from "../objectSet/ObjectSet.js";
+export type { EXPERIMENTAL_BulkLinkResult } from "../objectSet/BulkLinkResult.js";
+export type { MinimalObjectSet } from "../objectSet/ObjectSet.js";

package/build/types/public/unstable.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,eAAc,YAAY,qBAAqB;AAE/C,SAAS,+DAA+D;AACxE,SAAS,wDAAwD;AACjE,SAAS,yDAAyD;AAClE,SAAS,uDAAuD;AAEhE,eAAc,mCAAmC;AACjD,eAAc,wBAAwB","names":[],"sources":["../../../src/public/unstable.ts"],"version":3,"file":"unstable.d.ts"}
+{"mappings":"AAgBA,cAAc,YAAY,qBAAqB;AAE/C,SAAS,+DAA+D;AACxE,SAAS,wDAAwD;AACjE,SAAS,yDAAyD;AAClE,SAAS,uDAAuD;AAEhE,cAAc,mCAAmC;AACjD,cAAc,wBAAwB","names":[],"sources":["../../../src/public/unstable.ts"],"version":3,"file":"unstable.d.ts"}

package/build/types/queries/Queries.d.ts

@@ -2,7 +2,7 @@ import type { DataValueClientToWire, DataValueWireToClient } from "../mapping/Da
 import type { ObjectSet } from "../objectSet/ObjectSet.js";
 import type { ObjectTypeDefinition } from "../ontology/ObjectTypeDefinition.js";
 import type { AggregationKeyTypes, AggregationRangeKeyTypes, AggregationValueTypes } from "../ontology/QueryDefinition.js";
-import type { OsdkBase } from "../OsdkBase.js";
+import type { ObjectIdentifiers, OsdkBase } from "../OsdkBase.js";
 import type { OsdkObjectPrimaryKeyType } from "../OsdkObjectPrimaryKeyType.js";
 import type { AggKeyClientToWire, AggKeyWireToClient, AggValueClientToWire, AggValueWireToClient, ThreeDimensionalAggregation, TwoDimensionalAggregation } from "./Aggregations.js";
 /**
@@ -10,7 +10,7 @@ import type { AggKeyClientToWire, AggKeyWireToClient, AggValueClientToWire, AggV
 */
 export declare namespace QueryParam {
 	type PrimitiveType<T extends keyof DataValueClientToWire> = DataValueClientToWire[T];
-	type ObjectType<T extends ObjectTypeDefinition> = OsdkBase<T> | OsdkObjectPrimaryKeyType<T>;
+	type ObjectType<T extends ObjectTypeDefinition> = ObjectIdentifiers<T> | OsdkObjectPrimaryKeyType<T>;
 	type ObjectSetType<T extends ObjectTypeDefinition> = ObjectSet<T>;
 	type RangeKey<T extends AggregationRangeKeyTypes> = AggKeyClientToWire<"range", T>;
 	type TwoDimensionalAggregationType<

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

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,uBACA,6BACK,gCAAiC;AACxC,cAAc,iBAAiB,2BAA4B;AAC3D,cAAc,4BAA4B,qCAAsC;AAChF,cACE,qBACA,0BACA,6BACK,gCAAiC;AACxC,cAAc,gBAAgB,gBAAiB;AAC/C,cAAc,gCAAgC,gCAAiC;AAC/E,cACE,oBACA,oBACA,sBACA,sBACA,6BACA,iCACK,mBAAoB;;;;AAK3B,yBAAiB;MAIH,cAAc,gBAAgB,yBACxC,sBAAsB;MAKZ,WAAW,UAAU,wBAC7B,SAAS,KACT,yBAAyB;MAKjB,cAAc,UAAU,wBAAwB,UAAU;MAE1D,SAAS,UAAU,4BAA4B,mBACzD,SACA;MAGU;EACV,UAAU,sBAAsB;EAChC,UAAU;KACR,0BACF,UAAU,sBAAsB,mBAAmB,KAAK,GACxD,qBAAqB;MAGX;EACV,YAAY,sBAAsB;EAClC,WAAW,sBAAsB;EACjC,UAAU;KACR,4BACF,YAAY,sBAAsB,mBAAmB,OAAO,KAC5D,WAAW,sBAAsB,mBAAmB,MAAM,IAC1D,qBAAqB;;;;;AAOzB,yBAAiB;MAIH,cAAc,gBAAgB,yBACxC,sBAAsB;MAKZ,WAAW,UAAU,wBAAwB,SAAS;MAKtD,cAAc,UAAU,wBAAwB,UAC1D;MAGU,SAAS,UAAU,4BAA4B,mBACzD,SACA;MAGU;EACV,UAAU,sBAAsB;EAChC,UAAU;KACR,0BACF,UAAU,sBAAsB,mBAAmB,KAAK,GACxD,qBAAqB;MAGX;EACV,YAAY,sBAAsB;EAClC,WAAW,sBAAsB;EACjC,UAAU;KACR,4BACF,YAAY,sBAAsB,mBAAmB,OAAO,KAC5D,WAAW,sBAAsB,mBAAmB,MAAM,IAC1D,qBAAqB","names":[],"sources":["../../../src/queries/Queries.ts"],"version":3,"file":"Queries.d.ts"}
+{"mappings":"AAgBA,cACE,uBACA,6BACK,gCAAiC;AACxC,cAAc,iBAAiB,2BAA4B;AAC3D,cAAc,4BAA4B,qCAAsC;AAChF,cACE,qBACA,0BACA,6BACK,gCAAiC;AACxC,cAAc,mBAAmB,gBAAgB,gBAAiB;AAClE,cAAc,gCAAgC,gCAAiC;AAC/E,cACE,oBACA,oBACA,sBACA,sBACA,6BACA,iCACK,mBAAoB;;;;AAK3B,yBAAiB;MAIH,cAAc,gBAAgB,yBACxC,sBAAsB;MAKZ,WAAW,UAAU,wBAC7B,kBAAkB,KAClB,yBAAyB;MAKjB,cAAc,UAAU,wBAAwB,UAAU;MAE1D,SAAS,UAAU,4BAA4B,mBACzD,SACA;MAGU;EACV,UAAU,sBAAsB;EAChC,UAAU;KACR,0BACF,UAAU,sBAAsB,mBAAmB,KAAK,GACxD,qBAAqB;MAGX;EACV,YAAY,sBAAsB;EAClC,WAAW,sBAAsB;EACjC,UAAU;KACR,4BACF,YAAY,sBAAsB,mBAAmB,OAAO,KAC5D,WAAW,sBAAsB,mBAAmB,MAAM,IAC1D,qBAAqB;;;;;AAOzB,yBAAiB;MAIH,cAAc,gBAAgB,yBACxC,sBAAsB;MAKZ,WAAW,UAAU,wBAAwB,SAAS;MAKtD,cAAc,UAAU,wBAAwB,UAC1D;MAGU,SAAS,UAAU,4BAA4B,mBACzD,SACA;MAGU;EACV,UAAU,sBAAsB;EAChC,UAAU;KACR,0BACF,UAAU,sBAAsB,mBAAmB,KAAK,GACxD,qBAAqB;MAGX;EACV,YAAY,sBAAsB;EAClC,WAAW,sBAAsB;EACjC,UAAU;KACR,4BACF,YAAY,sBAAsB,mBAAmB,OAAO,KAC5D,WAAW,sBAAsB,mBAAmB,MAAM,IAC1D,qBAAqB","names":[],"sources":["../../../src/queries/Queries.ts"],"version":3,"file":"Queries.d.ts"}