@osdk/client 2.7.0-beta.9 → 2.7.0

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

@@ -764,7 +764,6 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
   }
   const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, requestBody, {
     preview: true,
-    branch: client.branch,
     transactionId: client.transactionId
   });
   return Promise.resolve({
@@ -866,7 +865,6 @@ async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot
     await client.flushEdits();
   }
   const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, requestBody, {
-    branch: client.branch,
     transactionId: client.transactionId
   });
   return Promise.resolve({
@@ -1194,13 +1192,20 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
   const firstKey = keysOfFilter[0];
   !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false) : invariant3__default.default(false) : void 0;
   if (firstKey === "$contains" && filter[firstKey] instanceof Object) {
-    const structFilter = Object.entries(filter[firstKey]);
-    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant3__default.default(false) : void 0;
-    const structFieldApiName = structFilter[0][0];
-    return handleWherePair(structFilter[0], objectOrInterface, {
-      propertyApiName: fieldName,
-      structFieldApiName
-    });
+    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" ? invariant3__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant3__default.default(false) : void 0;
+      const structFieldApiName = structFilter[0][0];
+      return handleWherePair(structFilter[0], objectOrInterface, {
+        propertyApiName: fieldName,
+        structFieldApiName
+      });
+    }
   }
   if (firstKey === "$ne") {
     return {
@@ -1408,23 +1413,6 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
       const selectorResult = derivedPropertyDefinitionFactory(wrappedObjectSet, definitionMap);
       definitionMap.set(selectorResult, wrappedObjectSet);
       return selectorResult;
-    },
-    constant: {
-      double: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
-      },
-      integer: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
-      },
-      long: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
-      },
-      datetime: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
-      },
-      timestamp: (value) => {
-        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Not supported") : invariant3__default.default(false) ;
-      }
     }
   };
 }
@@ -1547,7 +1535,6 @@ async function aggregate3(clientCtx, objectType, objectSet = resolveBaseObjectSe
     groupBy: body.groupBy,
     aggregation: body.aggregation
   }, {
-    branch: clientCtx.branch,
     transactionId: clientCtx.transactionId
   });
   if (!req.$groupBy) {
@@ -1605,7 +1592,6 @@ var fetchLinksPage = async (client, objectType, objectSet, links) => {
     objectSet,
     links
   }, {
-    branch: client.branch,
     preview: true
   });
   return remapLinksPage(result);
@@ -1746,7 +1732,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     });
     !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Stack must be a URL") : invariant3__default.default(false) : void 0;
   }
-  async subscribe(objectType, objectSet, listener, properties = []) {
+  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 +1751,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 +1805,10 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         return {
           objectSet,
           propertySet: requestedProperties,
-          referenceSet: requestedReferenceProperties
+          referenceSet: requestedReferenceProperties,
+          objectLoadingResponseOptions: {
+            shouldLoadObjectRids: true
+          }
         };
       })
     };
@@ -1976,9 +1966,14 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       }
       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 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) {
@@ -2222,7 +2217,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)()
       };
@@ -2332,5 +2327,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-Y362HOIZ.cjs.map
+//# sourceMappingURL=chunk-Y362HOIZ.cjs.map