@osdk/client 2.8.0-beta.25 → 2.8.0-beta.27

package/build/cjs/public/unstable-do-not-use.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk3RY4ECUB_cjs = require('../chunk-3RY4ECUB.cjs');
-var chunkR7OP6A6S_cjs = require('../chunk-R7OP6A6S.cjs');
+var chunkZPGIIKEZ_cjs = require('../chunk-ZPGIIKEZ.cjs');
+var chunkBWOPPEUP_cjs = require('../chunk-BWOPPEUP.cjs');
 require('../chunk-GSVXEVM4.cjs');
 require('../chunk-D26YLHTV.cjs');
 require('../chunk-YJG67XL4.cjs');
@@ -139,7 +139,7 @@ var WhereClauseCanonicalizer = class {
 var whereCanonicalizer = new WhereClauseCanonicalizer();
 var orderByCanonicalizer = new OrderByCanonicalizer();
 function computeObjectSetCacheKey(objectSet, options) {
-  const keyParts = ["objectSet", chunkR7OP6A6S_cjs.getWireObjectSet(objectSet)];
+  const keyParts = ["objectSet", chunkBWOPPEUP_cjs.getWireObjectSet(objectSet)];
   if (!options) {
     return JSON.stringify(keyParts);
   }
@@ -151,13 +151,13 @@ function computeObjectSetCacheKey(objectSet, options) {
     keyParts.push("props", propKeys);
   }
   if (options.union && options.union.length > 0) {
-    keyParts.push("union", options.union.map((os) => chunkR7OP6A6S_cjs.getWireObjectSet(os)));
+    keyParts.push("union", options.union.map((os) => chunkBWOPPEUP_cjs.getWireObjectSet(os)));
   }
   if (options.intersect && options.intersect.length > 0) {
-    keyParts.push("intersect", options.intersect.map((os) => chunkR7OP6A6S_cjs.getWireObjectSet(os)));
+    keyParts.push("intersect", options.intersect.map((os) => chunkBWOPPEUP_cjs.getWireObjectSet(os)));
   }
   if (options.subtract && options.subtract.length > 0) {
-    keyParts.push("subtract", options.subtract.map((os) => chunkR7OP6A6S_cjs.getWireObjectSet(os)));
+    keyParts.push("subtract", options.subtract.map((os) => chunkBWOPPEUP_cjs.getWireObjectSet(os)));
   }
   if (options.pivotTo) {
     keyParts.push("pivotTo", options.pivotTo);
@@ -221,8 +221,8 @@ var ObservableClientImpl = class {
     const instances = [];
     const objectSetWires = [];
     for (const item of options.dependsOnObjects ?? []) {
-      if (chunkR7OP6A6S_cjs.isObjectSet(item)) {
-        objectSetWires.push(chunkR7OP6A6S_cjs.getWireObjectSet(item));
+      if (chunkBWOPPEUP_cjs.isObjectSet(item)) {
+        objectSetWires.push(chunkBWOPPEUP_cjs.getWireObjectSet(item));
       } else {
         instances.push({
           $apiName: item.$objectType ?? item.$apiName,
@@ -230,7 +230,7 @@ var ObservableClientImpl = class {
         });
       }
     }
-    const objectSetTypesPromise = objectSetWires.length > 0 ? Promise.all(objectSetWires.map((wire) => chunkR7OP6A6S_cjs.extractObjectOrInterfaceType(this.__experimentalStore.client[chunkR7OP6A6S_cjs.additionalContext], wire))).then((types) => types.filter((t) => t != null).map((t) => t.apiName)) : void 0;
+    const objectSetTypesPromise = objectSetWires.length > 0 ? Promise.all(objectSetWires.map((wire) => chunkBWOPPEUP_cjs.extractObjectOrInterfaceType(this.__experimentalStore.client[chunkBWOPPEUP_cjs.additionalContext], wire))).then((types) => types.filter((t) => t != null).map((t) => t.apiName)) : void 0;
     return this.__experimentalStore.functions.observe({
       ...options,
       queryDef,
@@ -459,7 +459,7 @@ var OptimisticJob = class {
         return this;
       },
       createObject(type, pk, properties) {
-        const create = store.client[chunkR7OP6A6S_cjs.additionalContext].objectFactory2(store.client[chunkR7OP6A6S_cjs.additionalContext], [{
+        const create = store.client[chunkBWOPPEUP_cjs.additionalContext].objectFactory2(store.client[chunkBWOPPEUP_cjs.additionalContext], [{
           $primaryKey: pk,
           $apiName: type.apiName,
           $objectType: type.apiName,
@@ -917,7 +917,7 @@ var Query = class {
     this.store = store;
     this.cacheKeys = store.cacheKeys;
     this.#subject = observable;
-    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger : store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    this.logger = logger ?? (process.env.NODE_ENV === "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger : store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: process.env.NODE_ENV !== "production" ? `Query<${cacheKey.type}, ${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>` : "Query"
     }));
   }
@@ -1079,7 +1079,7 @@ var AggregationQuery = class extends Query {
   #invalidationTypes;
   #invalidationTypesPromise;
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `AggregationQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = cacheKey.otherKeys[API_NAME_IDX];
@@ -1097,7 +1097,7 @@ var AggregationQuery = class extends Query {
     try {
       const {
         invalidationSet
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkR7OP6A6S_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkBWOPPEUP_cjs.additionalContext], wireObjectSet);
       return /* @__PURE__ */ new Set([this.apiName, ...invalidationSet]);
     } catch (error) {
       this.store.logger?.error("Failed to compute invalidation types for aggregation, falling back to base type only", error);
@@ -1168,7 +1168,7 @@ var ObjectAggregationQuery = class extends AggregationQuery {
     };
     let objectSet;
     if (this.parsedWireObjectSet) {
-      objectSet = chunkR7OP6A6S_cjs.createObjectSet(objectTypeDef, this.store.client[chunkR7OP6A6S_cjs.additionalContext], this.parsedWireObjectSet);
+      objectSet = chunkBWOPPEUP_cjs.createObjectSet(objectTypeDef, this.store.client[chunkBWOPPEUP_cjs.additionalContext], this.parsedWireObjectSet);
     } else {
       objectSet = this.store.client(objectTypeDef);
     }
@@ -1210,7 +1210,7 @@ var AggregationsHelper = class extends AbstractHelper {
     return this.getOrCreateQuery(options, void 0);
   }
   getQueryWithObjectSet(options) {
-    const serializedObjectSet = JSON.stringify(chunkR7OP6A6S_cjs.getWireObjectSet(options.objectSet));
+    const serializedObjectSet = JSON.stringify(chunkBWOPPEUP_cjs.getWireObjectSet(options.objectSet));
     return this.getOrCreateQuery(options, serializedObjectSet);
   }
   getOrCreateQuery(options, serializedObjectSet) {
@@ -1533,7 +1533,7 @@ var FunctionParamsCanonicalizer = class {
       path.push("$:map_end");
       return arr;
     }
-    if (chunk3RY4ECUB_cjs.isObjectSpecifiersObject(value)) {
+    if (chunkZPGIIKEZ_cjs.isObjectSpecifiersObject(value)) {
       const objectType = value.$objectType ?? value.$apiName;
       path.push("$:osdk", objectType, value.$primaryKey);
       return {
@@ -1541,8 +1541,8 @@ var FunctionParamsCanonicalizer = class {
         $primaryKey: value.$primaryKey
       };
     }
-    if (chunkR7OP6A6S_cjs.isObjectSet(value)) {
-      const wire = chunkR7OP6A6S_cjs.getWireObjectSet(value);
+    if (chunkBWOPPEUP_cjs.isObjectSet(value)) {
+      const wire = chunkBWOPPEUP_cjs.getWireObjectSet(value);
       path.push("$:objectset", wire);
       return wire;
     }
@@ -1602,7 +1602,7 @@ var FunctionQuery = class extends Query {
   #dependsOnObjects;
   #queryDef;
   constructor(store, subject, queryDef, params, cacheKey, opts, objectSetTypesPromise) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `FunctionQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = queryDef.apiName;
@@ -1659,7 +1659,7 @@ var FunctionQuery = class extends Query {
       }).debug("calling _fetchAndStore");
     }
     try {
-      const result = await chunk3RY4ECUB_cjs.applyQuery(this.store.client[chunkR7OP6A6S_cjs.additionalContext], this.#queryDef, this.#params);
+      const result = await chunkZPGIIKEZ_cjs.applyQuery(this.store.client[chunkBWOPPEUP_cjs.additionalContext], this.#queryDef, this.#params);
       const executedAt = Date.now();
       this.store.batch({}, (batch) => {
         this.writeToStore({
@@ -1824,6 +1824,56 @@ var CachingCanonicalizer = class {
   }
 };
 
+// src/observable/internal/GenericCanonicalizer.ts
+var MAX_FINGERPRINT_DEPTH = 5;
+var GenericCanonicalizer = class extends CachingCanonicalizer {
+  #trie = new trie.Trie();
+  #existingValues = /* @__PURE__ */ new Map();
+  canonicalize(input) {
+    return super.canonicalize(input);
+  }
+  lookupOrCreate(input) {
+    const structuralKey = this.#collectSortedKeys(input);
+    const cacheKey = this.#trie.lookupArray(structuralKey);
+    const entry = this.#existingValues.get(cacheKey) ?? {
+      values: []
+    };
+    this.#existingValues.set(cacheKey, entry);
+    for (let i = entry.values.length - 1; i >= 0; i--) {
+      const existing = entry.values[i].deref();
+      if (!existing) {
+        entry.values.splice(i, 1);
+        continue;
+      }
+      if (deepEqual__default.default(existing, input)) {
+        return existing;
+      }
+    }
+    const canonical = input;
+    entry.values.push(new WeakRef(canonical));
+    return canonical;
+  }
+  #collectSortedKeys(obj, depth = 0) {
+    if (depth > MAX_FINGERPRINT_DEPTH || !obj || typeof obj !== "object") {
+      return [];
+    }
+    if (Array.isArray(obj)) {
+      const result2 = ["[]", String(obj.length)];
+      for (const item of obj) {
+        result2.push(...this.#collectSortedKeys(item, depth + 1));
+      }
+      return result2;
+    }
+    const record = obj;
+    const result = [];
+    for (const key of Object.keys(record).sort()) {
+      result.push(key);
+      result.push(...this.#collectSortedKeys(record[key], depth + 1));
+    }
+    return result;
+  }
+};
+
 // src/observable/internal/IntersectCanonicalizer.ts
 var IntersectCanonicalizer = class extends CachingCanonicalizer {
   structuralCache = /* @__PURE__ */ new Map();
@@ -1833,7 +1883,7 @@ var IntersectCanonicalizer = class extends CachingCanonicalizer {
   }
   lookupOrCreate(intersectWith) {
     const canonicalClauses = intersectWith.map((item) => this.whereCanonicalizer.canonicalize(item.where ?? {}));
-    const structuralKey = canonicalClauses.map((clause) => JSON.stringify(clause)).join("||");
+    const structuralKey = canonicalClauses.map((clause) => JSON.stringify(clause)).sort().join("||");
     let canonical = this.structuralCache.get(structuralKey);
     if (!canonical) {
       canonical = canonicalClauses;
@@ -2823,7 +2873,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
     batch.changes.modified.add(this.cacheKey);
   }
   constructor(store, subject, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `SpecificLinkQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     [this.#sourceApiName, this.#sourceTypeKind, this.#sourceUnderlyingObjectType, this.#sourcePk, this.#linkName, this.#whereClause, this.#orderBy] = cacheKey.otherKeys;
@@ -2837,7 +2887,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     const client = this.store.client;
-    const ontologyProvider = client[chunkR7OP6A6S_cjs.additionalContext].ontologyProvider;
+    const ontologyProvider = client[chunkBWOPPEUP_cjs.additionalContext].ontologyProvider;
     const isInterface = this.#sourceTypeKind === "interface";
     if (this.#orderBy && Object.keys(this.#orderBy).length > 0) {
       let targetTypeApiName;
@@ -2948,7 +2998,7 @@ var SpecificLinkQuery = class extends BaseListQuery {
     }
     return (async () => {
       try {
-        const ontologyProvider = this.store.client[chunkR7OP6A6S_cjs.additionalContext].ontologyProvider;
+        const ontologyProvider = this.store.client[chunkBWOPPEUP_cjs.additionalContext].ontologyProvider;
         if (this.#sourceTypeKind === "interface") {
           const objectMetadata = await ontologyProvider.getObjectDefinition(objectType);
           if (this.#sourceApiName in objectMetadata.interfaceMap) {
@@ -3038,6 +3088,7 @@ function evaluateFilter(f, realValue, expected, strict) {
     case "$containsAllTerms":
     case "$containsAllTermsInOrder":
     case "$containsAnyTerm":
+    case "$interval":
     case "$intersects":
     case "$within":
       return !strict;
@@ -3123,7 +3174,7 @@ var ListQuery = class extends BaseListQuery {
     batch.changes.registerList(this.cacheKey);
   }
   constructor(store, subject, apiName, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ListQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.apiName = apiName;
@@ -3166,10 +3217,10 @@ var ListQuery = class extends BaseListQuery {
   async fetchPageData(signal) {
     const needsResultType = Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy) || this.#pivotInfo != null && this.#intersectWith != null && this.#intersectWith.length > 0 && !this.#pivotIntersectApplied;
     if (needsResultType) {
-      const wireObjectSet = chunkR7OP6A6S_cjs.getWireObjectSet(this.#objectSet);
+      const wireObjectSet = chunkBWOPPEUP_cjs.getWireObjectSet(this.#objectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkR7OP6A6S_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkBWOPPEUP_cjs.additionalContext], wireObjectSet);
       if (Object.keys(this.#orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
         this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#orderBy);
       }
@@ -3206,6 +3257,9 @@ var ListQuery = class extends BaseListQuery {
       // but shouldn't be needed ideally
       ...Object.keys(this.#orderBy).length > 0 ? {
         $orderBy: this.#orderBy
+      } : {},
+      ...this.options.$loadPropertySecurityMetadata ? {
+        $loadPropertySecurityMetadata: true
       } : {}
     });
     if (signal?.aborted) {
@@ -3441,7 +3495,7 @@ var InterfaceListQuery = class extends ListQuery {
       type,
       apiName: this.apiName
     };
-    const clientCtx = store.client[chunkR7OP6A6S_cjs.additionalContext];
+    const clientCtx = store.client[chunkBWOPPEUP_cjs.additionalContext];
     let objectSet;
     if (rids != null) {
       objectSet = clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
@@ -3484,7 +3538,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
-      return this.apiName in object[chunk3RY4ECUB_cjs.ObjectDefRef].interfaceMap;
+      return this.apiName in object[chunkZPGIIKEZ_cjs.ObjectDefRef].interfaceMap;
     };
     const added = Array.from(changes.addedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.apiName));
     const modified = Array.from(changes.modifiedObjects).filter(matchesApiName).map(([, object]) => object.$as(this.apiName));
@@ -3503,7 +3557,7 @@ var InterfaceListQuery = class extends ListQuery {
   }
 };
 function createSourceSetForPivot(store, pivotInfo, rids) {
-  const clientCtx = store.client[chunkR7OP6A6S_cjs.additionalContext];
+  const clientCtx = store.client[chunkBWOPPEUP_cjs.additionalContext];
   if (rids != null) {
     return clientCtx.objectSetFactory({
       type: "object",
@@ -3558,7 +3612,7 @@ var ObjectListQuery = class extends ListQuery {
     const intersectWith = this.cacheKey.otherKeys[INTERSECT_IDX2];
     const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
     const rids = this.cacheKey.otherKeys[RIDS_IDX];
-    const clientCtx = store.client[chunkR7OP6A6S_cjs.additionalContext];
+    const clientCtx = store.client[chunkBWOPPEUP_cjs.additionalContext];
     const typeDefinition = {
       type: "object",
       apiName: this.apiName
@@ -3671,7 +3725,8 @@ var ListsHelper = class extends AbstractHelper {
       intersectWith,
       pivotTo,
       rids,
-      select
+      select,
+      $loadPropertySecurityMetadata
     } = options;
     const {
       apiName,
@@ -3684,7 +3739,7 @@ var ListsHelper = class extends AbstractHelper {
     const canonPivot = pivotTo ? this.pivotCanonicalizer.canonicalize(apiName, type, pivotTo) : void 0;
     const canonRids = rids != null ? this.ridListCanonicalizer.canonicalize(rids) : void 0;
     const canonSelect = select && select.length > 0 ? this.selectCanonicalizer.canonicalize(select) : void 0;
-    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy, canonRdp, canonIntersect, canonPivot, canonRids, canonSelect);
+    const listCacheKey = this.cacheKeys.get("list", type, apiName, canonWhere, canonOrderBy, canonRdp, canonIntersect, canonPivot, canonRids, canonSelect, $loadPropertySecurityMetadata ? true : void 0);
     return this.store.queries.get(listCacheKey, () => {
       const QueryClass = type === "object" ? ObjectListQuery : InterfaceListQuery;
       return new QueryClass(this.store, this.store.subjects.get(listCacheKey), apiName, listCacheKey, options);
@@ -3703,8 +3758,8 @@ function stripRdpFields(value, rdpFields) {
   if (rdpFields.size === 0) {
     return value;
   }
-  const underlying = value[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunk3RY4ECUB_cjs.ObjectDefRef];
+  const underlying = value[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkZPGIIKEZ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3717,7 +3772,7 @@ function stripRdpFields(value, rdpFields) {
       newProps[key] = underlying[key];
     }
   }
-  return chunk3RY4ECUB_cjs.createOsdkObject(value[chunk3RY4ECUB_cjs.ClientRef], objectDef, newProps);
+  return chunkZPGIIKEZ_cjs.createOsdkObject(value[chunkZPGIIKEZ_cjs.ClientRef], objectDef, newProps);
 }
 function isSuperset(superset, subset) {
   for (const field of subset) {
@@ -3728,8 +3783,8 @@ function isSuperset(superset, subset) {
   return true;
 }
 function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
-  const underlying = value[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
-  const objectDef = value[chunk3RY4ECUB_cjs.ObjectDefRef];
+  const underlying = value[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
+  const objectDef = value[chunkZPGIIKEZ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: underlying.$apiName,
     $objectType: underlying.$objectType,
@@ -3745,12 +3800,12 @@ function filterToRdpFields(value, rdpFieldsToKeep, sourceRdpFields) {
       }
     }
   }
-  return chunk3RY4ECUB_cjs.createOsdkObject(value[chunk3RY4ECUB_cjs.ClientRef], objectDef, newProps);
+  return chunkZPGIIKEZ_cjs.createOsdkObject(value[chunkZPGIIKEZ_cjs.ClientRef], objectDef, newProps);
 }
 function mergeSelectFields(sourceValue, selectFields, existingValue) {
-  const sourceUnderlying = sourceValue[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
-  const existingUnderlying = existingValue[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunk3RY4ECUB_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
+  const existingUnderlying = existingValue[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkZPGIIKEZ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3768,7 +3823,7 @@ function mergeSelectFields(sourceValue, selectFields, existingValue) {
       newProps[key] = sourceUnderlying[key];
     }
   }
-  return chunk3RY4ECUB_cjs.createOsdkObject(sourceValue[chunk3RY4ECUB_cjs.ClientRef], objectDef, newProps);
+  return chunkZPGIIKEZ_cjs.createOsdkObject(sourceValue[chunkZPGIIKEZ_cjs.ClientRef], objectDef, newProps);
 }
 function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, targetCurrentValue) {
   if (targetRdpFields.size === 0) {
@@ -3780,8 +3835,8 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
     return filterToRdpFields(sourceValue, targetRdpFields, sourceRdpFields);
   }
-  const sourceUnderlying = sourceValue[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
-  const objectDef = sourceValue[chunk3RY4ECUB_cjs.ObjectDefRef];
+  const sourceUnderlying = sourceValue[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
+  const objectDef = sourceValue[chunkZPGIIKEZ_cjs.ObjectDefRef];
   const newProps = {
     $apiName: sourceUnderlying.$apiName,
     $objectType: sourceUnderlying.$objectType,
@@ -3795,7 +3850,7 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
     }
   }
   if (targetCurrentValue) {
-    const targetUnderlying = targetCurrentValue[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
+    const targetUnderlying = targetCurrentValue[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
     for (const field of targetRdpFields) {
       if (field in targetUnderlying) {
         if (!sourceRdpFields.has(field) || newProps[field] === void 0) {
@@ -3804,7 +3859,7 @@ function mergeObjectFields(sourceValue, sourceRdpFields, targetRdpFields, target
       }
     }
   }
-  return chunk3RY4ECUB_cjs.createOsdkObject(sourceValue[chunk3RY4ECUB_cjs.ClientRef], objectDef, newProps);
+  return chunkZPGIIKEZ_cjs.createOsdkObject(sourceValue[chunkZPGIIKEZ_cjs.ClientRef], objectDef, newProps);
 }
 
 // src/observable/internal/object/ObjectCacheKeyRegistry.ts
@@ -3959,13 +4014,14 @@ var BulkObjectLoader = class {
   #maxEntries;
   constructor(client, maxWait = 25, maxEntries = 100) {
     this.#client = client;
-    this.#logger = client[chunkR7OP6A6S_cjs.additionalContext].logger;
+    this.#logger = client[chunkBWOPPEUP_cjs.additionalContext].logger;
     this.#maxWait = maxWait;
     this.#maxEntries = maxEntries;
   }
-  async fetch(apiName, primaryKey, defType = "object", select) {
+  async fetch(apiName, primaryKey, defType = "object", select, loadPropertySecurityMetadata) {
     const deferred = pDefer();
-    const selectKey = select && select.length > 0 ? `${apiName}\0${[...select].sort().join(",")}` : apiName;
+    const securitySuffix = loadPropertySecurityMetadata ? "\0sec" : "";
+    const selectKey = select && select.length > 0 ? `${apiName}\0${[...select].sort().join(",")}${securitySuffix}` : `${apiName}${securitySuffix}`;
     const entry = this.#m.get(selectKey);
     entry.data.push({
       primaryKey,
@@ -3974,25 +4030,27 @@ var BulkObjectLoader = class {
     if (entry.defType === void 0) {
       entry.defType = defType;
       entry.select = select;
+      entry.loadPropertySecurityMetadata = loadPropertySecurityMetadata;
     } else if (entry.defType !== defType) {
       deferred.reject(new shared_net_errors.PalantirApiError(`Conflicting defType for ${apiName}: existing=${entry.defType}, new=${defType}`));
       return deferred.promise;
     }
     if (!entry.timer) {
       entry.timer = setTimeout(() => {
-        this.#loadObjects(apiName, entry.data, entry.defType ?? "object", entry.select);
+        this.#loadObjects(apiName, entry.data, entry.defType ?? "object", entry.select, entry.loadPropertySecurityMetadata);
       }, this.#maxWait);
     }
     if (entry.data.length >= this.#maxEntries) {
       clearTimeout(entry.timer);
-      this.#loadObjects(apiName, entry.data, entry.defType ?? "object", entry.select);
+      this.#loadObjects(apiName, entry.data, entry.defType ?? "object", entry.select, entry.loadPropertySecurityMetadata);
     }
     return await deferred.promise;
   }
-  #loadObjects(apiName, arr, defType, select) {
-    const selectKey = select && select.length > 0 ? `${apiName}\0${[...select].sort().join(",")}` : apiName;
+  #loadObjects(apiName, arr, defType, select, loadPropertySecurityMetadata) {
+    const securitySuffix = loadPropertySecurityMetadata ? "\0sec" : "";
+    const selectKey = select && select.length > 0 ? `${apiName}\0${[...select].sort().join(",")}${securitySuffix}` : `${apiName}${securitySuffix}`;
     this.#m.delete(selectKey);
-    const loadFn = defType === "interface" ? this.#loadInterfaceObjects(apiName, arr, select) : this.#loadObjectTypeObjects(apiName, arr, select);
+    const loadFn = defType === "interface" ? this.#loadInterfaceObjects(apiName, arr, select, loadPropertySecurityMetadata) : this.#loadObjectTypeObjects(apiName, arr, select, loadPropertySecurityMetadata);
     loadFn.catch((e) => {
       this.#logger?.error("Unhandled exception", e);
       for (const {
@@ -4004,7 +4062,7 @@ var BulkObjectLoader = class {
       }
     });
   }
-  async #loadObjectTypeObjects(apiName, arr, select) {
+  async #loadObjectTypeObjects(apiName, arr, select, loadPropertySecurityMetadata) {
     const objectDef = {
       type: "object",
       apiName
@@ -4027,7 +4085,8 @@ var BulkObjectLoader = class {
       $includeRid: true,
       ...select && select.length > 0 ? {
         $select: select
-      } : {}
+      } : {},
+      $loadPropertySecurityMetadata: loadPropertySecurityMetadata ?? false
     });
     for (const {
       primaryKey,
@@ -4041,7 +4100,7 @@ var BulkObjectLoader = class {
       }
     }
   }
-  async #loadInterfaceObjects(apiName, arr, select) {
+  async #loadInterfaceObjects(apiName, arr, select, loadPropertySecurityMetadata) {
     const pks = arr.map((x) => x.primaryKey);
     const interfaceDef = {
       type: "interface",
@@ -4075,7 +4134,8 @@ var BulkObjectLoader = class {
         $pageSize: remainingPks.length,
         ...select && select.length > 0 ? {
           $select: select
-        } : {}
+        } : {},
+        $loadPropertySecurityMetadata: loadPropertySecurityMetadata ?? false
       });
       for (const obj of data) {
         foundObjects.set(obj.$primaryKey, obj);
@@ -4101,15 +4161,17 @@ var ObjectQuery = class extends Query {
   #pk;
   #defType;
   #select;
+  #loadPropertySecurityMetadata;
   #implementingTypes;
-  constructor(store, subject, type, pk, cacheKey, opts, defType = "object", select) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+  constructor(store, subject, type, pk, cacheKey, opts, defType = "object", select, loadPropertySecurityMetadata) {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#apiName = type;
     this.#pk = pk;
     this.#defType = defType;
     this.#select = select;
+    this.#loadPropertySecurityMetadata = loadPropertySecurityMetadata ?? false;
   }
   _createConnectable(subject) {
     return rxjs.connectable(subject.pipe(rxjs.map((x) => {
@@ -4145,11 +4207,12 @@ var ObjectQuery = class extends Query {
         $includeRid: true,
         ...this.#select && this.#select.length > 0 ? {
           $select: this.#select
-        } : {}
+        } : {},
+        $loadPropertySecurityMetadata: this.#loadPropertySecurityMetadata
       });
       obj = fetched;
     } else {
-      obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk, this.#defType, this.#select);
+      obj = await getBulkObjectLoader(this.store.client).fetch(this.#apiName, this.#pk, this.#defType, this.#select, this.#loadPropertySecurityMetadata);
     }
     this.store.batch({}, (batch) => {
       this.writeToStore(obj, "loaded", batch, this.#select ? new Set(this.#select) : void 0);
@@ -4200,13 +4263,14 @@ var ObjectsHelper = class extends AbstractHelper {
     const apiName = typeof options.apiName === "string" ? options.apiName : options.apiName.apiName;
     const {
       pk,
-      select
+      select,
+      $loadPropertySecurityMetadata
     } = options;
-    const defType = chunk3RY4ECUB_cjs.getDefType(options.apiName);
+    const defType = chunkZPGIIKEZ_cjs.getDefType(options.apiName);
     const objectCacheKey = this.cacheKeys.get("object", apiName, pk, rdpConfig ?? void 0);
     return this.store.queries.get(objectCacheKey, () => new ObjectQuery(this.store, this.store.subjects.get(objectCacheKey), apiName, pk, objectCacheKey, {
       dedupeInterval: 0
-    }, defType, select));
+    }, defType, select, $loadPropertySecurityMetadata));
   }
   /**
    * Internal helper method for writing objects to the store and returning their
@@ -4240,7 +4304,7 @@ var ObjectsHelper = class extends AbstractHelper {
     if (valueToWrite !== tombstone && existing?.value && this.isObjectHolder(existing.value)) {
       const expectedRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(sourceCacheKey);
       if (expectedRdpFields.size > 0) {
-        const underlying = valueToWrite[chunk3RY4ECUB_cjs.UnderlyingOsdkObject];
+        const underlying = valueToWrite[chunkZPGIIKEZ_cjs.UnderlyingOsdkObject];
         const actualRdpFields = /* @__PURE__ */ new Set();
         for (const field of expectedRdpFields) {
           if (underlying && field in underlying) {
@@ -4302,19 +4366,24 @@ var ObjectsHelper = class extends AbstractHelper {
 };
 
 // src/observable/internal/objectset/ObjectSetQuery.ts
-var ObjectSetQuery = class extends BaseListQuery {
+var ObjectSetQuery = class _ObjectSetQuery extends BaseListQuery {
   #baseObjectSetWire;
   #operations;
   #composedObjectSet;
   #objectTypes;
+  #requiresServerEvaluation;
+  #resultTypeApiName;
   constructor(store, subject, baseObjectSetWire, operations, cacheKey, opts) {
-    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    super(store, subject, opts, cacheKey, process.env.NODE_ENV !== "production" ? store.client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: `ObjectSetQuery<${cacheKey.otherKeys.map((x) => JSON.stringify(x)).join(", ")}>`
     }) : void 0);
     this.#baseObjectSetWire = baseObjectSetWire;
     this.#operations = operations;
     this.#composedObjectSet = this.#composeObjectSet(opts);
-    this.#objectTypes = this.#extractObjectTypes(opts);
+    const baseWire = JSON.parse(baseObjectSetWire);
+    this.#objectTypes = this.#extractObjectTypes(baseWire, opts);
+    this.#requiresServerEvaluation = !!(operations.pivotTo || operations.union && operations.union.length > 0 || operations.intersect && operations.intersect.length > 0 || operations.subtract && operations.subtract.length > 0);
+    this.#resultTypeApiName = _ObjectSetQuery.#extractTypeFromWireObjectSet(baseWire) ?? "";
     if (opts.autoFetchMore === true) {
       this.minResultsToLoad = Number.MAX_SAFE_INTEGER;
     } else if (typeof opts.autoFetchMore === "number") {
@@ -4323,6 +4392,9 @@ var ObjectSetQuery = class extends BaseListQuery {
       this.minResultsToLoad = opts.pageSize || 0;
     }
   }
+  get objectTypes() {
+    return this.#objectTypes;
+  }
   get rdpConfig() {
     return this.#operations.withProperties ?? null;
   }
@@ -4354,37 +4426,36 @@ var ObjectSetQuery = class extends BaseListQuery {
     }
     return result;
   }
-  #extractObjectTypes(opts) {
+  #extractObjectTypes(baseWire, opts) {
     const types = /* @__PURE__ */ new Set();
-    const baseWire = JSON.parse(this.#baseObjectSetWire);
-    if (baseWire.type) {
-      types.add(baseWire.type);
-    }
-    if (opts.union) {
-      for (const os of opts.union) {
-        const wire = chunkR7OP6A6S_cjs.getWireObjectSet(os);
-        if (wire.type) {
-          types.add(wire.type);
-        }
-      }
+    const baseTypeName = _ObjectSetQuery.#extractTypeFromWireObjectSet(baseWire);
+    if (baseTypeName) {
+      types.add(baseTypeName);
     }
-    if (opts.intersect) {
-      for (const os of opts.intersect) {
-        const wire = chunkR7OP6A6S_cjs.getWireObjectSet(os);
-        if (wire.type) {
-          types.add(wire.type);
-        }
-      }
+    _ObjectSetQuery.#addTypesFromObjectSets(opts.union, types);
+    _ObjectSetQuery.#addTypesFromObjectSets(opts.intersect, types);
+    _ObjectSetQuery.#addTypesFromObjectSets(opts.subtract, types);
+    return types;
+  }
+  static #addTypesFromObjectSets(sets, types) {
+    if (!sets) {
+      return;
     }
-    if (opts.subtract) {
-      for (const os of opts.subtract) {
-        const wire = chunkR7OP6A6S_cjs.getWireObjectSet(os);
-        if (wire.type) {
-          types.add(wire.type);
-        }
+    for (const os of sets) {
+      const typeName = _ObjectSetQuery.#extractTypeFromWireObjectSet(chunkBWOPPEUP_cjs.getWireObjectSet(os));
+      if (typeName) {
+        types.add(typeName);
       }
     }
-    return types;
+  }
+  static #extractTypeFromWireObjectSet(wire) {
+    if (wire.type === "base") {
+      return wire.objectType;
+    }
+    if (wire.type === "interfaceBase") {
+      return wire.interfaceType;
+    }
+    return void 0;
   }
   /**
    * Register changes to the cache specific to ObjectSetQuery
@@ -4398,10 +4469,10 @@ var ObjectSetQuery = class extends BaseListQuery {
    */
   async fetchPageData(signal) {
     if (this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 && !(this.sortingStrategy instanceof OrderBySortingStrategy)) {
-      const wireObjectSet = chunkR7OP6A6S_cjs.getWireObjectSet(this.#composedObjectSet);
+      const wireObjectSet = chunkBWOPPEUP_cjs.getWireObjectSet(this.#composedObjectSet);
       const {
         resultType
-      } = await getObjectTypesThatInvalidate(this.store.client[chunkR7OP6A6S_cjs.additionalContext], wireObjectSet);
+      } = await getObjectTypesThatInvalidate(this.store.client[chunkBWOPPEUP_cjs.additionalContext], wireObjectSet);
       this.sortingStrategy = new OrderBySortingStrategy(resultType.apiName, this.#operations.orderBy);
     }
     const resp = await this.#composedObjectSet.fetchPage({
@@ -4414,6 +4485,9 @@ var ObjectSetQuery = class extends BaseListQuery {
       // OrderBy is already applied in the composed ObjectSet
       ...this.#operations.orderBy && Object.keys(this.#operations.orderBy).length > 0 ? {
         $orderBy: this.#operations.orderBy
+      } : {},
+      ...this.options.$loadPropertySecurityMetadata ? {
+        $loadPropertySecurityMetadata: true
       } : {}
     });
     if (signal?.aborted) {
@@ -4434,6 +4508,119 @@ var ObjectSetQuery = class extends BaseListQuery {
   registerStreamUpdates(sub) {
     this.createWebsocketSubscription(this.#composedObjectSet, sub, "observeObjectSet");
   }
+  maybeUpdateAndRevalidate = (changes, optimisticId) => {
+    if (process.env.NODE_ENV !== "production") {
+      this.logger?.child({
+        methodName: "maybeUpdateAndRevalidate"
+      }).debug(DEBUG_ONLY__changesToString(changes));
+      this.logger?.child({
+        methodName: "maybeUpdateAndRevalidate"
+      }).debug(`Already in changes? ${changes.modified.has(this.cacheKey)}`);
+    }
+    if (changes.modified.has(this.cacheKey)) {
+      return;
+    }
+    changes.modified.add(this.cacheKey);
+    try {
+      if (this.#requiresServerEvaluation) {
+        return this.#handleServerRevalidation(changes);
+      }
+      return this.#handleLocalUpdate(changes, optimisticId);
+    } finally {
+      if (process.env.NODE_ENV !== "production") {
+        this.logger?.child({
+          methodName: "maybeUpdateAndRevalidate"
+        }).debug("in finally");
+      }
+    }
+  };
+  #handleServerRevalidation(changes) {
+    for (const objectType of this.#objectTypes) {
+      const added = changes.addedObjects.get(objectType);
+      const modified = changes.modifiedObjects.get(objectType);
+      if (added && added.length > 0 || modified && modified.length > 0) {
+        return this.revalidate(true);
+      }
+    }
+    for (const deletedKey of changes.deleted) {
+      if (deletedKey.type === "object" && this.#objectTypes.has(deletedKey.otherKeys[API_NAME_IDX3])) {
+        return this.revalidate(true);
+      }
+    }
+    return void 0;
+  }
+  #getRelevantChanges(changes) {
+    const resultApiName = this.#resultTypeApiName;
+    const addedObjects = changes.addedObjects.get(resultApiName) ?? [];
+    const modifiedObjects = changes.modifiedObjects.get(resultApiName) ?? [];
+    let hasRelevantDeletions = false;
+    for (const key of changes.deleted) {
+      if (key.type === "object" && key.otherKeys[API_NAME_IDX3] === resultApiName) {
+        hasRelevantDeletions = true;
+        break;
+      }
+    }
+    if (addedObjects.length === 0 && modifiedObjects.length === 0 && !hasRelevantDeletions) {
+      return void 0;
+    }
+    return {
+      addedObjects,
+      modifiedObjects
+    };
+  }
+  #handleLocalUpdate(changes, optimisticId) {
+    const whereClause = this.#operations.where;
+    const effectiveWhere = whereClause ?? this.store.whereCanonicalizer.canonicalize({
+      $and: []
+    });
+    const relevant = this.#getRelevantChanges(changes);
+    if (!relevant) {
+      return void 0;
+    }
+    const addedMatches = this.#classifyByWhereMatch(relevant.addedObjects, effectiveWhere);
+    const modifiedMatches = this.#classifyByWhereMatch(relevant.modifiedObjects, effectiveWhere);
+    const status = optimisticId || addedMatches.uncertain.size > 0 || modifiedMatches.uncertain.size > 0 ? "loading" : "loaded";
+    const {
+      retVal: needsRevalidation
+    } = this.store.batch({
+      optimisticId,
+      changes
+    }, (batch) => {
+      const existingKeys = new Set(batch.read(this.cacheKey)?.value?.data);
+      const {
+        newList,
+        needsRevalidation: needsRevalidation2
+      } = reconcileListChanges(existingKeys, addedMatches.definite, relevant.modifiedObjects, modifiedMatches, changes.deleted, batch.optimisticWrite, (obj) => this.#getObjectCacheKey(obj));
+      const existingTotalCount = batch.read(this.cacheKey)?.value?.totalCount;
+      this._updateList(newList, status, batch, {
+        type: "clientOrdered"
+      }, existingTotalCount);
+      return needsRevalidation2;
+    });
+    if (needsRevalidation) {
+      return this.revalidate(true);
+    }
+    return void 0;
+  }
+  #classifyByWhereMatch(objects, whereClause) {
+    const definite = /* @__PURE__ */ new Set();
+    const uncertain = /* @__PURE__ */ new Set();
+    for (const obj of objects) {
+      if (objectSortaMatchesWhereClause(obj, whereClause, true)) {
+        definite.add(obj);
+      } else if (objectSortaMatchesWhereClause(obj, whereClause, false)) {
+        uncertain.add(obj);
+      }
+    }
+    return {
+      definite,
+      uncertain
+    };
+  }
+  #getObjectCacheKey(obj) {
+    const pk = obj.$primaryKey;
+    return this.cacheKeys.get("object", obj.$objectType, pk, this.rdpConfig ?? void 0);
+  }
   invalidateObjectType = async (objectType, changes) => {
     if (this.#objectTypes.has(objectType)) {
       changes?.modified.add(this.cacheKey);
@@ -4454,15 +4641,46 @@ var ObjectSetQuery = class extends BaseListQuery {
     };
   }
 };
+function reconcileListChanges(existingKeys, addedDefiniteMatches, modifiedObjects, modifiedMatches, deleted, isOptimistic, getObjectCacheKey) {
+  const objectsToInsert = new Set(addedDefiniteMatches);
+  const keysToRemove = new Set(deleted);
+  let needsRevalidation = false;
+  for (const obj of modifiedObjects) {
+    if (modifiedMatches.definite.has(obj)) {
+      if (!existingKeys.has(getObjectCacheKey(obj))) {
+        objectsToInsert.add(obj);
+      }
+    } else if (!isOptimistic) {
+      keysToRemove.add(getObjectCacheKey(obj));
+      if (modifiedMatches.uncertain.has(obj)) {
+        needsRevalidation = true;
+      }
+    }
+  }
+  const newList = [];
+  for (const key of existingKeys) {
+    if (!keysToRemove.has(key)) {
+      newList.push(key);
+    }
+  }
+  for (const obj of objectsToInsert) {
+    newList.push(getObjectCacheKey(obj));
+  }
+  return {
+    newList,
+    needsRevalidation
+  };
+}
 
 // src/observable/internal/objectset/ObjectSetHelper.ts
 var ObjectSetHelper = class extends AbstractHelper {
-  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer, selectCanonicalizer) {
+  constructor(store, cacheKeys, whereCanonicalizer2, orderByCanonicalizer2, rdpCanonicalizer, selectCanonicalizer, objectSetArrayCanonicalizer) {
     super(store, cacheKeys);
     this.whereCanonicalizer = whereCanonicalizer2;
     this.orderByCanonicalizer = orderByCanonicalizer2;
     this.rdpCanonicalizer = rdpCanonicalizer;
     this.selectCanonicalizer = selectCanonicalizer;
+    this.objectSetArrayCanonicalizer = objectSetArrayCanonicalizer;
   }
   observe(options, subFn) {
     const ret = super.observe(options, subFn);
@@ -4475,7 +4693,7 @@ var ObjectSetHelper = class extends AbstractHelper {
     const {
       baseObjectSet
     } = options;
-    const baseObjectSetWire = JSON.stringify(chunkR7OP6A6S_cjs.getWireObjectSet(baseObjectSet));
+    const baseObjectSetWire = JSON.stringify(chunkBWOPPEUP_cjs.getWireObjectSet(baseObjectSet));
     const operations = this.buildCanonicalizedOperations(options);
     const objectSetCacheKey = this.cacheKeys.get("objectSet", baseObjectSetWire, operations);
     return this.store.queries.get(objectSetCacheKey, () => {
@@ -4491,13 +4709,13 @@ var ObjectSetHelper = class extends AbstractHelper {
       operations.withProperties = this.rdpCanonicalizer.canonicalize(options.withProperties);
     }
     if (options.union && options.union.length > 0) {
-      operations.union = options.union.map((os) => JSON.stringify(chunkR7OP6A6S_cjs.getWireObjectSet(os)));
+      operations.union = this.objectSetArrayCanonicalizer.canonicalizeUnion(options.union.map((os) => JSON.stringify(chunkBWOPPEUP_cjs.getWireObjectSet(os))));
     }
     if (options.intersect && options.intersect.length > 0) {
-      operations.intersect = options.intersect.map((os) => JSON.stringify(chunkR7OP6A6S_cjs.getWireObjectSet(os)));
+      operations.intersect = this.objectSetArrayCanonicalizer.canonicalizeIntersect(options.intersect.map((os) => JSON.stringify(chunkBWOPPEUP_cjs.getWireObjectSet(os))));
     }
     if (options.subtract && options.subtract.length > 0) {
-      operations.subtract = options.subtract.map((os) => JSON.stringify(chunkR7OP6A6S_cjs.getWireObjectSet(os)));
+      operations.subtract = this.objectSetArrayCanonicalizer.canonicalizeSubtract(options.subtract.map((os) => JSON.stringify(chunkBWOPPEUP_cjs.getWireObjectSet(os))));
     }
     if (options.pivotTo) {
       operations.pivotTo = options.pivotTo;
@@ -4511,10 +4729,31 @@ var ObjectSetHelper = class extends AbstractHelper {
     if (options.pageSize) {
       operations.pageSize = options.pageSize;
     }
+    if (options.$loadPropertySecurityMetadata) {
+      operations.loadPropertySecurity = true;
+    }
     return operations;
   }
 };
 
+// src/observable/internal/ObjectSetArrayCanonicalizer.ts
+var ObjectSetArrayCanonicalizer = class {
+  #unionTrie = new WeakRefTrie();
+  #intersectTrie = new WeakRefTrie();
+  #subtractTrie = new WeakRefTrie();
+  canonicalizeUnion(items) {
+    const sorted = [...items].sort();
+    return this.#unionTrie.lookupArray(sorted);
+  }
+  canonicalizeIntersect(items) {
+    const sorted = [...items].sort();
+    return this.#intersectTrie.lookupArray(sorted);
+  }
+  canonicalizeSubtract(items) {
+    return this.#subtractTrie.lookupArray(items);
+  }
+};
+
 // src/observable/internal/PivotCanonicalizer.ts
 var PivotCanonicalizer = class {
   #cache = /* @__PURE__ */ new Map();
@@ -4569,7 +4808,7 @@ var RdpCanonicalizer = class extends CachingCanonicalizer {
       apiName: "__rdp_canonicalizer_holder__"
     };
     for (const [key, rdpFunction] of Object.entries(rdp)) {
-      const builder = chunkR7OP6A6S_cjs.createWithPropertiesObjectSet(
+      const builder = chunkBWOPPEUP_cjs.createWithPropertiesObjectSet(
         objectTypeHolder,
         {
           type: "methodInput"
@@ -4642,6 +4881,8 @@ var Store = class {
   pivotCanonicalizer = new PivotCanonicalizer();
   ridListCanonicalizer = new RidListCanonicalizer();
   selectCanonicalizer = new SelectCanonicalizer();
+  objectSetArrayCanonicalizer = new ObjectSetArrayCanonicalizer();
+  genericCanonicalizer = new GenericCanonicalizer();
   /** @internal */
   queries = new Queries();
   /**
@@ -4663,7 +4904,7 @@ var Store = class {
   subjects = this.layers.subjects;
   // these are hopefully temporary
   constructor(client) {
-    this.logger = client[chunkR7OP6A6S_cjs.additionalContext].logger?.child({}, {
+    this.logger = client[chunkBWOPPEUP_cjs.additionalContext].logger?.child({}, {
       msgPrefix: "Store"
     });
     this.client = client;
@@ -4675,7 +4916,7 @@ var Store = class {
     this.lists = new ListsHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.intersectCanonicalizer, this.pivotCanonicalizer, this.ridListCanonicalizer, this.selectCanonicalizer);
     this.objects = new ObjectsHelper(this, this.cacheKeys);
     this.links = new LinksHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.selectCanonicalizer);
-    this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.selectCanonicalizer);
+    this.objectSets = new ObjectSetHelper(this, this.cacheKeys, this.whereCanonicalizer, this.orderByCanonicalizer, this.rdpCanonicalizer, this.selectCanonicalizer, this.objectSetArrayCanonicalizer);
   }
   /**
    * Called after a key is no longer retained and the timeout has elapsed
@@ -4807,6 +5048,17 @@ var Store = class {
    * @returns true if the query should be notified based on object type changes
    */
   #shouldPropagateForObjectTypeChanges(cacheKey, changes) {
+    if (cacheKey.type === "objectSet") {
+      const query = this.queries.peek(cacheKey);
+      if (query) {
+        for (const objectType of query.objectTypes) {
+          if (this.#changesAffectObjectType(changes, objectType)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
     const queryObjectType = this.#getQueryObjectType(cacheKey);
     if (!queryObjectType) {
       return false;
@@ -4880,6 +5132,11 @@ var Store = class {
     if (modifiedForType && modifiedForType.length > 0) {
       return true;
     }
+    for (const deletedKey of changes.deleted) {
+      if (deletedKey.type === "object" && deletedKey.otherKeys[API_NAME_IDX3] === objectType) {
+        return true;
+      }
+    }
     return false;
   }
   /**
@@ -4941,10 +5198,10 @@ var Store = class {
 
 // src/observable/ObservableClient.ts
 function createObservableClient(client) {
-  const tweakedClient = chunk3RY4ECUB_cjs.createClientFromContext({
-    ...client[chunkR7OP6A6S_cjs.additionalContext],
-    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkR7OP6A6S_cjs.additionalContext].fetch, (headers) => {
-      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunk3RY4ECUB_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
+  const tweakedClient = chunkZPGIIKEZ_cjs.createClientFromContext({
+    ...client[chunkBWOPPEUP_cjs.additionalContext],
+    fetch: shared_net_fetch.createFetchHeaderMutator(client[chunkBWOPPEUP_cjs.additionalContext].fetch, (headers) => {
+      headers.set("Fetch-User-Agent", [headers.get("Fetch-User-Agent"), chunkZPGIIKEZ_cjs.OBSERVABLE_USER_AGENT].filter((x) => x && x?.length > 0).join(" "));
       return headers;
     })
   });
@@ -4987,19 +5244,19 @@ function getOsdkConfig(ontologyRid) {
 
 Object.defineProperty(exports, "createClientWithTransaction", {
   enumerable: true,
-  get: function () { return chunk3RY4ECUB_cjs.createClientWithTransaction; }
+  get: function () { return chunkZPGIIKEZ_cjs.createClientWithTransaction; }
 });
 Object.defineProperty(exports, "augment", {
   enumerable: true,
-  get: function () { return chunkR7OP6A6S_cjs.augment; }
+  get: function () { return chunkBWOPPEUP_cjs.augment; }
 });
 Object.defineProperty(exports, "getWireObjectSet", {
   enumerable: true,
-  get: function () { return chunkR7OP6A6S_cjs.getWireObjectSet; }
+  get: function () { return chunkBWOPPEUP_cjs.getWireObjectSet; }
 });
 Object.defineProperty(exports, "isObjectSet", {
   enumerable: true,
-  get: function () { return chunkR7OP6A6S_cjs.isObjectSet; }
+  get: function () { return chunkBWOPPEUP_cjs.isObjectSet; }
 });
 exports.computeObjectSetCacheKey = computeObjectSetCacheKey;
 exports.createObservableClient = createObservableClient;