@osdk/api 2.2.0-beta.9 → 2.3.0-beta.1

package/build/types/derivedProperties/DerivedProperty.d.ts

@@ -4,31 +4,50 @@ import type { ObjectOrInterfaceDefinition, PropertyKeys } from "../ontology/Obje
 import type { CompileTimeMetadata } from "../ontology/ObjectTypeDefinition.js";
 import type { SimplePropertyDef } from "../ontology/SimplePropertyDef.js";
 import type { LinkedType, LinkNames } from "../util/LinkUtils.js";
-import type { CollectWithPropAggregations } from "./WithPropertiesAggregationOptions.js";
+import type { DatetimeExpressions, DefinitionForType, NumericExpressions } from "./Expressions.js";
+import type { CollectWithPropAggregations, MinMaxWithPropAggregateOption } from "./WithPropertiesAggregationOptions.js";
+declare const DerivedPropertyDefinitionBrand: unique symbol;
 export declare namespace DerivedProperty {
-	type SelectorResult<T extends SimplePropertyDef> = {
-		type: T
+	export interface Definition<
+		T extends SimplePropertyDef,
+		Q extends ObjectOrInterfaceDefinition
+	> {
+		readonly [DerivedPropertyDefinitionBrand]: true;
+	}
+	export interface NumericPropertyDefinition<
+		T extends SimplePropertyDef,
+		Q extends ObjectOrInterfaceDefinition
+	> extends Definition<T, Q>, NumericExpressions<Q, T> {}
+	export interface DatetimePropertyDefinition<
+		T extends SimplePropertyDef,
+		Q extends ObjectOrInterfaceDefinition
+	> extends Definition<T, Q>, DatetimeExpressions<Q, T> {}
+	export type Clause<Q extends ObjectOrInterfaceDefinition> = {
+		[key: string]: DerivedPropertyCreator<Q, SimplePropertyDef>
 	};
-	type Clause<Q extends ObjectOrInterfaceDefinition> = {
-		[key: string]: Selector<Q, SimplePropertyDef>
-	};
-	type Selector<
-		Q extends ObjectOrInterfaceDefinition,
-		T extends SimplePropertyDef
-	> = (baseObjectSet: DerivedProperty.Builder<Q, false>) => SelectorResult<T>;
-	interface Builder<
+	interface BaseBuilder<
 		Q extends ObjectOrInterfaceDefinition,
 		CONSTRAINED extends boolean
 	> extends Filterable<Q, CONSTRAINED>, Pivotable<Q, CONSTRAINED> {}
-	interface AggregateBuilder<
+	export interface Builder<
+		Q extends ObjectOrInterfaceDefinition,
+		CONSTRAINED extends boolean
+	> extends BaseBuilder<Q, CONSTRAINED>, Selectable<Q>, Constant<Q> {}
+	export interface AggregateBuilder<
 		Q extends ObjectOrInterfaceDefinition,
 		CONSTRAINED extends boolean
-	> extends Builder<Q, CONSTRAINED>, Aggregatable<Q> {}
-	interface SelectPropertyBuilder<
+	> extends BaseBuilder<Q, CONSTRAINED>, Aggregatable<Q> {}
+	export interface SelectPropertyBuilder<
 		Q extends ObjectOrInterfaceDefinition,
 		CONSTRAINED extends boolean
 	> extends AggregateBuilder<Q, CONSTRAINED>, Selectable<Q> {}
+	export type ValidParts = "DAYS" | "MONTHS" | "QUARTERS" | "YEARS";
+	export {};
 }
+export type DerivedPropertyCreator<
+	Q extends ObjectOrInterfaceDefinition,
+	T extends SimplePropertyDef
+> = (baseObjectSet: DerivedProperty.Builder<Q, false>) => DerivedProperty.Definition<T, Q> | DerivedProperty.NumericPropertyDefinition<T, Q> | DerivedProperty.DatetimePropertyDefinition<T, Q>;
 type BuilderTypeFromConstraint<
 	Q extends ObjectOrInterfaceDefinition,
 	CONSTRAINED extends boolean
@@ -45,14 +64,23 @@ type Pivotable<
 > = {
 	readonly pivotTo: <L extends LinkNames<Q>>(type: L) => CONSTRAINED extends true ? DerivedProperty.AggregateBuilder<LinkedType<Q, L>, true> : NonNullable<CompileTimeMetadata<Q>["links"][L]["multiplicity"]> extends true ? DerivedProperty.AggregateBuilder<LinkedType<Q, L>, true> : DerivedProperty.SelectPropertyBuilder<LinkedType<Q, L>, false>
 };
+type Constant<Q extends ObjectOrInterfaceDefinition> = {
+	readonly constant: {
+		readonly double: (value: number) => DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"double", "non-nullable", "single">, Q>
+		readonly integer: (value: number) => DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"integer", "non-nullable", "single">, Q>
+		readonly long: (value: string) => DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"long", "non-nullable", "single">, Q>
+		readonly datetime: (value: string) => DerivedProperty.DatetimePropertyDefinition<SimplePropertyDef.Make<"datetime", "non-nullable", "single">, Q>
+		readonly timestamp: (value: string) => DerivedProperty.DatetimePropertyDefinition<SimplePropertyDef.Make<"timestamp", "non-nullable", "single">, Q>
+	}
+};
 type Aggregatable<Q extends ObjectOrInterfaceDefinition> = {
 	readonly aggregate: <V extends ValidAggregationKeys<Q, "withPropertiesAggregate">>(aggregationSpecifier: V, opts?: V extends `${any}:${infer P}` ? P extends CollectWithPropAggregations ? {
 		limit: number
 	} : P extends "approximatePercentile" ? {
 		percentile: number
-	} : never : never) => DerivedProperty.SelectorResult<V extends `${infer N}:${infer P}` ? P extends CollectWithPropAggregations ? Array<CompileTimeMetadata<Q>["properties"][N]["type"]> | undefined : P extends "approximateDistinct" | "exactDistinct" | "$count" ? "integer" : "double" | undefined : V extends "$count" ? "integer" : never>
+	} : never : never) => DefinitionForType<Q, V extends `${infer N}:${infer P}` ? P extends CollectWithPropAggregations ? SimplePropertyDef.Make<CompileTimeMetadata<Q>["properties"][N]["type"], "nullable", "array"> : P extends MinMaxWithPropAggregateOption ? SimplePropertyDef.Make<CompileTimeMetadata<Q>["properties"][N]["type"], "nullable", "single"> : P extends "approximateDistinct" | "exactDistinct" ? SimplePropertyDef.Make<"integer", "non-nullable", "single"> : SimplePropertyDef.Make<"double", "nullable", "single"> : V extends "$count" ? SimplePropertyDef.Make<"integer", "non-nullable", "single"> : never>
 };
 type Selectable<Q extends ObjectOrInterfaceDefinition> = {
-	readonly selectProperty: <R extends PropertyKeys<Q>>(propertyName: R) => DerivedProperty.SelectorResult<SimplePropertyDef.Make<CompileTimeMetadata<Q>["properties"][R]["type"], CompileTimeMetadata<Q>["properties"][R]["nullable"], CompileTimeMetadata<Q>["properties"][R]["multiplicity"]>>
+	readonly selectProperty: <R extends PropertyKeys<Q>>(propertyName: R) => DefinitionForType<Q, SimplePropertyDef.Make<CompileTimeMetadata<Q>["properties"][R]["type"], CompileTimeMetadata<Q>["properties"][R]["nullable"] extends true ? "nullable" : "non-nullable", CompileTimeMetadata<Q>["properties"][R]["multiplicity"] extends true ? "array" : "single">>
 };
 export {};

package/build/types/derivedProperties/DerivedProperty.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,4BAA4B,kCAAmC;AAC7E,cAAc,mBAAmB,6BAA8B;AAC/D,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,2BAA2B,qCAAsC;AAC/E,cAAc,yBAAyB,kCAAmC;AAC1E,cAAc,YAAY,iBAAiB,sBAAuB;AAClE,cAAc,mCAAmC,uCAAwC;AAEzF,yBAAiB;MACH,eACV,UAAU,qBACR;EACF,MAAM;CACP;MAEW,OACV,UAAU,+BACR;iBACa,SAAS,GAAG;CAC5B;MAEW;EACV,UAAU;EACV,UAAU;MAEVA,eAAe,gBAAgB,QAAQ,GAAG,WACvC,eAAe;WAEH;EACf,UAAU;EACV;WACQ,WAAW,GAAG,cAAc,UAAU,GAAG,aAAa,CAC/D;WAEgB;EACf,UAAU;EACV;WACQ,QAAQ,GAAG,cAAc,aAAa,GAAG,CAClD;WAEgB;EACf,UAAU;EACV;WACQ,iBAAiB,GAAG,cAAc,WAAW,GAAG,CACzD;;KAGE;CACH,UAAU;CACV;IACE,oBAAoB,OAAO,gBAAgB,iBAAiB,GAAG,QAC/D,gBAAgB,sBAAsB,GAAG;KAExC;CACH,UAAU;CACV;IACE;UACO,QACPC,QAAQ,YAAY,OACjB,0BAA0B,GAAG;AACnC;KAEI;CACH,UAAU;CACV;IACE;UACO,UAAU,UAAU,UAAU,IACrCC,MAAM,MACH,oBAAoB,OACrB,gBAAgB,iBAAiB,WAAW,GAAG,IAAI,QACnD,YAAY,oBAAoB,GAAG,SAAS,GAAG,yBAC/C,OAAO,gBAAgB,iBAAiB,WAAW,GAAG,IAAI,QAC1D,gBAAgB,sBAAsB,WAAW,GAAG,IAAI;AAC7D;KAEI,aACH,UAAU,+BACR;UACO,YACP,UAAU,qBACR,GACA,4BAGFC,sBAAsB,GACtBC,OAAO,0BAA0B,MAC7B,UAAU,8BAA8B;EAAE;CAAe,IACzD,UAAU,0BAA0B;EAAE;CAAoB,sBAG3D,gBAAgB,eACnB,mBAAmB,WAAW,MAC1B,UAAU,8BACR,MAAM,oBAAoB,GAAG,cAAc,GAAG,uBAChD,UAAU,wBAAwB,kBAAkB,WAAW,YAC/D,uBACA,UAAU,WAAW;AAG5B;KAEI,WAAW,UAAU,+BAA+B;UAC9C,iBAAiB,UAAU,aAAa,IAC/CC,cAAc,MACX,gBAAgB,eACnB,kBAAkB,KAChB,oBAAoB,GAAG,cAAc,GAAG,SACxC,oBAAoB,GAAG,cAAc,GAAG,aACxC,oBAAoB,GAAG,cAAc,GAAG;AAG7C","names":["baseObjectSet: DerivedProperty.Builder<Q, false>","clause: WhereClause<Q>","type: L","aggregationSpecifier: V","opts?: V extends `${any}:${infer P}`\n      ? P extends CollectWithPropAggregations ? { limit: number }\n      : P extends \"approximatePercentile\" ? { percentile: number }\n      : never\n      : never","propertyName: R"],"sources":["../../../src/derivedProperties/DerivedProperty.ts"],"version":3,"file":"DerivedProperty.d.ts"}
+{"mappings":"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","names":["DerivedPropertyDefinitionBrand: unique symbol","baseObjectSet: DerivedProperty.Builder<Q, false>","clause: WhereClause<Q>","type: L","value: number","value: string","aggregationSpecifier: V","opts?: V extends `${any}:${infer P}`\n      ? P extends CollectWithPropAggregations ? { limit: number }\n      : P extends \"approximatePercentile\" ? { percentile: number }\n      : never\n      : never","propertyName: R"],"sources":["../../../src/derivedProperties/DerivedProperty.ts"],"version":3,"file":"DerivedProperty.d.ts"}

package/build/types/derivedProperties/Expressions.d.ts

@@ -0,0 +1,53 @@
+import type { ObjectOrInterfaceDefinition, PropertyKeys } from "../ontology/ObjectOrInterface.js";
+import type { CompileTimeMetadata } from "../ontology/ObjectTypeDefinition.js";
+import type { SimplePropertyDef } from "../ontology/SimplePropertyDef.js";
+import type { WirePropertyTypes } from "../ontology/WirePropertyTypes.js";
+import type { DerivedProperty } from "./DerivedProperty.js";
+type WithPropertiesNumerics = "integer" | "double" | "float" | "short" | "long";
+type WithPropertiesDatetime = "datetime" | "timestamp";
+export type DefinitionForType<
+	Q extends ObjectOrInterfaceDefinition,
+	T extends SimplePropertyDef
+> = SimplePropertyDef.ExtractMultiplicity<T> extends "array" ? DerivedProperty.Definition<T, Q> : SimplePropertyDef.ExtractWirePropertyType<T> extends WithPropertiesNumerics ? DerivedProperty.NumericPropertyDefinition<T, Q> : SimplePropertyDef.ExtractWirePropertyType<T> extends WithPropertiesDatetime ? DerivedProperty.DatetimePropertyDefinition<T, Q> : DerivedProperty.Definition<T, Q>;
+type NumericExpressionArg<Q extends ObjectOrInterfaceDefinition> = number | DerivedProperty.NumericPropertyDefinition<any, Q>;
+type ReturnTypeForNumericMethod<
+	Q extends ObjectOrInterfaceDefinition,
+	LEFT extends WirePropertyTypes,
+	RIGHT extends WirePropertyTypes
+> = "double" extends (LEFT | RIGHT) ? DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"double", "non-nullable", "single">, Q> : "float" extends (LEFT | RIGHT) ? DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"double", "non-nullable", "single">, Q> : "long" extends (LEFT | RIGHT) ? DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"long", "non-nullable", "single">, Q> : DerivedProperty.NumericPropertyDefinition<SimplePropertyDef.Make<"integer", "non-nullable", "single">, Q>;
+type ReturnTypeForDatetimeMethod<
+	Q extends ObjectOrInterfaceDefinition,
+	LEFT extends WirePropertyTypes,
+	RIGHT extends WirePropertyTypes
+> = "timestamp" extends (LEFT | RIGHT) ? DerivedProperty.DatetimePropertyDefinition<SimplePropertyDef.Make<"timestamp", "non-nullable", "single">, Q> : DerivedProperty.DatetimePropertyDefinition<SimplePropertyDef.Make<"datetime", "non-nullable", "single">, Q>;
+type ExtractWirePropertyTypeFromNumericArg<
+	Q extends ObjectOrInterfaceDefinition,
+	ARG extends NumericExpressionArg<Q>
+> = ARG extends number ? "double" : ARG extends DerivedProperty.NumericPropertyDefinition<infer T, Q> ? T extends SimplePropertyDef ? SimplePropertyDef.ExtractWirePropertyType<T> : never : ARG extends PropertyKeys.Filtered<Q, WithPropertiesNumerics> ? NonNullable<CompileTimeMetadata<Q>["properties"][ARG]["type"]> : never;
+export type NumericExpressions<
+	Q extends ObjectOrInterfaceDefinition,
+	LEFT_PROPERTY_TYPE extends SimplePropertyDef
+> = {
+	readonly add: <A extends NumericExpressionArg<Q>>(value: A) => ReturnTypeForNumericMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractWirePropertyTypeFromNumericArg<Q, A>>
+	readonly subtract: <A extends NumericExpressionArg<Q>>(value: A) => ReturnTypeForNumericMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractWirePropertyTypeFromNumericArg<Q, A>>
+	readonly multiply: <A extends NumericExpressionArg<Q>>(value: A) => ReturnTypeForNumericMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractWirePropertyTypeFromNumericArg<Q, A>>
+	readonly divide: <A extends NumericExpressionArg<Q>>(value: A) => ReturnTypeForNumericMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractWirePropertyTypeFromNumericArg<Q, A>>
+	readonly abs: () => DerivedProperty.NumericPropertyDefinition<LEFT_PROPERTY_TYPE, Q>
+	readonly negate: () => DerivedProperty.NumericPropertyDefinition<LEFT_PROPERTY_TYPE, Q>
+	readonly max: <A extends NumericExpressionArg<Q>>(value: A) => ReturnTypeForNumericMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractWirePropertyTypeFromNumericArg<Q, A>>
+	readonly min: <A extends NumericExpressionArg<Q>>(value: A) => ReturnTypeForNumericMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractWirePropertyTypeFromNumericArg<Q, A>>
+};
+type DatetimeExpressionArg<Q extends ObjectOrInterfaceDefinition> = DerivedProperty.DatetimePropertyDefinition<any, Q>;
+type ExtractPropertyTypeFromDatetimeArg<
+	Q extends ObjectOrInterfaceDefinition,
+	ARG extends DatetimeExpressionArg<Q>
+> = ARG extends DerivedProperty.DatetimePropertyDefinition<infer T, Q> ? T extends SimplePropertyDef ? SimplePropertyDef.ExtractWirePropertyType<T> : never : ARG extends PropertyKeys.Filtered<Q, WithPropertiesDatetime> ? NonNullable<CompileTimeMetadata<Q>["properties"][ARG]["type"]> : never;
+export type DatetimeExpressions<
+	Q extends ObjectOrInterfaceDefinition,
+	LEFT_PROPERTY_TYPE extends SimplePropertyDef
+> = {
+	readonly min: <A extends DatetimeExpressionArg<Q>>(value: A) => ReturnTypeForDatetimeMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractPropertyTypeFromDatetimeArg<Q, A>>
+	readonly max: (value: DatetimeExpressionArg<Q>) => ReturnTypeForDatetimeMethod<Q, SimplePropertyDef.ExtractWirePropertyType<LEFT_PROPERTY_TYPE>, ExtractPropertyTypeFromDatetimeArg<Q, typeof value>>
+	readonly extractPart: (value: DerivedProperty.ValidParts) => DerivedProperty.Definition<SimplePropertyDef.Make<"string", "non-nullable", "single">, Q>
+};
+export {};

package/build/types/derivedProperties/Expressions.d.ts.map

@@ -0,0 +1 @@
+{"mappings":"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","names":["value: A","value: DatetimeExpressionArg<Q>","value: DerivedProperty.ValidParts"],"sources":["../../../src/derivedProperties/Expressions.ts"],"version":3,"file":"Expressions.d.ts"}

package/build/types/derivedProperties/WithPropertiesAggregationOptions.d.ts

@@ -1,4 +1,7 @@
+export type DistinctWithPropAggregateOption = "approximateDistinct" | "exactDistinct";
 export type CollectWithPropAggregations = "collectSet" | "collectList";
-export type BaseWithPropAggregations = "approximateDistinct" | "exactDistinct";
-export type StringWithPropAggregateOption = BaseWithPropAggregations | CollectWithPropAggregations;
-export type NumericWithPropAggregateOption = "min" | "max" | "sum" | "avg" | "approximatePercentile" | BaseWithPropAggregations | CollectWithPropAggregations;
+export type BaseWithPropAggregations = DistinctWithPropAggregateOption | CollectWithPropAggregations;
+export type MinMaxWithPropAggregateOption = "min" | "max";
+export type DatetimeWithPropAggregateOption = MinMaxWithPropAggregateOption | BaseWithPropAggregations;
+export type NumericWithPropAggregateOption = "sum" | "avg" | "approximatePercentile" | MinMaxWithPropAggregateOption | BaseWithPropAggregations;
+export type ValidCollectPropertyKeysForSpecialTypes = "attachment" | "geopoint" | "geoshape" | "boolean";

package/build/types/derivedProperties/WithPropertiesAggregationOptions.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,YAAY,8BAA8B,eAAe;AAEzD,YAAY,2BACR,wBACA;AAEJ,YAAY,gCACR,2BACA;AAEJ,YAAY,iCACR,QACA,QACA,QACA,QACA,0BACA,2BACA","names":[],"sources":["../../../src/derivedProperties/WithPropertiesAggregationOptions.ts"],"version":3,"file":"WithPropertiesAggregationOptions.d.ts"}
+{"mappings":"AAgBA,YAAY,kCACR,wBACA;AAEJ,YAAY,8BAA8B,eAAe;AAEzD,YAAY,2BACR,kCACA;AAEJ,YAAY,gCAAgC,QAAQ;AAEpD,YAAY,kCACR,gCACA;AAEJ,YAAY,iCACR,QACA,QACA,0BACA,gCACA;AAEJ,YAAY,0CACR,eACA,aACA,aACA","names":[],"sources":["../../../src/derivedProperties/WithPropertiesAggregationOptions.ts"],"version":3,"file":"WithPropertiesAggregationOptions.d.ts"}

package/build/types/experimental/createMediaReference.d.ts

@@ -1,6 +1,5 @@
 import type { MediaReference } from "../object/Media.js";
-import type { FilteredPropertyKeys } from "../ontology/FilteredPropertyKeys.js";
-import type { ObjectOrInterfaceDefinition } from "../ontology/ObjectOrInterface.js";
+import type { ObjectOrInterfaceDefinition, PropertyKeys } from "../ontology/ObjectOrInterface.js";
 import type { Experiment } from "./Experiment.js";
 /**
 * @experimental This feature is experimental and might change in the future.
@@ -16,7 +15,7 @@ import type { Experiment } from "./Experiment.js";
 */
 type createMediaReference = <
 	Q extends ObjectOrInterfaceDefinition,
-	const L extends FilteredPropertyKeys<Q, "mediaReference">
+	const L extends PropertyKeys.Filtered<Q, "mediaReference">
 >(args: {
 	data: Blob
 	fileName: string

package/build/types/experimental/createMediaReference.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,sBAAsB,oBAAqB;AACzD,cAAc,4BAA4B,qCAAsC;AAChF,cAAc,mCAAmC,kCAAmC;AACpF,cAAc,kBAAkB,iBAAkB;;;;;;;;;;;;;KAc7C;CACH,UAAU;OACJ,UAAU,qBAAqB,GAAG;EAExCA,MAAM;CACJ,MAAM;CACN;CACA,YAAY;CACZ,cAAc;AACf,MACE,QAAQ;AAEb,OAAO,cAAMC,yDACX,WACE,SACA,2DACA;CAAE,sBAAsB;AAAsB","names":["args: {\n    data: Blob;\n    fileName: string;\n    objectType: Q;\n    propertyType: L;\n  }","__EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference:\n  Experiment<\n    \"2.1.0\",\n    \"__EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference\",\n    { createMediaReference: createMediaReference }\n  >"],"sources":["../../../src/experimental/createMediaReference.ts"],"version":3,"file":"createMediaReference.d.ts"}
+{"mappings":"AAgBA,cAAc,sBAAsB,oBAAqB;AACzD,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,kBAAkB,iBAAkB;;;;;;;;;;;;;KAc7C;CACH,UAAU;OACJ,UAAU,aAAa,SAAS,GAAG;EAEzCA,MAAM;CACJ,MAAM;CACN;CACA,YAAY;CACZ,cAAc;AACf,MACE,QAAQ;AAEb,OAAO,cAAMC,yDACX,WACE,SACA,2DACA;CAAE,sBAAsB;AAAsB","names":["args: {\n    data: Blob;\n    fileName: string;\n    objectType: Q;\n    propertyType: L;\n  }","__EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference:\n  Experiment<\n    \"2.1.0\",\n    \"__EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference\",\n    { createMediaReference: createMediaReference }\n  >"],"sources":["../../../src/experimental/createMediaReference.ts"],"version":3,"file":"createMediaReference.d.ts"}

package/build/types/experimental/fetchPageByRid.d.ts

@@ -8,7 +8,7 @@ type fetchPageByRidFn = <
 	const R extends boolean,
 	const S extends NullabilityAdherence,
 	const T extends boolean
->(objectType: Q, rids: string[], options?: FetchPageArgs<Q, L, R, any, S>) => Promise<FetchPageResult<Q, L, R, S, T>>;
+>(objectType: Q, rids: string[], options?: FetchPageArgs<Q, L, R, any, S, T>) => Promise<FetchPageResult<Q, L, R, S, T>>;
 export declare const __EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid: Experiment<"2.2.0", "__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid", {
 	fetchPageByRid: fetchPageByRidFn
 }>;

package/build/types/experimental/fetchPageByRid.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,eACA,4BACK,4BAA6B;AACpC,cAAc,uBAAuB,8BAA+B;AAEpE,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,kBAAkB,iBAAkB;KAE7C;CACH,UAAU;OACJ,UAAU,aAAa;OACvB;OACA,UAAU;OACV;EAENA,YAAY,GACZC,gBACAC,UAAU,cAAc,GAAG,GAAG,QAAQ,OACnC,QAAQ,gBAAgB,GAAG,GAAG,GAAG,GAAG;AAEzC,OAAO,cAAMC,mDAAmD,WAC9D,SACA,qDACA;CAAE,gBAAgB;AAAkB","names":["objectType: Q","rids: string[]","options?: FetchPageArgs<Q, L, R, any, S>","__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid: Experiment<\n  \"2.2.0\",\n  \"__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid\",\n  { fetchPageByRid: fetchPageByRidFn }\n>"],"sources":["../../../src/experimental/fetchPageByRid.ts"],"version":3,"file":"fetchPageByRid.d.ts"}
+{"mappings":"AAgBA,cACE,eACA,4BACK,4BAA6B;AACpC,cAAc,uBAAuB,8BAA+B;AAEpE,cACE,6BACA,oBACK,kCAAmC;AAC1C,cAAc,kBAAkB,iBAAkB;KAE7C;CACH,UAAU;OACJ,UAAU,aAAa;OACvB;OACA,UAAU;OACV;EAENA,YAAY,GACZC,gBACAC,UAAU,cAAc,GAAG,GAAG,QAAQ,GAAG,OACtC,QAAQ,gBAAgB,GAAG,GAAG,GAAG,GAAG;AAEzC,OAAO,cAAMC,mDAAmD,WAC9D,SACA,qDACA;CAAE,gBAAgB;AAAkB","names":["objectType: Q","rids: string[]","options?: FetchPageArgs<Q, L, R, any, S, T>","__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid: Experiment<\n  \"2.2.0\",\n  \"__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid\",\n  { fetchPageByRid: fetchPageByRidFn }\n>"],"sources":["../../../src/experimental/fetchPageByRid.ts"],"version":3,"file":"fetchPageByRid.d.ts"}

package/build/types/index.d.ts

@@ -1,48 +1,48 @@
-export type  { ActionReturnTypeForOptions } from "./actions/ActionReturnTypeForOptions.js";
-export type  { ActionEditResponse, ActionParam, ActionValidationResponse, ApplyActionOptions, ApplyBatchActionOptions } from "./actions/Actions.js";
-export type  { ValidAggregationKeys } from "./aggregate/AggregatableKeys.js";
-export type  { AggregateOpts } from "./aggregate/AggregateOpts.js";
-export type  { AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy } from "./aggregate/AggregateOptsThatErrors.js";
-export type  { AggregationResultsWithGroups } from "./aggregate/AggregationResultsWithGroups.js";
-export type  { AggregationResultsWithoutGroups } from "./aggregate/AggregationResultsWithoutGroups.js";
-export type  { AggregationClause } from "./aggregate/AggregationsClause.js";
-export type  { AggregationsResults } from "./aggregate/AggregationsResults.js";
-export type  { GeoFilterOptions } from "./aggregate/GeoFilter.js";
+export type { ActionReturnTypeForOptions } from "./actions/ActionReturnTypeForOptions.js";
+export type { ActionEditResponse, ActionParam, ActionValidationResponse, ApplyActionOptions, ApplyBatchActionOptions } from "./actions/Actions.js";
+export type { ValidAggregationKeys } from "./aggregate/AggregatableKeys.js";
+export type { AggregateOpts } from "./aggregate/AggregateOpts.js";
+export type { AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy } from "./aggregate/AggregateOptsThatErrors.js";
+export type { AggregationResultsWithGroups } from "./aggregate/AggregationResultsWithGroups.js";
+export type { AggregationResultsWithoutGroups } from "./aggregate/AggregationResultsWithoutGroups.js";
+export type { AggregationClause } from "./aggregate/AggregationsClause.js";
+export type { AggregationsResults } from "./aggregate/AggregationsResults.js";
+export type { GeoFilterOptions } from "./aggregate/GeoFilter.js";
 export { DistanceUnitMapping } from "./aggregate/WhereClause.js";
-export type  { GeoFilter_Intersects, GeoFilter_Within, PossibleWhereClauseFilters, WhereClause } from "./aggregate/WhereClause.js";
-export type  { OsdkObjectPropertyType } from "./Definitions.js";
-export type  { OsdkObjectLinksObject, SingleLinkAccessor } from "./definitions/LinkDefinitions.js";
-export type  { DerivedProperty } from "./derivedProperties/DerivedProperty.js";
+export type { GeoFilter_Intersects, GeoFilter_Within, PossibleWhereClauseFilters, WhereClause } from "./aggregate/WhereClause.js";
+export type { OsdkObjectPropertyType } from "./Definitions.js";
+export type { OsdkObjectLinksObject, SingleLinkAccessor } from "./definitions/LinkDefinitions.js";
+export type { DerivedProperty } from "./derivedProperties/DerivedProperty.js";
 export { DurationMapping } from "./groupby/GroupByClause.js";
-export type  { AllGroupByValues, GroupByClause, GroupByRange } from "./groupby/GroupByClause.js";
-export type  { AllowedBucketKeyTypes, AllowedBucketTypes, DataValueClientToWire, DataValueWireToClient } from "./mapping/DataValueMapping.js";
-export type  { PropertyValueWireToClient } from "./mapping/PropertyValueMapping.js";
-export type  { Attachment, AttachmentUpload } from "./object/Attachment.js";
-export type  { AsyncIterArgs, Augment, Augments, FetchPageArgs, NullabilityAdherence, SelectArg, SelectArgToKeys } from "./object/FetchPageArgs.js";
-export type  { FetchPageResult, SingleOsdkResult } from "./object/FetchPageResult.js";
-export type  { Media, MediaMetadata, MediaReference } from "./object/Media.js";
+export type { AllGroupByValues, GroupByClause, GroupByRange } from "./groupby/GroupByClause.js";
+export type { AllowedBucketKeyTypes, AllowedBucketTypes, DataValueClientToWire, DataValueWireToClient } from "./mapping/DataValueMapping.js";
+export type { PropertyValueWireToClient } from "./mapping/PropertyValueMapping.js";
+export type { Attachment, AttachmentUpload } from "./object/Attachment.js";
+export type { AsyncIterArgs, Augment, Augments, FetchPageArgs, NullabilityAdherence, SelectArg, SelectArgToKeys } from "./object/FetchPageArgs.js";
+export type { FetchPageResult, SingleOsdkResult } from "./object/FetchPageResult.js";
+export type { Media, MediaMetadata, MediaReference } from "./object/Media.js";
 export { isOk } from "./object/Result.js";
-export type  { Result } from "./object/Result.js";
-export type  { BaseObjectSet } from "./objectSet/BaseObjectSet.js";
-export type  { ObjectSet } from "./objectSet/ObjectSet.js";
-export type  { ObjectSetSubscription } from "./objectSet/ObjectSetListener.js";
-export type  { ActionDefinition, ActionMetadata } from "./ontology/ActionDefinition.js";
-export type  { FilteredPropertyKeys } from "./ontology/FilteredPropertyKeys.js";
-export type  { InterfaceDefinition, InterfaceMetadata } from "./ontology/InterfaceDefinition.js";
-export type  { ObjectOrInterfaceDefinition, PropertyKeys } from "./ontology/ObjectOrInterface.js";
-export type  { ObjectSpecifier } from "./ontology/ObjectSpecifier.js";
-export type  { CompileTimeMetadata, ObjectMetadata, ObjectTypeDefinition, PropertyDef, VersionBound } from "./ontology/ObjectTypeDefinition.js";
-export type  { OntologyMetadata } from "./ontology/OntologyMetadata.js";
-export type  { PrimaryKeyTypes } from "./ontology/PrimaryKeyTypes.js";
-export type  { ObjectQueryDataType, ObjectSetQueryDataType, QueryDataTypeDefinition, QueryDefinition, QueryMetadata, QueryParameterDefinition, ThreeDimensionalQueryAggregationDefinition, TwoDimensionalQueryAggregationDefinition } from "./ontology/QueryDefinition.js";
-export type  { BaseWirePropertyTypes, WirePropertyTypes } from "./ontology/WirePropertyTypes.js";
-export type  { OsdkBase, PrimaryKeyType } from "./OsdkBase.js";
-export type  { OsdkObject } from "./OsdkObject.js";
-export type  { ConvertProps, Osdk } from "./OsdkObjectFrom.js";
-export type  { PageResult } from "./PageResult.js";
-export type  { Range, ThreeDimensionalAggregation, TwoDimensionalAggregation } from "./queries/Aggregations.js";
-export type  { QueryParam, QueryResult } from "./queries/Queries.js";
+export type { Result } from "./object/Result.js";
+export type { BaseObjectSet } from "./objectSet/BaseObjectSet.js";
+export type { ObjectSet } from "./objectSet/ObjectSet.js";
+export type { ObjectSetSubscription } from "./objectSet/ObjectSetListener.js";
+export type { ActionDefinition, ActionMetadata } from "./ontology/ActionDefinition.js";
+export type { InterfaceDefinition, InterfaceMetadata } from "./ontology/InterfaceDefinition.js";
+export type { ObjectOrInterfaceDefinition, PropertyKeys } from "./ontology/ObjectOrInterface.js";
+export type { ObjectSpecifier } from "./ontology/ObjectSpecifier.js";
+export type { CompileTimeMetadata, ObjectMetadata, ObjectTypeDefinition, PropertyDef, VersionBound } from "./ontology/ObjectTypeDefinition.js";
+export type { OntologyMetadata } from "./ontology/OntologyMetadata.js";
+export type { PrimaryKeyTypes } from "./ontology/PrimaryKeyTypes.js";
+export type { ObjectQueryDataType, ObjectSetQueryDataType, QueryDataTypeDefinition, QueryDefinition, QueryMetadata, QueryParameterDefinition, ThreeDimensionalQueryAggregationDefinition, TwoDimensionalQueryAggregationDefinition } from "./ontology/QueryDefinition.js";
+export type { BaseWirePropertyTypes, WirePropertyTypes } from "./ontology/WirePropertyTypes.js";
+export type { OsdkBase, PrimaryKeyType } from "./OsdkBase.js";
+export type { OsdkObject } from "./OsdkObject.js";
+export type { ConvertProps, Osdk } from "./OsdkObjectFrom.js";
+export type { PageResult } from "./PageResult.js";
+export type { Range, ThreeDimensionalAggregation, TwoDimensionalAggregation } from "./queries/Aggregations.js";
+export type { QueryParam, QueryResult } from "./queries/Queries.js";
 export { TimeseriesDurationMapping } from "./timeseries/timeseries.js";
-export type  { GeotimeSeriesProperty, TimeSeriesPoint, TimeSeriesProperty, TimeSeriesQuery } from "./timeseries/timeseries.js";
-export type  { LinkedType, LinkNames } from "./util/LinkUtils.js";
+export type { GeotimeSeriesProperty, TimeSeriesPoint, TimeSeriesProperty, TimeSeriesQuery } from "./timeseries/timeseries.js";
+export type { LinkedType, LinkNames } from "./util/LinkUtils.js";
 export {};
+export type { Logger } from "./Logger.js";

package/build/types/index.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,eAAc,kCAAkC;AAChD,eACE,oBACA,aACA,0BACA,oBACA,+BACK;AACP,eAAc,4BAA4B;AAC1C,eAAc,qBAAqB;AACnC,eAAc,sEAAsE;AACpF,eAAc,oCAAoC;AAClD,eAAc,uCAAuC;AACrD,eAAc,yBAAyB;AACvC,eAAc,2BAA2B;AACzC,eAAc,wBAAwB;AACtC,SAAS,2BAA2B;AACpC,eACE,sBACA,kBACA,4BACA,mBACK;AACP,eAAc,8BAA8B;AAC5C,eACE,uBACA,0BACK;AACP,eAAc,uBAAuB;AACrC,SAAS,uBAAuB;AAChC,eACE,kBACA,eACA,oBACK;AACP,eACE,uBACA,oBACA,uBACA,6BACK;AACP,eACE,iCACK;AACP,eAAc,YAAY,wBAAwB;AAClD,eACE,eACA,SACA,UACA,eACA,sBACA,WACA,uBACK;AACP,eACE,iBACA,wBACK;AACP,eAAc,OAAO,eAAe,sBAAsB;AAC1D,SAAS,YAAY;AACrB,eAAc,cAAc;AAC5B,eAAc,qBAAqB;AACnC,eAAc,iBAAiB;AAC/B,eAAc,6BAA6B;AAC3C,eACE,kBACA,sBACK;AACP,eAAc,4BAA4B;AAC1C,eACE,qBACA,yBACK;AACP,eACE,6BACA,oBACK;AACP,eAAc,uBAAuB;AACrC,eACE,qBACA,gBACA,sBACA,aACA,oBACK;AACP,eAAc,wBAAwB;AACtC,eAAc,uBAAuB;AACrC,eACE,qBACA,wBACA,yBACA,iBACA,eACA,0BACA,4CACA,gDACK;AACP,eACE,uBACA,yBACK;AACP,eAAc,UAAU,sBAAsB;AAC9C,eAAc,kBAAkB;AAChC,eAAc,cAAc,YAAY;AACxC,eAAc,kBAAkB;AAChC,eACE,OACA,6BACA,iCACK;AACP,eAAc,YAAY,mBAAmB;AAC7C,SAAS,iCAAiC;AAC1C,eACE,uBACA,iBACA,oBACA,uBACK;AACP,eAAc,YAAY,iBAAiB;AAC3C","names":[],"sources":["../../src/index.ts"],"version":3,"file":"index.d.ts"}
+{"mappings":"AAgBA,cAAc,kCAAkC;AAChD,cACE,oBACA,aACA,0BACA,oBACA,+BACK;AACP,cAAc,4BAA4B;AAC1C,cAAc,qBAAqB;AACnC,cAAc,sEAAsE;AACpF,cAAc,oCAAoC;AAClD,cAAc,uCAAuC;AACrD,cAAc,yBAAyB;AACvC,cAAc,2BAA2B;AACzC,cAAc,wBAAwB;AACtC,SAAS,2BAA2B;AACpC,cACE,sBACA,kBACA,4BACA,mBACK;AACP,cAAc,8BAA8B;AAC5C,cACE,uBACA,0BACK;AACP,cAAc,uBAAuB;AACrC,SAAS,uBAAuB;AAChC,cACE,kBACA,eACA,oBACK;AACP,cACE,uBACA,oBACA,uBACA,6BACK;AACP,cACE,iCACK;AACP,cAAc,YAAY,wBAAwB;AAClD,cACE,eACA,SACA,UACA,eACA,sBACA,WACA,uBACK;AACP,cACE,iBACA,wBACK;AACP,cAAc,OAAO,eAAe,sBAAsB;AAC1D,SAAS,YAAY;AACrB,cAAc,cAAc;AAC5B,cAAc,qBAAqB;AACnC,cAAc,iBAAiB;AAC/B,cAAc,6BAA6B;AAC3C,cACE,kBACA,sBACK;AACP,cACE,qBACA,yBACK;AACP,cACE,6BACA,oBACK;AACP,cAAc,uBAAuB;AACrC,cACE,qBACA,gBACA,sBACA,aACA,oBACK;AACP,cAAc,wBAAwB;AACtC,cAAc,uBAAuB;AACrC,cACE,qBACA,wBACA,yBACA,iBACA,eACA,0BACA,4CACA,gDACK;AACP,cACE,uBACA,yBACK;AACP,cAAc,UAAU,sBAAsB;AAC9C,cAAc,kBAAkB;AAChC,cAAc,cAAc,YAAY;AACxC,cAAc,kBAAkB;AAChC,cACE,OACA,6BACA,iCACK;AACP,cAAc,YAAY,mBAAmB;AAC7C,SAAS,iCAAiC;AAC1C,cACE,uBACA,iBACA,oBACA,uBACK;AACP,cAAc,YAAY,iBAAiB;AAC3C;AACA,cAAc,cAAc","names":[],"sources":["../../src/index.ts"],"version":3,"file":"index.d.ts"}

package/build/types/mapping/DataValueMapping.d.ts

@@ -34,6 +34,8 @@ export interface DataValueWireToClient {
 	struct: Record<string, any>;
 	set: Set<any>;
 	objectType: string;
+	geohash: GeoJSON.Point;
+	geoshape: GeoJSON.GeoJSON;
 }
 /**
 * Map from the DataValue type to the typescript type that we accept
@@ -71,6 +73,8 @@ export interface DataValueClientToWire {
 	}[];
 	struct: Record<string, any>;
 	objectType: string;
+	geohash: GeoJSON.Point;
+	geoshape: GeoJSON.GeoJSON;
 }
 export type AllowedBucketTypes = string | number | boolean;
 export type AllowedBucketKeyTypes = AllowedBucketTypes | {

package/build/types/mapping/DataValueMapping.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,YAAY,wBAAwB,yBAA0B;AAC5E,cAAc,sBAAsB,oBAAqB;;;;AAKzD,iBAAiB,sBAAsB;CACrC,YAAY;CACZ;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,gBAAgB;CAChB,2BAA2B;EACzB,KAAK;EACL,OAAO;CACR;CACD,6BAA6B;EAC3B,KAAK;EACL,QAAQ;GAAE,KAAK;GAAuB,OAAO;EAAoB;CAClE;CACD,QAAQ;CACR,KAAK;CACL;AACD;;;;AAKD,iBAAiB,sBAAsB;CACrC,qBAAqB,mBAAmB,OAAO;WAAW;CAAc;CACxE;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,KAAK;CACL,gBAAgB;CAChB,2BAA2B;EACzB,KAAK;EACL,OAAO;CACR;CACD,6BAA6B;EAC3B,KAAK;EACL,QAAQ;GAAE,KAAK;GAAuB,OAAO;EAAoB;CAClE;CACD,QAAQ;CACR;AACD;AAED,YAAY;AACZ,YAAY,wBACR,qBACA;CACA,YAAY;CACZ,UAAU;AACX","names":[],"sources":["../../../src/mapping/DataValueMapping.ts"],"version":3,"file":"DataValueMapping.d.ts"}
+{"mappings":"AAgBA,cAAc,YAAY,wBAAwB,yBAA0B;AAC5E,cAAc,sBAAsB,oBAAqB;;;;AAKzD,iBAAiB,sBAAsB;CACrC,YAAY;CACZ;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,gBAAgB;CAChB,2BAA2B;EACzB,KAAK;EACL,OAAO;CACR;CACD,6BAA6B;EAC3B,KAAK;EACL,QAAQ;GAAE,KAAK;GAAuB,OAAO;EAAoB;CAClE;CACD,QAAQ;CACR,KAAK;CACL;CACA,SAAS,QAAQ;CACjB,UAAU,QAAQ;AACnB;;;;AAKD,iBAAiB,sBAAsB;CACrC,qBAAqB,mBAAmB,OAAO;WAAW;CAAc;CACxE;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,KAAK;CACL,gBAAgB;CAChB,2BAA2B;EACzB,KAAK;EACL,OAAO;CACR;CACD,6BAA6B;EAC3B,KAAK;EACL,QAAQ;GAAE,KAAK;GAAuB,OAAO;EAAoB;CAClE;CACD,QAAQ;CACR;CACA,SAAS,QAAQ;CACjB,UAAU,QAAQ;AACnB;AAED,YAAY;AACZ,YAAY,wBACR,qBACA;CACA,YAAY;CACZ,UAAU;AACX","names":[],"sources":["../../../src/mapping/DataValueMapping.ts"],"version":3,"file":"DataValueMapping.d.ts"}

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;
 }