@osdk/client 0.2.0 → 0.3.0

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

@@ -0,0 +1,49 @@
+export declare const Employee: {
+    apiName: "Employee";
+    description: string;
+    primaryKeyType: "integer";
+    links: {
+        peeps: {
+            multiplicity: true;
+            targetType: "Employee";
+        };
+        lead: {
+            multiplicity: false;
+            targetType: "Employee";
+        };
+        officeLink: {
+            multiplicity: false;
+            targetType: "Office";
+        };
+    };
+    properties: {
+        employeeId: {
+            multiplicity: false;
+            type: "integer";
+            nullable: false;
+        };
+        fullName: {
+            multiplicity: false;
+            type: "string";
+            nullable: true;
+        };
+        office: {
+            multiplicity: false;
+            description: string;
+            type: "string";
+            nullable: true;
+        };
+        startDate: {
+            multiplicity: false;
+            description: string;
+            type: "datetime";
+            nullable: true;
+        };
+        employeeStatus: {
+            multiplicity: false;
+            description: string;
+            type: "stringTimeseries";
+            nullable: true;
+        };
+    };
+};

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

@@ -0,0 +1,18 @@
+export declare const ObjectWithTimestampPrimaryKey: {
+    apiName: "ObjectWithTimestampPrimaryKey";
+    description: string;
+    primaryKeyType: "timestamp";
+    links: {};
+    properties: {
+        timestamp: {
+            multiplicity: false;
+            type: "timestamp";
+            nullable: false;
+        };
+        value: {
+            multiplicity: false;
+            type: "string";
+            nullable: true;
+        };
+    };
+};

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

@@ -0,0 +1,35 @@
+export declare const Office: {
+    apiName: "Office";
+    description: string;
+    primaryKeyType: "string";
+    links: {
+        occupants: {
+            multiplicity: true;
+            targetType: "Employee";
+        };
+    };
+    properties: {
+        officeId: {
+            multiplicity: false;
+            type: "string";
+            nullable: false;
+        };
+        entrance: {
+            multiplicity: false;
+            type: "geopoint";
+            nullable: true;
+        };
+        occupiedArea: {
+            multiplicity: false;
+            description: string;
+            type: "geoshape";
+            nullable: true;
+        };
+        name: {
+            multiplicity: false;
+            description: string;
+            type: "string";
+            nullable: true;
+        };
+    };
+};

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

@@ -0,0 +1,18 @@
+export declare const equipment: {
+    apiName: "equipment";
+    primaryKeyType: "string";
+    links: {};
+    properties: {
+        equipmentId: {
+            multiplicity: false;
+            description: string;
+            type: "string";
+            nullable: false;
+        };
+        type: {
+            multiplicity: false;
+            type: "string";
+            nullable: true;
+        };
+    };
+};

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

@@ -0,0 +1,158 @@
+export declare const objectTypeWithAllPropertyTypes: {
+    apiName: "objectTypeWithAllPropertyTypes";
+    description: string;
+    primaryKeyType: "integer";
+    links: {};
+    properties: {
+        id: {
+            multiplicity: false;
+            type: "integer";
+            nullable: false;
+        };
+        string: {
+            multiplicity: false;
+            type: "string";
+            nullable: true;
+        };
+        boolean: {
+            multiplicity: false;
+            type: "boolean";
+            nullable: true;
+        };
+        date: {
+            multiplicity: false;
+            type: "datetime";
+            nullable: true;
+        };
+        dateTime: {
+            multiplicity: false;
+            type: "timestamp";
+            nullable: true;
+        };
+        decimal: {
+            multiplicity: false;
+            type: "decimal";
+            nullable: true;
+        };
+        integer: {
+            multiplicity: false;
+            type: "integer";
+            nullable: true;
+        };
+        long: {
+            multiplicity: false;
+            type: "long";
+            nullable: true;
+        };
+        short: {
+            multiplicity: false;
+            type: "short";
+            nullable: true;
+        };
+        float: {
+            multiplicity: false;
+            type: "float";
+            nullable: true;
+        };
+        double: {
+            multiplicity: false;
+            type: "double";
+            nullable: true;
+        };
+        byte: {
+            multiplicity: false;
+            type: "byte";
+            nullable: true;
+        };
+        attachment: {
+            multiplicity: false;
+            type: "attachment";
+            nullable: true;
+        };
+        attachment2: {
+            multiplicity: false;
+            type: "attachment";
+            nullable: true;
+        };
+        geoPoint: {
+            multiplicity: false;
+            type: "geopoint";
+            nullable: true;
+        };
+        geoShape: {
+            multiplicity: false;
+            type: "geoshape";
+            nullable: true;
+        };
+        stringArray: {
+            multiplicity: true;
+            type: "string";
+            nullable: true;
+        };
+        booleanArray: {
+            multiplicity: true;
+            type: "boolean";
+            nullable: true;
+        };
+        dateArray: {
+            multiplicity: true;
+            type: "datetime";
+            nullable: true;
+        };
+        dateTimeArray: {
+            multiplicity: true;
+            type: "timestamp";
+            nullable: true;
+        };
+        decimalArray: {
+            multiplicity: true;
+            type: "decimal";
+            nullable: true;
+        };
+        integerArray: {
+            multiplicity: true;
+            type: "integer";
+            nullable: true;
+        };
+        longArray: {
+            multiplicity: true;
+            type: "long";
+            nullable: true;
+        };
+        shortArray: {
+            multiplicity: true;
+            type: "short";
+            nullable: true;
+        };
+        floatArray: {
+            multiplicity: true;
+            type: "float";
+            nullable: true;
+        };
+        doubleArray: {
+            multiplicity: true;
+            type: "double";
+            nullable: true;
+        };
+        byteArray: {
+            multiplicity: true;
+            type: "byte";
+            nullable: true;
+        };
+        attachmentArray: {
+            multiplicity: true;
+            type: "attachment";
+            nullable: true;
+        };
+        geoPointArray: {
+            multiplicity: true;
+            type: "geopoint";
+            nullable: true;
+        };
+        geoShapeArray: {
+            multiplicity: true;
+            type: "geoshape";
+            nullable: true;
+        };
+    };
+};

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

@@ -0,0 +1,5 @@
+export * from './objects/Employee.js';
+export * from './objects/ObjectWithTimestampPrimaryKey.js';
+export * from './objects/Office.js';
+export * from './objects/equipment.js';
+export * from './objects/objectTypeWithAllPropertyTypes.js';

package/build/types/index.d.ts

@@ -5,7 +5,7 @@ export type { ObjectSetListener } from "./objectSet/ObjectSetListener.js";
 export type { PageResult } from "./PageResult.js";
 export * as Objects from "./object/index.js";
 export type { OsdkObject } from "./OsdkObject.js";
-export type { OsdkObjectFrom } from "./OsdkObjectFrom.js";
+export type { OsdkInterfaceFrom, OsdkObjectFrom } from "./OsdkObjectFrom.js";
 export { createClientContext } from "@osdk/shared.net";
 export { isOk } from "@osdk/shared.net";
 export type { ResultOrError } from "@osdk/shared.net";

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";
-import type { Wire } from "../net/index.js";
-export declare function legacyToModernSingleAggregationResult<AC extends AggregationClause<any, any>>(entry: ArrayElement<Wire.AggregateObjectsResponseV2["data"]>): AggregationResultsWithoutGroups<any, any, AC>;
+export declare function legacyToModernSingleAggregationResult<AC extends AggregationClause<any, any>>(entry: ArrayElement<AggregateObjectsResponseV2["data"]>): AggregationResultsWithoutGroups<any, any, AC>;

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

@@ -1,4 +1,4 @@
-import type { ObjectTypeDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceDefinition } from "@osdk/api";
+import type { SearchJsonQueryV2 } from "@osdk/gateway/types";
 import type { WhereClause } from "../../query/index.js";
-import type { Wire } from "../net/index.js";
-export declare function modernToLegacyWhereClause<T extends ObjectTypeDefinition<any, any>>(whereClause: WhereClause<T>): Wire.SearchJsonQueryV2;
+export declare function modernToLegacyWhereClause<T extends ObjectOrInterfaceDefinition<any, any>>(whereClause: WhereClause<T>): SearchJsonQueryV2;

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

@@ -0,0 +1,8 @@
+export interface Attachment {
+    rid: string;
+}
+export declare class Attachment implements Attachment {
+    rid: string;
+    constructor(rid: string);
+}
+export declare function isAttachment(o: any): o is Attachment;

package/build/types/object/ObjectDefinitions.test.d.ts

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

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

@@ -1,5 +1,7 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { OntologyDefinition } from "@osdk/api";
 import type { OntologyObjectV2 } from "@osdk/gateway/types";
 import type { ClientContext } from "@osdk/shared.net";
-import type { OsdkObjectFrom } from "../OsdkObjectFrom.js";
-export declare function convertWireToOsdkObjects<T_ClientApiName extends ObjectTypeKeysFrom<T_OntologyDefinition> & string, T_OntologyDefinition extends OntologyDefinition<any>>(client: ClientContext<T_OntologyDefinition>, apiName: T_ClientApiName, objs: OntologyObjectV2[]): OsdkObjectFrom<T_ClientApiName, T_OntologyDefinition, ObjectTypePropertyKeysFrom<T_OntologyDefinition, T_ClientApiName>>[];
+/**
+ * @param objs the objects to be converted, the contents of this array will be mutated
+ */
+export declare function convertWireToOsdkObjects<T_OntologyDefinition extends OntologyDefinition<any>>(client: ClientContext<T_OntologyDefinition>, objs: OntologyObjectV2[]): void;

package/build/types/object/convertWireToOsdkObjects.test.d.ts

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

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

@@ -1,11 +1,13 @@
-import type { ObjectTypeKeysFrom, ObjectTypePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceKeysFrom, ObjectOrInterfacePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectSet } from "@osdk/gateway/types";
 import type { ClientContext } from "@osdk/shared.net";
-import type { Wire } from "../internal/net/index.js";
 import type { OsdkObjectFrom } from "../OsdkObjectFrom.js";
 import type { PageResult } from "../PageResult.js";
-import type { NOOP } from "../util/NOOP.js";
-export interface FetchPageOrThrowArgs<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>, L extends ObjectTypePropertyKeysFrom<O, K>> {
+export interface SelectArg<O extends OntologyDefinition<any>, K extends ObjectOrInterfaceKeysFrom<O>, L = ObjectOrInterfacePropertyKeysFrom<O, K>> {
     select?: readonly L[];
+}
+export interface FetchPageOrThrowArgs<O extends OntologyDefinition<any>, K extends ObjectOrInterfaceKeysFrom<O>, L = ObjectOrInterfacePropertyKeysFrom<O, K>> extends SelectArg<O, K, L> {
     nextPageToken?: string;
+    pageSize?: number;
 }
-export declare function fetchPageOrThrow<O extends OntologyDefinition<any>, T extends ObjectTypeKeysFrom<O>, const A extends FetchPageOrThrowArgs<O, T, ObjectTypePropertyKeysFrom<O, T>>>(client: ClientContext<O>, objectType: T & string, args: A, objectSet?: Wire.ObjectSet): Promise<PageResult<NOOP<OsdkObjectFrom<T, O, A["select"] extends readonly string[] ? A["select"][number] : ObjectTypePropertyKeysFrom<O, T>>>>>;
+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>>>>;

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

@@ -0,0 +1,4 @@
+import type { ObjectOrInterfacePropertyKeysFrom, 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>>;

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

@@ -0,0 +1,4 @@
+import type { ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom, 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>>>;

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

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

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

@@ -0,0 +1,9 @@
+import type { ObjectOrInterfacePropertyKeysFrom, ObjectTypeKeysFrom, ObjectTypeLinkKeysFrom, ObjectTypeLinkTargetTypeFrom, 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>>>>;

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

@@ -1,4 +1,4 @@
-import type { InterfaceKeysFrom, InterfacePropertyKeysFrom, ObjectTypeDefinitionFrom, ObjectTypeKeysFrom, ObjectTypePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { InterfaceKeysFrom, ObjectOrInterfaceDefinitionFrom, ObjectOrInterfaceKeysFrom, ObjectOrInterfacePropertyKeysFrom, OntologyDefinition } from "@osdk/api";
 import type { FetchPageOrThrowArgs } from "../object/fetchPageOrThrow.js";
 import type { OsdkInterfaceFrom, OsdkObjectFrom } from "../OsdkObjectFrom.js";
 import type { PageResult } from "../PageResult.js";
@@ -6,15 +6,12 @@ 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 ObjectTypeKeysFrom<O> | InterfaceKeysFrom<O>> = BaseObjectSet<O, K>;
-export interface BaseObjectSet<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O> | InterfaceKeysFrom<O>> {
-    fetchPageOrThrow: <L extends (K extends InterfaceKeysFrom<O> ? InterfacePropertyKeysFrom<O, K> : ObjectTypePropertyKeysFrom<O, K>)>(args?: FetchPageOrThrowArgs<O, K, L>) => Promise<PageResult<K extends InterfaceKeysFrom<O> ? OsdkInterfaceFrom<K, O, L> : OsdkObjectFrom<K, O, L>>>;
+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>> {
+    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<ObjectTypeDefinitionFrom<O, K>>) => ObjectSet<O, K>;
-    pivotTo: <T extends LinkTypesFrom<O, K>>(type: T & string, opts?: ObjectSetOptions<O, O["objects"][K]["links"][T]["targetType"]>) => ObjectSet<O, O["objects"][K]["links"][T]["targetType"]>;
+    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;
 }
-export interface ObjectSetOptions<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>> {
-    $where?: WhereClause<ObjectTypeDefinitionFrom<O, K>>;
-}
-export type ObjectSetFactory<O extends OntologyDefinition<any>> = <K extends ObjectTypeKeysFrom<O>>(type: K & string, opts?: ObjectSetOptions<O, K>) => ObjectSet<O, K>;
+export type ObjectSetFactory<O extends OntologyDefinition<any>> = <K extends ObjectOrInterfaceKeysFrom<O>>(type: K & string) => ObjectSet<O, K>;

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

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

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

@@ -1,5 +1,5 @@
-import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectOrInterfaceKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectSet as WireObjectSet } from "@osdk/gateway/types";
 import type { ClientContext } from "@osdk/shared.net";
-import type { Wire } from "../internal/net/index.js";
-import type { ObjectSet, ObjectSetOptions } from "./ObjectSet.js";
-export declare function createObjectSet<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>>(objectType: K & string, clientCtx: ClientContext<O>, opts: ObjectSetOptions<O, K> | undefined, objectSet?: Wire.ObjectSet): ObjectSet<O, K>;
+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>;

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

@@ -1,6 +1,6 @@
 import type { ObjectTypeKeysFrom, OntologyDefinition } from "@osdk/api";
+import type { ObjectSet } from "@osdk/gateway/types";
 import type { ObjectSet as OssObjectSet } from "../generated/object-set-service/api/index.js";
-import type { Wire } from "../internal/net/index.js";
 import type { ObjectPropertyMapping } from "./ObjectSetListenerWebsocket.js";
-export declare function toConjureObjectSet<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>>(objectSet: Wire.ObjectSet, objectPropertyMapping: ObjectPropertyMapping): OssObjectSet;
-export declare function getObjectSetBaseType(objectSet: Wire.ObjectSet): Promise<string>;
+export declare function toConjureObjectSet<O extends OntologyDefinition<any>, K extends ObjectTypeKeysFrom<O>>(objectSet: ObjectSet, objectPropertyMapping: ObjectPropertyMapping): OssObjectSet;
+export declare function getObjectSetBaseType(objectSet: ObjectSet): Promise<string>;

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

@@ -1,24 +1,24 @@
-import type { ObjectTypeDefinition, ObjectTypePropertyDefinition } from "@osdk/api";
-export type PossibleWhereClauseFilters = "gt" | "eq" | "ne" | "isNull" | "gte" | "lt" | "lte";
+import type { ObjectOrInterfaceDefinition, ObjectTypePropertyDefinition } from "@osdk/api";
+export type PossibleWhereClauseFilters = "gt" | "eq" | "ne" | "isNull" | "contains" | "gte" | "lt" | "lte";
 type MakeFilter<K extends PossibleWhereClauseFilters, V> = K extends string ? Omit<{
     [k in PossibleWhereClauseFilters]?: undefined;
 }, K> & {
     [k in K]: V;
 } : never;
-type BaseFilter<T> = T | MakeFilter<"eq" | "ne", 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 FilterFor<PD extends ObjectTypePropertyDefinition> = PD["type"] extends "string" ? StringFilter : NumberFilter;
-export interface AndWhereClause<T extends ObjectTypeDefinition<any, any>> {
+export interface AndWhereClause<T extends ObjectOrInterfaceDefinition<any, any>> {
     $and: WhereClause<T>[];
 }
-export interface OrWhereClause<T extends ObjectTypeDefinition<any, any>> {
+export interface OrWhereClause<T extends ObjectOrInterfaceDefinition<any, any>> {
     $or: WhereClause<T>[];
 }
-export interface NotWhereClause<T extends ObjectTypeDefinition<any, any>> {
+export interface NotWhereClause<T extends ObjectOrInterfaceDefinition<any, any>> {
     $not: WhereClause<T>;
 }
-export type WhereClause<T extends ObjectTypeDefinition<any, any>> = OrWhereClause<T> | AndWhereClause<T> | NotWhereClause<T> | {
+export type WhereClause<T extends ObjectOrInterfaceDefinition<any, any>> = OrWhereClause<T> | AndWhereClause<T> | NotWhereClause<T> | {
     [P in keyof T["properties"]]?: FilterFor<T["properties"][P]>;
 };
 export {};

package/build/types/util/test/mockOntology.d.ts

@@ -0,0 +1,59 @@
+export declare const MockOntology: {
+    metadata: {
+        ontologyRid: string;
+        ontologyApiName: string;
+        userAgent: string;
+    };
+    objects: {
+        Task: {
+            apiName: "Task";
+            primaryKeyType: "integer";
+            properties: {
+                id: {
+                    type: "integer";
+                };
+                name: {
+                    type: "string";
+                };
+            };
+            links: {
+                Todos: {
+                    targetType: "Todo";
+                    multiplicity: true;
+                };
+                RP: {
+                    targetType: "Person";
+                    multiplicity: false;
+                };
+            };
+        };
+        Todo: {
+            apiName: "Todo";
+            primaryKeyType: "integer";
+            properties: {
+                id: {
+                    type: "integer";
+                };
+                text: {
+                    type: "string";
+                };
+            };
+            links: {};
+        };
+        Person: {
+            apiName: "Person";
+            primaryKeyType: "integer";
+            properties: {
+                id: {
+                    type: "integer";
+                };
+                name: {
+                    type: "string";
+                };
+            };
+            links: {};
+        };
+    };
+    actions: {};
+    queries: {};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/client",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "",
   "access": "public",
   "license": "Apache-2.0",
@@ -22,14 +22,16 @@
     "isomorphic-ws": "^5.0.0",
     "tiny-invariant": "^1.3.1",
     "ws": "^8.14.2",
-    "@osdk/api": "1.0.1",
-    "@osdk/gateway": "1.0.1",
-    "@osdk/shared.net": "1.0.1"
+    "@osdk/api": "1.0.2",
+    "@osdk/gateway": "1.0.2",
+    "@osdk/shared.net": "1.0.2"
   },
   "devDependencies": {
     "@types/ws": "^8.5.10",
     "ts-expect": "^1.3.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "@osdk/generator": "1.0.4",
+    "@osdk/shared.test": "1.0.3"
   },
   "publishConfig": {
     "access": "public"
@@ -42,15 +44,18 @@
     "package.json",
     "*.d.ts"
   ],
-  "main": "./build/js/index.js",
+  "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
   "types": "./build/types/index.d.ts",
   "type": "module",
   "scripts": {
     "clean": "rm -rf lib dist types build tsconfig.tsbuildinfo",
+    "codegen": "node ./generateMockOntology.js",
     "dev:transpile": "tsup --watch",
     "fix-lint": "eslint . --fix && dprint fmt --config $(find-up dprint.json)",
     "lint": "eslint . && dprint check  --config $(find-up dprint.json)",
+    "test": "vitest run --pool=forks",
+    "test:watch": "vitest",
     "transpile": "tsup",
     "transpileWatch": "tsup --watch",
     "typecheck": "tsc-absolute --build"