@osdk/client 0.20.0-beta.2 → 0.20.0-beta.4

package/build/cjs/{chunk-VG5EKGOO.cjs → chunk-4FXEPHWC.cjs}

@@ -18,14 +18,13 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// ../internal.foundry.datasets/build/esm/chunk-CSAU5B4Q.js
+// ../internal.foundry.datasets/build/esm/chunk-PZ5AY32C.js
 var __defProp2 = Object.defineProperty;
 var __export2 = (target, all) => {
-  for (var name in all)
-    __defProp2(target, name, {
-      get: all[name],
-      enumerable: true
-    });
+  for (var name in all) __defProp2(target, name, {
+    get: all[name],
+    enumerable: true
+  });
 };
 async function foundryPlatformFetch(client, [httpMethodNum, origPath, flags, contentType, responseContentType], ...args) {
   const path = origPath.replace(/\{([^}]+)\}/g, () => encodeURIComponent(args.shift()));
@@ -83,7 +82,7 @@ async function apiFetch(clientCtx, method, endpointPath, data, queryArguments, h
   return response.blob();
 }
 
-// ../internal.foundry.datasets/build/esm/chunk-YPYY5DPJ.js
+// ../internal.foundry.datasets/build/esm/chunk-3STPFXHE.js
 var Branch_exports = {};
 __export2(Branch_exports, {
   createBranch: () => createBranch,
@@ -108,7 +107,7 @@ function deleteBranch($ctx, ...args) {
   return foundryPlatformFetch($ctx, _deleteBranch, ...args);
 }
 
-// ../internal.foundry.datasets/build/esm/chunk-Q6FZUZ4K.js
+// ../internal.foundry.datasets/build/esm/chunk-5ZK5IVCS.js
 var Dataset_exports = {};
 __export2(Dataset_exports, {
   createDataset: () => createDataset,
@@ -143,7 +142,7 @@ function deleteSchema($ctx, ...args) {
   return foundryPlatformFetch($ctx, _deleteSchema, ...args);
 }
 
-// ../internal.foundry.datasets/build/esm/chunk-UJYKN4YN.js
+// ../internal.foundry.datasets/build/esm/chunk-N55YZHZU.js
 var File_exports = {};
 __export2(File_exports, {
   deleteFile: () => deleteFile,
@@ -173,7 +172,7 @@ function getFileContent($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getFileContent, ...args);
 }
 
-// ../internal.foundry.datasets/build/esm/chunk-5RKMNE66.js
+// ../internal.foundry.datasets/build/esm/chunk-267TDC7H.js
 var Transaction_exports = {};
 __export2(Transaction_exports, {
   abortTransaction: () => abortTransaction,
@@ -198,14 +197,13 @@ function abortTransaction($ctx, ...args) {
   return foundryPlatformFetch($ctx, _abortTransaction, ...args);
 }
 
-// ../internal.foundry.models/build/esm/chunk-SJUC7YTI.js
+// ../internal.foundry.models/build/esm/chunk-IOTKXOZ6.js
 var __defProp3 = Object.defineProperty;
 var __export3 = (target, all) => {
-  for (var name in all)
-    __defProp3(target, name, {
-      get: all[name],
-      enumerable: true
-    });
+  for (var name in all) __defProp3(target, name, {
+    get: all[name],
+    enumerable: true
+  });
 };
 var LanguageModel_exports = {};
 __export3(LanguageModel_exports, {
@@ -237,17 +235,16 @@ __export(esm_exports, {
   QueryTypes: () => QueryType_exports
 });
 
-// ../internal.foundry.ontologies/build/esm/chunk-CSAU5B4Q.js
+// ../internal.foundry.ontologies/build/esm/chunk-PZ5AY32C.js
 var __defProp4 = Object.defineProperty;
 var __export4 = (target, all) => {
-  for (var name in all)
-    __defProp4(target, name, {
-      get: all[name],
-      enumerable: true
-    });
+  for (var name in all) __defProp4(target, name, {
+    get: all[name],
+    enumerable: true
+  });
 };
 
-// ../internal.foundry.ontologies/build/esm/chunk-UV55E7D4.js
+// ../internal.foundry.ontologies/build/esm/chunk-LTUKKONO.js
 var ActionType_exports = {};
 __export4(ActionType_exports, {
   applyAction: () => applyAction,
@@ -287,7 +284,7 @@ function validateAction($ctx, ...args) {
   return foundryPlatformFetch($ctx, _validateAction, ...args);
 }
 
-// ../internal.foundry.ontologies/build/esm/chunk-KU7N4OS3.js
+// ../internal.foundry.ontologies/build/esm/chunk-67IRYQ4I.js
 var Attachment_exports = {};
 __export4(Attachment_exports, {
   getAttachment: () => getAttachment,
@@ -307,7 +304,7 @@ function getAttachment($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getAttachment, ...args);
 }
 
-// ../internal.foundry.ontologies/build/esm/chunk-K2FHVG2O.js
+// ../internal.foundry.ontologies/build/esm/chunk-JDBI2K4S.js
 var ObjectType_exports = {};
 __export4(ObjectType_exports, {
   getObjectType: () => getObjectType,
@@ -332,7 +329,7 @@ function getOutgoingLinkType($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingLinkType, ...args);
 }
 
-// ../internal.foundry.ontologies/build/esm/chunk-LB4RYVNQ.js
+// ../internal.foundry.ontologies/build/esm/chunk-6OWDPN5M.js
 var Ontology_exports = {};
 __export4(Ontology_exports, {
   getOntology: () => getOntology,
@@ -347,7 +344,7 @@ function getOntology($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOntology, ...args);
 }
 
-// ../internal.foundry.ontologies/build/esm/chunk-FANEAZUW.js
+// ../internal.foundry.ontologies/build/esm/chunk-M2AD7ARN.js
 var OntologyObject_exports = {};
 __export4(OntologyObject_exports, {
   aggregateObjects: () => aggregateObjects,
@@ -382,7 +379,7 @@ function aggregateObjects($ctx, ...args) {
   return foundryPlatformFetch($ctx, _aggregateObjects, ...args);
 }
 
-// ../internal.foundry.ontologies/build/esm/chunk-CRDBJVD6.js
+// ../internal.foundry.ontologies/build/esm/chunk-CBKBUZ63.js
 var QueryType_exports = {};
 __export4(QueryType_exports, {
   executeQuery: () => executeQuery,
@@ -414,17 +411,16 @@ __export(esm_exports2, {
   QueryTypes: () => QueryType_exports2
 });
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-CSAU5B4Q.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-PZ5AY32C.js
 var __defProp5 = Object.defineProperty;
 var __export5 = (target, all) => {
-  for (var name in all)
-    __defProp5(target, name, {
-      get: all[name],
-      enumerable: true
-    });
+  for (var name in all) __defProp5(target, name, {
+    get: all[name],
+    enumerable: true
+  });
 };
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-UVEI3RO3.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-B5JRDCDE.js
 var Action_exports = {};
 __export5(Action_exports, {
   applyActionAsyncV2: () => applyActionAsyncV2,
@@ -444,7 +440,7 @@ function applyActionAsyncV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _applyActionAsyncV2, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-GCLYROAR.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-G4A4IJCI.js
 var ActionTypeV2_exports = {};
 __export5(ActionTypeV2_exports, {
   getActionTypeV2: () => getActionTypeV2,
@@ -459,7 +455,7 @@ function getActionTypeV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getActionTypeV2, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-GUSJ3JXB.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-6LZM4EP4.js
 var ObjectTypeV2_exports = {};
 __export5(ObjectTypeV2_exports, {
   getObjectTypeV2: () => getObjectTypeV2,
@@ -484,7 +480,7 @@ function getOutgoingLinkTypeV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingLinkTypeV2, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-ADT7WVKJ.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-TJX6RHXS.js
 var OntologyObjectSet_exports = {};
 __export5(OntologyObjectSet_exports, {
   aggregateObjectSetV2: () => aggregateObjectSetV2,
@@ -509,7 +505,7 @@ function aggregateObjectSetV2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _aggregateObjectSetV2, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-S2FR63YP.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-U2YDEYVP.js
 var OntologyObjectV2_exports = {};
 __export5(OntologyObjectV2_exports, {
   aggregateObjectsForInterface: () => aggregateObjectsForInterface,
@@ -609,7 +605,7 @@ function getObjectTypeFullMetadata($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getObjectTypeFullMetadata, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-QZMDTH3J.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-5MBQRC34.js
 var OntologyV2_exports = {};
 __export5(OntologyV2_exports, {
   getOntologyFullMetadata: () => getOntologyFullMetadata,
@@ -629,7 +625,7 @@ function getOntologyFullMetadata($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOntologyFullMetadata, ...args);
 }
 
-// ../internal.foundry.ontologiesv2/build/esm/chunk-HLZX6UUL.js
+// ../internal.foundry.ontologiesv2/build/esm/chunk-ASYINYCV.js
 var QueryType_exports2 = {};
 __export5(QueryType_exports2, {
   executeQueryV2: () => executeQueryV2,
@@ -678,10 +674,10 @@ function addUserAgent(client, withMetadata) {
 function createClientCache(fn) {
   const cache = /* @__PURE__ */ new WeakMap();
   function get(client, key) {
-    if (cache.get(client) == null) {
-      cache.set(client, /* @__PURE__ */ new Map());
+    if (cache.get(client.clientCacheKey) == null) {
+      cache.set(client.clientCacheKey, /* @__PURE__ */ new Map());
     }
-    let r = cache.get(client).get(key);
+    let r = cache.get(client.clientCacheKey).get(key);
     if (r === void 0 && fn !== void 0) {
       return set(client, key, fn(client, key));
     } else {
@@ -689,16 +685,15 @@ function createClientCache(fn) {
     }
   }
   function set(client, key, value) {
-    if (cache.get(client) == null) {
-      cache.set(client, /* @__PURE__ */ new Map());
+    if (cache.get(client.clientCacheKey) == null) {
+      cache.set(client.clientCacheKey, /* @__PURE__ */ new Map());
     }
-    cache.get(client).set(key, value);
+    cache.get(client.clientCacheKey).set(key, value);
     return value;
   }
   function remove(client, key) {
-    if (cache.get(client) == null)
-      return false;
-    return cache.get(client).delete(key);
+    if (cache.get(client.clientCacheKey) == null) return false;
+    return cache.get(client.clientCacheKey).delete(key);
   }
   return {
     get,
@@ -803,8 +798,7 @@ function customInspect(_depth, options, localInspect) {
   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;
+    if (typeof k === "symbol") continue;
     ret += `  ${options.stylize(k.toString(), "undefined")}: ${localInspect(this[k], newOptions)}
 `;
   }
@@ -911,8 +905,7 @@ function $asFactory(objDef) {
     }
     const underlying = this[UnderlyingOsdkObject];
     const existing = osdkObjectToInterfaceView.get(underlying).get(newDef.apiName);
-    if (existing)
-      return existing;
+    if (existing) return existing;
     const osdkInterface = createOsdkInterface(underlying, newDef);
     osdkObjectToInterfaceView.get(underlying).set(newDef.apiName, osdkInterface);
     return osdkInterface;
@@ -1080,8 +1073,7 @@ function modernToLegacyAggregationClause(select) {
   });
 }
 function modernToLegacyGroupByClause(groupByClause) {
-  if (!groupByClause)
-    return [];
+  if (!groupByClause) return [];
   return Object.entries(groupByClause).flatMap(([field, type]) => {
     if (type === "exact") {
       return [{
@@ -1115,8 +1107,7 @@ function modernToLegacyGroupByClause(groupByClause) {
         value: type.$duration[0],
         unit: client_api.DurationMapping[type.$duration[1]]
       }];
-    } else
-      return [];
+    } else return [];
   });
 }
 function convertRange(range) {
@@ -1142,7 +1133,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), clientCtx.ontologyRid, {
+  const result = await esm_exports2.OntologyObjectSets.aggregateObjectSetV2(addUserAgent(clientCtx, objectType), await clientCtx.ontologyRid, {
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
@@ -1259,6 +1250,7 @@ function createObjectSet(objectType, clientCtx, objectSet = {
         const result = await base.fetchPage({
           $nextPageToken
         });
+        $nextPageToken = result.nextPageToken;
         for (const obj of result.data) {
           yield obj;
         }
@@ -1386,8 +1378,7 @@ function createOsdkObject(client, objectDef, rawObj) {
         case UnderlyingOsdkObject:
           return receiver;
       }
-      if (p in target)
-        return target[p];
+      if (p in target) return target[p];
       if (p in rawObj) {
         const rawValue = target[RawObject][p];
         const propDef = objectDef.properties[p];
@@ -1454,8 +1445,7 @@ async function convertWireToOsdkObjects(client, objects, interfaceApiName, force
       continue;
     }
     let osdkObject = createOsdkObject(client, objectDef, rawObj);
-    if (interfaceApiName)
-      osdkObject = osdkObject.$as(interfaceApiName);
+    if (interfaceApiName) osdkObject = osdkObject.$as(interfaceApiName);
     ret.push(osdkObject);
   }
   client.logger?.debug(`END convertWireToOsdkObjects()`);
@@ -1548,7 +1538,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), client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
+  const result = await esm_exports2.OntologyObjectsV2.searchObjectsForInterface(addUserAgent(client, interfaceType), await client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
     augmentedProperties: args.$augment ?? {},
     augmentedSharedPropertyTypes: {},
     otherInterfaceTypes: [],
@@ -1615,9 +1605,9 @@ function applyFetchArgs(args, body) {
   return body;
 }
 async function fetchObjectPage(client, objectType, args, objectSet) {
-  const r = await esm_exports2.OntologyObjectSets.loadObjectSetV2(addUserAgent(client, objectType), client.ontologyRid, applyFetchArgs(args, {
+  const r = await esm_exports2.OntologyObjectSets.loadObjectSetV2(addUserAgent(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
@@ -1646,6 +1636,11 @@ 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) {
@@ -1667,6 +1662,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;
   }
@@ -1686,7 +1684,7 @@ async function toDataValue(value, client) {
 // src/actions/applyAction.ts
 async function applyAction2(client, action, parameters, options = {}) {
   if (Array.isArray(parameters)) {
-    const response = await esm_exports2.Actions.applyActionBatchV2(addUserAgent(client, action), client.ontologyRid, action.apiName, {
+    const response = await esm_exports2.Actions.applyActionBatchV2(addUserAgent(client, action), await client.ontologyRid, action.apiName, {
       requests: parameters ? await remapBatchActionParams(parameters, client) : [],
       options: {
         returnEdits: options?.$returnEdits ? "ALL" : "NONE"
@@ -1694,7 +1692,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), client.ontologyRid, action.apiName, {
+    const response = await esm_exports2.Actions.applyActionV2(addUserAgent(client, action), await client.ontologyRid, action.apiName, {
       parameters: await remapActionParams(parameters, client),
       options: {
         mode: options?.$validateOnly ? "VALIDATE_ONLY" : "VALIDATE_AND_EXECUTE",
@@ -1728,19 +1726,19 @@ async function remapBatchActionParams(params, client) {
   }));
   return remappedParams;
 }
-async function loadFullObjectMetadata(client, objtype) {
-  const full = await esm_exports2.OntologyObjectsV2.getObjectTypeFullMetadata(client, 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, 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);
@@ -1781,7 +1779,7 @@ var createStandardOntologyProviderFactory = (client) => {
 };
 
 // src/util/UserAgent.ts
-var USER_AGENT = `osdk-client/${"0.20.0-beta.2"}`;
+var USER_AGENT = `osdk-client/${"0.20.0-beta.4"}`;
 
 // src/createMinimalClient.ts
 function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fetchFn = global.fetch, objectSetFactory = createObjectSet) {
@@ -1797,13 +1795,285 @@ function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fet
     ...shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, USER_AGENT, fetchFn),
     objectSetFactory,
     ontologyRid: metadata.ontologyRid,
-    logger: options.logger
+    logger: options.logger,
+    clientCacheKey: {}
   };
   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(addUserAgent(client, 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) {
@@ -1821,6 +2091,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");
     }
@@ -1845,4 +2117,4 @@ exports.createObjectSet = createObjectSet;
 exports.createSimpleAsyncCache = createSimpleAsyncCache;
 exports.esm_exports = esm_exports2;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=chunk-VG5EKGOO.cjs.map
+//# sourceMappingURL=chunk-4FXEPHWC.cjs.map