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

package/build/browser/ontology/PrimaryKeyTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"PrimaryKeyTypes.js","names":[],"sources":["PrimaryKeyTypes.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nexport type PrimaryKeyTypes =\n  | \"string\"\n  | \"datetime\"\n  | \"double\"\n  | \"boolean\"\n  | \"integer\"\n  | \"timestamp\"\n  | \"short\"\n  | \"long\"\n  | \"byte\";\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"PrimaryKeyTypes.js","names":[],"sources":["PrimaryKeyTypes.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nexport type PrimaryKeyTypes =\n  | \"string\"\n  | \"datetime\"\n  | \"double\"\n  | \"integer\"\n  | \"timestamp\"\n  | \"short\"\n  | \"long\"\n  | \"byte\";\n"],"mappings":"","ignoreList":[]}

package/build/browser/ontology/QueryDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryDefinition.js","names":[],"sources":["QueryDefinition.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { OsdkMetadata } from \"../OsdkMetadata.js\";\nimport type { ObjectTypeDefinition } from \"./ObjectTypeDefinition.js\";\n\nexport interface QueryMetadata {\n  type: \"query\";\n  apiName: string;\n  description?: string;\n  displayName?: string;\n  version: string;\n  parameters: Record<string, QueryParameterDefinition<any>>;\n  output: QueryDataTypeDefinition;\n  rid: string;\n}\n\nexport interface QueryCompileTimeMetadata<T> {\n  signature: T;\n}\n\nexport interface QueryDefinition<T = any> {\n  type: \"query\";\n  apiName: string;\n  osdkMetadata?: OsdkMetadata;\n  __DefinitionMetadata?:\n    & QueryCompileTimeMetadata<T>\n    & QueryMetadata;\n}\n\nexport type QueryParameterDefinition<\n  T_Target extends ObjectTypeDefinition = any,\n> = {\n  description?: string;\n} & QueryDataTypeDefinition<T_Target>;\n\nexport type QueryDataTypeDefinition<\n  T_Target extends ObjectTypeDefinition = any,\n> =\n  | PrimitiveDataType\n  | ObjectQueryDataType<T_Target>\n  | ObjectSetQueryDataType<T_Target>\n  | SetQueryDataType\n  | UnionQueryDataType\n  | StructQueryDataType\n  | TwoDimensionalAggregationDataType\n  | ThreeDimensionalAggregationDataType\n  | MapDataType;\n\nexport type BaseQueryDataTypeDefinition<T extends string> = {\n  multiplicity?: boolean;\n  nullable?: boolean;\n  type: T;\n};\n\nexport type WireQueryDataTypes =\n  | \"double\"\n  | \"float\"\n  | \"integer\"\n  | \"long\"\n  | \"boolean\"\n  | \"string\"\n  | \"date\"\n  | \"timestamp\"\n  | \"attachment\";\n\nexport type PrimitiveDataType<\n  Q extends WireQueryDataTypes = WireQueryDataTypes,\n> = BaseQueryDataTypeDefinition<Q>;\n\nexport interface ObjectQueryDataType<\n  T_Target extends ObjectTypeDefinition = never,\n> extends BaseQueryDataTypeDefinition<\"object\"> {\n  object: string;\n  __OsdkTargetType?: T_Target;\n}\n\nexport interface ObjectSetQueryDataType<\n  T_Target extends ObjectTypeDefinition = never,\n> extends BaseQueryDataTypeDefinition<\"objectSet\"> {\n  objectSet: string;\n  __OsdkTargetType?: T_Target;\n}\n\nexport interface SetQueryDataType extends BaseQueryDataTypeDefinition<\"set\"> {\n  set: QueryDataTypeDefinition;\n}\n\nexport interface UnionQueryDataType\n  extends BaseQueryDataTypeDefinition<\"union\">\n{\n  union: ReadonlyArray<QueryDataTypeDefinition>;\n}\n\nexport interface StructQueryDataType\n  extends BaseQueryDataTypeDefinition<\"struct\">\n{\n  struct: Record<string, QueryDataTypeDefinition>;\n}\n\nexport interface TwoDimensionalAggregationDataType\n  extends BaseQueryDataTypeDefinition<\"twoDimensionalAggregation\">\n{\n  twoDimensionalAggregation: TwoDimensionalQueryAggregationDefinition;\n}\n\nexport interface ThreeDimensionalAggregationDataType\n  extends BaseQueryDataTypeDefinition<\"threeDimensionalAggregation\">\n{\n  threeDimensionalAggregation: ThreeDimensionalQueryAggregationDefinition;\n}\n\nexport interface MapDataType extends BaseQueryDataTypeDefinition<\"map\"> {\n  keyType: QueryDataTypeDefinition;\n  valueType: QueryDataTypeDefinition;\n}\n\nexport type AggregationKeyDataType<V = any> =\n  | SimpleAggregationKeyDataType<V>\n  | RangeAggregationKeyDataType<V>;\n\nexport interface SimpleAggregationKeyDataType<V = any> {\n  keyType: Exclude<AggregationKeyTypes, \"range\">;\n  valueType: V;\n}\nexport interface RangeAggregationKeyDataType<V = any> {\n  keyType: \"range\";\n  keySubtype: AggregationRangeKeyTypes;\n  valueType: V;\n}\n\nexport type TwoDimensionalQueryAggregationDefinition = AggregationKeyDataType<\n  AggregationValueTypes\n>;\n\nexport type ThreeDimensionalQueryAggregationDefinition = AggregationKeyDataType<\n  TwoDimensionalQueryAggregationDefinition\n>;\n\nexport type AggregationKeyTypes =\n  | \"boolean\"\n  | \"string\"\n  | \"date\"\n  | \"double\"\n  | \"integer\"\n  | \"timestamp\"\n  | \"range\";\n\nexport type AggregationRangeKeyTypes =\n  | \"date\"\n  | \"double\"\n  | \"integer\"\n  | \"timestamp\";\n\nexport type AggregationValueTypes = \"date\" | \"double\" | \"timestamp\";\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"QueryDefinition.js","names":[],"sources":["QueryDefinition.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { OsdkMetadata } from \"../OsdkMetadata.js\";\nimport type { ObjectTypeDefinition } from \"./ObjectTypeDefinition.js\";\n\nexport interface QueryMetadata {\n  type: \"query\";\n  apiName: string;\n  description?: string;\n  displayName?: string;\n  version: string;\n  parameters: Record<string, QueryParameterDefinition<any>>;\n  output: QueryDataTypeDefinition;\n  rid: string;\n}\n\nexport interface QueryCompileTimeMetadata<T> {\n  signature: T;\n}\n\nexport interface QueryDefinition<T = any> {\n  type: \"query\";\n  apiName: string;\n  version?: string;\n  isFixedVersion?: boolean;\n  osdkMetadata?: OsdkMetadata;\n  __DefinitionMetadata?:\n    & QueryCompileTimeMetadata<T>\n    & QueryMetadata;\n}\n\nexport type QueryParameterDefinition<\n  T_Target extends ObjectTypeDefinition = any,\n> = {\n  description?: string;\n} & QueryDataTypeDefinition<T_Target>;\n\nexport type QueryDataTypeDefinition<\n  T_Target extends ObjectTypeDefinition = any,\n> =\n  | PrimitiveDataType\n  | ObjectQueryDataType<T_Target>\n  | ObjectSetQueryDataType<T_Target>\n  | SetQueryDataType\n  | UnionQueryDataType\n  | StructQueryDataType\n  | TwoDimensionalAggregationDataType\n  | ThreeDimensionalAggregationDataType\n  | MapDataType;\n\nexport type BaseQueryDataTypeDefinition<T extends string> = {\n  multiplicity?: boolean;\n  nullable?: boolean;\n  type: T;\n};\n\nexport type WireQueryDataTypes =\n  | \"double\"\n  | \"float\"\n  | \"integer\"\n  | \"long\"\n  | \"boolean\"\n  | \"string\"\n  | \"date\"\n  | \"timestamp\"\n  | \"attachment\";\n\nexport type PrimitiveDataType<\n  Q extends WireQueryDataTypes = WireQueryDataTypes,\n> = BaseQueryDataTypeDefinition<Q>;\n\nexport interface ObjectQueryDataType<\n  T_Target extends ObjectTypeDefinition = never,\n> extends BaseQueryDataTypeDefinition<\"object\"> {\n  object: string;\n  __OsdkTargetType?: T_Target;\n}\n\nexport interface ObjectSetQueryDataType<\n  T_Target extends ObjectTypeDefinition = never,\n> extends BaseQueryDataTypeDefinition<\"objectSet\"> {\n  objectSet: string;\n  __OsdkTargetType?: T_Target;\n}\n\nexport interface SetQueryDataType extends BaseQueryDataTypeDefinition<\"set\"> {\n  set: QueryDataTypeDefinition;\n}\n\nexport interface UnionQueryDataType\n  extends BaseQueryDataTypeDefinition<\"union\">\n{\n  union: ReadonlyArray<QueryDataTypeDefinition>;\n}\n\nexport interface StructQueryDataType\n  extends BaseQueryDataTypeDefinition<\"struct\">\n{\n  struct: Record<string, QueryDataTypeDefinition>;\n}\n\nexport interface TwoDimensionalAggregationDataType\n  extends BaseQueryDataTypeDefinition<\"twoDimensionalAggregation\">\n{\n  twoDimensionalAggregation: TwoDimensionalQueryAggregationDefinition;\n}\n\nexport interface ThreeDimensionalAggregationDataType\n  extends BaseQueryDataTypeDefinition<\"threeDimensionalAggregation\">\n{\n  threeDimensionalAggregation: ThreeDimensionalQueryAggregationDefinition;\n}\n\nexport interface MapDataType extends BaseQueryDataTypeDefinition<\"map\"> {\n  keyType: QueryDataTypeDefinition;\n  valueType: QueryDataTypeDefinition;\n}\n\nexport type AggregationKeyDataType<V = any> =\n  | SimpleAggregationKeyDataType<V>\n  | RangeAggregationKeyDataType<V>;\n\nexport interface SimpleAggregationKeyDataType<V = any> {\n  keyType: Exclude<AggregationKeyTypes, \"range\">;\n  valueType: V;\n}\nexport interface RangeAggregationKeyDataType<V = any> {\n  keyType: \"range\";\n  keySubtype: AggregationRangeKeyTypes;\n  valueType: V;\n}\n\nexport type TwoDimensionalQueryAggregationDefinition = AggregationKeyDataType<\n  AggregationValueTypes\n>;\n\nexport type ThreeDimensionalQueryAggregationDefinition = AggregationKeyDataType<\n  TwoDimensionalQueryAggregationDefinition\n>;\n\nexport type AggregationKeyTypes =\n  | \"boolean\"\n  | \"string\"\n  | \"date\"\n  | \"double\"\n  | \"integer\"\n  | \"timestamp\"\n  | \"range\";\n\nexport type AggregationRangeKeyTypes =\n  | \"date\"\n  | \"double\"\n  | \"integer\"\n  | \"timestamp\";\n\nexport type AggregationValueTypes = \"date\" | \"double\" | \"timestamp\";\n"],"mappings":"","ignoreList":[]}

package/build/browser/ontology/SimplePropertyDef.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimplePropertyDef.js","names":["SimplePropertyDef"],"sources":["SimplePropertyDef.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { GetClientPropertyValueFromWire } from \"../mapping/PropertyValueMapping.js\";\nimport type { ObjectMetadata, PropertyDef } from \"./ObjectTypeDefinition.js\";\nimport type { WirePropertyTypes } from \"./WirePropertyTypes.js\";\n\nexport type SimplePropertyDef =\n  | WirePropertyTypes\n  | undefined\n  | Array<WirePropertyTypes>;\n\nexport namespace SimplePropertyDef {\n  export type Make<\n    T extends WirePropertyTypes,\n    N extends boolean | undefined,\n    M extends boolean | undefined,\n  > =\n    // while it is cleaner to just do this as the union of two conditionals, it\n    // actually makes it so that it can't be derived inline which we want\n    // to keep things simple so instead of :\n    // | (P[\"multiplicity\"] extends true ? Array<P[\"type\"]> : P[\"type\"])\n    // | (P[\"nullable\"] extends true ? undefined : never);\n    // we do:\n    M extends true ? N extends true ? Array<T> | undefined\n      : Array<T>\n      : N extends true ? T | undefined\n      : T;\n\n  export type FromPropertyMetadata<\n    P extends ObjectMetadata.Property,\n  > = Make<P[\"type\"], P[\"nullable\"], P[\"multiplicity\"]>;\n\n  // exported for testing\n  export type ExtractMultiplicity<\n    T extends\n      | WirePropertyTypes\n      | undefined\n      | Array<WirePropertyTypes>,\n  > = NonNullable<T> extends Array<any> ? \"array\" : \"single\";\n\n  // exported for testing\n  export type ExtractWirePropertyType<\n    T extends SimplePropertyDef,\n  > = T extends Array<infer Z> ? NonNullable<Z> : NonNullable<T>;\n\n  // exported for testing\n  export type ExtractNullable<\n    T extends SimplePropertyDef,\n  > = [undefined] extends [T] ? \"nullable\"\n    : [[undefined]] extends [T] ? \"nullable\"\n    : \"non-nullable\";\n\n  export type ToPropertyDef<S extends SimplePropertyDef> = PropertyDef<\n    SimplePropertyDef.ExtractWirePropertyType<S>,\n    SimplePropertyDef.ExtractNullable<S>,\n    SimplePropertyDef.ExtractMultiplicity<S>\n  >;\n\n  export type ExtractRuntimeBaseType<S extends SimplePropertyDef> =\n    GetClientPropertyValueFromWire<\n      SimplePropertyDef.ExtractWirePropertyType<S>\n    >;\n\n  export type ToRuntimeProperty<S extends SimplePropertyDef> =\n    ExtractMultiplicity<S> extends \"array\"\n      ? ExtractNullable<S> extends \"nullable\"\n        ? Array<ExtractRuntimeBaseType<S>> | undefined\n      : Array<ExtractRuntimeBaseType<S>>\n      : ExtractNullable<S> extends \"nullable\"\n        ? ExtractRuntimeBaseType<S> | undefined\n      : ExtractRuntimeBaseType<S>;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAdA,WAyBiBA,iBAAiB","ignoreList":[]}
+{"version":3,"file":"SimplePropertyDef.js","names":["SimplePropertyDef"],"sources":["SimplePropertyDef.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { GetClientPropertyValueFromWire } from \"../mapping/PropertyValueMapping.js\";\nimport type { ObjectMetadata, PropertyDef } from \"./ObjectTypeDefinition.js\";\nimport type { WirePropertyTypes } from \"./WirePropertyTypes.js\";\n\nexport type SimplePropertyDef =\n  | WirePropertyTypes\n  | undefined\n  | Array<WirePropertyTypes>;\n\nexport namespace SimplePropertyDef {\n  export type Make<\n    T extends WirePropertyTypes,\n    N extends \"nullable\" | \"non-nullable\",\n    M extends \"array\" | \"single\",\n  > =\n    // while it is cleaner to just do this as the union of two conditionals, it\n    // actually makes it so that it can't be derived inline which we want\n    // to keep things simple so instead of :\n    // | (P[\"multiplicity\"] extends true ? Array<P[\"type\"]> : P[\"type\"])\n    // | (P[\"nullable\"] extends true ? undefined : never);\n    // we do:\n    M extends \"array\" ? N extends \"nullable\" ? Array<T> | undefined\n      : Array<T>\n      : N extends \"nullable\" ? T | undefined\n      : T;\n\n  export type FromPropertyMetadata<\n    P extends ObjectMetadata.Property,\n  > = Make<\n    P[\"type\"],\n    P[\"nullable\"] extends true ? \"nullable\" : \"non-nullable\",\n    P[\"multiplicity\"] extends true ? \"array\" : \"single\"\n  >;\n\n  // exported for testing\n  export type ExtractMultiplicity<\n    T extends\n      | WirePropertyTypes\n      | undefined\n      | Array<WirePropertyTypes>,\n  > = NonNullable<T> extends Array<any> ? \"array\" : \"single\";\n\n  // exported for testing\n  export type ExtractWirePropertyType<\n    T extends SimplePropertyDef,\n  > = T extends Array<infer Z> ? NonNullable<Z> : NonNullable<T>;\n\n  // exported for testing\n  export type ExtractNullable<\n    T extends SimplePropertyDef,\n  > = [undefined] extends [T] ? \"nullable\"\n    : [[undefined]] extends [T] ? \"nullable\"\n    : \"non-nullable\";\n\n  export type ToPropertyDef<S extends SimplePropertyDef> = PropertyDef<\n    SimplePropertyDef.ExtractWirePropertyType<S>,\n    SimplePropertyDef.ExtractNullable<S>,\n    SimplePropertyDef.ExtractMultiplicity<S>\n  >;\n\n  export type ExtractRuntimeBaseType<S extends SimplePropertyDef> =\n    GetClientPropertyValueFromWire<\n      SimplePropertyDef.ExtractWirePropertyType<S>\n    >;\n\n  export type ToRuntimeProperty<S extends SimplePropertyDef> =\n    ExtractMultiplicity<S> extends \"array\"\n      ? ExtractNullable<S> extends \"nullable\"\n        ? Array<ExtractRuntimeBaseType<S>> | undefined\n      : Array<ExtractRuntimeBaseType<S>>\n      : ExtractNullable<S> extends \"nullable\"\n        ? ExtractRuntimeBaseType<S> | undefined\n      : ExtractRuntimeBaseType<S>;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAdA,WAyBiBA,iBAAiB","ignoreList":[]}

package/build/browser/queries/Queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"Queries.js","names":["QueryParam","QueryResult"],"sources":["Queries.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  DataValueClientToWire,\n  DataValueWireToClient,\n} from \"../mapping/DataValueMapping.js\";\nimport type { ObjectSet } from \"../objectSet/ObjectSet.js\";\nimport type { ObjectTypeDefinition } from \"../ontology/ObjectTypeDefinition.js\";\nimport type {\n  AggregationKeyTypes,\n  AggregationRangeKeyTypes,\n  AggregationValueTypes,\n} from \"../ontology/QueryDefinition.js\";\nimport type { OsdkBase } from \"../OsdkBase.js\";\nimport type { OsdkObjectPrimaryKeyType } from \"../OsdkObjectPrimaryKeyType.js\";\nimport type {\n  AggKeyClientToWire,\n  AggKeyWireToClient,\n  AggValueClientToWire,\n  AggValueWireToClient,\n  ThreeDimensionalAggregation,\n  TwoDimensionalAggregation,\n} from \"./Aggregations.js\";\n\n/**\n * Helper types for converting query definition parameter types to typescript types\n */\nexport namespace QueryParam {\n  /**\n   * Helper type to convert action definition parameter primitives to typescript types\n   */\n  export type PrimitiveType<T extends keyof DataValueClientToWire> =\n    DataValueClientToWire[T];\n\n  /**\n   * Helper type to convert action definition parameter object types to typescript types\n   */\n  export type ObjectType<T extends ObjectTypeDefinition> =\n    | OsdkBase<T>\n    | OsdkObjectPrimaryKeyType<T>;\n\n  /**\n   * Helper type to convert action definition parameter object sets to typescript types\n   */\n  export type ObjectSetType<T extends ObjectTypeDefinition> = ObjectSet<T>;\n\n  export type RangeKey<T extends AggregationRangeKeyTypes> = AggKeyClientToWire<\n    \"range\",\n    T\n  >;\n\n  export type TwoDimensionalAggregationType<\n    T extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = TwoDimensionalAggregation<\n    T extends AggregationKeyTypes ? AggKeyClientToWire<T> : T,\n    AggValueClientToWire<V>\n  >;\n\n  export type ThreeDimensionalAggregationType<\n    OUT extends AggregationKeyTypes | RangeKey<any>,\n    IN extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = ThreeDimensionalAggregation<\n    OUT extends AggregationKeyTypes ? AggKeyClientToWire<OUT> : OUT,\n    IN extends AggregationKeyTypes ? AggKeyClientToWire<IN> : IN,\n    AggValueClientToWire<V>\n  >;\n}\n\n/**\n * Helper types for converting query result types to typescript types\n */\nexport namespace QueryResult {\n  /**\n   * Helper type to convert action definition parameter primitives to typescript types\n   */\n  export type PrimitiveType<T extends keyof DataValueClientToWire> =\n    DataValueWireToClient[T];\n\n  /**\n   * Helper type to convert action definition parameter object types to typescript types\n   */\n  export type ObjectType<T extends ObjectTypeDefinition> = OsdkBase<T>;\n\n  /**\n   * Helper type to convert action definition parameter object sets to typescript types\n   */\n  export type ObjectSetType<T extends ObjectTypeDefinition> = ObjectSet<\n    T\n  >;\n\n  export type RangeKey<T extends AggregationRangeKeyTypes> = AggKeyWireToClient<\n    \"range\",\n    T\n  >;\n\n  export type TwoDimensionalAggregationType<\n    T extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = TwoDimensionalAggregation<\n    T extends AggregationKeyTypes ? AggKeyWireToClient<T> : T,\n    AggValueWireToClient<V>\n  >;\n\n  export type ThreeDimensionalAggregationType<\n    OUT extends AggregationKeyTypes | RangeKey<any>,\n    IN extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = ThreeDimensionalAggregation<\n    OUT extends AggregationKeyTypes ? AggKeyWireToClient<OUT> : OUT,\n    IN extends AggregationKeyTypes ? AggKeyWireToClient<IN> : IN,\n    AggValueWireToClient<V>\n  >;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAwBA;AACA;AACA;AAFA,WAGiBA,UAAU;AA2C3B;AACA;AACA;AAFA,WAGiBC,WAAW","ignoreList":[]}
+{"version":3,"file":"Queries.js","names":["QueryParam","QueryResult"],"sources":["Queries.ts"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  DataValueClientToWire,\n  DataValueWireToClient,\n} from \"../mapping/DataValueMapping.js\";\nimport type { ObjectSet } from \"../objectSet/ObjectSet.js\";\nimport type { ObjectTypeDefinition } from \"../ontology/ObjectTypeDefinition.js\";\nimport type {\n  AggregationKeyTypes,\n  AggregationRangeKeyTypes,\n  AggregationValueTypes,\n} from \"../ontology/QueryDefinition.js\";\nimport type { ObjectIdentifiers, OsdkBase } from \"../OsdkBase.js\";\nimport type { OsdkObjectPrimaryKeyType } from \"../OsdkObjectPrimaryKeyType.js\";\nimport type {\n  AggKeyClientToWire,\n  AggKeyWireToClient,\n  AggValueClientToWire,\n  AggValueWireToClient,\n  ThreeDimensionalAggregation,\n  TwoDimensionalAggregation,\n} from \"./Aggregations.js\";\n\n/**\n * Helper types for converting query definition parameter types to typescript types\n */\nexport namespace QueryParam {\n  /**\n   * Helper type to convert action definition parameter primitives to typescript types\n   */\n  export type PrimitiveType<T extends keyof DataValueClientToWire> =\n    DataValueClientToWire[T];\n\n  /**\n   * Helper type to convert action definition parameter object types to typescript types\n   */\n  export type ObjectType<T extends ObjectTypeDefinition> =\n    | ObjectIdentifiers<T>\n    | OsdkObjectPrimaryKeyType<T>;\n\n  /**\n   * Helper type to convert action definition parameter object sets to typescript types\n   */\n  export type ObjectSetType<T extends ObjectTypeDefinition> = ObjectSet<T>;\n\n  export type RangeKey<T extends AggregationRangeKeyTypes> = AggKeyClientToWire<\n    \"range\",\n    T\n  >;\n\n  export type TwoDimensionalAggregationType<\n    T extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = TwoDimensionalAggregation<\n    T extends AggregationKeyTypes ? AggKeyClientToWire<T> : T,\n    AggValueClientToWire<V>\n  >;\n\n  export type ThreeDimensionalAggregationType<\n    OUT extends AggregationKeyTypes | RangeKey<any>,\n    IN extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = ThreeDimensionalAggregation<\n    OUT extends AggregationKeyTypes ? AggKeyClientToWire<OUT> : OUT,\n    IN extends AggregationKeyTypes ? AggKeyClientToWire<IN> : IN,\n    AggValueClientToWire<V>\n  >;\n}\n\n/**\n * Helper types for converting query result types to typescript types\n */\nexport namespace QueryResult {\n  /**\n   * Helper type to convert action definition parameter primitives to typescript types\n   */\n  export type PrimitiveType<T extends keyof DataValueClientToWire> =\n    DataValueWireToClient[T];\n\n  /**\n   * Helper type to convert action definition parameter object types to typescript types\n   */\n  export type ObjectType<T extends ObjectTypeDefinition> = OsdkBase<T>;\n\n  /**\n   * Helper type to convert action definition parameter object sets to typescript types\n   */\n  export type ObjectSetType<T extends ObjectTypeDefinition> = ObjectSet<\n    T\n  >;\n\n  export type RangeKey<T extends AggregationRangeKeyTypes> = AggKeyWireToClient<\n    \"range\",\n    T\n  >;\n\n  export type TwoDimensionalAggregationType<\n    T extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = TwoDimensionalAggregation<\n    T extends AggregationKeyTypes ? AggKeyWireToClient<T> : T,\n    AggValueWireToClient<V>\n  >;\n\n  export type ThreeDimensionalAggregationType<\n    OUT extends AggregationKeyTypes | RangeKey<any>,\n    IN extends AggregationKeyTypes | RangeKey<any>,\n    V extends AggregationValueTypes,\n  > = ThreeDimensionalAggregation<\n    OUT extends AggregationKeyTypes ? AggKeyWireToClient<OUT> : OUT,\n    IN extends AggregationKeyTypes ? AggKeyWireToClient<IN> : IN,\n    AggValueWireToClient<V>\n  >;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAwBA;AACA;AACA;AAFA,WAGiBA,UAAU;AA2C3B;AACA;AACA;AAFA,WAGiBC,WAAW","ignoreList":[]}

package/build/browser/test/EmployeeApiTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmployeeApiTest.js","names":["EmployeeApiTest","type","apiName"],"sources":["EmployeeApiTest.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  ObjectMetadata as $ObjectMetadata,\n  ObjectSet as $ObjectSet,\n  ObjectTypeDefinition as $ObjectTypeDefinition,\n  PropertyDef as $PropertyDef,\n  PropertyValueWireToClient as $PropType,\n  SingleLinkAccessor as $SingleLinkAccessor,\n} from \"../index.js\";\n\nexport namespace EmployeeApiTest {\n  export type PropertyKeys =\n    | \"employeeId\"\n    | \"fullName\"\n    | \"class\"\n    | \"booleanProp\";\n\n  export interface Links {\n    readonly lead: $SingleLinkAccessor<EmployeeApiTest>;\n    readonly peeps: EmployeeApiTest.ObjectSet;\n  }\n\n  export interface Props {\n    readonly class: $PropType[\"string\"] | undefined;\n    readonly fullName: $PropType[\"string\"] | undefined;\n    readonly employeeId: $PropType[\"integer\"] | undefined;\n    readonly booleanProp: $PropType[\"boolean\"] | undefined;\n  }\n  export type StrictProps = Props;\n\n  export interface ObjectSet\n    extends $ObjectSet<EmployeeApiTest, EmployeeApiTest.ObjectSet>\n  {}\n}\n\nexport interface EmployeeApiTest extends $ObjectTypeDefinition {\n  type: \"object\";\n  apiName: \"Employee\";\n  __DefinitionMetadata?: {\n    objectSet: EmployeeApiTest.ObjectSet;\n    props: EmployeeApiTest.Props;\n    linksType: EmployeeApiTest.Links;\n    strictProps: EmployeeApiTest.StrictProps;\n    apiName: \"Employee\";\n    description: \"A full-time or part-time \\n\\n employee of our firm\";\n    displayName: \"Employee\";\n    icon: {\n      type: \"blueprint\";\n      color: \"blue\";\n      name: \"person\";\n    };\n    implements: [\"FooInterface\"];\n    interfaceMap: {\n      FooInterface: {\n        fooSpt: \"fullName\";\n      };\n    };\n    inverseInterfaceMap: {\n      FooInterface: {\n        fullName: \"fooSpt\";\n      };\n    };\n    links: {\n      lead: $ObjectMetadata.Link<EmployeeApiTest, false>;\n      peeps: $ObjectMetadata.Link<EmployeeApiTest, true>;\n    };\n    pluralDisplayName: \"Employees\";\n    primaryKeyApiName: \"employeeId\";\n    primaryKeyType: \"integer\";\n    properties: {\n      class: $PropertyDef<\"string\", \"nullable\", \"single\">;\n      fullName: $PropertyDef<\"string\", \"nullable\", \"single\">;\n      employeeId: $PropertyDef<\"integer\", \"nullable\", \"single\">;\n      booleanProp: $PropertyDef<\"boolean\", \"nullable\", \"single\">;\n    };\n    rid: \"ri.ontology.main.object-type.401ac022-89eb-4591-8b7e-0a912b9efb44\";\n    status: \"ACTIVE\";\n    titleProperty: \"fullName\";\n    type: \"object\";\n    visibility: \"NORMAL\";\n  };\n}\n\nexport const EmployeeApiTest: EmployeeApiTest = {\n  type: \"object\",\n  apiName: \"Employee\",\n};\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAoFA,OAAO,MAAMA,eAAgC,GAAG;EAC9CC,IAAI,EAAE,QAAQ;EACdC,OAAO,EAAE;AACX,CAAC","ignoreList":[]}
+{"version":3,"file":"EmployeeApiTest.js","names":["EmployeeApiTest","type","apiName"],"sources":["EmployeeApiTest.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  ObjectMetadata as $ObjectMetadata,\n  ObjectSet as $ObjectSet,\n  ObjectTypeDefinition as $ObjectTypeDefinition,\n  PropertyDef as $PropertyDef,\n  PropertyValueWireToClient as $PropType,\n  SingleLinkAccessor as $SingleLinkAccessor,\n} from \"../index.js\";\n\nexport namespace EmployeeApiTest {\n  export type PropertyKeys =\n    | \"employeeId\"\n    | \"fullName\"\n    | \"class\"\n    | \"attachment\"\n    | \"geopoint\"\n    | \"timeseries\"\n    | \"mediaReference\"\n    | \"geotimeSeriesReference\"\n    | \"isActive\"\n    | \"yearsOfExperience\"\n    | \"rank\"\n    | \"performanceScore\"\n    | \"hourlyRate\"\n    | \"dateOfJoining\"\n    | \"lastUpdated\";\n\n  export interface Links {\n    readonly lead: $SingleLinkAccessor<EmployeeApiTest>;\n    readonly peeps: EmployeeApiTest.ObjectSet;\n  }\n\n  export interface Props {\n    readonly class: $PropType[\"string\"] | undefined;\n    readonly fullName: $PropType[\"string\"] | undefined;\n    readonly employeeId: $PropType[\"integer\"] | undefined;\n    readonly attachment: $PropType[\"attachment\"] | undefined;\n    readonly geopoint: $PropType[\"geopoint\"] | undefined;\n    readonly timeseries: $PropType[\"numericTimeseries\"] | undefined;\n    readonly mediaReference: $PropType[\"mediaReference\"] | undefined;\n    readonly geotimeSeriesReference:\n      | $PropType[\"geotimeSeriesReference\"]\n      | undefined;\n    readonly isActive: $PropType[\"boolean\"] | undefined;\n    readonly yearsOfExperience: $PropType[\"long\"] | undefined;\n    readonly rank: $PropType[\"short\"] | undefined;\n    readonly performanceScore: $PropType[\"double\"] | undefined;\n    readonly hourlyRate: $PropType[\"float\"] | undefined;\n    readonly dateOfJoining: $PropType[\"datetime\"] | undefined;\n    readonly lastUpdated: $PropType[\"timestamp\"] | undefined;\n  }\n  export type StrictProps = Props;\n\n  export interface ObjectSet\n    extends $ObjectSet<EmployeeApiTest, EmployeeApiTest.ObjectSet>\n  {}\n}\n\nexport interface EmployeeApiTest extends $ObjectTypeDefinition {\n  type: \"object\";\n  apiName: \"Employee\";\n  __DefinitionMetadata?: {\n    objectSet: EmployeeApiTest.ObjectSet;\n    props: EmployeeApiTest.Props;\n    linksType: EmployeeApiTest.Links;\n    strictProps: EmployeeApiTest.StrictProps;\n    apiName: \"Employee\";\n    description: \"A full-time or part-time \\n\\n employee of our firm\";\n    displayName: \"Employee\";\n    icon: {\n      type: \"blueprint\";\n      color: \"blue\";\n      name: \"person\";\n    };\n    implements: [\"FooInterface\"];\n    interfaceMap: {\n      FooInterface: {\n        fooSpt: \"fullName\";\n      };\n    };\n    inverseInterfaceMap: {\n      FooInterface: {\n        fullName: \"fooSpt\";\n      };\n    };\n    links: {\n      lead: $ObjectMetadata.Link<EmployeeApiTest, false>;\n      peeps: $ObjectMetadata.Link<EmployeeApiTest, true>;\n    };\n    pluralDisplayName: \"Employees\";\n    primaryKeyApiName: \"employeeId\";\n    primaryKeyType: \"integer\";\n    properties: {\n      class: $PropertyDef<\"string\", \"nullable\", \"single\">;\n      fullName: $PropertyDef<\"string\", \"nullable\", \"single\">;\n      employeeId: $PropertyDef<\"integer\", \"nullable\", \"single\">;\n      attachment: $PropertyDef<\"attachment\", \"nullable\", \"single\">;\n      geopoint: $PropertyDef<\"geopoint\", \"nullable\", \"single\">;\n      timeseries: $PropertyDef<\"numericTimeseries\", \"nullable\", \"single\">;\n      mediaReference: $PropertyDef<\"mediaReference\", \"nullable\", \"single\">;\n      geotimeSeriesReference: $PropertyDef<\n        \"geotimeSeriesReference\",\n        \"nullable\",\n        \"single\"\n      >;\n      isActive: $PropertyDef<\"boolean\", \"nullable\", \"single\">;\n      yearsOfExperience: $PropertyDef<\"long\", \"nullable\", \"single\">;\n      rank: $PropertyDef<\"short\", \"nullable\", \"single\">;\n      performanceScore: $PropertyDef<\"double\", \"nullable\", \"single\">;\n      hourlyRate: $PropertyDef<\"float\", \"nullable\", \"single\">;\n      dateOfJoining: $PropertyDef<\"datetime\", \"nullable\", \"single\">;\n      lastUpdated: $PropertyDef<\"timestamp\", \"nullable\", \"single\">;\n    };\n    rid: \"ri.ontology.main.object-type.401ac022-89eb-4591-8b7e-0a912b9efb44\";\n    status: \"ACTIVE\";\n    titleProperty: \"fullName\";\n    type: \"object\";\n    visibility: \"NORMAL\";\n  };\n}\n\nexport const EmployeeApiTest: EmployeeApiTest = {\n  type: \"object\",\n  apiName: \"Employee\",\n};\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA2HA,OAAO,MAAMA,eAAgC,GAAG;EAC9CC,IAAI,EAAE,QAAQ;EACdC,OAAO,EAAE;AACX,CAAC","ignoreList":[]}

package/build/browser/util/IncludeValuesExtending.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=IncludeValuesExtending.js.map

package/build/browser/util/IncludeValuesExtending.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IncludeValuesExtending.js","names":[],"sources":["IncludeValuesExtending.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nexport type IncludeValuesExtending<T extends Record<keyof any, any>, M> = {\n  [K in keyof T as T[K] extends M ? K : never]: T[K];\n};\n"],"mappings":"","ignoreList":[]}

package/build/cjs/{FilteredPropertyKeys-qAMesbuN.d.cts → ObjectSet-1V2b-FHw.d.cts}

@@ -56,10 +56,13 @@ interface MediaMetadata {
     mediaType: string;
 }
 
+type DistinctWithPropAggregateOption = "approximateDistinct" | "exactDistinct";
 type CollectWithPropAggregations = "collectSet" | "collectList";
-type BaseWithPropAggregations = "approximateDistinct" | "exactDistinct";
-type StringWithPropAggregateOption = BaseWithPropAggregations | CollectWithPropAggregations;
-type NumericWithPropAggregateOption = "min" | "max" | "sum" | "avg" | "approximatePercentile" | BaseWithPropAggregations | CollectWithPropAggregations;
+type BaseWithPropAggregations = DistinctWithPropAggregateOption | CollectWithPropAggregations;
+type MinMaxWithPropAggregateOption = "min" | "max";
+type DatetimeWithPropAggregateOption = MinMaxWithPropAggregateOption | BaseWithPropAggregations;
+type NumericWithPropAggregateOption = "sum" | "avg" | "approximatePercentile" | MinMaxWithPropAggregateOption | BaseWithPropAggregations;
+type ValidCollectPropertyKeysForSpecialTypes = "attachment" | "geopoint" | "geoshape" | "boolean";
 
 type TimeSeriesQuery = {
     $before: number;
@@ -244,11 +247,15 @@ type GetWirePropertyValueFromClient<T extends keyof PropertyValueClientToWire |
     [K in keyof T]: PropertyValueClientToWire[T[K]];
 } : never;
 
+type IncludeValuesExtending<T extends Record<keyof any, any>, M> = {
+    [K in keyof T as T[K] extends M ? K : never]: T[K];
+};
+
 interface OsdkMetadata {
     extraUserAgent: string;
 }
 
-type PrimaryKeyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "byte";
+type PrimaryKeyTypes = "string" | "datetime" | "double" | "integer" | "timestamp" | "short" | "long" | "byte";
 
 type VersionString<Major extends number, Minor extends number, Patch extends number> = `${Major}.${Minor}.${Patch}`;
 
@@ -344,8 +351,8 @@ interface InterfaceDefinition {
 
 type SimplePropertyDef = WirePropertyTypes | undefined | Array<WirePropertyTypes>;
 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"]>;
+    type Make<T extends WirePropertyTypes, 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";
@@ -367,13 +374,22 @@ declare namespace DerivedObjectOrInterfaceDefinition {
         };
     } & K;
 }
-type PropertyKeys<O extends ObjectOrInterfaceDefinition, RDPs extends Record<string, SimplePropertyDef> = {}> = (keyof NonNullable<O["__DefinitionMetadata"]>["properties"] | keyof RDPs) & string;
+type PropertyKeys<O extends ObjectOrInterfaceDefinition> = (keyof CompileTimeMetadata<O>["properties"]) & string;
+declare namespace PropertyKeys {
+    type Filtered<Q extends ObjectOrInterfaceDefinition, T extends WirePropertyTypes> = keyof IncludeValuesExtending<CompileTimeMetadata<Q>["properties"], {
+        type: T;
+    }>;
+}
 
-type StringAggregateOption = "approximateDistinct" | "exactDistinct";
-type NumericAggregateOption = "min" | "max" | "sum" | "avg" | "approximateDistinct" | "exactDistinct";
-type AGG_FOR_TYPE<T, U extends boolean> = number extends T ? U extends true ? NumericAggregateOption : NumericWithPropAggregateOption : string extends T ? U extends true ? StringAggregateOption : StringWithPropAggregateOption : boolean extends T ? U extends true ? never : StringWithPropAggregateOption : never;
+type BaseAggregateOptions = "approximateDistinct" | "exactDistinct";
+type MinMaxAggregateOption = "min" | "max";
+type DatetimeAggregateOption = MinMaxAggregateOption | BaseAggregateOptions;
+type NumericAggregateOption = "sum" | "avg" | "approximateDistinct" | "exactDistinct" | MinMaxAggregateOption;
+type AGG_FOR_TYPE<WIRE_TYPE extends WirePropertyTypes> = number extends GetWirePropertyValueFromClient<WIRE_TYPE> ? NumericAggregateOption : WIRE_TYPE extends "datetime" | "timestamp" ? DatetimeAggregateOption : BaseAggregateOptions;
+type WITH_PROPERTIES_AGG_FOR_TYPE<WIRE_TYPE extends WirePropertyTypes> = number extends GetWirePropertyValueFromClient<WIRE_TYPE> ? NumericWithPropAggregateOption : WIRE_TYPE extends "datetime" | "timestamp" ? DatetimeWithPropAggregateOption : WIRE_TYPE extends "string" ? BaseWithPropAggregations : WITH_PROPERTIES_AGG_FOR_SPECIAL_WIRE_TYPE<WIRE_TYPE>;
+type WITH_PROPERTIES_AGG_FOR_SPECIAL_WIRE_TYPE<WIRE_TYPE extends WirePropertyTypes> = WIRE_TYPE extends ValidCollectPropertyKeysForSpecialTypes ? BaseWithPropAggregations : DistinctWithPropAggregateOption;
 type ValidAggregationKeys<Q extends ObjectOrInterfaceDefinition, R extends "aggregate" | "withPropertiesAggregate" = "aggregate"> = keyof ({
-    [KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<GetWirePropertyValueFromClient<CompileTimeMetadata<Q>["properties"][KK]["type"]>, R extends "aggregate" ? true : false>}`]?: any;
+    [KK in AggregatableKeys<Q> as `${KK & string}:${R extends "aggregate" ? AGG_FOR_TYPE<CompileTimeMetadata<Q>["properties"][KK]["type"]> : WITH_PROPERTIES_AGG_FOR_TYPE<CompileTimeMetadata<Q>["properties"][KK]["type"]>}`]?: any;
 } & {
     $count?: any;
 });
@@ -527,23 +543,39 @@ type NullabilityAdherence = false | "throw" | "drop";
 declare namespace NullabilityAdherence {
     type Default = "throw";
 }
+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;
+    }
+}
 interface SelectArg<Q extends ObjectOrInterfaceDefinition, L extends PropertyKeys<Q> = PropertyKeys<Q>, R extends boolean = false, S extends NullabilityAdherence = NullabilityAdherence.Default> {
     $select?: readonly L[];
     $includeRid?: R;
 }
-interface OrderByArg<Q extends ObjectOrInterfaceDefinition, L extends PropertyKeys<Q> = PropertyKeys<Q>> {
-    $orderBy?: {
-        [K in L]?: "asc" | "desc";
-    };
+interface OrderByArg<Q extends ObjectOrInterfaceDefinition, L extends PropertyKeys<Q> = PropertyKeys<Q>> extends ObjectSetArgs.OrderBy<L> {
 }
 type SelectArgToKeys<Q extends ObjectOrInterfaceDefinition, A extends SelectArg<Q, any, any>> = A extends SelectArg<Q, never> ? PropertyKeys<Q> : A["$select"] extends readonly string[] ? A["$select"][number] : PropertyKeys<Q>;
-interface FetchPageArgs<Q extends ObjectOrInterfaceDefinition, K extends PropertyKeys<Q> = PropertyKeys<Q>, 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> {
+interface FetchPageArgs<Q extends ObjectOrInterfaceDefinition, K extends PropertyKeys<Q> = PropertyKeys<Q>, R extends boolean = false, A extends Augments = never, S extends NullabilityAdherence = NullabilityAdherence.Default, T extends boolean = false, RDP_KEYS extends string = never> extends AsyncIterArgs<Q, K, R, A, S, T, RDP_KEYS> {
     $nextPageToken?: string;
     $pageSize?: number;
 }
-interface AsyncIterArgs<Q extends ObjectOrInterfaceDefinition, K extends PropertyKeys<Q> = PropertyKeys<Q>, R extends boolean = false, A extends Augments = never, S extends NullabilityAdherence = NullabilityAdherence.Default, T extends boolean = false> extends SelectArg<Q, K, R, S>, OrderByArg<Q, PropertyKeys<Q>> {
+interface AsyncIterArgs<Q extends ObjectOrInterfaceDefinition, K extends PropertyKeys<Q> = PropertyKeys<Q>, R extends boolean = false, A extends Augments = never, S extends NullabilityAdherence = NullabilityAdherence.Default, 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;
 }
 type Augment<X extends ObjectOrInterfaceDefinition, T extends string> = {
     [K in CompileTimeMetadata<X>["apiName"]]: T[];
@@ -592,7 +624,7 @@ type UnionIfTrue<S extends string, UNION_IF_TRUE extends boolean, E extends stri
 /**
  * Helper type for converting fetch options into an Osdk object
  */
-type FetchPageResult<Q extends ObjectOrInterfaceDefinition, L extends PropertyKeys<Q>, R extends boolean, S extends NullabilityAdherence, T extends boolean> = PageResult<PropertyKeys<Q> extends L ? Osdk.Instance<Q, ExtractOptions<R, S, T>> : Osdk.Instance<Q, ExtractOptions<R, S, T>, L>>;
+type FetchPageResult<Q extends ObjectOrInterfaceDefinition, L extends PropertyKeys<Q>, R extends boolean, S extends NullabilityAdherence, 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
  */
@@ -601,18 +633,20 @@ type SingleOsdkResult<Q extends ObjectOrInterfaceDefinition, L extends PropertyK
 }>;
 
 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);
 };
 
 type OsdkObjectPrimaryKeyType<Q extends ObjectTypeDefinition> = PropertyValueWireToClient[CompileTimeMetadata<Q>["primaryKeyType"]];
 
-type OsdkBase<Q extends ObjectOrInterfaceDefinition> = {
+interface ObjectIdentifiers<Q extends ObjectOrInterfaceDefinition> {
     readonly $apiName: Q["apiName"];
-    readonly $objectType: string;
     readonly $primaryKey: PrimaryKeyType<Q>;
-    readonly $title: string | undefined;
+}
+interface OsdkBase<Q extends ObjectOrInterfaceDefinition> extends ObjectIdentifiers<Q> {
     readonly $objectSpecifier: ObjectSpecifier<Q>;
-};
+    readonly $objectType: string;
+    readonly $title: string | undefined;
+}
 type PrimaryKeyType<Q extends ObjectOrInterfaceDefinition> = (Q extends ObjectTypeDefinition ? OsdkObjectPrimaryKeyType<Q> : unknown) & PropertyValueWireToClient[PrimaryKeyTypes];
 
 type SpecialOsdkPropParams = "$all" | "$rid" | "$strict" | "$notStrict";
@@ -624,6 +658,8 @@ type MapPropNamesToObjectType<FROM extends ObjectOrInterfaceDefinition, TO exten
 type PropMapToInterface<FROM extends ObjectTypeDefinition, TO extends InterfaceDefinition> = NonNullable<CompileTimeMetadata<FROM>["inverseInterfaceMap"]>[ApiNameAsString<TO>];
 type MapPropNamesToInterface<FROM extends ObjectTypeDefinition, TO extends InterfaceDefinition, P extends ValidOsdkPropParams<FROM>> = PropMapToInterface<FROM, TO>[JustProps<FROM, P> & keyof PropMapToInterface<FROM, TO>];
 /**
+ * Older version of this helper that allows for `$rid` and co in
+ * the properties field.
  * @param FROM - the interface or object type to convert from
  * @param TO - the interface or object type to convert to
  * @param P - the property(s) to convert
@@ -910,37 +946,36 @@ type WhereClause<T extends ObjectOrInterfaceDefinition> = OrWhereClause<T> | And
 type LinkNames<Q extends ObjectOrInterfaceDefinition> = keyof CompileTimeMetadata<Q>["links"] & string;
 type LinkedType<Q extends ObjectOrInterfaceDefinition, L extends LinkNames<Q>> = NonNullable<CompileTimeMetadata<Q>["links"][L]["__OsdkLinkTargetType"]>;
 
+declare const DerivedPropertyDefinitionBrand: unique symbol;
 declare namespace DerivedProperty {
-    type SelectorResult<T extends SimplePropertyDef> = {
-        type: T;
-    };
-    type Clause<Q extends ObjectOrInterfaceDefinition> = {
-        [key: string]: Selector<Q, SimplePropertyDef>;
+    export interface Definition<T extends SimplePropertyDef, Q extends ObjectOrInterfaceDefinition> {
+        readonly [DerivedPropertyDefinitionBrand]: true;
+    }
+    export type Clause<Q extends ObjectOrInterfaceDefinition> = {
+        [key: string]: DerivedPropertyCreator<Q, SimplePropertyDef>;
     };
-    type Selector<Q extends ObjectOrInterfaceDefinition, T extends SimplePropertyDef> = (baseObjectSet: DerivedProperty.Builder<Q, false>) => SelectorResult<T>;
-    interface Builder<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> extends Filterable<Q, CONSTRAINED>, Pivotable<Q, CONSTRAINED> {
+    interface BaseBuilder<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> extends Filterable<Q, CONSTRAINED>, Pivotable<Q, CONSTRAINED> {
     }
-    interface AggregateBuilder<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> extends Builder<Q, CONSTRAINED>, Aggregatable<Q> {
+    export interface Builder<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> extends BaseBuilder<Q, CONSTRAINED> {
     }
-    interface SelectPropertyBuilder<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> extends AggregateBuilder<Q, CONSTRAINED>, Selectable<Q> {
+    export interface AggregateBuilder<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> extends BaseBuilder<Q, CONSTRAINED>, Aggregatable<Q> {
     }
+    export {  };
 }
-type BuilderTypeFromConstraint<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> = CONSTRAINED extends true ? DerivedProperty.AggregateBuilder<Q, true> : DerivedProperty.SelectPropertyBuilder<Q, false>;
+type DerivedPropertyCreator<Q extends ObjectOrInterfaceDefinition, T extends SimplePropertyDef> = (baseObjectSet: DerivedProperty.Builder<Q, false>) => DerivedProperty.Definition<T, Q>;
+type BuilderTypeFromConstraint<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> = CONSTRAINED extends true ? DerivedProperty.AggregateBuilder<Q, true> : DerivedProperty.AggregateBuilder<Q, false>;
 type Filterable<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> = {
     readonly where: (clause: WhereClause<Q>) => BuilderTypeFromConstraint<Q, CONSTRAINED>;
 };
 type Pivotable<Q extends ObjectOrInterfaceDefinition, CONSTRAINED extends boolean> = {
-    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>;
+    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.AggregateBuilder<LinkedType<Q, L>, false>;
 };
 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>;
-};
-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"]>>;
+    } : never : never) => DerivedProperty.Definition<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, Q>;
 };
 
 interface BaseObjectSet<Q extends ObjectOrInterfaceDefinition> {
@@ -987,11 +1022,29 @@ type ObjectUpdate<O extends ObjectOrInterfaceDefinition, P extends PropertyKeys<
     state: "ADDED_OR_UPDATED" | "REMOVED";
 };
 
-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 : {};
+type MergeObjectSet<Q extends ObjectOrInterfaceDefinition, 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];
+}>;
 interface MinimalObjectSet<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<string, SimplePropertyDef> = {}> extends BaseObjectSet<Q>, FetchPage<Q, RDPs>, AsyncIter<Q, RDPs>, Where<Q, RDPs> {
 }
+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
      * @param args - Args to specify next page token and page size, if applicable
@@ -1004,9 +1057,22 @@ interface FetchPage<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<s
   
      * @returns a page of objects
      */
-    readonly fetchPage: <L extends PropertyKeys<Q, RDPs>, 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];
-    }>>>;
+    <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>, 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
@@ -1021,9 +1087,22 @@ interface FetchPage<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<s
       }
      * @returns a page of objects, wrapped in a result wrapper
      */
-    readonly fetchPageWithErrors: <L extends PropertyKeys<Q, RDPs>, 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];
-    }>>>>;
+    <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
+     * @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
+     */
+    <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>, MaybeSimplifyPropertyKeys<Q, L>>>>>;
 }
 interface Where<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<string, SimplePropertyDef> = {}> {
     /**
@@ -1038,7 +1117,7 @@ interface Where<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<strin
     */
     readonly where: (clause: WhereClause<MergeObjectSet<Q, RDPs>>) => this;
 }
-interface AsyncIter<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<string, SimplePropertyDef> = {}> {
+interface AsyncIterSignature<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<string, SimplePropertyDef> = {}> {
     /**
      * Returns an async iterator to load all objects of this type
      * @example
@@ -1047,18 +1126,28 @@ interface AsyncIter<Q extends ObjectOrInterfaceDefinition, RDPs extends Record<s
      * }
      * @returns an async iterator to load all objects
      */
-    readonly asyncIter: <L extends PropertyKeys<Q, RDPs>, 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];
-    }>>;
+    <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>, 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]>;
+        [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;
     }>;
 }
-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>> {
+interface ObjectSet<Q extends ObjectOrInterfaceDefinition = any, 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> {
     /**
@@ -1124,21 +1213,31 @@ 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, RDPs extends Record<string, SimplePropertyDef>> {
+interface FetchOneSignature<Q extends ObjectTypeDefinition, RDPs extends Record<string, SimplePropertyDef>> {
+    /**
+     * Fetches one object with the specified primary key, without a result wrapper
+     */
+    <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
      */
-    readonly fetchOne: Q extends ObjectTypeDefinition ? <const L extends PropertyKeys<Q, RDPs>, 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;
+    <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>, 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> {
     /**
@@ -1151,11 +1250,7 @@ interface Subscribe<Q extends ObjectOrInterfaceDefinition> {
         unsubscribe: () => void;
     };
 }
-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> {
+interface ObjectSetCleanedTypes<Q extends ObjectOrInterfaceDefinition, D extends Record<string, SimplePropertyDef>, MERGED extends ObjectOrInterfaceDefinition & Q> extends MinimalObjectSet<Q, D>, WithProperties<Q, D>, Aggregate<MERGED>, SetArithmetic<MERGED>, PivotTo<Q>, FetchOne<Q, D>, Subscribe<MERGED> {
 }
 
-type FilteredPropertyKeys<O extends ObjectOrInterfaceDefinition, T extends WirePropertyTypes> = {
-    [K in keyof NonNullable<O["__DefinitionMetadata"]>["properties"]]: NonNullable<O["__DefinitionMetadata"]>["properties"][K]["type"] extends T ? K : never;
-}[keyof NonNullable<O["__DefinitionMetadata"]>["properties"]];
-
-export { type CompileTimeMetadata as $, type Attachment as A, type SelectArgToKeys as B, type FetchPageResult as C, DistanceUnitMapping as D, type SingleOsdkResult as E, type FetchPageArgs as F, type GeoFilterOptions as G, type Media as H, type InterfaceDefinition as I, type MediaMetadata as J, isOk as K, type Result as L, type MediaReference as M, NullabilityAdherence as N, type ObjectTypeDefinition as O, type PropertyValueWireToClient as P, type BaseObjectSet as Q, type ReleaseStatus as R, type SingleLinkAccessor as S, ObjectSetSubscription as T, type FilteredPropertyKeys as U, type ValidAggregationKeys as V, type WhereClause as W, type InterfaceMetadata as X, type ObjectOrInterfaceDefinition as Y, type PropertyKeys as Z, type ObjectSpecifier as _, type AttachmentUpload as a, ObjectMetadata as a0, type PropertyDef as a1, type VersionBound as a2, type BaseWirePropertyTypes as a3, type WirePropertyTypes as a4, type PrimaryKeyType as a5, type ConvertProps as a6, Osdk as a7, type PageResult as a8, TimeseriesDurationMapping as a9, type GeotimeSeriesProperty as aa, type TimeSeriesPoint as ab, type TimeSeriesProperty as ac, type TimeSeriesQuery as ad, type LinkedType as ae, type LinkNames as af, type ExtractOptions as ag, type MinimalObjectSet as ah, type OsdkBase as b, type OsdkObjectPrimaryKeyType as c, type ObjectSet as d, type OsdkMetadata as e, type PrimaryKeyTypes as f, type AggregateOpts as g, type AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy as h, type AggregationResultsWithGroups as i, type AggregationResultsWithoutGroups as j, type AggregationClause as k, type AggregationsResults as l, type GeoFilter_Intersects as m, type GeoFilter_Within as n, type PossibleWhereClauseFilters as o, type OsdkObjectPropertyType as p, type OsdkObjectLinksObject as q, DerivedProperty as r, DurationMapping as s, type AllGroupByValues as t, type GroupByClause as u, type GroupByRange as v, type AsyncIterArgs as w, type Augment as x, type Augments as y, type SelectArg as z };
+export { type ObjectSpecifier as $, type AttachmentUpload as A, type SelectArg as B, type CompileTimeMetadata as C, DistanceUnitMapping as D, type SelectArgToKeys as E, type FetchPageArgs as F, type GeoFilterOptions as G, type FetchPageResult as H, type InterfaceDefinition as I, type SingleOsdkResult as J, type Media as K, type MediaMetadata as L, type MediaReference as M, NullabilityAdherence as N, type ObjectTypeDefinition as O, type PropertyValueWireToClient as P, isOk as Q, type ReleaseStatus as R, type SingleLinkAccessor as S, type Result as T, type BaseObjectSet as U, type ValidAggregationKeys as V, type WhereClause as W, ObjectSetSubscription as X, type InterfaceMetadata as Y, type ObjectOrInterfaceDefinition as Z, PropertyKeys as _, type Attachment as a, ObjectMetadata as a0, type PropertyDef as a1, type VersionBound as a2, type BaseWirePropertyTypes as a3, type WirePropertyTypes as a4, type PrimaryKeyType as a5, type ConvertProps as a6, Osdk as a7, type PageResult as a8, TimeseriesDurationMapping as a9, type GeotimeSeriesProperty as aa, type TimeSeriesPoint as ab, type TimeSeriesProperty as ac, type TimeSeriesQuery as ad, type LinkedType as ae, type LinkNames as af, type ExtractOptions as ag, type MinimalObjectSet as ah, type ObjectIdentifiers as b, type OsdkObjectPrimaryKeyType as c, type ObjectSet as d, type OsdkMetadata as e, type PrimaryKeyTypes as f, type OsdkBase as g, type AggregateOpts as h, type AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy as i, type AggregationResultsWithGroups as j, type AggregationResultsWithoutGroups as k, type AggregationClause as l, type AggregationsResults as m, type GeoFilter_Intersects as n, type GeoFilter_Within as o, type PossibleWhereClauseFilters as p, type OsdkObjectPropertyType as q, type OsdkObjectLinksObject as r, DerivedProperty as s, DurationMapping as t, type AllGroupByValues as u, type GroupByClause as v, type GroupByRange as w, type AsyncIterArgs as x, type Augment as y, type Augments as z };