@osdk/client 2.5.2 → 2.6.0-beta.10

package/build/cjs/{chunk-MEL46GIF.cjs → chunk-RO7XAQOS.cjs}

@@ -1,29 +1,44 @@
 'use strict';
 
-var chunkQ7SFCCGT_cjs = require('./chunk-Q7SFCCGT.cjs');
+var chunk6SCDLAU2_cjs = require('./chunk-6SCDLAU2.cjs');
 var shared_net_errors = require('@osdk/shared.net.errors');
-var api = require('@osdk/api');
-var invariant8 = require('tiny-invariant');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
+var invariant3 = require('tiny-invariant');
+var api = require('@osdk/api');
 var WebSocket = require('isomorphic-ws');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var invariant8__default = /*#__PURE__*/_interopDefault(invariant8);
+var invariant3__default = /*#__PURE__*/_interopDefault(invariant3);
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// src/object/fetchPage.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 var Action_exports = {};
-chunkQ7SFCCGT_cjs.__export(Action_exports, {
+chunk6SCDLAU2_cjs.__export(Action_exports, {
   apply: () => apply,
   applyAsync: () => applyAsync,
   applyBatch: () => applyBatch
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/index.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
 
 // ../../node_modules/.pnpm/@osdk+shared.client@1.0.1/node_modules/@osdk/shared.client/index.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var symbolClientContext = Symbol("ClientContext");
 
 // ../../node_modules/.pnpm/@osdk+shared.client2@1.0.0/node_modules/@osdk/shared.client2/index.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var symbolClientContext2 = "__osdkClientContext";
 async function foundryPlatformFetch(client, [httpMethodNum, origPath, flags, contentType, responseContentType], ...args) {
   const path = origPath.replace(/\{([^}]+)\}/g, () => encodeURIComponent(args.shift()));
@@ -68,7 +83,7 @@ async function apiFetch(clientCtx, method, endpointPath, data, queryArguments, h
   if (!response.ok) {
     try {
       const convertedError = await response.json();
-      return new shared_net_errors.PalantirApiError(convertedError.message, convertedError.errorName, convertedError.errorCode, response.status, convertedError.errorInstanceId, convertedError.parameters);
+      return new shared_net_errors.PalantirApiError(convertedError.message, convertedError.errorName, convertedError.errorCode, convertedError.errorDescription, response.status, convertedError.errorInstanceId, convertedError.parameters);
     } catch (e) {
       if (e instanceof Error) {
         return new shared_net_errors.UnknownError(e.message, "UNKNOWN");
@@ -89,7 +104,7 @@ function parseUrl(baseUrl, endpointPath) {
   return new URL(`api${endpointPath}`, baseUrl);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 var _apply = [1, "/v2/ontologies/{0}/actions/{1}/apply", 3];
 function apply($ctx, ...args) {
   return foundryPlatformFetch($ctx, _apply, ...args);
@@ -103,13 +118,17 @@ function applyBatch($ctx, ...args) {
   return foundryPlatformFetch($ctx, _applyBatch, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeFullMetadata.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
 var ActionTypeV2_exports = {};
-chunkQ7SFCCGT_cjs.__export(ActionTypeV2_exports, {
+chunk6SCDLAU2_cjs.__export(ActionTypeV2_exports, {
   get: () => get,
   getByRid: () => getByRid,
   list: () => list
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _list = [0, "/v2/ontologies/{0}/actionTypes", 2];
 function list($ctx, ...args) {
   return foundryPlatformFetch($ctx, _list, ...args);
@@ -123,13 +142,14 @@ function getByRid($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getByRid, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
 var Attachment_exports = {};
-chunkQ7SFCCGT_cjs.__export(Attachment_exports, {
+chunk6SCDLAU2_cjs.__export(Attachment_exports, {
   get: () => get2,
   read: () => read,
   upload: () => upload
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _upload = [1, "/v2/ontologies/attachments/upload", 7, "*/*"];
 function upload($ctx, ...args) {
   const headerParams = {
@@ -148,14 +168,23 @@ function get2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _get2, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/CipherTextProperty.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
 var MediaReferenceProperty_exports = {};
-chunkQ7SFCCGT_cjs.__export(MediaReferenceProperty_exports, {
+chunk6SCDLAU2_cjs.__export(MediaReferenceProperty_exports, {
   getMediaContent: () => getMediaContent,
   getMediaMetadata: () => getMediaMetadata,
-  upload: () => upload2,
-  uploadMedia: () => uploadMedia
+  upload: () => upload2
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _getMediaContent = [0, "/v2/ontologies/{0}/objects/{1}/{2}/media/{3}/content", 2, , "*/*"];
 function getMediaContent($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getMediaContent, ...args);
@@ -168,20 +197,17 @@ var _upload2 = [1, "/v2/ontologies/{0}/objectTypes/{1}/media/{2}/upload", 3, "*/
 function upload2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _upload2, ...args);
 }
-var _uploadMedia = [1, "/v2/ontologies/{0}/actions/{1}/media/upload", 3, "*/*"];
-function uploadMedia($ctx, ...args) {
-  return foundryPlatformFetch($ctx, _uploadMedia, ...args);
-}
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
 var ObjectTypeV2_exports = {};
-chunkQ7SFCCGT_cjs.__export(ObjectTypeV2_exports, {
+chunk6SCDLAU2_cjs.__export(ObjectTypeV2_exports, {
   get: () => get3,
   getFullMetadata: () => getFullMetadata,
   getOutgoingLinkType: () => getOutgoingLinkType,
   list: () => list2,
   listOutgoingLinkTypes: () => listOutgoingLinkTypes
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _list2 = [0, "/v2/ontologies/{0}/objectTypes", 2];
 function list2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _list2, ...args);
@@ -203,17 +229,19 @@ function getOutgoingLinkType($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingLinkType, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
 var OntologyInterface_exports = {};
-chunkQ7SFCCGT_cjs.__export(OntologyInterface_exports, {
+chunk6SCDLAU2_cjs.__export(OntologyInterface_exports, {
   aggregate: () => aggregate,
   get: () => get4,
   getOutgoingInterfaceLinkType: () => getOutgoingInterfaceLinkType,
   list: () => list3,
+  listInterfaceLinkedObjects: () => listInterfaceLinkedObjects,
   listObjectsForInterface: () => listObjectsForInterface,
   listOutgoingInterfaceLinkTypes: () => listOutgoingInterfaceLinkTypes,
   search: () => search
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _list3 = [0, "/v2/ontologies/{0}/interfaceTypes", 2];
 function list3($ctx, ...args) {
   return foundryPlatformFetch($ctx, _list3, ...args);
@@ -242,10 +270,14 @@ var _getOutgoingInterfaceLinkType = [0, "/v2/ontologies/{0}/interfaceTypes/{1}/o
 function getOutgoingInterfaceLinkType($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingInterfaceLinkType, ...args);
 }
+var _listInterfaceLinkedObjects = [0, "/v2/ontologies/{0}/interfaces/{1}/{2}/{3}/links/{4}", 2];
+function listInterfaceLinkedObjects($ctx, ...args) {
+  return foundryPlatformFetch($ctx, _listInterfaceLinkedObjects, ...args);
+}
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
 var OntologyObjectSet_exports = {};
-chunkQ7SFCCGT_cjs.__export(OntologyObjectSet_exports, {
+chunk6SCDLAU2_cjs.__export(OntologyObjectSet_exports, {
   aggregate: () => aggregate2,
   createTemporary: () => createTemporary,
   get: () => get5,
@@ -253,6 +285,7 @@ chunkQ7SFCCGT_cjs.__export(OntologyObjectSet_exports, {
   loadMultipleObjectTypes: () => loadMultipleObjectTypes,
   loadObjectsOrInterfaces: () => loadObjectsOrInterfaces
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _createTemporary = [1, "/v2/ontologies/{0}/objectSets/createTemporary", 3];
 function createTemporary($ctx, ...args) {
   return foundryPlatformFetch($ctx, _createTemporary, ...args);
@@ -278,22 +311,36 @@ function aggregate2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _aggregate2, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyTransaction.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyValueType.js
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
 var Query_exports = {};
-chunkQ7SFCCGT_cjs.__export(Query_exports, {
+chunk6SCDLAU2_cjs.__export(Query_exports, {
   execute: () => execute
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _execute = [1, "/v2/ontologies/{0}/queries/{1}/execute", 7];
 function execute($ctx, ...args) {
   return foundryPlatformFetch($ctx, _execute, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
 var QueryType_exports = {};
-chunkQ7SFCCGT_cjs.__export(QueryType_exports, {
+chunk6SCDLAU2_cjs.__export(QueryType_exports, {
   get: () => get6,
   list: () => list4
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _list4 = [0, "/v2/ontologies/{0}/queryTypes", 2];
 function list4($ctx, ...args) {
   return foundryPlatformFetch($ctx, _list4, ...args);
@@ -303,13 +350,14 @@ function get6($ctx, ...args) {
   return foundryPlatformFetch($ctx, _get6, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
 var TimeSeriesPropertyV2_exports = {};
-chunkQ7SFCCGT_cjs.__export(TimeSeriesPropertyV2_exports, {
+chunk6SCDLAU2_cjs.__export(TimeSeriesPropertyV2_exports, {
   getFirstPoint: () => getFirstPoint,
   getLastPoint: () => getLastPoint,
   streamPoints: () => streamPoints
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _getFirstPoint = [0, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/firstPoint", 2];
 function getFirstPoint($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getFirstPoint, ...args);
@@ -323,12 +371,13 @@ function streamPoints($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamPoints, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.40.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
 var TimeSeriesValueBankProperty_exports = {};
-chunkQ7SFCCGT_cjs.__export(TimeSeriesValueBankProperty_exports, {
+chunk6SCDLAU2_cjs.__export(TimeSeriesValueBankProperty_exports, {
   getLatestValue: () => getLatestValue,
   streamValues: () => streamValues
 });
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var _getLatestValue = [0, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/latestValue", 2];
 function getLatestValue($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getLatestValue, ...args);
@@ -337,187 +386,17 @@ var _streamValues = [1, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/strea
 function streamValues($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamValues, ...args);
 }
+
+// src/internal/conversions/extractNamespace.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function extractNamespace(fqApiName) {
   const last = fqApiName.lastIndexOf(".");
   if (last === -1) return [void 0, fqApiName];
   return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
 }
-function modernToLegacyWhereClause(whereClause, objectOrInterface) {
-  if ("$and" in whereClause) {
-    return {
-      type: "and",
-      value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
-    };
-  } else if ("$or" in whereClause) {
-    return {
-      type: "or",
-      value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
-    };
-  } else if ("$not" in whereClause) {
-    return {
-      type: "not",
-      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface)
-    };
-  }
-  const parts = Object.entries(whereClause);
-  if (parts.length === 1) {
-    return handleWherePair(parts[0], objectOrInterface);
-  }
-  return {
-    type: "and",
-    value: parts.map((v) => handleWherePair(v, objectOrInterface))
-  };
-}
-function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
-    /**
-     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
-     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
-     * Once we solidify that this is the way forward, I can remove field and clean this up
-     */
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: {
-      topLeft: {
-        type: "Point",
-        coordinates: [bbox[0], bbox[3]]
-      },
-      bottomRight: {
-        type: "Point",
-        coordinates: [bbox[2], bbox[1]]
-      }
-    }
-  };
-}
-function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType,
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: {
-      type: "Polygon",
-      coordinates
-    }
-  };
-}
-function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector) {
-  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant8__default.default(false) : void 0;
-  const propertyIdentifier = structFieldSelector != null ? {
-    type: "structField",
-    ...structFieldSelector,
-    propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
-  } : void 0;
-  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
-  if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
-    return {
-      type: "eq",
-      ...propertyIdentifier != null && {
-        propertyIdentifier
-      },
-      field,
-      value: filter
-    };
-  }
-  const keysOfFilter = Object.keys(filter);
-  const hasDollarSign = keysOfFilter.some((key) => key.startsWith("$"));
-  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant8__default.default(false) : void 0;
-  if (!hasDollarSign) {
-    const structFilter = Object.entries(filter);
-    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant8__default.default(false) : void 0;
-    const structFieldApiName = keysOfFilter[0];
-    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
-      propertyApiName: fieldName,
-      structFieldApiName
-    });
-  }
-  const firstKey = keysOfFilter[0];
-  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false) : invariant8__default.default(false) : void 0;
-  if (firstKey === "$ne") {
-    return {
-      type: "not",
-      value: {
-        type: "eq",
-        ...propertyIdentifier != null && {
-          propertyIdentifier
-        },
-        field,
-        value: filter[firstKey]
-      }
-    };
-  }
-  if (firstKey === "$within") {
-    const withinBody = filter[firstKey];
-    if (Array.isArray(withinBody)) {
-      return makeGeoFilterBbox(withinBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
-      return makeGeoFilterBbox(withinBody.$bbox, firstKey, propertyIdentifier, field);
-    } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
-      return {
-        type: "withinDistanceOf",
-        ...propertyIdentifier != null && {
-          propertyIdentifier
-        },
-        field,
-        value: {
-          center: Array.isArray(withinBody.$of) ? {
-            type: "Point",
-            coordinates: withinBody.$of
-          } : withinBody.$of,
-          distance: {
-            value: withinBody.$distance[0],
-            unit: api.DistanceUnitMapping[withinBody.$distance[1]]
-          }
-        }
-      };
-    } else {
-      const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, fieldName);
-    }
-  }
-  if (firstKey === "$intersects") {
-    const intersectsBody = filter[firstKey];
-    if (Array.isArray(intersectsBody)) {
-      return makeGeoFilterBbox(intersectsBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
-      return makeGeoFilterBbox(intersectsBody.$bbox, firstKey, propertyIdentifier, field);
-    } else {
-      const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
-    }
-  }
-  if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
-    return {
-      type: firstKey.substring(1),
-      ...propertyIdentifier != null && {
-        propertyIdentifier
-      },
-      field,
-      value: typeof filter[firstKey] === "string" ? filter[firstKey] : filter[firstKey]["term"],
-      fuzzy: typeof filter[firstKey] === "string" ? false : filter[firstKey]["fuzzySearch"] ?? false
-    };
-  }
-  return {
-    type: firstKey.substring(1),
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: filter[firstKey]
-  };
-}
-function fullyQualifyPropName(fieldName, objectOrInterface) {
-  if (objectOrInterface.type === "interface") {
-    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
-    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
-    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
-  }
-  return fieldName;
-}
+
+// src/util/addUserAgentAndRequestContextHeaders.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var addUserAgentAndRequestContextHeaders = (client, withMetadata) => ({
   ...client,
   fetch: shared_net_fetch.createFetchHeaderMutator(client.fetch, (headers) => {
@@ -528,6 +407,9 @@ var addUserAgentAndRequestContextHeaders = (client, withMetadata) => ({
     return headers;
   })
 });
+
+// src/util/extractObjectOrInterfaceType.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 async function extractObjectOrInterfaceType(clientCtx, objectSet) {
   switch (objectSet.type) {
     case "searchAround": {
@@ -537,7 +419,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       }
       const objOrInterfaceDef2 = def2.type === "object" ? await clientCtx.ontologyProvider.getObjectDefinition(def2.apiName) : await clientCtx.ontologyProvider.getInterfaceDefinition(def2.apiName);
       const linkDef2 = objOrInterfaceDef2.links[objectSet.link];
-      !linkDef2 ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant8__default.default(false) : void 0;
+      !linkDef2 ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant3__default.default(false) : void 0;
       return objOrInterfaceDef2.type === "object" ? {
         apiName: objOrInterfaceDef2.links[objectSet.link].targetType,
         type: "object"
@@ -563,15 +445,19 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       };
     case "filter":
     case "asBaseObjectTypes":
-    case "asType":
     case "nearestNeighbors":
       return extractObjectOrInterfaceType(clientCtx, objectSet.objectSet);
+    case "asType":
+      return {
+        type: clientCtx.asTypeInterfaceOrObjectMapping[objectSet.entityType],
+        apiName: objectSet.entityType
+      };
     case "intersect": {
       const objectSets2 = objectSet.objectSets;
       const objectSetTypes2 = await Promise.all(objectSets2.map((os) => extractObjectOrInterfaceType(clientCtx, os)));
       const filteredObjectTypes2 = objectSetTypes2.filter(Boolean);
       const firstInterfaceType = filteredObjectTypes2.find((val) => val?.type === "interface");
-      !firstInterfaceType ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing interface type in intersect objectset scope'`) : invariant8__default.default(false) : void 0;
+      !firstInterfaceType ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Missing interface type in intersect objectset scope'`) : invariant3__default.default(false) : void 0;
       return firstInterfaceType;
     }
     case "subtract":
@@ -582,7 +468,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       const firstObjectType = filteredObjectTypes[0];
       !filteredObjectTypes.every((val) => {
         return val?.apiName === firstObjectType?.apiName && val?.type === firstObjectType?.type;
-      }) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Can only have one object type when doing subtract, union") : invariant8__default.default(false) : void 0;
+      }) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Can only have one object type when doing subtract, union") : invariant3__default.default(false) : void 0;
       return filteredObjectTypes[0];
     case "static":
     case "reference":
@@ -594,7 +480,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       }
       const objOrInterfaceDef = def.type === "object" ? await clientCtx.ontologyProvider.getObjectDefinition(def.apiName) : await clientCtx.ontologyProvider.getInterfaceDefinition(def.apiName);
       const linkDef = objOrInterfaceDef.links[objectSet.interfaceLink];
-      !linkDef ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing link definition for '${objectSet.interfaceLink}'`) : invariant8__default.default(false) : void 0;
+      !linkDef ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Missing link definition for '${objectSet.interfaceLink}'`) : invariant3__default.default(false) : void 0;
       return objOrInterfaceDef.type === "object" ? {
         apiName: objOrInterfaceDef.links[objectSet.interfaceLink].targetType,
         type: "object"
@@ -604,9 +490,12 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       };
     // We don't have to worry about new object sets being added and doing a runtime break and breaking people since the OSDK is always constructing these.
     default:
-      process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Unsupported object set type for deriving object or interface type,`) : invariant8__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Unsupported object set type for deriving object or interface type,`) : invariant3__default.default(false) ;
   }
 }
+
+// src/util/extractRdpDefinition.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 async function extractRdpDefinition(clientCtx, objectSet) {
   return (await extractRdpDefinitionInternal(clientCtx, objectSet, void 0)).definitions;
 }
@@ -624,7 +513,7 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
       }
       const objDef = await clientCtx.ontologyProvider.getObjectDefinition(childObjectType);
       const linkDef = objDef.links[objectSet.link];
-      !linkDef ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant8__default.default(false) : void 0;
+      !linkDef ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant3__default.default(false) : void 0;
       return {
         definitions: definitions2,
         childObjectType: objDef.links[objectSet.link].targetType
@@ -710,13 +599,13 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
         ...acc,
         ...definitions2
       }), {});
-      !(Object.keys(definitions).length === 0) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Object sets combined using intersect, subtract, or union must not contain any derived property definitions") : invariant8__default.default(false) : void 0;
+      !(Object.keys(definitions).length === 0) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Object sets combined using intersect, subtract, or union must not contain any derived property definitions") : invariant3__default.default(false) : void 0;
       const firstValidChildObjectType = objectSetTypes.find(({
         childObjectType
       }) => childObjectType != null)?.childObjectType;
       !objectSetTypes.every(({
         childObjectType
-      }) => childObjectType === firstValidChildObjectType || childObjectType == null) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "All object sets in an intersect, subtract, or union must have the same child object type") : invariant8__default.default(false) : void 0;
+      }) => childObjectType === firstValidChildObjectType || childObjectType == null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "All object sets in an intersect, subtract, or union must have the same child object type") : invariant3__default.default(false) : void 0;
       return {
         definitions: {},
         childObjectType: firstValidChildObjectType
@@ -728,13 +617,14 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
       };
     // We don't have to worry about new object sets being added and doing a runtime break and breaking people since the OSDK is always constructing these.
     case "interfaceLinkSearchAround":
-      process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant8__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant3__default.default(false) ;
     default:
-      process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant8__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant3__default.default(false) ;
   }
 }
 
 // src/util/objectSetUtils.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function resolveBaseObjectSetType(objectType) {
   return objectType.type === "interface" ? {
     type: "interfaceBase",
@@ -795,7 +685,8 @@ async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
   const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, {
     osdkMetadata: void 0
   }), await client.ontologyRid, requestBody, {
-    preview: true
+    preview: true,
+    transactionId: client.transactionId
   });
   return Promise.resolve({
     data: await client.objectFactory2(client, result.data, void 0, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings),
@@ -831,7 +722,8 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     );
     return result2;
   }
-  const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, interfaceType.apiName, args);
+  const extractedInterfaceTypeApiName = (await extractObjectOrInterfaceType(client, objectSet))?.apiName ?? interfaceType.apiName;
+  const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, extractedInterfaceTypeApiName, args);
   const requestBody = await buildAndRemapRequestBody(args, {
     objectSet: resolvedInterfaceObjectSet,
     select: args?.$select ? [...args.$select] : [],
@@ -839,10 +731,12 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     snapshot: useSnapshot
   }, client, interfaceType);
   const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, requestBody, {
-    preview: true
+    preview: true,
+    branch: client.branch,
+    transactionId: client.transactionId
   });
   return Promise.resolve({
-    data: await client.objectFactory2(client, result.data, (await extractObjectOrInterfaceType(client, resolvedInterfaceObjectSet))?.apiName ?? interfaceType.apiName, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings),
+    data: await client.objectFactory2(client, result.data, extractedInterfaceTypeApiName, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings),
     nextPageToken: result.nextPageToken,
     totalCount: result.totalCount
   });
@@ -935,7 +829,10 @@ async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
   }, client, objectType);
-  const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, requestBody);
+  const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, requestBody, {
+    branch: client.branch,
+    transactionId: client.transactionId
+  });
   return Promise.resolve({
     data: await client.objectFactory(client, r.data, void 0, void 0, await extractRdpDefinition(client, objectSet), args.$select, false),
     nextPageToken: r.nextPageToken,
@@ -943,7 +840,11 @@ async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot
   });
 }
 
+// src/public-utils/hydrateAttachmentFromRid.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/Client.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var additionalContext = Symbol("additionalContext");
 
 // src/public-utils/hydrateAttachmentFromRid.ts
@@ -966,7 +867,11 @@ function hydrateAttachmentFromRidInternal(client, rid) {
   };
 }
 
+// src/logger/MinimalLogger.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/logger/BaseLogger.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function noop() {
 }
 var levels = {
@@ -1032,6 +937,9 @@ var MinimalLogger = class _MinimalLogger extends BaseLogger {
     };
   }
 };
+
+// src/object/fetchSingle.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 async function fetchSingle(client, objectType, args, objectSet) {
   const result = await fetchPage(client, objectType, {
     ...args,
@@ -1059,6 +967,247 @@ async function fetchSingleWithErrors(client, objectType, args, objectSet) {
     };
   }
 }
+
+// src/objectSet/createObjectSet.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/derivedProperties/createWithPropertiesObjectSet.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/internal/conversions/modernToLegacyWhereClause.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/internal/conversions/fullyQualifyPropName.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+function fullyQualifyPropName(fieldName, objectOrInterface) {
+  if (objectOrInterface.type === "interface") {
+    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
+    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
+    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
+  }
+  return fieldName;
+}
+
+// src/internal/conversions/makeGeoFilterIntersects.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/internal/conversions/makeGeoFilterBbox.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
+  return {
+    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
+    /**
+     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
+     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
+     * Once we solidify that this is the way forward, I can remove field and clean this up
+     */
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: {
+      topLeft: {
+        type: "Point",
+        coordinates: [bbox[0], bbox[3]]
+      },
+      bottomRight: {
+        type: "Point",
+        coordinates: [bbox[2], bbox[1]]
+      }
+    }
+  };
+}
+
+// src/internal/conversions/makeGeoFilterPolygon.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
+  return {
+    type: filterType,
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: {
+      type: "Polygon",
+      coordinates
+    }
+  };
+}
+
+// src/internal/conversions/makeGeoFilterIntersects.ts
+function makeGeoFilterIntersects(intersectsBody, propertyIdentifier, field) {
+  if (Array.isArray(intersectsBody)) {
+    return makeGeoFilterBbox(intersectsBody, "$intersects", propertyIdentifier, field);
+  } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
+    return makeGeoFilterBbox(intersectsBody.$bbox, "$intersects", propertyIdentifier, field);
+  } else {
+    const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
+    return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
+  }
+}
+
+// src/internal/conversions/makeGeoFilterWithin.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+function makeGeoFilterWithin(withinBody, propertyIdentifier, field) {
+  if (Array.isArray(withinBody)) {
+    return makeGeoFilterBbox(withinBody, "$within", propertyIdentifier, field);
+  } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
+    return makeGeoFilterBbox(withinBody.$bbox, "$within", propertyIdentifier, field);
+  } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
+    return {
+      type: "withinDistanceOf",
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: {
+        center: Array.isArray(withinBody.$of) ? {
+          type: "Point",
+          coordinates: withinBody.$of
+        } : withinBody.$of,
+        distance: {
+          value: withinBody.$distance[0],
+          unit: api.DistanceUnitMapping[withinBody.$distance[1]]
+        }
+      }
+    };
+  } else {
+    const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
+    return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, field);
+  }
+}
+
+// src/internal/conversions/modernToLegacyWhereClause.ts
+function isAndClause(whereClause) {
+  return "$and" in whereClause && whereClause.$and !== void 0;
+}
+function isOrClause(whereClause) {
+  return "$or" in whereClause && whereClause.$or !== void 0;
+}
+function isNotClause(whereClause) {
+  return "$not" in whereClause && whereClause.$not !== void 0;
+}
+function modernToLegacyWhereClause(whereClause, objectOrInterface, rdpNames) {
+  const parts = Object.entries(whereClause).map(([key, value]) => ({
+    [key]: value
+  }));
+  if (parts.length === 1) {
+    return modernToLegacyWhereClauseInner(whereClause, objectOrInterface, rdpNames);
+  }
+  return {
+    type: "and",
+    value: parts.map((v) => modernToLegacyWhereClauseInner(v, objectOrInterface, rdpNames))
+  };
+}
+function modernToLegacyWhereClauseInner(whereClause, objectOrInterface, rdpNames) {
+  const parts = Object.entries(whereClause);
+  !(parts.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid where clause provided.") : invariant3__default.default(false) : void 0;
+  if (isAndClause(whereClause)) {
+    return {
+      type: "and",
+      value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface, rdpNames))
+    };
+  } else if (isOrClause(whereClause)) {
+    return {
+      type: "or",
+      value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface, rdpNames))
+    };
+  } else if (isNotClause(whereClause)) {
+    return {
+      type: "not",
+      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface, rdpNames)
+    };
+  }
+  return handleWherePair(parts[0], objectOrInterface, void 0, rdpNames);
+}
+function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector, rdpNames) {
+  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant3__default.default(false) : void 0;
+  const isRdp = !structFieldSelector && rdpNames?.has(fieldName);
+  const propertyIdentifier = isRdp ? {
+    type: "property",
+    apiName: fieldName
+  } : structFieldSelector != null ? {
+    type: "structField",
+    ...structFieldSelector,
+    propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
+  } : void 0;
+  const field = !isRdp && structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
+  !(field == null || propertyIdentifier == null && (field != null || isRdp != null)) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Encountered error constructing where clause: field and propertyIdentifier cannot both be defined") : invariant3__default.default(false) : void 0;
+  if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
+    return {
+      type: "eq",
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: filter
+    };
+  }
+  const keysOfFilter = Object.keys(filter);
+  const hasDollarSign = keysOfFilter.some((key) => key.startsWith("$"));
+  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant3__default.default(false) : void 0;
+  if (!hasDollarSign) {
+    const structFilter = Object.entries(filter);
+    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant3__default.default(false) : void 0;
+    const structFieldApiName = keysOfFilter[0];
+    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
+      propertyApiName: fieldName,
+      structFieldApiName
+    }, rdpNames);
+  }
+  const firstKey = keysOfFilter[0];
+  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false) : invariant3__default.default(false) : void 0;
+  if (firstKey === "$contains" && filter[firstKey] instanceof Object) {
+    const structFilter = Object.entries(filter[firstKey]);
+    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant3__default.default(false) : void 0;
+    const structFieldApiName = structFilter[0][0];
+    return handleWherePair(structFilter[0], objectOrInterface, {
+      propertyApiName: fieldName,
+      structFieldApiName
+    });
+  }
+  if (firstKey === "$ne") {
+    return {
+      type: "not",
+      value: {
+        type: "eq",
+        ...propertyIdentifier != null && {
+          propertyIdentifier
+        },
+        field,
+        value: filter[firstKey]
+      }
+    };
+  }
+  if (firstKey === "$within") {
+    return makeGeoFilterWithin(filter[firstKey], propertyIdentifier, field);
+  }
+  if (firstKey === "$intersects") {
+    return makeGeoFilterIntersects(filter[firstKey], propertyIdentifier, field);
+  }
+  if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
+    return {
+      type: firstKey.substring(1),
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: typeof filter[firstKey] === "string" ? filter[firstKey] : filter[firstKey]["term"],
+      fuzzy: typeof filter[firstKey] === "string" ? false : filter[firstKey]["fuzzySearch"] ?? false
+    };
+  }
+  return {
+    type: firstKey.substring(1),
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: filter[firstKey]
+  };
+}
+
+// src/derivedProperties/derivedPropertyDefinitionFactory.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
   const definition = {
     abs() {
@@ -1125,12 +1274,12 @@ function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
 var getDefinitionFromMap = (arg, definitionMap) => {
   if (typeof arg === "object") {
     const definition = definitionMap.get(arg);
-    !definition ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Derived Property is not defined") : invariant8__default.default(false) : void 0;
+    !definition ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Derived Property is not defined") : invariant3__default.default(false) : void 0;
     return definition;
   } else if (typeof arg === "number") {
-    process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Literals for derived properties are not yet supported") : invariant8__default.default(false) ;
+    process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Literals for derived properties are not yet supported") : invariant3__default.default(false) ;
   }
-  process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Invalid argument type for a derived property") : invariant8__default.default(false) ;
+  process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid argument type for a derived property") : invariant3__default.default(false) ;
 };
 
 // src/derivedProperties/createWithPropertiesObjectSet.ts
@@ -1144,15 +1293,16 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
       }, definitionMap);
     },
     where: (clause) => {
+      const rdpNames = new Set(definitionMap.keys());
       return createWithPropertiesObjectSet(objectType, {
         type: "filter",
         objectSet,
-        where: modernToLegacyWhereClause(clause, objectType)
+        where: modernToLegacyWhereClause(clause, objectType, rdpNames)
       }, definitionMap);
     },
     aggregate: (aggregation, opt) => {
       const splitAggregation = aggregation.split(":");
-      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Invalid aggregation format") : invariant8__default.default(false) : void 0;
+      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid aggregation format") : invariant3__default.default(false) : void 0;
       const [aggregationPropertyName, aggregationOperation] = splitAggregation;
       let aggregationOperationDefinition;
       switch (aggregationOperation) {
@@ -1190,7 +1340,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
             break;
           }
         default:
-          process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant8__default.default(false) ;
+          process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant3__default.default(false) ;
       }
       const wrappedObjectSet = {
         type: "selection",
@@ -1222,16 +1372,39 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
       const selectorResult = derivedPropertyDefinitionFactory(wrappedObjectSet, definitionMap);
       definitionMap.set(selectorResult, wrappedObjectSet);
       return selectorResult;
+    },
+    constant: {
+      double: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+      },
+      integer: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+      },
+      long: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+      },
+      datetime: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+      },
+      timestamp: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+      }
     }
   };
 }
+
+// src/object/aggregate.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
+// src/internal/conversions/legacyToModernSingleAggregationResult.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function legacyToModernSingleAggregationResult(entry) {
   return entry.metrics.reduce((accumulator, curValue) => {
     const parts = curValue.name.split(".");
     if (parts[0] === "count") {
       return accumulator;
     }
-    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant8__default.default(false) : void 0;
+    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant3__default.default(false) : void 0;
     const property = parts[0];
     const metricType = parts[1];
     if (!(property in accumulator)) {
@@ -1243,6 +1416,7 @@ function legacyToModernSingleAggregationResult(entry) {
 }
 
 // src/internal/conversions/modernToLegacyAggregationClause.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var directionFieldMap = (dir) => dir === "asc" ? "ASC" : dir === "desc" ? "DESC" : void 0;
 function modernToLegacyAggregationClause(select) {
   return Object.entries(select).flatMap(([propAndMetric, aggregationType]) => {
@@ -1264,6 +1438,9 @@ function modernToLegacyAggregationClause(select) {
     }];
   });
 }
+
+// src/internal/conversions/modernToLegacyGroupByClause.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 function modernToLegacyGroupByClause(groupByClause) {
   if (!groupByClause) return [];
   return Object.entries(groupByClause).flatMap(([field, type]) => {
@@ -1330,9 +1507,12 @@ async function aggregate3(clientCtx, objectType, objectSet = resolveBaseObjectSe
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
+  }, {
+    branch: clientCtx.branch,
+    transactionId: clientCtx.transactionId
   });
   if (!req.$groupBy) {
-    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "no group by clause should mean only one data result") : invariant8__default.default(false) : void 0;
+    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "no group by clause should mean only one data result") : invariant3__default.default(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
       ...legacyToModernSingleAggregationResult(result.data[0])
@@ -1358,6 +1538,7 @@ function aggregationToCountResult(entry) {
 }
 
 // src/util/augmentRequestContext.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var augmentRequestContext = (client, augment2) => ({
   ...client,
   requestContext: {
@@ -1367,12 +1548,17 @@ var augmentRequestContext = (client, augment2) => ({
 });
 
 // src/util/WireObjectSet.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var WIRE_OBJECT_SET_TYPES = /* @__PURE__ */ new Set(["base", "filter", "intersect", "reference", "searchAround", "static", "subtract", "union", "interfaceBase"]);
 function isWireObjectSet(o) {
   return o != null && typeof o === "object" && WIRE_OBJECT_SET_TYPES.has(o.type);
 }
 
+// src/objectSet/ObjectSetListenerWebsocket.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
+
 // src/util/exponentialBackoff.ts
+chunk6SCDLAU2_cjs.init_cjs_shims();
 var DEFAULT_OPTIONS = {
   initialDelayMs: 1e3,
   maxDelayMs: 6e4,
@@ -1415,6 +1601,7 @@ var EXPONENTIAL_BACKOFF_MAX_DELAY_MS = 6e4;
 var EXPONENTIAL_BACKOFF_MULTIPLIER = 2;
 var EXPONENTIAL_BACKOFF_JITTER_FACTOR = 0.3;
 var WEBSOCKET_IDLE_DISCONNECT_DELAY_MS = 15e3;
+var WEBSOCKET_HEARTBEAT_INTERVAL_MS = 45 * 1e3;
 function doNothing() {
 }
 function fillOutListener({
@@ -1464,6 +1651,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   #subscriptions = /* @__PURE__ */ new Map();
   #endedSubscriptions = /* @__PURE__ */ new Set();
   #maybeDisconnectTimeout;
+  #heartbeatInterval;
   // DO NOT CONSTRUCT DIRECTLY. ONLY EXPOSED AS A TESTING SEAM
   constructor(client, {
     minimumReconnectDelayMs = MINIMUM_RECONNECT_DELAY_MS
@@ -1479,7 +1667,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#logger = client.logger?.child({}, {
       msgPrefix: "<OSW> "
     });
-    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Stack must be a URL") : invariant8__default.default(false) : void 0;
+    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Stack must be a URL") : invariant3__default.default(false) : void 0;
   }
   async subscribe(objectType, objectSet, listener, properties = []) {
     const objOrInterfaceDef = objectType.type === "object" ? await this.#client.ontologyProvider.getObjectDefinition(objectType.apiName) : await this.#client.ontologyProvider.getInterfaceDefinition(objectType.apiName);
@@ -1642,6 +1830,14 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#isFirstConnection = false;
     this.#backoff.reset();
     this.#sendSubscribeMessage();
+    if (this.#heartbeatInterval) {
+      clearInterval(this.#heartbeatInterval);
+    }
+    this.#heartbeatInterval = setInterval(() => {
+      if (this.#ws?.readyState === WebSocket__default.default.OPEN) {
+        this.#sendSubscribeMessage();
+      }
+    }, WEBSOCKET_HEARTBEAT_INTERVAL_MS);
   };
   #onMessage = async (message) => {
     const data = JSON.parse(String(message.data));
@@ -1665,7 +1861,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         return;
       }
       default:
-        process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Unexpected message type") : invariant8__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Unexpected message type") : invariant3__default.default(false) ;
     }
   };
   #handleMessage_objectSetChanged = async (payload) => {
@@ -1730,7 +1926,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   }
   #handleMessage_refreshObjectSet = (payload) => {
     const sub = this.#subscriptions.get(payload.id);
-    !sub ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Expected subscription id ${payload.id}`) : invariant8__default.default(false) : void 0;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Expected subscription id ${payload.id}`) : invariant3__default.default(false) : void 0;
     try {
       sub.listener.onOutOfDate();
     } catch (error) {
@@ -1744,7 +1940,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       responses
     } = payload;
     const subs = this.#pendingSubscriptions.get(id);
-    !subs ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `should have a pending subscription for ${id}`) : invariant8__default.default(false) : void 0;
+    !subs ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `should have a pending subscription for ${id}`) : invariant3__default.default(false) : void 0;
     this.#pendingSubscriptions.delete(id);
     for (let i = 0; i < responses.length; i++) {
       const sub = subs[i];
@@ -1786,7 +1982,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   #handleMessage_subscriptionClosed(payload) {
     const sub = this.#subscriptions.get(payload.id);
     if (sub == null && this.#endedSubscriptions.has(payload.id)) return;
-    !sub ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Expected subscription id ${payload.id}`) : invariant8__default.default(false) : void 0;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Expected subscription id ${payload.id}`) : invariant3__default.default(false) : void 0;
     this.#tryCatchOnError(sub, true, payload.cause);
     this.#unsubscribe(sub, "error");
   }
@@ -1799,6 +1995,10 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#cycleWebsocket();
   };
   #cycleWebsocket = () => {
+    if (this.#heartbeatInterval) {
+      clearInterval(this.#heartbeatInterval);
+      this.#heartbeatInterval = void 0;
+    }
     if (this.#ws) {
       this.#ws.removeEventListener("open", this.#onOpen);
       this.#ws.removeEventListener("message", this.#onMessage);
@@ -1811,7 +2011,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     if (this.#subscriptions.size > 0) {
       if (process.env.NODE_ENV !== "production") {
         for (const s of this.#subscriptions.values()) {
-          !(s.status !== "done" && s.status !== "error") ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "should not have done/error subscriptions still") : invariant8__default.default(false) : void 0;
+          !(s.status !== "done" && s.status !== "error") ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "should not have done/error subscriptions still") : invariant3__default.default(false) : void 0;
         }
       }
       for (const s of this.#subscriptions.values()) {
@@ -1965,6 +2165,16 @@ function createObjectSet(objectType, clientCtx, objectSet = resolveBaseObjectSet
         objectSet
       });
     },
+    asType: (objectTypeDef) => {
+      const existingMapping = clientCtx.asTypeInterfaceOrObjectMapping[objectTypeDef.apiName];
+      !(!existingMapping || existingMapping === objectTypeDef.type) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `${objectTypeDef.apiName} was previously used as an ${existingMapping}, but now used as a ${objectTypeDef.type}.`) : invariant3__default.default(false) : void 0;
+      clientCtx.asTypeInterfaceOrObjectMapping[objectTypeDef.apiName] = objectTypeDef.type;
+      return clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
+        type: "asType",
+        objectSet,
+        entityType: objectTypeDef.apiName
+      });
+    },
     $objectSetInternals: {
       def: objectType
     }
@@ -2020,16 +2230,18 @@ exports.additionalContext = additionalContext;
 exports.augment = augment;
 exports.augmentRequestContext = augmentRequestContext;
 exports.createObjectSet = createObjectSet;
+exports.createWithPropertiesObjectSet = createWithPropertiesObjectSet;
 exports.extractNamespace = extractNamespace;
 exports.fetchPage = fetchPage;
 exports.fetchSingle = fetchSingle;
 exports.fetchSingleWithErrors = fetchSingleWithErrors;
 exports.fetchStaticRidPage = fetchStaticRidPage;
+exports.foundryPlatformFetch = foundryPlatformFetch;
 exports.getWireObjectSet = getWireObjectSet;
 exports.hydrateAttachmentFromRid = hydrateAttachmentFromRid;
 exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-MEL46GIF.cjs.map
-//# sourceMappingURL=chunk-MEL46GIF.cjs.map
+//# sourceMappingURL=chunk-RO7XAQOS.cjs.map
+//# sourceMappingURL=chunk-RO7XAQOS.cjs.map