@osdk/client 2.7.0-beta.9 → 2.8.0-beta.1

package/build/cjs/{chunk-PARVKNVB.cjs → chunk-VVKEXIIO.cjs}

@@ -2,23 +2,23 @@
 
 var chunkLDTMSHUZ_cjs = require('./chunk-LDTMSHUZ.cjs');
 var shared_net_errors = require('@osdk/shared.net.errors');
+var invariant4 = 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 invariant3__default = /*#__PURE__*/_interopDefault(invariant3);
+var invariant4__default = /*#__PURE__*/_interopDefault(invariant4);
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
 
 // src/object/fetchPage.ts
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 var Action_exports = {};
 chunkLDTMSHUZ_cjs.__export(Action_exports, {
   apply: () => apply,
@@ -28,10 +28,10 @@ chunkLDTMSHUZ_cjs.__export(Action_exports, {
 });
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/index.js
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.6.0/node_modules/@osdk/shared.net.platformapi/build/esm/index.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.6.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
 // ../../node_modules/.pnpm/@osdk+shared.client@1.0.1/node_modules/@osdk/shared.client/index.js
@@ -105,7 +105,7 @@ function parseUrl(baseUrl, endpointPath) {
   return new URL(`api${endpointPath}`, baseUrl);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.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);
@@ -123,10 +123,10 @@ function applyWithOverrides($ctx, ...args) {
   return foundryPlatformFetch($ctx, _applyWithOverrides, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeFullMetadata.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeFullMetadata.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
 var ActionTypeV2_exports = {};
 chunkLDTMSHUZ_cjs.__export(ActionTypeV2_exports, {
   get: () => get,
@@ -147,7 +147,7 @@ function getByRid($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getByRid, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
 var Attachment_exports = {};
 chunkLDTMSHUZ_cjs.__export(Attachment_exports, {
   get: () => get2,
@@ -183,16 +183,16 @@ function get2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _get2, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/CipherTextProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/CipherTextProperty.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
 var MediaReferenceProperty_exports = {};
 chunkLDTMSHUZ_cjs.__export(MediaReferenceProperty_exports, {
   getMediaContent: () => getMediaContent,
@@ -213,7 +213,7 @@ function upload2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _upload2, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
 var ObjectTypeV2_exports = {};
 chunkLDTMSHUZ_cjs.__export(ObjectTypeV2_exports, {
   get: () => get3,
@@ -244,7 +244,7 @@ function getOutgoingLinkType($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingLinkType, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
 var OntologyInterface_exports = {};
 chunkLDTMSHUZ_cjs.__export(OntologyInterface_exports, {
   aggregate: () => aggregate,
@@ -290,7 +290,7 @@ function listInterfaceLinkedObjects($ctx, ...args) {
   return foundryPlatformFetch($ctx, _listInterfaceLinkedObjects, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
 var OntologyObjectSet_exports = {};
 chunkLDTMSHUZ_cjs.__export(OntologyObjectSet_exports, {
   aggregate: () => aggregate2,
@@ -331,19 +331,19 @@ function loadLinks($ctx, ...args) {
   return foundryPlatformFetch($ctx, _loadLinks, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyTransaction.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyTransaction.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyValueType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyValueType.js
 chunkLDTMSHUZ_cjs.init_cjs_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
 var Query_exports = {};
 chunkLDTMSHUZ_cjs.__export(Query_exports, {
   execute: () => execute
@@ -354,7 +354,7 @@ function execute($ctx, ...args) {
   return foundryPlatformFetch($ctx, _execute, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
 var QueryType_exports = {};
 chunkLDTMSHUZ_cjs.__export(QueryType_exports, {
   get: () => get6,
@@ -370,7 +370,7 @@ function get6($ctx, ...args) {
   return foundryPlatformFetch($ctx, _get6, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
 var TimeSeriesPropertyV2_exports = {};
 chunkLDTMSHUZ_cjs.__export(TimeSeriesPropertyV2_exports, {
   getFirstPoint: () => getFirstPoint,
@@ -391,7 +391,7 @@ function streamPoints($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamPoints, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.44.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.45.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
 var TimeSeriesValueBankProperty_exports = {};
 chunkLDTMSHUZ_cjs.__export(TimeSeriesValueBankProperty_exports, {
   getLatestValue: () => getLatestValue,
@@ -439,7 +439,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" ? invariant3__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant3__default.default(false) : void 0;
+      !linkDef2 ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant4__default.default(false) : void 0;
       return objOrInterfaceDef2.type === "object" ? {
         apiName: objOrInterfaceDef2.links[objectSet.link].targetType,
         type: "object"
@@ -477,7 +477,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       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" ? invariant3__default.default(false, `Missing interface type in intersect objectset scope'`) : invariant3__default.default(false) : void 0;
+      !firstInterfaceType ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Missing interface type in intersect objectset scope'`) : invariant4__default.default(false) : void 0;
       return firstInterfaceType;
     }
     case "subtract":
@@ -488,7 +488,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" ? invariant3__default.default(false, "Can only have one object type when doing subtract, union") : invariant3__default.default(false) : void 0;
+      }) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Can only have one object type when doing subtract, union") : invariant4__default.default(false) : void 0;
       return filteredObjectTypes[0];
     case "static":
     case "reference":
@@ -500,7 +500,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" ? invariant3__default.default(false, `Missing link definition for '${objectSet.interfaceLink}'`) : invariant3__default.default(false) : void 0;
+      !linkDef ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Missing link definition for '${objectSet.interfaceLink}'`) : invariant4__default.default(false) : void 0;
       return objOrInterfaceDef.type === "object" ? {
         apiName: objOrInterfaceDef.links[objectSet.interfaceLink].targetType,
         type: "object"
@@ -510,7 +510,7 @@ 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" ? invariant3__default.default(false, `Unsupported object set type for deriving object or interface type,`) : invariant3__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Unsupported object set type for deriving object or interface type,`) : invariant4__default.default(false) ;
   }
 }
 
@@ -533,7 +533,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" ? invariant3__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant3__default.default(false) : void 0;
+      !linkDef ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant4__default.default(false) : void 0;
       return {
         definitions: definitions2,
         childObjectType: objDef.links[objectSet.link].targetType
@@ -619,13 +619,13 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
         ...acc,
         ...definitions2
       }), {});
-      !(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;
+      !(Object.keys(definitions).length === 0) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Object sets combined using intersect, subtract, or union must not contain any derived property definitions") : invariant4__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" ? 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;
+      }) => childObjectType === firstValidChildObjectType || childObjectType == null) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "All object sets in an intersect, subtract, or union must have the same child object type") : invariant4__default.default(false) : void 0;
       return {
         definitions: {},
         childObjectType: firstValidChildObjectType
@@ -637,9 +637,9 @@ 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" ? invariant3__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant3__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant4__default.default(false) ;
     default:
-      process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant3__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant4__default.default(false) ;
   }
 }
 
@@ -690,6 +690,7 @@ function resolveInterfaceObjectSet(objectSet, interfaceTypeApiName, args) {
   } : objectSet;
 }
 async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
+  const shouldLoadPropertySecurities = args.$loadPropertySecurityMetadata ?? false;
   const requestBody = await applyFetchArgs(args, {
     objectSet: {
       type: "static",
@@ -697,7 +698,8 @@ async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
     },
     select: args?.$select ?? [],
     excludeRid: !args?.$includeRid,
-    snapshot: useSnapshot
+    snapshot: useSnapshot,
+    loadPropertySecurities: shouldLoadPropertySecurities
   }, client, {
     type: "object",
     apiName: ""
@@ -712,13 +714,14 @@ async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
     transactionId: client.transactionId
   });
   return Promise.resolve({
-    data: await client.objectFactory2(client, result.data, void 0, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings, result.interfaceToObjectTypeMappingsV2),
+    data: await client.objectFactory2(client, result.data, void 0, {}, shouldLoadPropertySecurities ? result.propertySecurities : void 0, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings, result.interfaceToObjectTypeMappingsV2),
     nextPageToken: result.nextPageToken,
     totalCount: result.totalCount
   });
 }
 async function fetchInterfacePage(client, interfaceType, args, objectSet, useSnapshot = false) {
   if (args.$__UNSTABLE_useOldInterfaceApis) {
+    !(args.$loadPropertySecurityMetadata === false || args.$loadPropertySecurityMetadata === void 0) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "`$loadPropertySecurityMetadata` is not supported with old interface APIs") : invariant4__default.default(false) : void 0;
     const baseRequestBody = {
       augmentedProperties: {},
       augmentedSharedPropertyTypes: {},
@@ -746,16 +749,19 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
       // drop readonly
       interfaceType.apiName,
       !args.$includeRid,
-      await extractRdpDefinition(client, objectSet)
+      await extractRdpDefinition(client, objectSet),
+      void 0
     );
     return result2;
   }
   const extractedInterfaceTypeApiName = (await extractObjectOrInterfaceType(client, objectSet))?.apiName ?? interfaceType.apiName;
   const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, extractedInterfaceTypeApiName, args);
+  const shouldLoadPropertySecurities = args.$loadPropertySecurityMetadata ?? false;
   const requestBody = await buildAndRemapRequestBody(args, {
     objectSet: resolvedInterfaceObjectSet,
     select: args?.$select ? [...args.$select] : [],
     selectV2: [],
+    loadPropertySecurities: shouldLoadPropertySecurities,
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
   }, client, interfaceType);
@@ -768,7 +774,7 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     transactionId: client.transactionId
   });
   return Promise.resolve({
-    data: await client.objectFactory2(client, result.data, extractedInterfaceTypeApiName, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings, result.interfaceToObjectTypeMappingsV2),
+    data: await client.objectFactory2(client, result.data, extractedInterfaceTypeApiName, {}, shouldLoadPropertySecurities ? result.propertySecurities : void 0, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings, result.interfaceToObjectTypeMappingsV2),
     nextPageToken: result.nextPageToken,
     totalCount: result.totalCount
   });
@@ -831,6 +837,9 @@ async function applyFetchArgs(args, body, _client, objectType) {
   if (args?.$pageSize != null) {
     body.pageSize = args.$pageSize;
   }
+  if (args?.$loadPropertySecurityMetadata) {
+    body.loadPropertySecurities = true;
+  }
   const orderBy = args?.$orderBy;
   if (orderBy) {
     if (orderBy === "relevance") {
@@ -855,10 +864,12 @@ async function applyFetchArgs(args, body, _client, objectType) {
 async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot = false) {
   void client.ontologyProvider.getObjectDefinition(objectType.apiName).catch(() => {
   });
+  const shouldLoadPropertySecurities = args.$loadPropertySecurityMetadata ?? false;
   const requestBody = await buildAndRemapRequestBody(args, {
     objectSet,
     select: args?.$select ? [...args.$select] : [],
     selectV2: [],
+    loadPropertySecurities: shouldLoadPropertySecurities,
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
   }, client, objectType);
@@ -870,7 +881,7 @@ async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot
     transactionId: client.transactionId
   });
   return Promise.resolve({
-    data: await client.objectFactory(client, r.data, void 0, void 0, await extractRdpDefinition(client, objectSet), args.$select, false),
+    data: await client.objectFactory(client, r.data, void 0, void 0, await extractRdpDefinition(client, objectSet), shouldLoadPropertySecurities ? r.propertySecurities : void 0, args.$select, false),
     nextPageToken: r.nextPageToken,
     totalCount: r.totalCount
   });
@@ -1137,7 +1148,7 @@ function modernToLegacyWhereClause(whereClause, 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;
+  !(parts.length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Invalid where clause provided.") : invariant4__default.default(false) : void 0;
   if (isAndClause(whereClause)) {
     return {
       type: "and",
@@ -1157,7 +1168,7 @@ function modernToLegacyWhereClauseInner(whereClause, 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;
+  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant4__default.default(false) : void 0;
   const isRdp = !structFieldSelector && rdpNames?.has(fieldName);
   const propertyIdentifier = isRdp ? {
     type: "property",
@@ -1168,7 +1179,7 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     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;
+  !(field == null || propertyIdentifier == null && (field != null || isRdp != null)) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Encountered error constructing where clause: field and propertyIdentifier cannot both be defined") : invariant4__default.default(false) : void 0;
   if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
     return {
       type: "eq",
@@ -1181,10 +1192,10 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
   }
   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;
+  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant4__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;
+    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant4__default.default(false) : void 0;
     const structFieldApiName = keysOfFilter[0];
     return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
       propertyApiName: fieldName,
@@ -1192,15 +1203,22 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     }, rdpNames);
   }
   const firstKey = keysOfFilter[0];
-  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false) : invariant3__default.default(false) : void 0;
+  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false) : invariant4__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
-    });
+    const containsValue = filter[firstKey];
+    const containsKeys = Object.keys(containsValue);
+    const isFilterObject = containsKeys.some((key) => key.startsWith("$"));
+    if (isFilterObject) {
+      return handleWherePair([fieldName, containsValue], objectOrInterface, structFieldSelector, rdpNames);
+    } else {
+      const structFilter = Object.entries(containsValue);
+      !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant4__default.default(false) : void 0;
+      const structFieldApiName = structFilter[0][0];
+      return handleWherePair(structFilter[0], objectOrInterface, {
+        propertyApiName: fieldName,
+        structFieldApiName
+      });
+    }
   }
   if (firstKey === "$ne") {
     return {
@@ -1310,12 +1328,12 @@ function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
 var getDefinitionFromMap = (arg, definitionMap) => {
   if (typeof arg === "object") {
     const definition = definitionMap.get(arg);
-    !definition ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Derived Property is not defined") : invariant3__default.default(false) : void 0;
+    !definition ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Derived Property is not defined") : invariant4__default.default(false) : void 0;
     return definition;
   } else if (typeof arg === "number") {
-    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" ? invariant4__default.default(false, "Literals for derived properties are not yet supported") : invariant4__default.default(false) ;
   }
-  process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid argument type for a derived property") : invariant3__default.default(false) ;
+  process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Invalid argument type for a derived property") : invariant4__default.default(false) ;
 };
 
 // src/derivedProperties/createWithPropertiesObjectSet.ts
@@ -1338,7 +1356,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
     },
     aggregate: (aggregation, opt) => {
       const splitAggregation = aggregation.split(":");
-      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid aggregation format") : invariant3__default.default(false) : void 0;
+      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Invalid aggregation format") : invariant4__default.default(false) : void 0;
       const [aggregationPropertyName, aggregationOperation] = splitAggregation;
       let aggregationOperationDefinition;
       switch (aggregationOperation) {
@@ -1376,7 +1394,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
             break;
           }
         default:
-          process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant3__default.default(false) ;
+          process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant4__default.default(false) ;
       }
       const wrappedObjectSet = {
         type: "selection",
@@ -1411,19 +1429,19 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
     },
     constant: {
       double: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Not supported") : invariant4__default.default(false) ;
       },
       integer: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Not supported") : invariant4__default.default(false) ;
       },
       long: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Not supported") : invariant4__default.default(false) ;
       },
       datetime: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Not supported") : invariant4__default.default(false) ;
       },
       timestamp: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Not supported") : invariant4__default.default(false) ;
       }
     }
   };
@@ -1440,7 +1458,7 @@ function legacyToModernSingleAggregationResult(entry) {
     if (parts[0] === "count") {
       return accumulator;
     }
-    !(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;
+    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant4__default.default(false) : void 0;
     const property = parts[0];
     const metricType = parts[1];
     if (!(property in accumulator)) {
@@ -1551,7 +1569,7 @@ async function aggregate3(clientCtx, objectType, objectSet = resolveBaseObjectSe
     transactionId: clientCtx.transactionId
   });
   if (!req.$groupBy) {
-    !(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;
+    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "no group by clause should mean only one data result") : invariant4__default.default(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
       ...legacyToModernSingleAggregationResult(result.data[0])
@@ -1744,9 +1762,9 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#logger = client.logger?.child({}, {
       msgPrefix: "<OSW> "
     });
-    !(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;
+    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Stack must be a URL") : invariant4__default.default(false) : void 0;
   }
-  async subscribe(objectType, objectSet, listener, properties = []) {
+  async subscribe(objectType, objectSet, listener, properties = [], shouldLoadRids = false) {
     const objOrInterfaceDef = objectType.type === "object" ? await this.#client.ontologyProvider.getObjectDefinition(objectType.apiName) : await this.#client.ontologyProvider.getInterfaceDefinition(objectType.apiName);
     let objectProperties = [];
     let referenceProperties = [];
@@ -1765,7 +1783,8 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       // Since we don't have a real subscription id yet but we need to keep
       // track of this reference, we can just use a random uuid.
       subscriptionId: `TMP-${nextUuid()}}`,
-      interfaceApiName: objOrInterfaceDef.type === "object" ? void 0 : objOrInterfaceDef.apiName
+      interfaceApiName: objOrInterfaceDef.type === "object" ? void 0 : objOrInterfaceDef.apiName,
+      loadRids: shouldLoadRids
     };
     this.#subscriptions.set(sub.subscriptionId, sub);
     void this.#initiateSubscribe(sub);
@@ -1818,7 +1837,10 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         return {
           objectSet,
           propertySet: requestedProperties,
-          referenceSet: requestedReferenceProperties
+          referenceSet: requestedReferenceProperties,
+          objectLoadingResponseOptions: {
+            shouldLoadObjectRids: true
+          }
         };
       })
     };
@@ -1938,7 +1960,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         return;
       }
       default:
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Unexpected message type") : invariant3__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Unexpected message type") : invariant4__default.default(false) ;
     }
   };
   #handleMessage_objectSetChanged = async (payload) => {
@@ -1952,7 +1974,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         __primaryKey: sub.primaryKeyPropertyName != null ? o.primaryKey[sub.primaryKeyPropertyName] : void 0,
         ...o.primaryKey,
         [o.property]: o.value
-      }], sub.interfaceApiName, {}, false, void 0, false, await this.#fetchInterfaceMapping(o.objectType, sub.interfaceApiName));
+      }], sub.interfaceApiName, {}, void 0, false, void 0, false, await this.#fetchInterfaceMapping(o.objectType, sub.interfaceApiName));
       const singleOsdkObject = osdkObjectArray[0] ?? void 0;
       return singleOsdkObject != null ? {
         object: singleOsdkObject,
@@ -1974,11 +1996,16 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       for (const key of keysToDelete) {
         delete o.object[key];
       }
-      const osdkObjectArray = await this.#client.objectFactory2(this.#client, [o.object], sub.interfaceApiName, {}, false, void 0, false, await this.#fetchInterfaceMapping(o.object.__apiName, sub.interfaceApiName));
+      const osdkObjectArray = await this.#client.objectFactory2(this.#client, [o.object], sub.interfaceApiName, {}, void 0, false, void 0, false, await this.#fetchInterfaceMapping(o.object.__apiName, sub.interfaceApiName));
       const singleOsdkObject = osdkObjectArray[0] ?? void 0;
-      return singleOsdkObject != null ? {
+      const rid = singleOsdkObject["$rid"];
+      return singleOsdkObject != null ? rid === void 0 ? {
         object: singleOsdkObject,
         state: o.state
+      } : {
+        object: singleOsdkObject,
+        state: o.state,
+        rid
       } : void 0;
     }));
     for (const osdkObject of osdkObjects) {
@@ -2003,7 +2030,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   }
   #handleMessage_refreshObjectSet = (payload) => {
     const sub = this.#subscriptions.get(payload.id);
-    !sub ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Expected subscription id ${payload.id}`) : invariant3__default.default(false) : void 0;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Expected subscription id ${payload.id}`) : invariant4__default.default(false) : void 0;
     try {
       sub.listener.onOutOfDate();
     } catch (error) {
@@ -2017,7 +2044,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       responses
     } = payload;
     const subs = this.#pendingSubscriptions.get(id);
-    !subs ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `should have a pending subscription for ${id}`) : invariant3__default.default(false) : void 0;
+    !subs ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `should have a pending subscription for ${id}`) : invariant4__default.default(false) : void 0;
     this.#pendingSubscriptions.delete(id);
     for (let i = 0; i < responses.length; i++) {
       const sub = subs[i];
@@ -2059,7 +2086,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" ? invariant3__default.default(false, `Expected subscription id ${payload.id}`) : invariant3__default.default(false) : void 0;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `Expected subscription id ${payload.id}`) : invariant4__default.default(false) : void 0;
     this.#tryCatchOnError(sub, true, payload.cause);
     this.#unsubscribe(sub, "error");
   }
@@ -2088,7 +2115,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" ? invariant3__default.default(false, "should not have done/error subscriptions still") : invariant3__default.default(false) : void 0;
+          !(s.status !== "done" && s.status !== "error") ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "should not have done/error subscriptions still") : invariant4__default.default(false) : void 0;
         }
       }
       for (const s of this.#subscriptions.values()) {
@@ -2222,7 +2249,7 @@ function createObjectSet(objectType, clientCtx, objectSet = resolveBaseObjectSet
       })), objectType, options, await createWithPk(clientCtx, objectType, objectSet, primaryKey));
     } : void 0,
     subscribe: (listener, opts) => {
-      const pendingSubscribe = ObjectSetListenerWebsocket.getInstance(clientCtx).subscribe(objectType, objectSet, listener, opts?.properties);
+      const pendingSubscribe = ObjectSetListenerWebsocket.getInstance(clientCtx).subscribe(objectType, objectSet, listener, opts?.properties, opts?.includeRid);
       return {
         unsubscribe: async () => (await pendingSubscribe)()
       };
@@ -2244,7 +2271,7 @@ function createObjectSet(objectType, clientCtx, objectSet = resolveBaseObjectSet
     },
     narrowToType: (objectTypeDef) => {
       const existingMapping = clientCtx.narrowTypeInterfaceOrObjectMapping[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;
+      !(!existingMapping || existingMapping === objectTypeDef.type) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, `${objectTypeDef.apiName} was previously used as an ${existingMapping}, but now used as a ${objectTypeDef.type}.`) : invariant4__default.default(false) : void 0;
       clientCtx.narrowTypeInterfaceOrObjectMapping[objectTypeDef.apiName] = objectTypeDef.type;
       return clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
         type: "asType",
@@ -2332,5 +2359,5 @@ exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-PARVKNVB.cjs.map
-//# sourceMappingURL=chunk-PARVKNVB.cjs.map
+//# sourceMappingURL=chunk-VVKEXIIO.cjs.map
+//# sourceMappingURL=chunk-VVKEXIIO.cjs.map