@osdk/api 2.2.0-beta.16 → 2.2.0-beta.18

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

@@ -4,30 +4,48 @@ 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 { DatetimeExpressions, DefinitionForType, NumericExpressions } from "./Expressions.js";
 import type { CollectWithPropAggregations, MinMaxWithPropAggregateOption } from "./WithPropertiesAggregationOptions.js";
 export declare namespace DerivedProperty {
-	type SelectorResult<T extends SimplePropertyDef> = {
-		type: T
+	export interface Definition<
+		T extends SimplePropertyDef,
+		Q extends ObjectOrInterfaceDefinition
+	> {
+		type: T;
+	}
+	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]: Creator<Q, SimplePropertyDef>
 	};
-	type Clause<Q extends ObjectOrInterfaceDefinition> = {
-		[key: string]: Selector<Q, SimplePropertyDef>
-	};
-	type Selector<
+	export type Creator<
 		Q extends ObjectOrInterfaceDefinition,
 		T extends SimplePropertyDef
-	> = (baseObjectSet: DerivedProperty.Builder<Q, false>) => SelectorResult<T>;
-	interface Builder<
+	> = (baseObjectSet: Builder<Q, false>) => Definition<T, Q> | NumericPropertyDefinition<T, Q> | DatetimePropertyDefinition<T, Q>;
+	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 {};
 }
 type BuilderTypeFromConstraint<
 	Q extends ObjectOrInterfaceDefinition,
@@ -45,14 +63,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 MinMaxWithPropAggregateOption ? 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,cACE,6BACA,qCACK,uCAAwC;AAE/C,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,gCACR,oBAAoB,GAAG,cAAc,GAAG,sBAC1C,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":["baseObjectSet: 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/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/index.d.ts

@@ -27,7 +27,6 @@ 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";

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;AACA,eAAc,cAAc","names":[],"sources":["../../src/index.ts"],"version":3,"file":"index.d.ts"}
+{"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,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;AACA,eAAc,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,7 +69,8 @@ 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?: PropertyKeys<Q> extends K ? T : never;

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,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"}
+{"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/objectSet/ObjectSet.d.ts

@@ -3,29 +3,67 @@ import type { AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy } f
 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 { 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] : DerivedProperty.Creator<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]: DerivedProperty.Creator<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,cAGE,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"}