@osdk/client 2.2.0-beta.2 → 2.2.0-beta.21

package/build/cjs/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkT5UE6BI7_cjs = require('./chunk-T5UE6BI7.cjs');
-var chunkX7WGNFZ4_cjs = require('./chunk-X7WGNFZ4.cjs');
-require('./chunk-Q7SFCCGT.cjs');
+var chunk33GHS3X4_cjs = require('./chunk-33GHS3X4.cjs');
+var chunkT4NIFYZS_cjs = require('./chunk-T4NIFYZS.cjs');
+var chunk37QC7LR3_cjs = require('./chunk-37QC7LR3.cjs');
 var api = require('@osdk/api');
 var shared_net_errors = require('@osdk/shared.net.errors');
 var unstable = require('@osdk/api/unstable');
@@ -18,7 +18,7 @@ var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 // src/actions/ActionValidationError.ts
 var ActionValidationError = class extends Error {
   constructor(validation) {
-    super("Validation Error");
+    super("Validation Error: " + JSON.stringify(validation, null, 2));
     this.validation = validation;
   }
 };
@@ -55,7 +55,7 @@ function applyPageToken(payload, {
   return pageToken ? {
     ...payload,
     pageToken
-  } : undefined;
+  } : void 0;
 }
 async function* pageRequestAsAsyncIter(call, values, nextArgs, initialPayload) {
   let payload = initialPayload;
@@ -72,7 +72,7 @@ async function* pageRequestAsAsyncIter(call, values, nextArgs, initialPayload) {
 function createSimpleCache(map = /* @__PURE__ */ new Map(), fn) {
   function get(key) {
     let r = map.get(key);
-    if (r === undefined && fn !== undefined) {
+    if (r === void 0 && fn !== void 0) {
       return set(key, fn(key));
     } else {
       return r;
@@ -120,7 +120,7 @@ function createSimpleAsyncCache(type, fn, createCacheLocal = createSimpleCache)
 var cachedAllOntologies;
 async function getOntologyVersionForRid(ctx, ontologyRid) {
   cachedAllOntologies ??= await client_unstable.loadAllOntologies(ctx, {});
-  !cachedAllOntologies.ontologies[ontologyRid] ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "ontology should be loaded") : invariant__default.default(false) : undefined;
+  !cachedAllOntologies.ontologies[ontologyRid] ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "ontology should be loaded") : invariant__default.default(false) : void 0;
   return cachedAllOntologies.ontologies[ontologyRid].currentOntologyVersion;
 }
 var strongMemoAsync = (fn) => createSimpleAsyncCache("strong", fn).get;
@@ -162,7 +162,7 @@ var MetadataClient = class {
         [objectTypeRid]: await this.ontologyVersion("")
       }
     });
-    !linkTypes.linkTypes[objectTypeRid] ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "link type should be loaded") : invariant__default.default(false) : undefined;
+    !linkTypes.linkTypes[objectTypeRid] ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "link type should be loaded") : invariant__default.default(false) : void 0;
     const ret = {};
     for (const l of linkTypes.linkTypes[objectTypeRid]) {
       const helper = ({
@@ -232,22 +232,22 @@ var MetadataClient = class {
       interfaceTypes: [],
       typeGroups: [],
       loadRedacted: false,
-      includeObjectTypeCount: undefined,
+      includeObjectTypeCount: void 0,
       includeObjectTypesWithoutSearchableDatasources: true,
-      includeEntityMetadata: undefined,
+      includeEntityMetadata: void 0,
       actionTypes: [],
-      includeTypeGroupEntitiesCount: undefined,
-      entityMetadata: undefined
+      includeTypeGroupEntitiesCount: void 0,
+      entityMetadata: void 0
     };
-    const entities = await client_unstable.bulkLoadOntologyEntities(this.#ctx, undefined, body);
-    !entities.objectTypes[0]?.objectType ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "object type should be loaded") : invariant__default.default(false) : undefined;
+    const entities = await client_unstable.bulkLoadOntologyEntities(this.#ctx, void 0, body);
+    !entities.objectTypes[0]?.objectType ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "object type should be loaded") : invariant__default.default(false) : void 0;
     return entities.objectTypes[0].objectType;
   });
   ontologyVersion = strongMemoAsync(async (_) => getOntologyVersionForRid(this.#ctx, await this.#client.ontologyRid));
 };
 var metadataCacheClient = weakMemoAsync((client) => Promise.resolve(new MetadataClient(client)));
 function createObjectPropertyMapping(conjureOT) {
-  !(conjureOT.primaryKeys.length === 1) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `only one primary key supported, got ${conjureOT.primaryKeys.length}`) : invariant__default.default(false) : undefined;
+  !(conjureOT.primaryKeys.length === 1) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `only one primary key supported, got ${conjureOT.primaryKeys.length}`) : invariant__default.default(false) : void 0;
   const pkRid = conjureOT.primaryKeys[0];
   const pkProperty = Object.values(conjureOT.propertyTypes).find((a) => a.rid === pkRid);
   if (!pkProperty) {
@@ -279,7 +279,7 @@ function createBulkLinksAsyncIterFactory(ctx) {
       return;
     }
     ctx.logger?.debug("Preparing to fetch bulk links");
-    !objs.every((a) => a.$objectType === objs[0].$objectType) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false) : invariant__default.default(false) : undefined;
+    !objs.every((a) => a.$objectType === objs[0].$objectType) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false) : invariant__default.default(false) : void 0;
     const mcc = await metadataCacheClient(ctx);
     const helper = await mcc.forObjectByApiName(objs[0].$objectType);
     const [objectTypeRid, propertyMapping, fullLinkMapping] = await Promise.all([helper.getRid(), helper.getPropertyMapping(), helper.getLinkMapping()]);
@@ -291,21 +291,21 @@ function createBulkLinksAsyncIterFactory(ctx) {
     }
     const req = {
       objectSetContext: {
-        forkRid: undefined,
+        forkRid: void 0,
         objectSetFilterContext: {
           parameterOverrides: {}
         },
-        ontologyBranchRid: undefined,
-        owningRid: undefined,
-        reportUsage: undefined,
-        workstateRid: undefined
+        ontologyBranchRid: void 0,
+        owningRid: void 0,
+        reportUsage: void 0,
+        workstateRid: void 0
       },
       responseOptions: {
         includeObjectSetEntities: true,
         includeUsageCost: false
       },
       pageSize: 1e3,
-      pageToken: undefined,
+      pageToken: void 0,
       linksRequests: [{
         directedLinkTypes: Object.values(linkMapping).map(({
           directedLinkTypeRid
@@ -318,7 +318,7 @@ function createBulkLinksAsyncIterFactory(ctx) {
         })))
       }]
     };
-    const bulkLinksIter = pageRequestAsAsyncIter(client_unstable.getBulkLinksPage.bind(undefined, makeConjureContext(ctx, "object-set-service/api")), getResults, applyPageToken, req);
+    const bulkLinksIter = pageRequestAsAsyncIter(client_unstable.getBulkLinksPage.bind(void 0, makeConjureContext(ctx, "object-set-service/api")), getResults, applyPageToken, req);
     for await (const item of bulkLinksIter) {
       const {
         objectIdentifier
@@ -368,6 +368,9 @@ function getPrimaryKeyOrThrow(ref) {
 function isAttachmentUpload(o) {
   return typeof o === `object` && "name" in o && "data" in o && o.data instanceof Blob;
 }
+function isAttachmentFile(o) {
+  return typeof o === "object" && o instanceof Blob && "name" in o;
+}
 function createAttachmentUpload(data, name) {
   return {
     data,
@@ -395,23 +398,36 @@ function isOsdkBaseObject(o) {
   return o && typeof o === "object" && typeof o.$apiName === "string" && o.$primaryKey != null;
 }
 
+// src/util/isPoint.ts
+function isPoint(o) {
+  return o && typeof o === "object" && "type" in o && o.type === "Point" && "coordinates" in o && o.coordinates.length === 2;
+}
+
 // src/util/toDataValue.ts
 async function toDataValue(value, client) {
   if (value == null) {
     return value;
   }
   if (Array.isArray(value) || value instanceof Set) {
+    const values = Array.from(value);
+    if (values.some((dataValue) => isAttachmentUpload(dataValue) || isAttachmentFile(dataValue))) {
+      const converted = [];
+      for (const value2 of values) {
+        converted.push(await toDataValue(value2, client));
+      }
+      return converted;
+    }
     const promiseArray = Array.from(value, async (innerValue) => await toDataValue(innerValue, client));
     return Promise.all(promiseArray);
   }
   if (isAttachmentUpload(value)) {
-    const attachment = await chunkX7WGNFZ4_cjs.Attachment_exports.upload(client, value.data, {
+    const attachment = await chunk37QC7LR3_cjs.Attachment_exports.upload(client, value.data, {
       filename: value.name
     });
     return await toDataValue(attachment.rid, client);
   }
-  if (typeof value === "object" && value instanceof Blob && "name" in value) {
-    const attachment = await chunkX7WGNFZ4_cjs.Attachment_exports.upload(client, value, {
+  if (isAttachmentFile(value)) {
+    const attachment = await chunk37QC7LR3_cjs.Attachment_exports.upload(client, value, {
       filename: value.name
     });
     return await toDataValue(attachment.rid, client);
@@ -422,11 +438,14 @@ async function toDataValue(value, client) {
   if (isOsdkBaseObject(value)) {
     return await toDataValue(value.$primaryKey, client);
   }
-  if (chunkT5UE6BI7_cjs.isWireObjectSet(value)) {
+  if (isPoint(value)) {
+    return await toDataValue(value.coordinates.join(), client);
+  }
+  if (chunk33GHS3X4_cjs.isWireObjectSet(value)) {
     return value;
   }
-  if (chunkT5UE6BI7_cjs.isObjectSet(value)) {
-    return chunkT5UE6BI7_cjs.getWireObjectSet(value);
+  if (chunk33GHS3X4_cjs.isObjectSet(value)) {
+    return chunk33GHS3X4_cjs.getWireObjectSet(value);
   }
   if (isMediaReference(value)) {
     return value;
@@ -449,24 +468,24 @@ async function toDataValue(value, client) {
 
 // src/actions/applyAction.ts
 async function applyAction(client, action, parameters, options = {}) {
-  const clientWithHeaders = chunkX7WGNFZ4_cjs.addUserAgentAndRequestContextHeaders(chunkT5UE6BI7_cjs.augmentRequestContext(client, (_) => ({
+  const clientWithHeaders = chunk37QC7LR3_cjs.addUserAgentAndRequestContextHeaders(chunk33GHS3X4_cjs.augmentRequestContext(client, (_) => ({
     finalMethodCall: "applyAction"
   })), action);
   if (Array.isArray(parameters)) {
-    const response = await chunkX7WGNFZ4_cjs.Action_exports.applyBatch(clientWithHeaders, await client.ontologyRid, action.apiName, {
+    const response = await chunk37QC7LR3_cjs.Action_exports.applyBatch(clientWithHeaders, await client.ontologyRid, action.apiName, {
       requests: parameters ? await remapBatchActionParams(parameters, client) : [],
       options: {
         returnEdits: options?.$returnEdits ? "ALL" : "NONE"
       }
     });
     const edits = response.edits;
-    return options?.$returnEdits ? edits?.type === "edits" ? remapActionResponse(response) : edits : undefined;
+    return options?.$returnEdits ? edits?.type === "edits" ? remapActionResponse(response) : edits : void 0;
   } else {
-    const response = await chunkX7WGNFZ4_cjs.Action_exports.apply(clientWithHeaders, await client.ontologyRid, action.apiName, {
+    const response = await chunk37QC7LR3_cjs.Action_exports.apply(clientWithHeaders, await client.ontologyRid, action.apiName, {
       parameters: await remapActionParams(parameters, client),
       options: {
         mode: options?.$validateOnly ? "VALIDATE_ONLY" : "VALIDATE_AND_EXECUTE",
-        returnEdits: options?.$returnEdits ? "ALL" : "NONE"
+        returnEdits: options?.$returnEdits ? "ALL_V2_WITH_DELETIONS" : "NONE"
       }
     });
     if (options?.$validateOnly) {
@@ -476,7 +495,7 @@ async function applyAction(client, action, parameters, options = {}) {
       throw new ActionValidationError(response.validation);
     }
     const edits = response.edits;
-    return options?.$returnEdits ? edits?.type === "edits" ? remapActionResponse(response) : edits : undefined;
+    return options?.$returnEdits ? edits?.type === "edits" ? remapActionResponse(response) : edits : void 0;
   }
 }
 async function remapActionParams(params, client) {
@@ -485,7 +504,7 @@ async function remapActionParams(params, client) {
   }
   const parameterMap = {};
   for (const [key, value] of Object.entries(params)) {
-    parameterMap[key] = await toDataValue(value, client);
+    parameterMap[key] = value == null ? null : await toDataValue(value, client);
   }
   return parameterMap;
 }
@@ -505,35 +524,41 @@ function remapActionResponse(response) {
       deletedLinksCount: editResponses.deletedLinksCount,
       deletedObjectsCount: editResponses.deletedObjectsCount,
       addedLinks: [],
+      deletedLinks: [],
       addedObjects: [],
+      deletedObjects: [],
       modifiedObjects: [],
       editedObjectTypes: []
     };
     const editedObjectTypesSet = /* @__PURE__ */ new Set();
     for (const edit of editResponses.edits) {
-      if (edit.type === "addLink") {
-        remappedActionResponse.addedLinks.push({
+      if (edit.type === "addLink" || edit.type === "deleteLink") {
+        const osdkEdit = {
           linkTypeApiNameAtoB: edit.linkTypeApiNameAtoB,
           linkTypeApiNameBtoA: edit.linkTypeApiNameBtoA,
           aSideObject: edit.aSideObject,
           bSideObject: edit.bSideObject
-        });
+        };
+        edit.type === "addLink" ? remappedActionResponse.addedLinks.push(osdkEdit) : remappedActionResponse.deletedLinks?.push(osdkEdit);
         editedObjectTypesSet.add(edit.aSideObject.objectType);
         editedObjectTypesSet.add(edit.bSideObject.objectType);
-      } else if (edit.type === "addObject") {
-        remappedActionResponse.addedObjects.push({
+      } else if (edit.type === "addObject" || edit.type === "deleteObject" || edit.type === "modifyObject") {
+        const osdkEdit = {
           objectType: edit.objectType,
           primaryKey: edit.primaryKey
-        });
-        editedObjectTypesSet.add(edit.objectType);
-      } else if (edit.type === "modifyObject") {
-        remappedActionResponse.modifiedObjects.push({
-          objectType: edit.objectType,
-          primaryKey: edit.primaryKey
-        });
+        };
+        if (edit.type === "addObject") {
+          remappedActionResponse.addedObjects.push(osdkEdit);
+        } else if (edit.type === "deleteObject") {
+          remappedActionResponse.deletedObjects?.push(osdkEdit);
+        } else if (edit.type === "modifyObject") {
+          remappedActionResponse.modifiedObjects.push(osdkEdit);
+        }
         editedObjectTypesSet.add(edit.objectType);
       } else {
-        process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Unknown edit type") : invariant__default.default(false) ;
+        if (process.env.NODE_ENV !== "production") {
+          console.warn(`Unexpected edit type: ${JSON.stringify(edit)}`);
+        }
       }
     }
     remappedActionResponse.editedObjectTypes = [...editedObjectTypesSet];
@@ -660,7 +685,7 @@ var GeotimeSeriesPropertyImpl = class {
     }
   }
   async getLatestValue() {
-    const latestPointPromise = chunkX7WGNFZ4_cjs.TimeSeriesValueBankProperty_exports.getLatestValue(this.#client, await this.#client.ontologyRid, ...this.#triplet);
+    const latestPointPromise = chunk37QC7LR3_cjs.TimeSeriesValueBankProperty_exports.getLatestValue(this.#client, await this.#client.ontologyRid, ...this.#triplet);
     latestPointPromise.then(
       (latestPoint) => this.lastFetchedValue = latestPoint,
       // eslint-disable-next-line no-console
@@ -676,7 +701,7 @@ var GeotimeSeriesPropertyImpl = class {
     return allPoints;
   }
   async *asyncIterValues(query) {
-    const streamPointsIterator = await chunkX7WGNFZ4_cjs.TimeSeriesValueBankProperty_exports.streamValues(this.#client, await this.#client.ontologyRid, ...this.#triplet, query ? {
+    const streamPointsIterator = await chunk37QC7LR3_cjs.TimeSeriesValueBankProperty_exports.streamValues(this.#client, await this.#client.ontologyRid, ...this.#triplet, query ? {
       range: getTimeRange(query)
     } : {});
     for await (const timeseriesPoint of asyncIterPointsHelper(streamPointsIterator)) {
@@ -700,13 +725,13 @@ var MediaReferencePropertyImpl = class {
     this.#triplet = [objectApiName, primaryKey, propertyName];
   }
   async fetchContents() {
-    return chunkX7WGNFZ4_cjs.MediaReferenceProperty_exports.getMediaContent(this.#client, await this.#client.ontologyRid, ...this.#triplet, {
+    return chunk37QC7LR3_cjs.MediaReferenceProperty_exports.getMediaContent(this.#client, await this.#client.ontologyRid, ...this.#triplet, {
       preview: true
       // TODO: Can turn this back off when backend is no longer in beta.
     });
   }
   async fetchMetadata() {
-    const r = await chunkX7WGNFZ4_cjs.MediaReferenceProperty_exports.getMediaMetadata(this.#client, await this.#client.ontologyRid, ...this.#triplet, {
+    const r = await chunk37QC7LR3_cjs.MediaReferenceProperty_exports.getMediaMetadata(this.#client, await this.#client.ontologyRid, ...this.#triplet, {
       preview: true
       // TODO: Can turn this back off when backend is no longer in beta.
     });
@@ -727,10 +752,10 @@ var TimeSeriesPropertyImpl = class {
     this.#triplet = [objectApiName, primaryKey, propertyName];
   }
   async getFirstPoint() {
-    return chunkX7WGNFZ4_cjs.TimeSeriesPropertyV2_exports.getFirstPoint(this.#client, await this.#client.ontologyRid, ...this.#triplet);
+    return chunk37QC7LR3_cjs.TimeSeriesPropertyV2_exports.getFirstPoint(this.#client, await this.#client.ontologyRid, ...this.#triplet);
   }
   async getLastPoint() {
-    return chunkX7WGNFZ4_cjs.TimeSeriesPropertyV2_exports.getLastPoint(this.#client, await this.#client.ontologyRid, ...this.#triplet);
+    return chunk37QC7LR3_cjs.TimeSeriesPropertyV2_exports.getLastPoint(this.#client, await this.#client.ontologyRid, ...this.#triplet);
   }
   async getAllPoints(query) {
     const allPoints = [];
@@ -740,7 +765,7 @@ var TimeSeriesPropertyImpl = class {
     return allPoints;
   }
   async *asyncIterPoints(query) {
-    const streamPointsIterator = await chunkX7WGNFZ4_cjs.TimeSeriesPropertyV2_exports.streamPoints(this.#client, await this.#client.ontologyRid, ...this.#triplet, query ? {
+    const streamPointsIterator = await chunk37QC7LR3_cjs.TimeSeriesPropertyV2_exports.streamPoints(this.#client, await this.#client.ontologyRid, ...this.#triplet, query ? {
       range: getTimeRange(query)
     } : {});
     for await (const timeseriesPoint of asyncIterPointsHelper(streamPointsIterator)) {
@@ -749,21 +774,23 @@ var TimeSeriesPropertyImpl = class {
   }
 };
 
+// src/util/objectSpecifierUtils.ts
+function createObjectSpecifierFromPrimaryKey(objectDef, primaryKey) {
+  return `${objectDef.apiName}:${primaryKey}`;
+}
+function extractPrimaryKeyFromObjectSpecifier(ObjectSpecifier) {
+  return ObjectSpecifier.split(":")[1];
+}
+
 // src/ontology/OntologyProvider.ts
 var InterfaceDefinitions = Symbol("InterfaceDefinitions" );
 
-// src/object/convertWireToOsdkObjects/InternalSymbols.ts
-var UnderlyingOsdkObject = Symbol("Underlying Object" );
-var ObjectDefRef = Symbol("ObjectDefinition" );
-var InterfaceDefRef = Symbol("InterfaceDefinition" );
-var ClientRef = Symbol("ClientRef" );
-
 // src/object/convertWireToOsdkObjects/createOsdkInterface.ts
 function createOsdkInterface(underlying, interfaceDef) {
-  const [objApiNamespace] = chunkT5UE6BI7_cjs.extractNamespace(interfaceDef.apiName);
+  const [objApiNamespace] = chunk33GHS3X4_cjs.extractNamespace(interfaceDef.apiName);
   return Object.freeze(Object.defineProperties({}, {
     // first to minimize hidden classes
-    [UnderlyingOsdkObject]: {
+    [chunkT4NIFYZS_cjs.UnderlyingOsdkObject]: {
       value: underlying
     },
     "$apiName": {
@@ -782,6 +809,10 @@ function createOsdkInterface(underlying, interfaceDef) {
       value: underlying.$primaryKey,
       enumerable: "$primaryKey" in underlying
     },
+    "$objectSpecifier": {
+      value: underlying.$objectSpecifier,
+      enumerable: "$objectSpecifier" in underlying
+    },
     "$title": {
       value: underlying.$title,
       enumerable: "$title" in underlying
@@ -790,12 +821,16 @@ function createOsdkInterface(underlying, interfaceDef) {
       value: underlying.$rid,
       enumerable: "$rid" in underlying
     },
-    [InterfaceDefRef]: {
+    "$clone": {
+      value: clone,
+      enumerable: false
+    },
+    [chunkT4NIFYZS_cjs.InterfaceDefRef]: {
       value: interfaceDef
     },
     ...Object.fromEntries(Object.keys(interfaceDef.properties).map((p) => {
-      const objDef = underlying[ObjectDefRef];
-      const [apiNamespace, apiName] = chunkT5UE6BI7_cjs.extractNamespace(p);
+      const objDef = underlying[chunkT4NIFYZS_cjs.ObjectDefRef];
+      const [apiNamespace, apiName] = chunk33GHS3X4_cjs.extractNamespace(p);
       const targetPropName = objDef.interfaceMap[interfaceDef.apiName][p];
       return [apiNamespace === objApiNamespace ? apiName : p, {
         enumerable: targetPropName in underlying,
@@ -803,6 +838,26 @@ function createOsdkInterface(underlying, interfaceDef) {
       }];
     }))
   }));
+  function clone(update) {
+    if (update == null) {
+      return underlying.$clone().$as(interfaceDef);
+    }
+    for (const key of Object.keys(update)) {
+      if (!(key in interfaceDef.properties)) {
+        throw new Error(`Invalid property ${key} for interface ${interfaceDef.apiName}`);
+      }
+    }
+    const remappedProps = Object.fromEntries(Object.keys(update).map((p) => mapProperty(p, update[p])).filter((x) => x != null));
+    return underlying.$clone(remappedProps).$as(interfaceDef);
+  }
+  function mapProperty(propertyName, value) {
+    const objDef = underlying[chunkT4NIFYZS_cjs.ObjectDefRef];
+    const targetPropName = objDef.interfaceMap[interfaceDef.apiName][propertyName];
+    if (targetPropName == null) {
+      throw new Error(`Cannot clone interface with ${propertyName} as property is not implemented by the underlying object type ${objDef.apiName}`);
+    }
+    return [targetPropName, value];
+  }
 }
 
 // src/object/convertWireToOsdkObjects/getDollarAs.ts
@@ -813,14 +868,14 @@ function $asFactory(objDef) {
     let targetInterfaceApiName;
     if (typeof targetMinDef === "string") {
       if (targetMinDef === objDef.apiName) {
-        return this[UnderlyingOsdkObject];
+        return this[chunkT4NIFYZS_cjs.UnderlyingOsdkObject];
       }
       if (objDef.interfaceMap?.[targetMinDef] == null) {
         throw new Error(`Object does not implement interface '${targetMinDef}'.`);
       }
       targetInterfaceApiName = targetMinDef;
     } else if (targetMinDef.apiName === objDef.apiName) {
-      return this[UnderlyingOsdkObject];
+      return this[chunkT4NIFYZS_cjs.UnderlyingOsdkObject];
     } else {
       if (targetMinDef.type === "object") {
         throw new Error(`'${targetMinDef.apiName}' is not an interface nor is it '${objDef.apiName}', which is the object type.`);
@@ -831,7 +886,7 @@ function $asFactory(objDef) {
     if (!def) {
       throw new Error(`Object does not implement interface '${targetInterfaceApiName}'.`);
     }
-    const underlying = this[UnderlyingOsdkObject];
+    const underlying = this[chunkT4NIFYZS_cjs.UnderlyingOsdkObject];
     const existing = osdkObjectToInterfaceView.get(underlying).get(targetInterfaceApiName)?.deref();
     if (existing) return existing;
     const osdkInterface = createOsdkInterface(underlying, def.def);
@@ -842,17 +897,17 @@ function $asFactory(objDef) {
 
 // src/object/convertWireToOsdkObjects/getDollarLink.ts
 function get$link(holder) {
-  const client = holder[ClientRef];
-  const objDef = holder[ObjectDefRef];
-  const rawObj = holder[UnderlyingOsdkObject];
+  const client = holder[chunkT4NIFYZS_cjs.ClientRef];
+  const objDef = holder[chunkT4NIFYZS_cjs.ObjectDefRef];
+  const rawObj = holder[chunkT4NIFYZS_cjs.UnderlyingOsdkObject];
   return Object.freeze(Object.fromEntries(Object.keys(objDef.links).map((linkName) => {
     const linkDef = objDef.links[linkName];
     const objectSet = client.objectSetFactory(objDef, client).where({
       [objDef.primaryKeyApiName]: rawObj.$primaryKey
     }).pivotTo(linkName);
     const value = !linkDef.multiplicity ? {
-      fetchOne: (options) => chunkT5UE6BI7_cjs.fetchSingle(client, objDef, options ?? {}, chunkT5UE6BI7_cjs.getWireObjectSet(objectSet)),
-      fetchOneWithErrors: (options) => chunkT5UE6BI7_cjs.fetchSingleWithErrors(client, objDef, options ?? {}, chunkT5UE6BI7_cjs.getWireObjectSet(objectSet))
+      fetchOne: (options) => chunk33GHS3X4_cjs.fetchSingle(client, objDef, options ?? {}, chunk33GHS3X4_cjs.getWireObjectSet(objectSet)),
+      fetchOneWithErrors: (options) => chunk33GHS3X4_cjs.fetchSingleWithErrors(client, objDef, options ?? {}, chunk33GHS3X4_cjs.getWireObjectSet(objectSet))
     } : objectSet;
     return [linkName, value];
   })));
@@ -863,7 +918,7 @@ var specialPropertyTypes = /* @__PURE__ */ new Set(["attachment", "geotimeSeries
 var basePropDefs = {
   "$as": {
     get: function() {
-      return get$as(this[ObjectDefRef]);
+      return get$as(this[chunkT4NIFYZS_cjs.ObjectDefRef]);
     }
   },
   "$link": {
@@ -873,10 +928,10 @@ var basePropDefs = {
   },
   "$clone": {
     value: function(update) {
-      const rawObj = this[UnderlyingOsdkObject];
-      const def = this[ObjectDefRef];
+      const rawObj = this[chunkT4NIFYZS_cjs.UnderlyingOsdkObject];
+      const def = this[chunkT4NIFYZS_cjs.ObjectDefRef];
       if (update == null) {
-        return createOsdkObject(this[ClientRef], def, {
+        return createOsdkObject(this[chunkT4NIFYZS_cjs.ClientRef], def, {
           ...rawObj
         });
       }
@@ -887,24 +942,32 @@ var basePropDefs = {
         update.$title = update[def.titleProperty];
       }
       const newObject = {
-        ...this[UnderlyingOsdkObject],
+        ...this[chunkT4NIFYZS_cjs.UnderlyingOsdkObject],
         ...update
       };
-      return createOsdkObject(this[ClientRef], this[ObjectDefRef], newObject);
+      return createOsdkObject(this[chunkT4NIFYZS_cjs.ClientRef], this[chunkT4NIFYZS_cjs.ObjectDefRef], newObject);
     }
+  },
+  "$objectSpecifier": {
+    get: function() {
+      const rawObj = this[chunkT4NIFYZS_cjs.UnderlyingOsdkObject];
+      return createObjectSpecifierFromPrimaryKey(this[chunkT4NIFYZS_cjs.ObjectDefRef], rawObj.$primaryKey);
+    },
+    enumerable: true
   }
 };
-function createOsdkObject(client, objectDef, rawObj) {
+function createOsdkObject(client, objectDef, simpleOsdkProperties, derivedPropertyTypeByName = {}) {
+  const rawObj = simpleOsdkProperties;
   Object.defineProperties(rawObj, {
-    [UnderlyingOsdkObject]: {
+    [chunkT4NIFYZS_cjs.UnderlyingOsdkObject]: {
       enumerable: false,
-      value: rawObj
+      value: simpleOsdkProperties
     },
-    [ObjectDefRef]: {
+    [chunkT4NIFYZS_cjs.ObjectDefRef]: {
       value: objectDef,
       enumerable: false
     },
-    [ClientRef]: {
+    [chunkT4NIFYZS_cjs.ClientRef]: {
       value: client,
       enumerable: false
     },
@@ -913,6 +976,17 @@ function createOsdkObject(client, objectDef, rawObj) {
   for (const propKey of Object.keys(rawObj)) {
     if (propKey in objectDef.properties && typeof objectDef.properties[propKey].type === "string" && specialPropertyTypes.has(objectDef.properties[propKey].type)) {
       rawObj[propKey] = createSpecialProperty(client, objectDef, rawObj, propKey);
+    } else if (propKey in derivedPropertyTypeByName && typeof derivedPropertyTypeByName[propKey].type === "string" && specialPropertyTypes.has(derivedPropertyTypeByName[propKey].type)) {
+      const rawValue = rawObj[propKey];
+      if (derivedPropertyTypeByName[propKey].type === "attachment") {
+        if (Array.isArray(rawValue)) {
+          rawObj[propKey] = rawValue.map((a) => chunk33GHS3X4_cjs.hydrateAttachmentFromRidInternal(client, a.rid));
+        } else {
+          rawObj[propKey] = chunk33GHS3X4_cjs.hydrateAttachmentFromRidInternal(client, rawValue.rid);
+        }
+      } else {
+        process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Derived property aggregations for Timeseries and Media are not supported") : invariant__default.default(false) ;
+      }
     }
   }
   return Object.freeze(rawObj);
@@ -921,54 +995,45 @@ function createSpecialProperty(client, objectDef, rawObject, p) {
   const rawValue = rawObject[p];
   const propDef = objectDef.properties[p];
   if (process.env.NODE_ENV !== "production") {
-    !(propDef != null && typeof propDef.type === "string" && specialPropertyTypes.has(propDef.type)) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false) : invariant__default.default(false) : undefined;
-  }
-  {
-    {
-      {
-        {
-          if (propDef.type === "attachment") {
-            if (Array.isArray(rawValue)) {
-              return rawValue.map((a) => chunkT5UE6BI7_cjs.hydrateAttachmentFromRidInternal(client, a.rid));
-            }
-            return chunkT5UE6BI7_cjs.hydrateAttachmentFromRidInternal(client, rawValue.rid);
-          }
-          if (propDef.type === "numericTimeseries" || propDef.type === "stringTimeseries" || propDef.type === "sensorTimeseries") {
-            return new TimeSeriesPropertyImpl(client, objectDef.apiName, rawObject[objectDef.primaryKeyApiName], p);
-          }
-          if (propDef.type === "geotimeSeriesReference") {
-            return new GeotimeSeriesPropertyImpl(client, objectDef.apiName, rawObject[objectDef.primaryKeyApiName], p, rawValue.type === "geotimeSeriesValue" ? {
-              time: rawValue.timestamp,
-              value: {
-                type: "Point",
-                coordinates: rawValue.position
-              }
-            } : undefined);
-          }
-          if (propDef.type === "mediaReference") {
-            return new MediaReferencePropertyImpl({
-              client,
-              objectApiName: objectDef.apiName,
-              primaryKey: rawObject[objectDef.primaryKeyApiName],
-              propertyName: p
-            });
-          }
-        }
-      }
+    !(propDef != null && typeof propDef.type === "string" && specialPropertyTypes.has(propDef.type)) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false) : invariant__default.default(false) : void 0;
+  }
+  if (propDef.type === "attachment") {
+    if (Array.isArray(rawValue)) {
+      return rawValue.map((a) => chunk33GHS3X4_cjs.hydrateAttachmentFromRidInternal(client, a.rid));
     }
+    return chunk33GHS3X4_cjs.hydrateAttachmentFromRidInternal(client, rawValue.rid);
+  }
+  if (propDef.type === "numericTimeseries" || propDef.type === "stringTimeseries" || propDef.type === "sensorTimeseries") {
+    return new TimeSeriesPropertyImpl(client, objectDef.apiName, rawObject[objectDef.primaryKeyApiName], p);
+  }
+  if (propDef.type === "geotimeSeriesReference") {
+    return new GeotimeSeriesPropertyImpl(client, objectDef.apiName, rawObject[objectDef.primaryKeyApiName], p, rawValue.type === "geotimeSeriesValue" ? {
+      time: rawValue.timestamp,
+      value: {
+        type: "Point",
+        coordinates: rawValue.position
+      }
+    } : void 0);
+  }
+  if (propDef.type === "mediaReference") {
+    return new MediaReferencePropertyImpl({
+      client,
+      objectApiName: objectDef.apiName,
+      primaryKey: rawObject[objectDef.primaryKeyApiName],
+      propertyName: p
+    });
   }
 }
 
 // src/object/convertWireToOsdkObjects.ts
-async function convertWireToOsdkObjects(client, objects, interfaceApiName, forceRemoveRid = false, selectedProps, strictNonNull = false) {
-  client.logger?.debug(`START convertWireToOsdkObjects()`);
+async function convertWireToOsdkObjects(client, objects, interfaceApiName, forceRemoveRid = false, derivedPropertyTypesByName, selectedProps, strictNonNull = false) {
   fixObjectPropertiesInPlace(objects, forceRemoveRid);
-  const ifaceDef = interfaceApiName ? await client.ontologyProvider.getInterfaceDefinition(interfaceApiName) : undefined;
-  const ifaceSelected = ifaceDef ? selectedProps ?? Object.keys(ifaceDef.properties) : undefined;
+  const ifaceDef = interfaceApiName ? await client.ontologyProvider.getInterfaceDefinition(interfaceApiName) : void 0;
+  const ifaceSelected = ifaceDef ? selectedProps ?? Object.keys(ifaceDef.properties) : void 0;
   const ret = [];
   for (const rawObj of objects) {
     const objectDef = await client.ontologyProvider.getObjectDefinition(rawObj.$apiName);
-    !objectDef ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Missing definition for '${rawObj.$apiName}'`) : invariant__default.default(false) : undefined;
+    !objectDef ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Missing definition for '${rawObj.$apiName}'`) : invariant__default.default(false) : void 0;
     let objProps;
     let conforming = true;
     if (ifaceDef && ifaceSelected) {
@@ -985,24 +1050,22 @@ async function convertWireToOsdkObjects(client, objects, interfaceApiName, force
     } else if (strictNonNull === "drop" && !conforming) {
       continue;
     }
-    let osdkObject = createOsdkObject(client, objectDef, rawObj);
+    let osdkObject = createOsdkObject(client, objectDef, rawObj, derivedPropertyTypesByName);
     if (interfaceApiName) osdkObject = osdkObject.$as(interfaceApiName);
     ret.push(osdkObject);
   }
-  client.logger?.debug(`END convertWireToOsdkObjects()`);
   return ret;
 }
-async function convertWireToOsdkObjects2(client, objects, interfaceApiName, forceRemoveRid = false, selectedProps, strictNonNull = false, interfaceToObjectTypeMappings = {}) {
-  client.logger?.debug(`START convertWireToOsdkObjects2()`);
+async function convertWireToOsdkObjects2(client, objects, interfaceApiName, derivedPropertyTypeByName, forceRemoveRid = false, selectedProps, strictNonNull = false, interfaceToObjectTypeMappings = {}) {
   fixObjectPropertiesInPlace(objects, forceRemoveRid);
   const ret = [];
   for (const rawObj of objects) {
     const objectDef = await client.ontologyProvider.getObjectDefinition(rawObj.$apiName);
-    !objectDef ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Missing definition for '${rawObj.$apiName}'`) : invariant__default.default(false) : undefined;
-    const interfaceToObjMapping = interfaceApiName ? interfaceToObjectTypeMappings[interfaceApiName][rawObj.$apiName] : undefined;
+    !objectDef ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Missing definition for '${rawObj.$apiName}'`) : invariant__default.default(false) : void 0;
+    const interfaceToObjMapping = interfaceApiName ? interfaceToObjectTypeMappings[interfaceApiName][rawObj.$apiName] : void 0;
     const ifaceSelected = interfaceApiName && interfaceToObjMapping ? selectedProps ? Object.keys(interfaceToObjMapping).filter((val) => {
       selectedProps?.includes(interfaceToObjMapping[val]);
-    }) : [...Object.values(interfaceToObjMapping), objectDef.primaryKeyApiName] : undefined;
+    }) : [...Object.values(interfaceToObjMapping), objectDef.primaryKeyApiName] : void 0;
     let objProps;
     let conforming = true;
     if (interfaceApiName && ifaceSelected) {
@@ -1017,11 +1080,10 @@ async function convertWireToOsdkObjects2(client, objects, interfaceApiName, forc
     } else if (strictNonNull === "drop" && !conforming) {
       continue;
     }
-    let osdkObject = createOsdkObject(client, objectDef, rawObj);
+    let osdkObject = createOsdkObject(client, objectDef, rawObj, derivedPropertyTypeByName);
     if (interfaceApiName) osdkObject = osdkObject.$as(interfaceApiName);
     ret.push(osdkObject);
   }
-  client.logger?.debug(`END convertWireToOsdkObjects2()`);
   return ret;
 }
 function convertInterfacePropNamesToObjectPropNames(objectDef, interfaceApiName, ifacePropsToMap) {
@@ -1033,7 +1095,7 @@ function reframeAsObjectInPlace(objectDef, interfaceApiName, rawObj) {
     if (sptProp in rawObj) {
       const value = rawObj[sptProp];
       delete rawObj[sptProp];
-      if (value !== undefined) {
+      if (value !== void 0) {
         newProps[regularProp] = value;
       }
     }
@@ -1049,6 +1111,7 @@ function isConforming(client, def, obj, propsToCheck) {
       if (process.env.NODE_ENV !== "production") {
         client.logger?.debug({
           obj: {
+            $apiName: obj["$apiName"],
             $objectType: obj["$objectType"],
             $primaryKey: obj["$primaryKey"]
           }
@@ -1097,7 +1160,7 @@ function createClientCache(fn) {
       cache.set(client.clientCacheKey, /* @__PURE__ */ new Map());
     }
     let r = cache.get(client.clientCacheKey).get(key);
-    if (r === undefined && fn !== undefined) {
+    if (r === void 0 && fn !== void 0) {
       return set(client, key, fn(client, key));
     } else {
       return r;
@@ -1145,27 +1208,26 @@ function createAsyncClientCache(fn, createCacheLocal = createClientCache) {
   return ret;
 }
 async function loadActionMetadata(client, actionType) {
-  const r = await chunkX7WGNFZ4_cjs.ActionTypeV2_exports.get(client, await client.ontologyRid, actionType);
+  const r = await chunk37QC7LR3_cjs.ActionTypeV2_exports.get(client, await client.ontologyRid, actionType);
   return generatorConverters.wireActionTypeV2ToSdkActionMetadata(r);
 }
 async function loadFullObjectMetadata(client, objectType) {
-  const full = await chunkX7WGNFZ4_cjs.ObjectTypeV2_exports.getFullMetadata(client, await client.ontologyRid, objectType, {
+  const full = await chunk37QC7LR3_cjs.ObjectTypeV2_exports.getFullMetadata(client, await client.ontologyRid, objectType, {
     preview: true
   });
   const ret = generatorConverters.wireObjectTypeFullMetadataToSdkObjectMetadata(full, true);
-  client.logger?.debug(`END loadFullObjectMetadata(${objectType})`);
   return {
     ...ret
   };
 }
 async function loadInterfaceMetadata(client, objectType) {
-  const r = await chunkX7WGNFZ4_cjs.OntologyInterface_exports.get(client, await client.ontologyRid, objectType, {
+  const r = await chunk37QC7LR3_cjs.OntologyInterface_exports.get(client, await client.ontologyRid, objectType, {
     preview: true
   });
   return generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(r, true);
 }
 async function loadQueryMetadata(client, queryType) {
-  const r = await chunkX7WGNFZ4_cjs.QueryType_exports.get(client, await client.ontologyRid, queryType);
+  const r = await chunk37QC7LR3_cjs.QueryType_exports.get(client, await client.ontologyRid, queryType);
   return generatorConverters.wireQueryTypeV2ToSdkQueryMetadata(r);
 }
 
@@ -1176,7 +1238,7 @@ var createStandardOntologyProviderFactory = (client) => {
       let objectDef = await loadFullObjectMetadata(client3, key);
       const interfaceDefs = Object.fromEntries((await Promise.all(objectDef.implements?.map((i) => ret.getInterfaceDefinition(i)) ?? [])).map((i) => [i.apiName, {
         def: i,
-        handler: undefined
+        handler: void 0
       }]));
       const fullObjectDef = {
         ...objectDef,
@@ -1212,10 +1274,10 @@ var createStandardOntologyProviderFactory = (client) => {
 };
 
 // src/util/UserAgent.ts
-var USER_AGENT = `osdk-client/${"2.2.0-beta.2"}`;
+var USER_AGENT = `osdk-client/${"2.2.0-beta.21"}`;
 
 // src/createMinimalClient.ts
-function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fetchFn = global.fetch, objectSetFactory = chunkT5UE6BI7_cjs.createObjectSet) {
+function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fetchFn = global.fetch, objectSetFactory = chunk33GHS3X4_cjs.createObjectSet, createOntologyProviderFactory = createStandardOntologyProviderFactory) {
   if (process.env.NODE_ENV !== "production") {
     try {
       new URL(baseUrl);
@@ -1237,7 +1299,7 @@ function createMinimalClient(metadata, baseUrl, tokenProvider, options = {}, fet
     requestContext: {}
   };
   return Object.freeze(Object.assign(minimalClient, {
-    ontologyProvider: createStandardOntologyProviderFactory()(minimalClient)
+    ontologyProvider: createOntologyProviderFactory(options)(minimalClient)
   }));
 }
 
@@ -1271,19 +1333,27 @@ async function toDataValueQueries(value, client, desiredType) {
     return value;
   }
   if (Array.isArray(value) && desiredType.multiplicity) {
+    const values = Array.from(value);
+    if (values.some((dataValue) => isAttachmentUpload(dataValue) || isAttachmentFile(dataValue))) {
+      const converted = [];
+      for (const value2 of values) {
+        converted.push(await toDataValueQueries(value2, client, desiredType));
+      }
+      return converted;
+    }
     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 chunkX7WGNFZ4_cjs.Attachment_exports.upload(client, value.data, {
+        const attachment = await chunk37QC7LR3_cjs.Attachment_exports.upload(client, value.data, {
           filename: value.name
         });
         return attachment.rid;
       }
-      if (typeof value === "object" && value instanceof Blob && "name" in value) {
-        const attachment = await chunkX7WGNFZ4_cjs.Attachment_exports.upload(client, value, {
+      if (isAttachmentFile(value)) {
+        const attachment = await chunk37QC7LR3_cjs.Attachment_exports.upload(client, value, {
           filename: value.name
         });
         return attachment.rid;
@@ -1314,11 +1384,24 @@ async function toDataValueQueries(value, client, desiredType) {
       break;
     }
     case "objectSet": {
-      if (chunkT5UE6BI7_cjs.isWireObjectSet(value)) {
+      if (chunk33GHS3X4_cjs.isWireObjectSet(value)) {
         return value;
       }
-      if (chunkT5UE6BI7_cjs.isObjectSet(value)) {
-        return chunkT5UE6BI7_cjs.getWireObjectSet(value);
+      if (chunk33GHS3X4_cjs.isObjectSet(value)) {
+        return chunk33GHS3X4_cjs.getWireObjectSet(value);
+      }
+      break;
+    }
+    case "map": {
+      if (typeof value === "object") {
+        const entrySet = [];
+        for (const [key, mapValue] of Object.entries(value)) {
+          entrySet.push({
+            key: desiredType.keyType.type === "object" ? extractPrimaryKeyFromObjectSpecifier(key) : await toDataValueQueries(key, client, desiredType.keyType),
+            value: await toDataValueQueries(mapValue, client, desiredType.valueType)
+          });
+        }
+        return entrySet;
       }
       break;
     }
@@ -1347,7 +1430,7 @@ async function toDataValueQueries(value, client, desiredType) {
 // src/queries/applyQuery.ts
 async function applyQuery(client, query, params) {
   const qd = await client.ontologyProvider.getQueryDefinition(query.apiName);
-  const response = await chunkX7WGNFZ4_cjs.Query_exports.execute(chunkX7WGNFZ4_cjs.addUserAgentAndRequestContextHeaders(chunkT5UE6BI7_cjs.augmentRequestContext(client, (_) => ({
+  const response = await chunk37QC7LR3_cjs.Query_exports.execute(chunk37QC7LR3_cjs.addUserAgentAndRequestContextHeaders(chunk33GHS3X4_cjs.augmentRequestContext(client, (_) => ({
     finalMethodCall: "applyQuery"
   })), query), await client.ontologyRid, query.apiName, {
     parameters: params ? await remapQueryParams(params, client, qd.parameters) : {}
@@ -1366,7 +1449,7 @@ async function remapQueryParams(params, client, paramTypes) {
 async function remapQueryResponse(client, responseDataType, responseValue, definitions) {
   if (responseValue == null) {
     if (responseDataType.nullable) {
-      return undefined;
+      return void 0;
     } else {
       throw new Error("Got null response when nullable was not allowed");
     }
@@ -1392,11 +1475,11 @@ async function remapQueryResponse(client, responseDataType, responseValue, defin
       return responseValue;
     }
     case "attachment": {
-      return chunkT5UE6BI7_cjs.hydrateAttachmentFromRidInternal(client, responseValue);
+      return chunk33GHS3X4_cjs.hydrateAttachmentFromRidInternal(client, responseValue);
     }
     case "object": {
       const def = definitions.get(responseDataType.object);
-      if (!def) {
+      if (!def || def.type !== "object") {
         throw new Error(`Missing definition for ${responseDataType.object}`);
       }
       return createQueryObjectResponse(responseValue, def);
@@ -1407,7 +1490,7 @@ async function remapQueryResponse(client, responseDataType, responseValue, defin
         throw new Error(`Missing definition for ${responseDataType.objectSet}`);
       }
       if (typeof responseValue === "string") {
-        return chunkT5UE6BI7_cjs.createObjectSet(def, client, {
+        return chunk33GHS3X4_cjs.createObjectSet(def, client, {
           type: "intersect",
           objectSets: [{
             type: "base",
@@ -1418,7 +1501,7 @@ async function remapQueryResponse(client, responseDataType, responseValue, defin
           }]
         });
       }
-      return chunkT5UE6BI7_cjs.createObjectSet(def, client, responseValue);
+      return chunk33GHS3X4_cjs.createObjectSet(def, client, responseValue);
     }
     case "struct": {
       for (const [key, subtype] of Object.entries(responseDataType.struct)) {
@@ -1428,6 +1511,18 @@ async function remapQueryResponse(client, responseDataType, responseValue, defin
       }
       return responseValue;
     }
+    case "map": {
+      const map = {};
+      !Array.isArray(responseValue) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Expected array entry") : invariant__default.default(false) : void 0;
+      for (const entry of responseValue) {
+        !entry.key ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Expected key") : invariant__default.default(false) : void 0;
+        !entry.value ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Expected value") : invariant__default.default(false) : void 0;
+        const key = responseDataType.keyType.type === "object" ? getObjectSpecifier(entry.key, responseDataType.keyType.object, definitions) : entry.key;
+        const value = await remapQueryResponse(client, responseDataType.valueType, entry.value, definitions);
+        map[key] = value;
+      }
+      return map;
+    }
     case "twoDimensionalAggregation": {
       const result = [];
       for (const {
@@ -1483,6 +1578,14 @@ async function getRequiredDefinitions(dataType, client) {
     case "set": {
       return getRequiredDefinitions(dataType.set, client);
     }
+    case "map": {
+      for (const value of [dataType.keyType, dataType.valueType]) {
+        for (const [type, objectDef] of await getRequiredDefinitions(value, client)) {
+          result.set(type, objectDef);
+        }
+      }
+      break;
+    }
     case "struct": {
       for (const value of Object.values(dataType.struct)) {
         for (const [type, objectDef] of await getRequiredDefinitions(value, client)) {
@@ -1521,28 +1624,36 @@ function requiresConversion(dataType) {
       return false;
   }
 }
+function getObjectSpecifier(primaryKey, objectTypeApiName, definitions) {
+  const def = definitions.get(objectTypeApiName);
+  if (!def || def.type !== "object") {
+    throw new Error(`Missing definition for ${objectTypeApiName}`);
+  }
+  return createObjectSpecifierFromPrimaryKey(def, primaryKey);
+}
 function createQueryObjectResponse(primaryKey, objectDef) {
   return {
     $apiName: objectDef.apiName,
-    $title: undefined,
+    $title: void 0,
     $objectType: objectDef.apiName,
-    $primaryKey: primaryKey
+    $primaryKey: primaryKey,
+    $objectSpecifier: createObjectSpecifierFromPrimaryKey(objectDef, primaryKey)
   };
 }
 
 // src/createClient.ts
 var ActionInvoker = class {
   constructor(clientCtx, actionDef) {
-    this.applyAction = applyAction.bind(undefined, clientCtx, actionDef);
-    this.batchApplyAction = applyAction.bind(undefined, clientCtx, actionDef);
+    this.applyAction = applyAction.bind(void 0, clientCtx, actionDef);
+    this.batchApplyAction = applyAction.bind(void 0, clientCtx, actionDef);
   }
 };
 var QueryInvoker = class {
   constructor(clientCtx, queryDef) {
-    this.executeFunction = applyQuery.bind(undefined, clientCtx, queryDef);
+    this.executeFunction = applyQuery.bind(void 0, clientCtx, queryDef);
   }
 };
-function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvider, options = undefined, fetchFn = fetch) {
+function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvider, options = void 0, fetchFn = fetch) {
   if (typeof ontologyRid === "string") {
     if (!ontologyRid.startsWith("ri.")) {
       throw new Error("Invalid ontology RID");
@@ -1556,7 +1667,10 @@ function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvi
   }
   const clientCtx = createMinimalClient({
     ontologyRid
-  }, baseUrl, tokenProvider, options, fetchFn, objectSetFactory);
+  }, baseUrl, tokenProvider, {
+    ...options,
+    logger: options?.logger ?? new chunk33GHS3X4_cjs.MinimalLogger()
+  }, fetchFn, objectSetFactory);
   function clientFn(o) {
     if (o.type === "object" || o.type === "interface") {
       return objectSetFactory(o, clientCtx);
@@ -1573,7 +1687,7 @@ function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvi
         case unstable.__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchOneByRid.name:
           return {
             fetchOneByRid: async (objectType, rid, options2) => {
-              return await chunkT5UE6BI7_cjs.fetchSingle(clientCtx, objectType, options2, createWithRid(rid));
+              return await chunk33GHS3X4_cjs.fetchSingle(clientCtx, objectType, options2, createWithRid([rid]));
             }
           };
         case unstable.__EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference.name:
@@ -1582,31 +1696,37 @@ function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvi
               const {
                 data,
                 fileName,
-                objectTypeApi,
-                propertyTypeApi
+                objectType,
+                propertyType
               } = args;
-              return await chunkX7WGNFZ4_cjs.MediaReferenceProperty_exports.upload(clientCtx, await clientCtx.ontologyRid, objectTypeApi, propertyTypeApi, data, {
+              return await chunk37QC7LR3_cjs.MediaReferenceProperty_exports.upload(clientCtx, await clientCtx.ontologyRid, objectType.apiName, propertyType, data, {
                 mediaItemPath: fileName,
                 preview: true
               });
             }
           };
+        case unstable.__EXPERIMENTAL__NOT_SUPPORTED_YET__fetchPageByRid.name:
+          return {
+            fetchPageByRid: async (objectOrInterfaceType, rids, options2 = {}) => {
+              return await chunk37QC7LR3_cjs.fetchPage(clientCtx, objectOrInterfaceType, options2, createWithRid(rids));
+            }
+          };
       }
       throw new Error("not implemented");
     } else {
       throw new Error("not implemented");
     }
   }
-  const fetchMetadata = fetchMetadataInternal.bind(undefined, clientCtx);
+  const fetchMetadata = fetchMetadataInternal.bind(void 0, clientCtx);
   const symbolClientContext2 = "__osdkClientContext";
   const client = Object.defineProperties(clientFn, {
-    [chunkX7WGNFZ4_cjs.symbolClientContext]: {
+    [chunk37QC7LR3_cjs.symbolClientContext]: {
       value: clientCtx
     },
     [symbolClientContext2]: {
       value: clientCtx
     },
-    [chunkX7WGNFZ4_cjs.additionalContext]: {
+    [chunk37QC7LR3_cjs.additionalContext]: {
       value: clientCtx
     },
     fetchMetadata: {
@@ -1615,21 +1735,21 @@ function createClientInternal(objectSetFactory, baseUrl, ontologyRid, tokenProvi
   });
   return client;
 }
-var createClient = createClientInternal.bind(undefined, chunkT5UE6BI7_cjs.createObjectSet);
-function createWithRid(rid) {
+var createClient = createClientInternal.bind(void 0, chunk33GHS3X4_cjs.createObjectSet);
+function createWithRid(rids) {
   const withRid = {
     type: "static",
-    "objects": [rid]
+    "objects": rids
   };
   return withRid;
 }
-function createPlatformClient(baseUrl, tokenProvider, options = undefined, fetchFn = fetch) {
+function createPlatformClient(baseUrl, tokenProvider, options = void 0, fetchFn = fetch) {
   return shared_client_impl.createSharedClientContext(baseUrl, tokenProvider, USER_AGENT, fetchFn);
 }
 var isoRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})?$/;
 var extractDate = (dateTime) => {
-  !(dateTime.length < 33) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Invalid date format. Provided input is too long.") : invariant__default.default(false) : undefined;
-  !isoRegex.test(dateTime) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Invalid date format. Expected ISO 8601 format, but received ${dateTime}`) : invariant__default.default(false) : undefined;
+  !(dateTime.length < 33) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, "Invalid date format. Provided input is too long.") : invariant__default.default(false) : void 0;
+  !isoRegex.test(dateTime) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Invalid date format. Expected ISO 8601 format, but received ${dateTime}`) : invariant__default.default(false) : void 0;
   return extractDateFromIsoString(dateTime);
 };
 var extractDateInUTC = (date) => {
@@ -1657,6 +1777,7 @@ Object.defineProperty(exports, "PalantirApiError", {
 exports.ActionValidationError = ActionValidationError;
 exports.createAttachmentUpload = createAttachmentUpload;
 exports.createClient = createClient;
+exports.createObjectSpecifierFromPrimaryKey = createObjectSpecifierFromPrimaryKey;
 exports.createPlatformClient = createPlatformClient;
 exports.extractDate = extractDate;
 exports.extractDateInLocalTime = extractDateInLocalTime;