@osdk/client 0.20.0-beta.3 → 0.20.0

package/build/cjs/{chunk-EP4KLU3N.cjs → chunk-VW7XYOFL.cjs}

@@ -18,6 +18,14 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/actions/ActionValidationError.ts
+var ActionValidationError = class extends Error {
+  constructor(validation) {
+    super("Validation Error");
+    this.validation = validation;
+  }
+};
+
 // ../internal.foundry.datasets/build/esm/chunk-PZ5AY32C.js
 var __defProp2 = Object.defineProperty;
 var __export2 = (target, all) => {
@@ -404,6 +412,7 @@ var esm_exports2 = {};
 __export(esm_exports2, {
   ActionTypesV2: () => ActionTypeV2_exports,
   Actions: () => Action_exports,
+  Attachments: () => Attachment_exports2,
   ObjectTypesV2: () => ObjectTypeV2_exports,
   OntologiesV2: () => OntologyV2_exports,
   OntologyObjectSets: () => OntologyObjectSet_exports,
@@ -420,6 +429,26 @@ var __export5 = (target, all) => {
   });
 };
 
+// ../internal.foundry.ontologiesv2/build/esm/chunk-ASYINYCV.js
+var QueryType_exports2 = {};
+__export5(QueryType_exports2, {
+  executeQueryV2: () => executeQueryV2,
+  getQueryTypeV2: () => getQueryTypeV2,
+  listQueryTypesV2: () => listQueryTypesV2
+});
+var _listQueryTypesV2 = [0, "/v2/ontologies/{0}/queryTypes", 2];
+function listQueryTypesV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _listQueryTypesV2, ...args);
+}
+var _getQueryTypeV2 = [0, "/v2/ontologies/{0}/queryTypes/{1}"];
+function getQueryTypeV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _getQueryTypeV2, ...args);
+}
+var _executeQueryV2 = [1, "/v2/ontologies/{0}/queries/{1}/execute", 3];
+function executeQueryV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _executeQueryV2, ...args);
+}
+
 // ../internal.foundry.ontologiesv2/build/esm/chunk-B5JRDCDE.js
 var Action_exports = {};
 __export5(Action_exports, {
@@ -455,6 +484,26 @@ function getActionTypeV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getActionTypeV2, ...args);
 }
 
+// ../internal.foundry.ontologiesv2/build/esm/chunk-YGTQQ5D7.js
+var Attachment_exports2 = {};
+__export5(Attachment_exports2, {
+  getAttachmentContentV2: () => getAttachmentContentV2,
+  getAttachmentV2: () => getAttachmentV2,
+  uploadAttachmentV2: () => uploadAttachmentV2
+});
+var _uploadAttachmentV2 = [1, "/v2/ontologies/attachments/upload", 7, "*/*"];
+function uploadAttachmentV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _uploadAttachmentV2, ...args);
+}
+var _getAttachmentContentV2 = [0, "/v2/ontologies/attachments/{0}/content", , , "*/*"];
+function getAttachmentContentV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _getAttachmentContentV2, ...args);
+}
+var _getAttachmentV2 = [0, "/v2/ontologies/attachments/{0}"];
+function getAttachmentV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _getAttachmentV2, ...args);
+}
+
 // ../internal.foundry.ontologiesv2/build/esm/chunk-6LZM4EP4.js
 var ObjectTypeV2_exports = {};
 __export5(ObjectTypeV2_exports, {
@@ -505,16 +554,15 @@ function aggregateObjectSetV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _aggregateObjectSetV2, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-U2YDEYVP.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-KYMDEQ65.js
 var OntologyObjectV2_exports = {};
 __export5(OntologyObjectV2_exports, {
   aggregateObjectsForInterface: () => aggregateObjectsForInterface,
   aggregateObjectsV2: () => aggregateObjectsV2,
   countObjects: () => countObjects,
-  getAttachmentByRidV2: () => getAttachmentByRidV2,
-  getAttachmentContentByRidV2: () => getAttachmentContentByRidV2,
-  getAttachmentContentV2: () => getAttachmentContentV2,
-  getAttachmentsV2: () => getAttachmentsV2,
+  getAttachmentPropertyByRidV2: () => getAttachmentPropertyByRidV2,
+  getAttachmentPropertyContentByRidV2: () => getAttachmentPropertyContentByRidV2,
+  getAttachmentPropertyContentV2: () => getAttachmentPropertyContentV2,
   getFirstPoint: () => getFirstPoint,
   getInterfaceType: () => getInterfaceType,
   getLastPoint: () => getLastPoint,
@@ -524,6 +572,7 @@ __export5(OntologyObjectV2_exports, {
   listInterfaceTypes: () => listInterfaceTypes,
   listLinkedObjectsV2: () => listLinkedObjectsV2,
   listObjectsV2: () => listObjectsV2,
+  listPropertyAttachments: () => listPropertyAttachments,
   searchObjectsForInterface: () => searchObjectsForInterface,
   searchObjectsV2: () => searchObjectsV2,
   streamPoints: () => streamPoints
@@ -572,21 +621,21 @@ var _getLinkedObjectV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/links/{3}/{4}",
 function getLinkedObjectV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getLinkedObjectV2, ...args);
 }
-var _getAttachmentsV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}", 2];
-function getAttachmentsV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _getAttachmentsV2, ...args);
+var _listPropertyAttachments = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}", 2];
+function listPropertyAttachments($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _listPropertyAttachments, ...args);
 }
-var _getAttachmentByRidV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}/{4}", 2];
-function getAttachmentByRidV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _getAttachmentByRidV2, ...args);
+var _getAttachmentPropertyByRidV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}/{4}", 2];
+function getAttachmentPropertyByRidV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _getAttachmentPropertyByRidV2, ...args);
 }
-var _getAttachmentContentV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}/content", 2, , "*/*"];
-function getAttachmentContentV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _getAttachmentContentV2, ...args);
+var _getAttachmentPropertyContentV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}/content", 2, , "*/*"];
+function getAttachmentPropertyContentV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _getAttachmentPropertyContentV2, ...args);
 }
-var _getAttachmentContentByRidV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}/{4}/content", 2, , "*/*"];
-function getAttachmentContentByRidV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _getAttachmentContentByRidV2, ...args);
+var _getAttachmentPropertyContentByRidV2 = [0, "/v2/ontologies/{0}/objects/{1}/{2}/attachments/{3}/{4}/content", 2, , "*/*"];
+function getAttachmentPropertyContentByRidV2($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _getAttachmentPropertyContentByRidV2, ...args);
 }
 var _getFirstPoint = [0, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/firstPoint", 2];
 function getFirstPoint($ctx, ...args) {
@@ -625,26 +674,6 @@ function getOntologyFullMetadata($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOntologyFullMetadata, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-ASYINYCV.js
-var QueryType_exports2 = {};
-__export5(QueryType_exports2, {
-  executeQueryV2: () => executeQueryV2,
-  getQueryTypeV2: () => getQueryTypeV2,
-  listQueryTypesV2: () => listQueryTypesV2
-});
-var _listQueryTypesV2 = [0, "/v2/ontologies/{0}/queryTypes", 2];
-function listQueryTypesV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _listQueryTypesV2, ...args);
-}
-var _getQueryTypeV2 = [0, "/v2/ontologies/{0}/queryTypes/{1}"];
-function getQueryTypeV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _getQueryTypeV2, ...args);
-}
-var _executeQueryV2 = [1, "/v2/ontologies/{0}/queries/{1}/execute", 3];
-function executeQueryV2($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _executeQueryV2, ...args);
-}
-
 // src/createAttachmentFromRid.ts
 function createAttachmentFromRid(client, rid) {
   return {
@@ -657,17 +686,165 @@ function createAttachmentFromRid(client, rid) {
     }
   };
 }
-function addUserAgent(client, withMetadata) {
-  if (withMetadata.osdkMetadata) {
+
+// src/object/AttachmentUpload.ts
+function isAttachmentUpload(o) {
+  return o instanceof Blob && "name" in o;
+}
+function createAttachmentUpload(data, name) {
+  const attachmentUpload = Object.create(data, {
+    name: {
+      value: name
+    }
+  });
+  return attachmentUpload;
+}
+var addUserAgentAndRequestContextHeaders = (client, withMetadata) => ({
+  ...client,
+  fetch: shared_net_fetch.createFetchHeaderMutator(client.fetch, (headers) => {
+    headers.set("X-OSDK-Request-Context", JSON.stringify(client.requestContext));
+    if (withMetadata.osdkMetadata) {
+      headers.set("Fetch-User-Agent", withMetadata.osdkMetadata.extraUserAgent);
+    }
+    return headers;
+  })
+});
+
+// src/util/streamutils.ts
+var START_TOKEN = new Uint8Array([123, 34, 100, 97, 116, 97, 34, 58, 91]);
+var OBJECT_OPEN_CHAR_CODE = 123;
+var OBJECT_CLOSE_CHAR_CODE = 125;
+async function* parseStreamedResponse(asyncIterable) {
+  const utf8decoder = new TextDecoder("utf-8");
+  let parsedStart = false;
+  let prevChunks = [];
+  let openBracesCount = 0;
+  for await (let chunk of asyncIterable) {
+    let i = 0;
+    if (!parsedStart) {
+      parsedStart = true;
+      if (startsWith(chunk, START_TOKEN)) {
+        i = START_TOKEN.length;
+      }
+    }
+    for (; i < chunk.length; i++) {
+      while (openBracesCount === 0 && chunk[i] !== OBJECT_OPEN_CHAR_CODE && i < chunk.length) {
+        i++;
+      }
+      let j = i;
+      for (; j < chunk.length; j++) {
+        const c = chunk[j];
+        if (c === OBJECT_OPEN_CHAR_CODE) {
+          openBracesCount++;
+        } else if (c === OBJECT_CLOSE_CHAR_CODE) {
+          openBracesCount--;
+          if (0 === openBracesCount) {
+            yield combineAndParse(utf8decoder, prevChunks, chunk.subarray(i, j + 1));
+            prevChunks = [];
+            i = j;
+            break;
+          }
+        }
+      }
+      if (j === chunk.length) {
+        prevChunks.push(chunk.subarray(i));
+        break;
+      }
+    }
+  }
+}
+function startsWith(a, b) {
+  if (a.length < b.length) {
+    return false;
+  }
+  for (let i = 0; i < b.length; i++) {
+    if (a[i] !== b[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+function combineAndParse(utf8decoder, prev, curr) {
+  let str = "";
+  for (const chunk of prev) {
+    str += utf8decoder.decode(chunk, {
+      stream: true
+    });
+  }
+  str += utf8decoder.decode(curr);
+  return JSON.parse(str);
+}
+async function* iterateReadableStream(readableStream) {
+  let res = await readableStream.read();
+  while (!res.done) {
+    yield res.value;
+    res = await readableStream.read();
+  }
+}
+
+// src/createTimeseriesProperty.ts
+function createTimeseriesProperty(client, objectApiName, primaryKey, propertyName) {
+  return {
+    async getFirstPoint() {
+      return esm_exports2.OntologyObjectsV2.getFirstPoint(client, await client.ontologyRid, objectApiName, primaryKey, propertyName);
+    },
+    async getLastPoint() {
+      return esm_exports2.OntologyObjectsV2.getLastPoint(client, await client.ontologyRid, objectApiName, primaryKey, propertyName);
+    },
+    async getAllPoints(query) {
+      return getAllTimeSeriesPoints(client, objectApiName, primaryKey, propertyName, query);
+    },
+    asyncIterPoints(query) {
+      return iterateTimeSeriesPoints(client, objectApiName, primaryKey, propertyName, query);
+    }
+  };
+}
+async function getAllTimeSeriesPoints(client, objectApiName, primaryKey, propertyName, body) {
+  const allPoints = [];
+  for await (const point of iterateTimeSeriesPoints(client, objectApiName, primaryKey, propertyName, body)) {
+    allPoints.push({
+      time: point.time,
+      value: point.value
+    });
+  }
+  return allPoints;
+}
+async function* iterateTimeSeriesPoints(client, objectApiName, primaryKey, propertyName, body) {
+  new TextDecoder("utf-8");
+  const streamPointsIterator = await esm_exports2.OntologyObjectsV2.streamPoints(client, await client.ontologyRid, objectApiName, primaryKey, propertyName, body ? {
+    range: getTimeRange(body)
+  } : {});
+  const reader = streamPointsIterator.stream().getReader();
+  for await (const point of parseStreamedResponse(iterateReadableStream(reader))) {
+    yield {
+      time: point.time,
+      value: point.value
+    };
+  }
+}
+function getTimeRange(body) {
+  if ("$startTime" in body || "$endTime" in body) {
     return {
-      ...client,
-      fetch: shared_net_fetch.createFetchHeaderMutator(client.fetch, (headers) => {
-        headers.set("Fetch-User-Agent", withMetadata.osdkMetadata.extraUserAgent);
-        return headers;
-      })
+      type: "absolute",
+      startTime: body.$startTime,
+      endTime: body.$endTime
     };
   }
-  return client;
+  return body.$before ? {
+    type: "relative",
+    startTime: {
+      when: "BEFORE",
+      value: body.$before,
+      unit: client_api.TimeseriesDurationMapping[body.$unit]
+    }
+  } : {
+    type: "relative",
+    endTime: {
+      when: "AFTER",
+      value: body.$after,
+      unit: client_api.TimeseriesDurationMapping[body.$unit]
+    }
+  };
 }
 
 // src/object/Cache.ts
@@ -784,34 +961,6 @@ var InterfaceDefRef = Symbol(process.env.MODE !== "production" ? "InterfaceDefin
 var RawObject = Symbol(process.env.MODE !== "production" ? "RawObject" : void 0);
 var ClientRef = Symbol(process.env.MODE !== "production" ? "ClientRef" : void 0);
 
-// src/object/convertWireToOsdkObjects/OsdkCustomInspectPrototype.ts
-var OsdkCustomInspectPrototype = Object.create(null, {
-  [Symbol.for("nodejs.util.inspect.custom")]: {
-    value: customInspect
-  }
-});
-function customInspect(_depth, options, localInspect) {
-  const newOptions = {
-    ...options,
-    depth: options.depth == null ? null : options.depth - 1
-  };
-  let ret = `Osdk<${options.stylize(this[ObjectDefRef]?.apiName ?? this[InterfaceDefRef]?.apiName, "special")}> {
-`;
-  for (const k of /* @__PURE__ */ new Set(["$apiName", "$objectType", "$primaryKey", ...Reflect.ownKeys(this)])) {
-    if (typeof k === "symbol") continue;
-    ret += `  ${options.stylize(k.toString(), "undefined")}: ${localInspect(this[k], newOptions)}
-`;
-  }
-  if (this[UnderlyingOsdkObject] !== this) {
-    ret += "\n";
-    ret += `  ${options.stylize("$as", "special")}: ${localInspect(this[UnderlyingOsdkObject], newOptions).replace(/\n/g, `
-  `)}`;
-    ret += "\n";
-  }
-  ret += "}";
-  return ret;
-}
-
 // src/object/convertWireToOsdkObjects/createOsdkInterface.ts
 var handlerCache = createSimpleCache(/* @__PURE__ */ new WeakMap(), createInterfaceProxyHandler);
 function createOsdkInterface(underlying, interfaceDef) {
@@ -819,9 +968,6 @@ function createOsdkInterface(underlying, interfaceDef) {
     [UnderlyingOsdkObject]: underlying,
     [InterfaceDefRef]: interfaceDef
   };
-  {
-    Object.setPrototypeOf(interfaceHolder, OsdkCustomInspectPrototype);
-  }
   const handler = handlerCache.get(interfaceDef);
   const proxy = new Proxy(
     interfaceHolder,
@@ -1133,7 +1279,7 @@ async function aggregate(clientCtx, objectType, objectSet = {
   if (req.$where) {
     body.where = modernToLegacyWhereClause(req.$where);
   }
-  const result = await esm_exports2.OntologyObjectSets.aggregateObjectSetV2(addUserAgent(clientCtx, objectType), await clientCtx.ontologyRid, {
+  const result = await esm_exports2.OntologyObjectSets.aggregateObjectSetV2(addUserAgentAndRequestContextHeaders(clientCtx, objectType), await clientCtx.ontologyRid, {
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
@@ -1191,6 +1337,15 @@ async function fetchSingleWithErrors(client, objectType, args, objectSet) {
   }
 }
 
+// src/util/augmentRequestContext.ts
+var augmentRequestContext = (client, augment2) => ({
+  ...client,
+  requestContext: {
+    ...client.requestContext,
+    ...augment2(client.requestContext)
+  }
+});
+
 // src/util/WireObjectSet.ts
 var WIRE_OBJECT_SET_TYPES = /* @__PURE__ */ new Set(["base", "filter", "intersect", "reference", "searchAround", "static", "subtract", "union"]);
 function isWireObjectSet(o) {
@@ -1213,9 +1368,15 @@ function createObjectSet(objectType, clientCtx, objectSet = {
   objectType: objectType["apiName"]
 }) {
   const base = {
-    aggregate: aggregate.bind(globalThis, clientCtx, objectType, objectSet),
-    fetchPage: fetchPageInternal.bind(globalThis, clientCtx, objectType, objectSet),
-    fetchPageWithErrors: fetchPageWithErrorsInternal.bind(globalThis, clientCtx, objectType, objectSet),
+    aggregate: aggregate.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
+      finalMethodCall: "aggregate"
+    })), objectType, objectSet),
+    fetchPage: fetchPageInternal.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
+      finalMethodCall: "fetchPage"
+    })), objectType, objectSet),
+    fetchPageWithErrors: fetchPageWithErrorsInternal.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
+      finalMethodCall: "fetchPageWithErrors"
+    })), objectType, objectSet),
     where: (clause) => {
       return clientCtx.objectSetFactory(objectType, clientCtx, {
         type: "filter",
@@ -1247,9 +1408,12 @@ function createObjectSet(objectType, clientCtx, objectSet = {
     asyncIter: async function* () {
       let $nextPageToken = void 0;
       do {
-        const result = await base.fetchPage({
+        const result = await fetchPageInternal(augmentRequestContext(clientCtx, (_) => ({
+          finalMethodCall: "asyncIter"
+        })), objectType, objectSet, {
           $nextPageToken
         });
+        $nextPageToken = result.nextPageToken;
         for (const obj of result.data) {
           yield obj;
         }
@@ -1265,7 +1429,9 @@ function createObjectSet(objectType, clientCtx, objectSet = {
           value: primaryKey
         }
       };
-      return await fetchSingle(clientCtx, objectType, options, withPk);
+      return await fetchSingle(augmentRequestContext(clientCtx, (_) => ({
+        finalMethodCall: "fetchOne"
+      })), objectType, options, withPk);
     } : void 0,
     fetchOneWithErrors: isObjectTypeDefinition(objectType) ? async (primaryKey, options) => {
       const withPk = {
@@ -1277,7 +1443,9 @@ function createObjectSet(objectType, clientCtx, objectSet = {
           value: primaryKey
         }
       };
-      return await fetchSingleWithErrors(clientCtx, objectType, options, withPk);
+      return await fetchSingleWithErrors(augmentRequestContext(clientCtx, (_) => ({
+        finalMethodCall: "fetchOneWithErrors"
+      })), objectType, options, withPk);
     } : void 0
   };
   function createSearchAround(link) {
@@ -1337,7 +1505,7 @@ var DollarLinkProxyHandler = {
 
 // src/object/convertWireToOsdkObjects/createOsdkObject.ts
 var objectPrototypeCache = createClientCache(function(client, objectDef) {
-  return Object.create(process.env.target !== "browser" ? OsdkCustomInspectPrototype : null, {
+  return Object.create(null, {
     [ObjectDefRef]: {
       value: objectDef
     },
@@ -1388,6 +1556,9 @@ function createOsdkObject(client, objectDef, rawObj) {
             }
             return createAttachmentFromRid(client, rawValue.rid);
           }
+          if (propDef.type === "numericTimeseries" || propDef.type === "stringTimeseries") {
+            return createTimeseriesProperty(client, objectDef.apiName, target[RawObject][objectDef.primaryKeyApiName], p);
+          }
         }
         return rawValue;
       }
@@ -1537,7 +1708,7 @@ function objectSetToSearchJsonV2(objectSet, expectedApiName, existingWhere = voi
   throw new Error(`Unsupported objectSet type: ${objectSet.type}`);
 }
 async function fetchInterfacePage(client, interfaceType, args, objectSet) {
-  const result = await esm_exports2.OntologyObjectsV2.searchObjectsForInterface(addUserAgent(client, interfaceType), await client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
+  const result = await esm_exports2.OntologyObjectsV2.searchObjectsForInterface(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
     augmentedProperties: args.$augment ?? {},
     augmentedSharedPropertyTypes: {},
     otherInterfaceTypes: [],
@@ -1604,9 +1775,9 @@ function applyFetchArgs(args, body) {
   return body;
 }
 async function fetchObjectPage(client, objectType, args, objectSet) {
-  const r = await esm_exports2.OntologyObjectSets.loadObjectSetV2(addUserAgent(client, objectType), await client.ontologyRid, applyFetchArgs(args, {
+  const r = await esm_exports2.OntologyObjectSets.loadObjectSetV2(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, applyFetchArgs(args, {
     objectSet,
-    // We have to do the following case because LoadObjectSetRequestV2 isnt readonly
+    // We have to do the following case because LoadObjectSetRequestV2 isn't readonly
     select: args?.$select ?? [],
     // FIXME?
     excludeRid: !args?.$includeRid
@@ -1617,24 +1788,16 @@ async function fetchObjectPage(client, objectType, args, objectSet) {
   });
 }
 
-// src/actions/ActionValidationError.ts
-var ActionValidationError = class extends Error {
-  constructor(validation) {
-    super("Validation Error");
-    this.validation = validation;
-  }
-};
-
-// src/object/AttachmentUpload.ts
-function isAttachmentUpload(o) {
-  return o instanceof Blob && "name" in o;
-}
-
 // src/util/isOntologyObjectV2.ts
 function isOntologyObjectV2(o) {
   return o && typeof o === "object" && typeof o.__apiName === "string" && o.__primaryKey != null;
 }
 
+// src/util/isOsdkObject.ts
+function isOsdkBaseObject(o) {
+  return o && typeof o === "object" && typeof o.$apiName === "string" && o.$primaryKey != null;
+}
+
 // src/util/toDataValue.ts
 async function toDataValue(value, client) {
   if (value == null) {
@@ -1656,6 +1819,9 @@ async function toDataValue(value, client) {
   if (isOntologyObjectV2(value)) {
     return await toDataValue(value.__primaryKey, client);
   }
+  if (isOsdkBaseObject(value)) {
+    return await toDataValue(value.$primaryKey, client);
+  }
   if (isWireObjectSet(value)) {
     return value;
   }
@@ -1674,8 +1840,11 @@ async function toDataValue(value, client) {
 
 // src/actions/applyAction.ts
 async function applyAction2(client, action, parameters, options = {}) {
+  const clientWithHeaders = addUserAgentAndRequestContextHeaders(augmentRequestContext(client, (_) => ({
+    finalMethodCall: "applyAction"
+  })), action);
   if (Array.isArray(parameters)) {
-    const response = await esm_exports2.Actions.applyActionBatchV2(addUserAgent(client, action), await client.ontologyRid, action.apiName, {
+    const response = await esm_exports2.Actions.applyActionBatchV2(clientWithHeaders, await client.ontologyRid, action.apiName, {
       requests: parameters ? await remapBatchActionParams(parameters, client) : [],
       options: {
         returnEdits: options?.$returnEdits ? "ALL" : "NONE"
@@ -1683,7 +1852,7 @@ async function applyAction2(client, action, parameters, options = {}) {
     });
     return options?.$returnEdits ? response.edits : void 0;
   } else {
-    const response = await esm_exports2.Actions.applyActionV2(addUserAgent(client, action), await client.ontologyRid, action.apiName, {
+    const response = await esm_exports2.Actions.applyActionV2(clientWithHeaders, await client.ontologyRid, action.apiName, {
       parameters: await remapActionParams(parameters, client),
       options: {
         mode: options?.$validateOnly ? "VALIDATE_ONLY" : "VALIDATE_AND_EXECUTE",
@@ -1717,19 +1886,19 @@ async function remapBatchActionParams(params, client) {
   }));
   return remappedParams;
 }
-async function loadFullObjectMetadata(client, objtype) {
-  const full = await esm_exports2.OntologyObjectsV2.getObjectTypeFullMetadata(client, await client.ontologyRid, objtype, {
+async function loadFullObjectMetadata(client, objectType) {
+  const full = await esm_exports2.OntologyObjectsV2.getObjectTypeFullMetadata(client, await client.ontologyRid, objectType, {
     preview: true
   });
   const ret = generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(full, true);
-  client.logger?.debug(`END loadFullObjectMetadata(${objtype})`);
+  client.logger?.debug(`END loadFullObjectMetadata(${objectType})`);
   return {
     ...ret,
     rid: full.objectType.rid
   };
 }
-async function loadInterfaceDefinition(client, objtype) {
-  const r = await esm_exports2.OntologyObjectsV2.getInterfaceType(client, await client.ontologyRid, objtype, {
+async function loadInterfaceDefinition(client, objectType) {
+  const r = await esm_exports2.OntologyObjectsV2.getInterfaceType(client, await client.ontologyRid, objectType, {
     preview: true
   });
   return generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(r, true);
@@ -1770,7 +1939,7 @@ var createStandardOntologyProviderFactory = (client) => {
 };
 
 // src/util/UserAgent.ts
-var USER_AGENT = `osdk-client/${"0.20.0-beta.3"}`;
+var USER_AGENT = `osdk-client/${"0.20.0"}`;
 
 // src/createMinimalClient.ts
 function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fetchFn = global.fetch, objectSetFactory = createObjectSet) {
@@ -1787,13 +1956,287 @@ function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fet
     objectSetFactory,
     ontologyRid: metadata.ontologyRid,
     logger: options.logger,
-    clientCacheKey: {}
+    clientCacheKey: {},
+    requestContext: {}
   };
   return Object.assign(minimalClient, {
     ontologyProvider: createStandardOntologyProviderFactory()(minimalClient)
   });
 }
 
+// src/util/isOsdkBaseObject.ts
+function isOsdkBaseObject2(o) {
+  return o && typeof o === "object" && typeof o.$apiName === "string" && o.$primaryKey != null;
+}
+
+// src/util/toDataValueQueries.ts
+async function toDataValueQueries(value, client, desiredType) {
+  if (value == null) {
+    return value;
+  }
+  if (Array.isArray(value) && desiredType.multiplicity) {
+    const promiseArray = Array.from(value, async (innerValue) => await toDataValueQueries(innerValue, client, desiredType));
+    return Promise.all(promiseArray);
+  }
+  switch (desiredType.type) {
+    case "attachment": {
+      if (isAttachmentUpload(value)) {
+        const attachment = await esm_exports.Attachments.uploadAttachment(client, value, {
+          filename: value.name
+        }, {
+          "Content-Length": value.size.toString(),
+          "Content-Type": value.type
+        });
+        return attachment.rid;
+      }
+      return value;
+    }
+    case "twoDimensionalAggregation": {
+      return {
+        groups: value
+      };
+    }
+    case "threeDimensionalAggregation": {
+      return {
+        groups: value
+      };
+    }
+    case "set": {
+      if (value instanceof Set) {
+        const promiseArray = Array.from(value, async (innerValue) => await toDataValueQueries(innerValue, client, desiredType["set"]));
+        return Promise.all(promiseArray);
+      }
+      break;
+    }
+    case "object": {
+      if (isOsdkBaseObject2(value)) {
+        return value.$primaryKey;
+      }
+      break;
+    }
+    case "objectSet": {
+      if (isWireObjectSet(value)) {
+        return value;
+      }
+      if (isObjectSet(value)) {
+        return getWireObjectSet(value);
+      }
+      break;
+    }
+    case "struct": {
+      if (typeof value === "object") {
+        const structMap = {};
+        for (const [key, structValue] of Object.entries(value)) {
+          structMap[key] = await toDataValueQueries(structValue, client, desiredType["struct"][key]);
+        }
+        return structMap;
+      }
+    }
+    case "boolean":
+    case "date":
+    case "double":
+    case "float":
+    case "integer":
+    case "long":
+    case "string":
+    case "timestamp":
+      return value;
+  }
+  return value;
+}
+
+// src/queries/applyQuery.ts
+async function applyQuery(client, query, params) {
+  const response = await esm_exports2.QueryTypes.executeQueryV2(addUserAgentAndRequestContextHeaders(augmentRequestContext(client, (_) => ({
+    finalMethodCall: "applyQuery"
+  })), query), await client.ontologyRid, query.apiName, {
+    parameters: params ? await remapQueryParams(params, client, query.parameters) : {}
+  });
+  const objectOutputDefs = await getRequiredDefinitions(query.output, client);
+  const remappedResponse = await remapQueryResponse(client, query.output, response.value, objectOutputDefs);
+  return remappedResponse;
+}
+async function remapQueryParams(params, client, paramTypes) {
+  const parameterMap = {};
+  for (const [key, value] of Object.entries(params)) {
+    parameterMap[key] = await toDataValueQueries(value, client, paramTypes[key]);
+  }
+  return parameterMap;
+}
+async function remapQueryResponse(client, responseDataType, responseValue, definitions) {
+  if (responseValue == null) {
+    if (responseDataType.nullable) {
+      return void 0;
+    } else {
+      throw new Error("Got null response when nullable was not allowed");
+    }
+  }
+  if (responseDataType.multiplicity != null && responseDataType.multiplicity !== false) {
+    const withoutMultiplicity = {
+      ...responseDataType,
+      multiplicity: false
+    };
+    for (let i = 0; i < responseValue.length; i++) {
+      responseValue[i] = await remapQueryResponse(responseValue[i], withoutMultiplicity, client, definitions);
+    }
+    return responseValue;
+  }
+  switch (responseDataType.type) {
+    case "union": {
+      throw new Error("Union return types are not yet supported");
+    }
+    case "set": {
+      for (let i = 0; i < responseValue.length; i++) {
+        responseValue[i] = await remapQueryResponse(responseValue[i], responseDataType.set, client, definitions);
+      }
+      return responseValue;
+    }
+    case "attachment": {
+      return createAttachmentFromRid(client, responseValue);
+    }
+    case "object": {
+      const def = definitions.get(responseDataType.object);
+      if (!def) {
+        throw new Error(`Missing definition for ${responseDataType.object}`);
+      }
+      return createQueryObjectResponse(responseValue, def);
+    }
+    case "objectSet": {
+      const def = definitions.get(responseDataType.objectSet);
+      if (!def) {
+        throw new Error(`Missing definition for ${responseDataType.objectSet}`);
+      }
+      if (typeof responseValue === "string") {
+        return createObjectSet(def, client, {
+          type: "intersect",
+          objectSets: [{
+            type: "base",
+            objectType: responseDataType.objectSet
+          }, {
+            type: "reference",
+            reference: responseValue
+          }]
+        });
+      }
+      return createObjectSet(def, client, responseValue);
+    }
+    case "struct": {
+      for (const [key, subtype] of Object.entries(responseDataType.struct)) {
+        if (requiresConversion(subtype)) {
+          responseValue[key] = await remapQueryResponse(responseValue[key], subtype, client, definitions);
+        }
+      }
+      return responseValue;
+    }
+    case "twoDimensionalAggregation": {
+      const result = [];
+      for (const {
+        key,
+        value
+      } of responseValue.groups) {
+        result.push({
+          key,
+          value
+        });
+      }
+      return result;
+    }
+    case "threeDimensionalAggregation": {
+      const result = [];
+      for (const {
+        key,
+        groups
+      } of responseValue.groups) {
+        const subResult = [];
+        for (const {
+          key: subKey,
+          value
+        } of groups) {
+          subResult.push({
+            key: subKey,
+            value
+          });
+        }
+        result.push({
+          key,
+          groups: subResult
+        });
+      }
+      return result;
+    }
+  }
+  return responseValue;
+}
+async function getRequiredDefinitions(dataType, client) {
+  const result = /* @__PURE__ */ new Map();
+  switch (dataType.type) {
+    case "objectSet": {
+      const objectDef = await client.ontologyProvider.getObjectDefinition(dataType.objectSet);
+      result.set(dataType.objectSet, objectDef);
+      break;
+    }
+    case "object": {
+      const objectDef = await client.ontologyProvider.getObjectDefinition(dataType.object);
+      result.set(dataType.object, objectDef);
+      break;
+    }
+    case "set": {
+      return getRequiredDefinitions(dataType.set, client);
+    }
+    case "struct": {
+      for (const value of Object.values(dataType.struct)) {
+        for (const [type, objectDef] of await getRequiredDefinitions(value, client)) {
+          result.set(type, objectDef);
+        }
+      }
+      break;
+    }
+  }
+  return result;
+}
+function requiresConversion(dataType) {
+  switch (dataType.type) {
+    case "boolean":
+    case "date":
+    case "double":
+    case "float":
+    case "integer":
+    case "long":
+    case "object":
+    case "string":
+    case "timestamp":
+      return false;
+    case "union":
+      return true;
+    case "struct":
+      return Object.values(dataType.struct).some(requiresConversion);
+    case "set":
+      return requiresConversion(dataType.set);
+    case "attachment":
+    case "objectSet":
+    case "twoDimensionalAggregation":
+    case "threeDimensionalAggregation":
+      return true;
+    default:
+      return false;
+  }
+}
+function createQueryObjectResponse(primaryKey, objectDef) {
+  return {
+    $apiName: objectDef.apiName,
+    $title: void 0,
+    $objectType: objectDef.apiName,
+    $primaryKey: primaryKey
+  };
+}
+
+// src/queries/createQueryInvoker.ts
+function createQueryInvoker(client, query) {
+  return function(...args) {
+    return applyQuery(client, query, ...args);
+  };
+}
+
 // src/createClient.ts
 var ActionInvoker = class {
   constructor(clientCtx, actionDef) {
@@ -1811,6 +2254,8 @@ function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvi
     } else if (o.type === "action") {
       clientCtx.ontologyProvider.maybeSeed(o);
       return new ActionInvoker(clientCtx, o);
+    } else if (o.type === "query") {
+      return createQueryInvoker(clientCtx, o);
     } else {
       throw new Error("not implemented");
     }
@@ -1829,10 +2274,11 @@ exports.USER_AGENT = USER_AGENT;
 exports.augment = augment;
 exports.convertWireToOsdkObjects = convertWireToOsdkObjects;
 exports.createAttachmentFromRid = createAttachmentFromRid;
+exports.createAttachmentUpload = createAttachmentUpload;
 exports.createClient = createClient;
 exports.createClientInternal = createClientInternal;
 exports.createObjectSet = createObjectSet;
 exports.createSimpleAsyncCache = createSimpleAsyncCache;
 exports.esm_exports = esm_exports2;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=chunk-EP4KLU3N.cjs.map
+//# sourceMappingURL=chunk-VW7XYOFL.cjs.map