@osdk/client 0.8.0 → 0.10.0

package/build/types/generatedNoCheck/ontology/objects/objectTypeWithAllPropertyTypes.d.ts

@@ -1,158 +1,161 @@
-export declare const objectTypeWithAllPropertyTypes: {
-    apiName: "objectTypeWithAllPropertyTypes";
-    description: string;
-    primaryKeyType: "integer";
+import type { ObjectTypeDefinition } from '@osdk/api';
+export interface objectTypeWithAllPropertyTypesDef extends ObjectTypeDefinition<'objectTypeWithAllPropertyTypes'> {
+    type: 'object';
+    apiName: 'objectTypeWithAllPropertyTypes';
+    description: 'An object type with all property types';
+    primaryKeyType: 'integer';
     links: {};
     properties: {
         id: {
             multiplicity: false;
-            type: "integer";
+            type: 'integer';
             nullable: false;
         };
         string: {
             multiplicity: false;
-            type: "string";
+            type: 'string';
             nullable: true;
         };
         boolean: {
             multiplicity: false;
-            type: "boolean";
+            type: 'boolean';
             nullable: true;
         };
         date: {
             multiplicity: false;
-            type: "datetime";
+            type: 'datetime';
             nullable: true;
         };
         dateTime: {
             multiplicity: false;
-            type: "timestamp";
+            type: 'timestamp';
             nullable: true;
         };
         decimal: {
             multiplicity: false;
-            type: "decimal";
+            type: 'decimal';
             nullable: true;
         };
         integer: {
             multiplicity: false;
-            type: "integer";
+            type: 'integer';
             nullable: true;
         };
         long: {
             multiplicity: false;
-            type: "long";
+            type: 'long';
             nullable: true;
         };
         short: {
             multiplicity: false;
-            type: "short";
+            type: 'short';
             nullable: true;
         };
         float: {
             multiplicity: false;
-            type: "float";
+            type: 'float';
             nullable: true;
         };
         double: {
             multiplicity: false;
-            type: "double";
+            type: 'double';
             nullable: true;
         };
         byte: {
             multiplicity: false;
-            type: "byte";
+            type: 'byte';
             nullable: true;
         };
         attachment: {
             multiplicity: false;
-            type: "attachment";
+            type: 'attachment';
             nullable: true;
         };
         attachment2: {
             multiplicity: false;
-            type: "attachment";
+            type: 'attachment';
             nullable: true;
         };
         geoPoint: {
             multiplicity: false;
-            type: "geopoint";
+            type: 'geopoint';
             nullable: true;
         };
         geoShape: {
             multiplicity: false;
-            type: "geoshape";
+            type: 'geoshape';
             nullable: true;
         };
         stringArray: {
             multiplicity: true;
-            type: "string";
+            type: 'string';
             nullable: true;
         };
         booleanArray: {
             multiplicity: true;
-            type: "boolean";
+            type: 'boolean';
             nullable: true;
         };
         dateArray: {
             multiplicity: true;
-            type: "datetime";
+            type: 'datetime';
             nullable: true;
         };
         dateTimeArray: {
             multiplicity: true;
-            type: "timestamp";
+            type: 'timestamp';
             nullable: true;
         };
         decimalArray: {
             multiplicity: true;
-            type: "decimal";
+            type: 'decimal';
             nullable: true;
         };
         integerArray: {
             multiplicity: true;
-            type: "integer";
+            type: 'integer';
             nullable: true;
         };
         longArray: {
             multiplicity: true;
-            type: "long";
+            type: 'long';
             nullable: true;
         };
         shortArray: {
             multiplicity: true;
-            type: "short";
+            type: 'short';
             nullable: true;
         };
         floatArray: {
             multiplicity: true;
-            type: "float";
+            type: 'float';
             nullable: true;
         };
         doubleArray: {
             multiplicity: true;
-            type: "double";
+            type: 'double';
             nullable: true;
         };
         byteArray: {
             multiplicity: true;
-            type: "byte";
+            type: 'byte';
             nullable: true;
         };
         attachmentArray: {
             multiplicity: true;
-            type: "attachment";
+            type: 'attachment';
             nullable: true;
         };
         geoPointArray: {
             multiplicity: true;
-            type: "geopoint";
+            type: 'geopoint';
             nullable: true;
         };
         geoShapeArray: {
             multiplicity: true;
-            type: "geoshape";
+            type: 'geoshape';
             nullable: true;
         };
     };
-};
+}
+export declare const objectTypeWithAllPropertyTypes: objectTypeWithAllPropertyTypesDef;

package/build/types/index.d.ts

@@ -10,5 +10,7 @@ export { createClientContext } from "@osdk/shared.net";
 export { isOk } from "@osdk/shared.net";
 export type { ResultOrError } from "@osdk/shared.net";
 export type { ClientContext } from "@osdk/shared.net";
-export type { ActionEditResponse, ActionValidationResponse, } from "./actions/Actions.js";
+export type { ActionEditResponse, ActionValidationResponse, ApplyActionOptions, OsdkActionParameters, } from "./actions/Actions.js";
 export { ActionValidationError } from "./actions/ActionValidationError.js";
+export type { ActionReturnTypeForOptions } from "./actions/applyAction.js";
+export type { NOOP } from "./util/NOOP.js";

package/build/types/internal/conversions/legacyToModernSingleAggregationResult.d.ts

@@ -1,4 +1,4 @@
 import type { AggregateObjectsResponseV2 } from "@osdk/gateway/types";
 import type { AggregationClause, AggregationResultsWithoutGroups } from "../../query/index.js";
 import type { ArrayElement } from "../../util/ArrayElement.js";
-export declare function legacyToModernSingleAggregationResult<AC extends AggregationClause<any, any>>(entry: ArrayElement<AggregateObjectsResponseV2["data"]>): AggregationResultsWithoutGroups<any, any, AC>;
+export declare function legacyToModernSingleAggregationResult<AC extends AggregationClause<any>>(entry: ArrayElement<AggregateObjectsResponseV2["data"]>): AggregationResultsWithoutGroups<any, AC>;

package/build/types/internal/conversions/modernToLegacyAggregationClause.d.ts

@@ -1,4 +1,3 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
 import type { Aggregation } from "@osdk/gateway/types";
 import type { AggregationClause } from "../../query/index.js";
-export declare function modernToLegacyAggregationClause<T extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<T>, AC extends AggregationClause<T, K>>(select: AC): Aggregation[];
+export declare function modernToLegacyAggregationClause<AC extends AggregationClause<any>>(select: AC): Aggregation[];

package/build/types/internal/conversions/modernToLegacyGroupByClause.d.ts

@@ -1,4 +1,3 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
 import type { AggregationGroupByV2 } from "@osdk/gateway/types";
 import type { GroupByClause } from "../../query/index.js";
-export declare function modernToLegacyGroupByClause<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>>(groupByClause: GroupByClause<O, K> | undefined): AggregationGroupByV2[];
+export declare function modernToLegacyGroupByClause(groupByClause: GroupByClause<any> | undefined): AggregationGroupByV2[];

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

@@ -1,5 +1,6 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
+import type { ObjectSet } from "@osdk/gateway/types";
 import type { ClientContext } from "@osdk/shared.net";
 import type { AggregateOpts } from "../query/aggregations/AggregateOpts.js";
 import type { AggregationsResults } from "../query/index.js";
-export declare function aggregateOrThrow<T extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<T>, const AO extends AggregateOpts<T, K, any>>(clientCtx: ClientContext<T>, objectType: K & string, req: AO): Promise<AggregationsResults<T, K, AO>>;
+export declare function aggregateOrThrow<Q extends ObjectOrInterfaceDefinition, const AO extends AggregateOpts<Q, any>>(clientCtx: ClientContext<any>, objectType: Q, objectSet: ObjectSet | undefined, req: AO): Promise<AggregationsResults<Q, AO>>;

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

@@ -1,13 +1,19 @@
-import type { ObjectOrInterfaceKeysFrom, ObjectOrInterfacePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition, ObjectOrInterfacePropertyKeysFrom2, ObjectTypeDefinition } from "@osdk/api";
 import type { ObjectSet } from "@osdk/gateway/types";
 import type { ClientContext } from "@osdk/shared.net";
 import type { OsdkObjectFrom } from "../OsdkObjectFrom.js";
 import type { PageResult } from "../PageResult.js";
-export interface SelectArg<O extends OntologyDefinition<any>, K extends ObjectOrInterfaceKeysFrom<O>, L = ObjectOrInterfacePropertyKeysFrom<O, K>> {
+export interface SelectArg<Q extends ObjectOrInterfaceDefinition<any, any>, L = ObjectOrInterfacePropertyKeysFrom2<Q>, R extends boolean = false> {
     select?: readonly L[];
+    includeRid?: R;
 }
-export interface FetchPageOrThrowArgs<O extends OntologyDefinition<any>, K extends ObjectOrInterfaceKeysFrom<O>, L = ObjectOrInterfacePropertyKeysFrom<O, K>> extends SelectArg<O, K, L> {
+export interface OrderByArg<Q extends ObjectOrInterfaceDefinition<any, any>, L extends ObjectOrInterfacePropertyKeysFrom2<Q> = ObjectOrInterfacePropertyKeysFrom2<Q>> {
+    orderBy?: {
+        [K in L]?: "asc" | "desc";
+    };
+}
+export interface FetchPageOrThrowArgs<Q extends ObjectOrInterfaceDefinition<any, any>, L = ObjectOrInterfacePropertyKeysFrom2<Q>, R extends boolean = false> extends SelectArg<Q, L, R>, OrderByArg<Q, ObjectOrInterfacePropertyKeysFrom2<Q>> {
     nextPageToken?: string;
     pageSize?: number;
 }
-export declare function fetchPageOrThrow<O extends OntologyDefinition<any>, T extends ObjectOrInterfaceKeysFrom<O>, const A extends FetchPageOrThrowArgs<O, T>>(client: ClientContext<O>, objectType: T & string, args: A, objectSet?: ObjectSet): Promise<PageResult<OsdkObjectFrom<T, O, A["select"] extends readonly string[] ? A["select"][number] : ObjectOrInterfacePropertyKeysFrom<O, T>>>>;
+export declare function fetchPageOrThrow<Q extends ObjectOrInterfaceDefinition, const A extends FetchPageOrThrowArgs<Q, any, any>>(client: ClientContext<any>, objectType: Q, args: A, objectSet?: ObjectSet): Promise<PageResult<OsdkObjectFrom<Q extends ObjectTypeDefinition<any> ? Q : never, A["select"] extends readonly string[] ? A["select"][number] : ObjectOrInterfacePropertyKeysFrom2<Q>, A["includeRid"] extends true ? true : false>>>;

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

@@ -1,4 +1,5 @@
-import type { ObjectOrInterfacePropertyKeysFrom, ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom, ObjectTypeLinkTargetTypeFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom, ObjectTypeLinkTargetTypeFrom, OntologyDefinition } from "@osdk/api";
 import type { ClientContext } from "@osdk/shared.net";
 import type { OsdkObjectFrom } from "../OsdkObjectFrom.js";
-export declare function getLinkedObjectByPkOrThrow<O extends OntologyDefinition<any>, T extends ObjectTypeKeysFrom<O> & string, L extends ObjectTypeLinkKeysFrom<O, T> & string, S = ReadonlyArray<ObjectOrInterfacePropertyKeysFrom<O, ObjectTypeLinkTargetTypeFrom<O, T, L>>>>(client: ClientContext<O>, sourceApiName: T, primaryKey: any, linkTypeApiName: L, linkedObjectPrimaryKey: any, select?: S): Promise<OsdkObjectFrom<T, O>>;
+import type { SelectArg } from "./fetchPageOrThrow.js";
+export declare function getLinkedObjectByPkOrThrow<O extends OntologyDefinition<any>, T extends ObjectTypeKeysFrom<O> & string, L extends ObjectTypeLinkKeysFrom<O, T> & string, S extends SelectArg<ObjectTypeLinkTargetTypeFrom<O, T, L>> = SelectArg<ObjectTypeLinkTargetTypeFrom<O, T, L>>>(client: ClientContext<O>, sourceApiName: T, primaryKey: any, linkTypeApiName: L, linkedObjectPrimaryKey: any, options?: S): Promise<OsdkObjectFrom<O["objects"][T]>>;

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

@@ -1,4 +1,7 @@
-import type { ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom2, OntologyDefinition } from "@osdk/api";
 import { type ClientContext } from "@osdk/shared.net";
 import type { SelectArg } from "./fetchPageOrThrow.js";
-export declare function getLinkedObjectOrThrow<O extends OntologyDefinition<any>, T extends ObjectTypeKeysFrom<O> & string, L extends ObjectTypeLinkKeysFrom<O, T> & string, S extends SelectArg<O, T>["select"]>(client: ClientContext<O>, sourceApiName: T, primaryKey: any, linkTypeApiName: L, select?: S): Promise<import("../OsdkObjectFrom.js").OsdkObjectFrom<T, O, S extends readonly string[] ? S[number] : import("@osdk/api").ObjectOrInterfacePropertyKeysFrom<O, T>>>;
+export declare function getLinkedObjectOrThrow<O extends OntologyDefinition<any>, T extends ObjectTypeKeysFrom<O> & string, L extends ObjectTypeLinkKeysFrom2<O["objects"][T]> & string, S extends SelectArg<O["objects"][T]>["select"]>(client: ClientContext<O>, sourceApiName: T, primaryKey: any, linkTypeApiName: L, select?: S): Promise<import("../OsdkObjectFrom.js").OsdkObjectFrom<O["objects"][T]["links"][ObjectTypeLinkKeysFrom2<O["objects"][T]>]["__Mark"], import("./pageLinkedObjectsOrThrow.js").SelectArgToKeys<{
+    readonly pageSize: 1;
+    readonly select: S | undefined;
+}>>>;

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

@@ -1,9 +1,7 @@
-import type { ObjectOrInterfacePropertyKeysFrom, ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom, ObjectTypeLinkTargetTypeFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfacePropertyKeysFrom2, ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom2, OntologyDefinition } from "@osdk/api";
 import { type ClientContext } from "@osdk/shared.net";
 import type { OsdkObjectFrom } from "../OsdkObjectFrom.js";
 import type { PageResult } from "../PageResult.js";
-export declare function pageLinkedObjectsOrThrow<O extends OntologyDefinition<any>, T extends ObjectTypeKeysFrom<O>, L extends ObjectTypeLinkKeysFrom<O, T>, S = ReadonlyArray<ObjectOrInterfacePropertyKeysFrom<O, ObjectTypeLinkTargetTypeFrom<O, T, L>>>>(client: ClientContext<O>, sourceApiName: T & string, primaryKey: any, linkTypeApiName: string, options?: {
-    nextPageToken?: string;
-    pageSize?: number;
-    select?: S;
-}): Promise<PageResult<OsdkObjectFrom<T, O, S extends readonly string[] ? S[number] : ObjectOrInterfacePropertyKeysFrom<O, T>>>>;
+import type { FetchPageOrThrowArgs, SelectArg } from "./fetchPageOrThrow.js";
+export type SelectArgToKeys<A extends SelectArg<any>> = A["select"] extends readonly string[] ? A["select"][number] : A extends SelectArg<infer Q> ? ObjectOrInterfacePropertyKeysFrom2<Q> : never;
+export declare function pageLinkedObjectsOrThrow<O extends OntologyDefinition<any>, T_SourceTypeKey extends ObjectTypeKeysFrom<O>, T_LinkApiName extends ObjectTypeLinkKeysFrom2<O["objects"][T_SourceTypeKey]>, Q extends O["objects"][T_SourceTypeKey]["links"][T_LinkApiName]["__Mark"], const A extends FetchPageOrThrowArgs<Q>>(client: ClientContext<O>, sourceApiName: T_SourceTypeKey & string, primaryKey: any, linkTypeApiName: string, options: A): Promise<PageResult<OsdkObjectFrom<Q, SelectArgToKeys<A>>>>;

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

@@ -1,2 +1,2 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
-export type LinkTypesFrom<O extends OntologyDefinition<string>, K extends ObjectTypeKeysFrom<O>> = keyof O["objects"][K]["links"];
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
+export type LinkTypesFrom<Q extends ObjectOrInterfaceDefinition> = keyof Q["links"];

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

@@ -1,19 +1,21 @@
-import type { InterfaceKeysFrom, ObjectOrInterfaceDefinitionFrom, ObjectOrInterfaceKeysFrom, ObjectOrInterfacePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition, ObjectOrInterfaceDefinitionFrom, ObjectOrInterfaceKeysFrom, ObjectOrInterfacePropertyKeysFrom2, OntologyDefinition } from "@osdk/api";
 import type { ObjectSet as WireObjectSet } from "@osdk/gateway/types";
 import type { FetchPageOrThrowArgs } from "../object/fetchPageOrThrow.js";
-import type { OsdkInterfaceFrom, OsdkObjectFrom } from "../OsdkObjectFrom.js";
+import type { OsdkObjectOrInterfaceFrom } from "../OsdkObjectFrom.js";
 import type { PageResult } from "../PageResult.js";
 import type { AggregateOpts } from "../query/aggregations/AggregateOpts.js";
 import type { AggregationsResults, WhereClause } from "../query/index.js";
-import type { LinkTypesFrom } from "./LinkTypesFrom.js";
 import type { ObjectSetListener } from "./ObjectSetListener.js";
-export type ObjectSet<O extends OntologyDefinition<string>, K extends ObjectOrInterfaceKeysFrom<O>> = BaseObjectSet<O, K>;
-export interface BaseObjectSet<O extends OntologyDefinition<any>, K extends ObjectOrInterfaceKeysFrom<O>> {
+export type ObjectSet<Q extends ObjectOrInterfaceDefinition> = BaseObjectSet<Q>;
+export interface BaseObjectSet<Q extends ObjectOrInterfaceDefinition> {
     definition: WireObjectSet;
-    fetchPageOrThrow: <L extends ObjectOrInterfacePropertyKeysFrom<O, K>>(args?: FetchPageOrThrowArgs<O, K, L>) => Promise<PageResult<K extends InterfaceKeysFrom<O> ? OsdkInterfaceFrom<K, O, L> : OsdkObjectFrom<K, O, L>>>;
-    aggregateOrThrow: <const AO extends AggregateOpts<O, K, any>>(req: AO) => Promise<AggregationsResults<O, K, AO>>;
-    where: (clause: WhereClause<ObjectOrInterfaceDefinitionFrom<O, K>>) => ObjectSet<O, K>;
-    pivotTo: <T extends LinkTypesFrom<O, K>>(type: T & string) => ObjectSet<O, O["objects"][K]["links"][T]["targetType"]>;
-    subscribe: (listener: ObjectSetListener<O, K>) => () => void;
+    fetchPageOrThrow: <L extends ObjectOrInterfacePropertyKeysFrom2<Q>, R extends boolean>(args?: FetchPageOrThrowArgs<Q, L, R>) => Promise<PageResult<OsdkObjectOrInterfaceFrom<Q, L, R>>>;
+    aggregateOrThrow: <const AO extends AggregateOpts<Q, any>>(req: AO) => Promise<AggregationsResults<Q, AO>>;
+    where: (clause: WhereClause<Q>) => ObjectSet<Q>;
+    union: (...objectSets: ReadonlyArray<ObjectSet<Q>>) => ObjectSet<Q>;
+    intersect: (...objectSets: ReadonlyArray<ObjectSet<Q>>) => ObjectSet<Q>;
+    subtract: (...objectSets: ReadonlyArray<ObjectSet<Q>>) => ObjectSet<Q>;
+    pivotTo: <T extends keyof Q["links"]>(type: T & string) => ObjectSet<NonNullable<Q["links"][T]["__Mark"]>>;
+    subscribe: (listener: ObjectSetListener<Q>) => () => void;
 }
-export type ObjectSetFactory<O extends OntologyDefinition<any>> = <K extends ObjectOrInterfaceKeysFrom<O>>(type: K & string) => ObjectSet<O, K>;
+export type ObjectSetFactory<O extends OntologyDefinition<any>> = <K extends ObjectOrInterfaceKeysFrom<O>>(type: K & string) => ObjectSet<ObjectOrInterfaceDefinitionFrom<O, K>>;

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

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

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

@@ -1,17 +1,17 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
-import type { OsdkObjectFrom } from "../OsdkObjectFrom.js";
-export type ObjectSetListener<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>> = Partial<{
+import type { InterfaceDefinition, ObjectTypeDefinition } from "@osdk/api";
+import type { OsdkObjectOrInterfaceFrom } from "../OsdkObjectFrom.js";
+export interface ObjectSetListener<O extends ObjectTypeDefinition<any> | InterfaceDefinition<any, any>> {
     /**
      * Specific objects have changed and can be immediately updated
      */
-    onChange: (objects: Array<OsdkObjectFrom<K, O>>) => void;
+    onChange?: (objects: Array<OsdkObjectOrInterfaceFrom<O>>) => void;
     /**
      * The ObjectSet has become outdated and should be re-fetched in its entirety.
      * This is also sent when the subscription is first initialized.
      */
-    onOutOfDate: () => void;
+    onOutOfDate?: () => void;
     /**
      * There was a fatal error with the subscription process
      */
-    onError: (error: unknown) => void;
-}>;
+    onError?: (error: unknown) => void;
+}

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

@@ -1,4 +1,4 @@
-import type { ObjectOrInterfaceKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition, OntologyDefinition } from "@osdk/api";
 import type { ObjectSet } from "@osdk/gateway/types";
 import { type ClientContext } from "@osdk/shared.net";
 import type { ObjectSetListener } from "./ObjectSetListener.js";
@@ -6,7 +6,7 @@ export declare class ObjectSetListenerWebsocket<O extends OntologyDefinition<any
     #private;
     static getInstance<O extends OntologyDefinition<any, any, any>>(client: ClientContext<O>): ObjectSetListenerWebsocket<O>;
     private constructor();
-    subscribe<K extends ObjectOrInterfaceKeysFrom<O>>(objectSet: ObjectSet, listener: ObjectSetListener<O, K>): () => void;
+    subscribe<Q extends ObjectOrInterfaceDefinition>(objectSet: ObjectSet, listener: ObjectSetListener<Q>): () => void;
 }
 export type ObjectPropertyMapping = {
     apiName: string;

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

@@ -1,5 +1,5 @@
-import type { ObjectOrInterfaceKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { ObjectSet as WireObjectSet } from "@osdk/gateway/types";
 import type { ClientContext } from "@osdk/shared.net";
 import type { ObjectSet } from "./ObjectSet.js";
-export declare function createObjectSet<O extends OntologyDefinition<any>, K extends ObjectOrInterfaceKeysFrom<O>>(objectType: K & string, clientCtx: ClientContext<O>, objectSet?: WireObjectSet): ObjectSet<O, K>;
+export declare function createObjectSet<Q extends ObjectOrInterfaceDefinition>(objectType: Q, clientCtx: ClientContext<any>, objectSet?: WireObjectSet): ObjectSet<Q>;

package/build/types/query/WhereClause.d.ts

@@ -1,12 +1,12 @@
 import type { BBox, Point, Polygon } from "geojson";
 import type { ObjectOrInterfaceDefinition, ObjectTypePropertyDefinition } from "@osdk/api";
-export type PossibleWhereClauseFilters = "gt" | "eq" | "ne" | "isNull" | "contains" | "gte" | "lt" | "lte" | "$within";
+export type PossibleWhereClauseFilters = "$gt" | "$eq" | "$ne" | "$isNull" | "$contains" | "$gte" | "$lt" | "$lte" | "$within" | "$intersects";
 type MakeFilter<K extends PossibleWhereClauseFilters, V> = K extends string ? {
     [k in K]: V;
 } : never;
-type BaseFilter<T> = T | MakeFilter<"eq" | "ne" | "contains", T> | MakeFilter<"isNull", boolean>;
+type BaseFilter<T> = T | MakeFilter<"$eq" | "$ne" | "$contains", T> | MakeFilter<"$isNull", boolean>;
 type StringFilter = BaseFilter<string>;
-type NumberFilter = BaseFilter<number> | MakeFilter<"gt" | "gte" | "lt" | "lte", number>;
+type NumberFilter = BaseFilter<number> | MakeFilter<"$gt" | "$gte" | "$lt" | "$lte", number>;
 export declare const DistanceUnitMapping: {
     centimeter: "CENTIMETERS";
     centimeters: "CENTIMETERS";
@@ -39,8 +39,15 @@ export type GeoFilter_Within = {
         polygon: Polygon["coordinates"];
     } | Polygon;
 };
-export type GeoFilter = GeoFilter_Within;
-type FilterFor<PD extends ObjectTypePropertyDefinition> = PD["type"] extends "string" ? StringFilter : PD["type"] extends "geopoint" ? GeoFilter : NumberFilter;
+export type GeoFilter_Intersects = {
+    "$intersects": {
+        bbox: BBox;
+    } | BBox | {
+        polygon: Polygon["coordinates"];
+    } | Polygon;
+};
+export type GeoFilter = GeoFilter_Within | GeoFilter_Intersects;
+type FilterFor<PD extends ObjectTypePropertyDefinition> = PD["type"] extends "string" ? StringFilter : PD["type"] extends "geopoint" | "geoshape" ? GeoFilter : NumberFilter;
 export interface AndWhereClause<T extends ObjectOrInterfaceDefinition<any, any>> {
     $and: WhereClause<T>[];
 }

package/build/types/query/aggregations/AggregatableKeys.d.ts

@@ -1,4 +1,4 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
-export type AggregatableKeys<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>> = keyof {
-    [P in ObjectTypePropertyKeysFrom<O, K>]: any;
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
+export type AggregatableKeys<Q extends ObjectOrInterfaceDefinition<any, any>> = keyof {
+    [P in keyof Q["properties"]]: any;
 };

package/build/types/query/aggregations/AggregateOpts.d.ts

@@ -1,7 +1,7 @@
-import type { ObjectTypeDefinitionFrom, ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { AggregationClause, GroupByClause, WhereClause } from "../../query/index.js";
-export type AggregateOpts<T extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<T>, AC extends AggregationClause<T, K>> = {
+export type AggregateOpts<Q extends ObjectOrInterfaceDefinition<any, any>, AC extends AggregationClause<Q>> = {
     select: AC;
-    where?: WhereClause<ObjectTypeDefinitionFrom<T, K>>;
-    groupBy?: GroupByClause<T, K>;
+    where?: WhereClause<Q>;
+    groupBy?: GroupByClause<Q>;
 };

package/build/types/query/aggregations/AggregationResultsWithGroups.d.ts

@@ -1,11 +1,10 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyDefinitionFrom, ObjectTypePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { OsdkObjectPropertyType } from "../../Definitions.js";
 import type { AggregationResultsWithoutGroups } from "./AggregationResultsWithoutGroups.js";
 import type { AggregationClause } from "./AggregationsClause.js";
 import type { GroupByClause } from "./GroupByClause.js";
-export type AggregationResultsWithGroups<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>, A extends AggregationClause<O, K>, G extends GroupByClause<O, K> | undefined> = {
-    group: {
-        [P in keyof G & ObjectTypePropertyKeysFrom<O, K>]: OsdkObjectPropertyType<ObjectTypePropertyDefinitionFrom<O, K, P>>;
+export type AggregationResultsWithGroups<Q extends ObjectOrInterfaceDefinition<any, any>, A extends AggregationClause<Q>, G extends GroupByClause<Q> | undefined> = ({
+    $group: {
+        [P in keyof G & keyof Q["properties"]]: OsdkObjectPropertyType<Q["properties"][P]>;
     };
-    values: AggregationResultsWithoutGroups<O, K, A>;
-}[];
+} & AggregationResultsWithoutGroups<Q, A>)[];

package/build/types/query/aggregations/AggregationResultsWithoutGroups.d.ts

@@ -1,11 +1,11 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyDefinitionFrom, ObjectTypePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { OsdkObjectPropertyType } from "../../Definitions.js";
 import type { StringArrayToUnion } from "../../util/StringArrayToUnion.js";
 import type { AggregationClause } from "./AggregationsClause.js";
-type SubselectKeys<AC extends AggregationClause<any, any>, P extends keyof AC> = AC[P] extends readonly string[] | string ? P : never;
-export type AggregationResultsWithoutGroups<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>, AC extends AggregationClause<O, K>> = {
-    [P in ObjectTypePropertyKeysFrom<O, K> as SubselectKeys<AC, P>]: AC[P] extends readonly string[] | string ? {
-        [Z in StringArrayToUnion<AC[P]>]: Z extends "approximateDistinct" ? number : OsdkObjectPropertyType<ObjectTypePropertyDefinitionFrom<O, K, P>>;
+type SubselectKeys<AC extends AggregationClause<any>, P extends keyof AC> = AC[P] extends readonly string[] | string ? P : never;
+export type AggregationResultsWithoutGroups<Q extends ObjectOrInterfaceDefinition<any, any>, AC extends AggregationClause<any>> = {
+    [P in keyof Q["properties"] as SubselectKeys<AC, P>]: AC[P] extends readonly string[] | string ? {
+        [Z in StringArrayToUnion<AC[P]>]: Z extends "approximateDistinct" ? number : OsdkObjectPropertyType<Q["properties"][P]>;
     } : never;
 };
 export {};

package/build/types/query/aggregations/AggregationsClause.d.ts

@@ -1,8 +1,8 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyDefinitionsFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { AggregatableKeys } from "./AggregatableKeys.js";
-type StringAggregateOption = "approximateDistinct";
-type NumericAggregateOption = "min" | "max" | "sum" | "avg" | "approximateDistinct";
-export type AggregationClause<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>> = {
-    [P in AggregatableKeys<O, K>]?: ObjectTypePropertyDefinitionsFrom<O, K>[P]["type"] extends "string" ? StringAggregateOption | StringAggregateOption[] : ObjectTypePropertyDefinitionsFrom<O, K>[P]["type"] extends "double" ? NumericAggregateOption | NumericAggregateOption[] : ObjectTypePropertyDefinitionsFrom<O, K>[P]["type"];
+type StringAggregateOption = "approximateDistinct" | "count";
+type NumericAggregateOption = "count" | "min" | "max" | "sum" | "avg" | "approximateDistinct";
+export type AggregationClause<Q extends ObjectOrInterfaceDefinition<any, any>> = {
+    [P in AggregatableKeys<Q>]?: Q["properties"][P]["type"] extends "string" ? StringAggregateOption | StringAggregateOption[] : Q["properties"][P]["type"] extends "double" | "integer" | "float" | "decimal" | "byte" | "long" | "short" ? NumericAggregateOption | NumericAggregateOption[] : never;
 };
 export {};

package/build/types/query/aggregations/AggregationsClause.test.d.ts

@@ -4,6 +4,7 @@ export type huh = AggregatableKeys<{
     metadata: any;
     objects: {
         Todo: {
+            type: "object";
             apiName: "Todo";
             primaryKeyType: "double";
             links: {};
@@ -19,11 +20,12 @@ export type huh = AggregatableKeys<{
     };
     actions: {};
     queries: {};
-}, "Todo">;
+}["objects"]["Todo"]>;
 export type Q = AggregationClause<{
     metadata: any;
     objects: {
         Todo: {
+            type: "object";
             apiName: "Todo";
             primaryKeyType: "double";
             links: {};
@@ -39,4 +41,4 @@ export type Q = AggregationClause<{
     };
     actions: {};
     queries: {};
-}, "Todo">;
+}["objects"]["Todo"]>;

package/build/types/query/aggregations/AggregationsResults.d.ts

@@ -1,5 +1,5 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { AggregateOpts } from "./AggregateOpts.js";
 import type { AggregationResultsWithGroups } from "./AggregationResultsWithGroups.js";
 import type { AggregationResultsWithoutGroups } from "./AggregationResultsWithoutGroups.js";
-export type AggregationsResults<T extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<T>, AO extends AggregateOpts<T, K, any>> = unknown extends AO["groupBy"] ? AggregationResultsWithoutGroups<T, K, AO["select"]> : Exclude<AO["groupBy"], undefined> extends never ? AggregationResultsWithoutGroups<T, K, AO["select"]> : AggregationResultsWithGroups<T, K, AO["select"], AO["groupBy"]>;
+export type AggregationsResults<Q extends ObjectOrInterfaceDefinition, AO extends AggregateOpts<Q, any>> = unknown extends AO["groupBy"] ? AggregationResultsWithoutGroups<Q, AO["select"]> : Exclude<AO["groupBy"], undefined> extends never ? AggregationResultsWithoutGroups<Q, AO["select"]> : AggregationResultsWithGroups<Q, AO["select"], AO["groupBy"]>;

package/build/types/query/aggregations/GroupByClause.d.ts

@@ -1,12 +1,12 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyDefinitionFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
 import type { AggregatableKeys } from "./AggregatableKeys.js";
 import type { GroupByMapper } from "./GroupByMapper.js";
-export type GroupByClause<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>> = {
-    [P in AggregatableKeys<O, K>]?: GroupByEntry<O, K, P>;
+export type GroupByClause<Q extends ObjectOrInterfaceDefinition<any, any>> = {
+    [P in AggregatableKeys<Q>]?: GroupByEntry<Q, P>;
 };
 export type StringGroupByValue = "exact" | {
     exactWithLimit: number;
 };
-type GroupByEntry<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>, P extends AggregatableKeys<O, K>> = ObjectTypePropertyDefinitionFrom<O, K, P>["type"] extends keyof GroupByMapper ? GroupByMapper[ObjectTypePropertyDefinitionFrom<O, K, P>["type"]] : never;
+type GroupByEntry<Q extends ObjectOrInterfaceDefinition<any, any>, P extends AggregatableKeys<Q>> = Q["properties"][P]["type"] extends keyof GroupByMapper ? GroupByMapper[Q["properties"][P]["type"]] : never;
 export type AllGroupByValues = GroupByMapper[keyof GroupByMapper];
 export {};

package/build/types/query/aggregations/GroupByClause.test.d.ts

@@ -3,6 +3,7 @@ export type F = GroupByClause<{
     metadata: any;
     objects: {
         Todo: {
+            type: "object";
             apiName: "Todo";
             primaryKeyType: "double";
             links: {};
@@ -18,4 +19,4 @@ export type F = GroupByClause<{
     };
     actions: {};
     queries: {};
-}, "Todo">;
+}["objects"]["Todo"]>;