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

package/build/cjs/{chunk-T5UE6BI7.cjs → chunk-33GHS3X4.cjs}

@@ -1,28 +1,28 @@
 'use strict';
 
-var chunkX7WGNFZ4_cjs = require('./chunk-X7WGNFZ4.cjs');
+var chunk37QC7LR3_cjs = require('./chunk-37QC7LR3.cjs');
 var shared_net_errors = require('@osdk/shared.net.errors');
-var invariant5 = require('tiny-invariant');
+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 invariant5__default = /*#__PURE__*/_interopDefault(invariant5);
+var invariant3__default = /*#__PURE__*/_interopDefault(invariant3);
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
 
 // src/public-utils/hydrateAttachmentFromRid.ts
 function hydrateAttachmentFromRid(client, rid) {
-  return hydrateAttachmentFromRidInternal(client[chunkX7WGNFZ4_cjs.additionalContext], rid);
+  return hydrateAttachmentFromRidInternal(client[chunk37QC7LR3_cjs.additionalContext], rid);
 }
 function hydrateAttachmentFromRidInternal(client, rid) {
   return {
     rid,
     async fetchContents() {
-      return chunkX7WGNFZ4_cjs.Attachment_exports.read(client, rid);
+      return chunk37QC7LR3_cjs.Attachment_exports.read(client, rid);
     },
     async fetchMetadata() {
-      const r = await chunkX7WGNFZ4_cjs.Attachment_exports.get(client, rid);
+      const r = await chunk37QC7LR3_cjs.Attachment_exports.get(client, rid);
       return {
         ...r,
         sizeBytes: Number(r.sizeBytes)
@@ -30,8 +30,75 @@ function hydrateAttachmentFromRidInternal(client, rid) {
     }
   };
 }
+
+// src/logger/BaseLogger.ts
+function noop() {
+}
+var levels = {
+  trace: 10,
+  debug: 20,
+  info: 30,
+  warn: 40,
+  error: 50,
+  fatal: 60
+};
+var BaseLogger = class {
+  #factory;
+  constructor(bindings, options = {}, factory) {
+    this.bindings = bindings;
+    this.options = options;
+    this.#factory = factory;
+    for (const k of ["trace", "debug", "info", "warn", "error", "fatal"]) {
+      if (this.options?.level && !this.isLevelEnabled(k)) {
+        continue;
+      }
+      this[k] = this.createLogMethod(k, bindings);
+    }
+  }
+  trace = noop;
+  debug = noop;
+  warn = noop;
+  info = noop;
+  error = noop;
+  fatal = noop;
+  child(bindings, options) {
+    return new this.#factory({
+      ...this.bindings,
+      ...bindings
+    }, {
+      level: (options ?? this.options)?.level,
+      msgPrefix: [this.options?.msgPrefix, options?.msgPrefix].filter((x) => x).join(" ")
+    });
+  }
+  isLevelEnabled(level) {
+    const ourLevel = this.options?.level ?? "info";
+    return level in levels && ourLevel in levels && levels[level] >= levels[ourLevel];
+  }
+};
+
+// src/logger/MinimalLogger.ts
+var MinimalLogger = class _MinimalLogger extends BaseLogger {
+  constructor(bindings = {}, options = {}) {
+    super(bindings, {
+      ...options,
+      level: options.level ?? "error"
+    }, _MinimalLogger);
+  }
+  createLogMethod(name, bindings) {
+    const msgs = [name];
+    if (this.options?.msgPrefix) {
+      msgs.push(this.options.msgPrefix);
+    }
+    if (typeof bindings === "object" && "methodName" in bindings) {
+      msgs.push(`.${bindings.methodName}()`);
+    }
+    return (...args) => {
+      console[name === "fatal" ? "error" : name](msgs.join(" "), ...args);
+    };
+  }
+};
 async function fetchSingle(client, objectType, args, objectSet) {
-  const result = await chunkX7WGNFZ4_cjs.fetchPage(client, objectType, {
+  const result = await chunk37QC7LR3_cjs.fetchPage(client, objectType, {
     ...args,
     $pageSize: 1
   }, objectSet);
@@ -59,7 +126,7 @@ async function fetchSingleWithErrors(client, objectType, args, objectSet) {
 }
 function extractNamespace(fqApiName) {
   const last = fqApiName.lastIndexOf(".");
-  if (last === -1) return [undefined, fqApiName];
+  if (last === -1) return [void 0, fqApiName];
   return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
 }
 function modernToLegacyWhereClause(whereClause, objectOrInterface) {
@@ -126,13 +193,13 @@ function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field
   };
 }
 function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector) {
-  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant5__default.default(false) : undefined;
+  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant3__default.default(false) : void 0;
   const propertyIdentifier = structFieldSelector != null ? {
     type: "structField",
     ...structFieldSelector,
     propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
-  } : undefined;
-  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : undefined;
+  } : void 0;
+  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
   if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
     return {
       type: "eq",
@@ -145,10 +212,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" ? invariant5__default.default(false, "WhereClause Filter with multiple clauses isn't allowed") : invariant5__default.default(false) : undefined;
+  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant3__default.default(false) : void 0;
   if (!hasDollarSign) {
     const structFilter = Object.entries(filter);
-    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant5__default.default(false) : undefined;
+    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant3__default.default(false) : void 0;
     const structFieldApiName = keysOfFilter[0];
     return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
       propertyApiName: fieldName,
@@ -156,7 +223,7 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     });
   }
   const firstKey = keysOfFilter[0];
-  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : undefined;
+  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false) : invariant3__default.default(false) : void 0;
   if (firstKey === "$ne") {
     return {
       type: "not",
@@ -238,10 +305,84 @@ function fullyQualifyPropName(fieldName, objectOrInterface) {
   }
   return fieldName;
 }
+function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
+  const definition = {
+    abs() {
+      return derivedPropertyDefinitionFactory({
+        type: "absoluteValue",
+        property: wireDefinition
+      }, definitionMap);
+    },
+    negate() {
+      return derivedPropertyDefinitionFactory({
+        type: "negate",
+        property: wireDefinition
+      }, definitionMap);
+    },
+    max(value) {
+      return derivedPropertyDefinitionFactory({
+        type: "greatest",
+        properties: [wireDefinition, getDefinitionFromMap(value, definitionMap)]
+      }, definitionMap);
+    },
+    min(value) {
+      return derivedPropertyDefinitionFactory({
+        type: "least",
+        properties: [wireDefinition, getDefinitionFromMap(value, definitionMap)]
+      }, definitionMap);
+    },
+    add(value) {
+      return derivedPropertyDefinitionFactory({
+        type: "add",
+        properties: [wireDefinition, getDefinitionFromMap(value, definitionMap)]
+      }, definitionMap);
+    },
+    subtract(value) {
+      return derivedPropertyDefinitionFactory({
+        "type": "subtract",
+        "left": wireDefinition,
+        "right": getDefinitionFromMap(value, definitionMap)
+      }, definitionMap);
+    },
+    multiply(value) {
+      return derivedPropertyDefinitionFactory({
+        type: "multiply",
+        properties: [wireDefinition, getDefinitionFromMap(value, definitionMap)]
+      }, definitionMap);
+    },
+    divide(value) {
+      return derivedPropertyDefinitionFactory({
+        "type": "subtract",
+        "left": wireDefinition,
+        "right": getDefinitionFromMap(value, definitionMap)
+      }, definitionMap);
+    },
+    extractPart: (part) => {
+      return derivedPropertyDefinitionFactory({
+        type: "extract",
+        part,
+        property: wireDefinition
+      }, definitionMap);
+    },
+    type: {}
+  };
+  definitionMap.set(definition, wireDefinition);
+  return definition;
+}
+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;
+    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" ? invariant3__default.default(false, "Invalid argument type for a derived property") : invariant3__default.default(false) ;
+};
 
 // src/derivedProperties/createWithPropertiesObjectSet.ts
-function createWithPropertiesObjectSet(objectType, objectSet, definitionMap) {
-  const base = {
+function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fromBaseObjectSet = false) {
+  return {
     pivotTo: (link) => {
       return createWithPropertiesObjectSet(objectType, {
         type: "searchAround",
@@ -258,7 +399,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap) {
     },
     aggregate: (aggregation, opt) => {
       const splitAggregation = aggregation.split(":");
-      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Invalid aggregation format") : invariant5__default.default(false) : undefined;
+      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid aggregation format") : invariant3__default.default(false) : void 0;
       const [aggregationPropertyName, aggregationOperation] = splitAggregation;
       let aggregationOperationDefinition;
       switch (aggregationOperation) {
@@ -288,7 +429,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap) {
             limit: opt?.limit ?? 100
           };
           break;
-        case undefined:
+        case void 0:
           if (aggregationPropertyName === "$count") {
             aggregationOperationDefinition = {
               type: "count"
@@ -296,34 +437,57 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap) {
             break;
           }
         default:
-          process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant5__default.default(false) ;
+          process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant3__default.default(false) ;
       }
-      const selectorResult = {
-        type: {}
-      };
-      definitionMap.set(selectorResult, {
+      const wrappedObjectSet = {
         type: "selection",
         objectSet,
         operation: aggregationOperationDefinition
-      });
+      };
+      const selectorResult = derivedPropertyDefinitionFactory(wrappedObjectSet, definitionMap);
+      definitionMap.set(selectorResult, wrappedObjectSet);
       return selectorResult;
     },
     selectProperty: (name) => {
-      const selectorResult = {
-        type: {}
-      };
-      definitionMap.set(selectorResult, {
+      if (fromBaseObjectSet) {
+        const wrappedObjectSet2 = {
+          type: "property",
+          apiName: name
+        };
+        const selectorResult2 = derivedPropertyDefinitionFactory(wrappedObjectSet2, definitionMap);
+        definitionMap.set(selectorResult2, wrappedObjectSet2);
+        return selectorResult2;
+      }
+      const wrappedObjectSet = {
         type: "selection",
         objectSet,
         operation: {
           type: "get",
           selectedPropertyApiName: name
         }
-      });
+      };
+      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) ;
+      }
     }
   };
-  return base;
 }
 function legacyToModernSingleAggregationResult(entry) {
   return entry.metrics.reduce((accumulator, curValue) => {
@@ -331,7 +495,7 @@ function legacyToModernSingleAggregationResult(entry) {
     if (parts[0] === "count") {
       return accumulator;
     }
-    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant5__default.default(false) : undefined;
+    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant3__default.default(false) : void 0;
     const property = parts[0];
     const metricType = parts[1];
     if (!(property in accumulator)) {
@@ -343,7 +507,7 @@ function legacyToModernSingleAggregationResult(entry) {
 }
 
 // src/internal/conversions/modernToLegacyAggregationClause.ts
-var directionFieldMap = (dir) => dir === "asc" ? "ASC" : dir === "desc" ? "DESC" : undefined;
+var directionFieldMap = (dir) => dir === "asc" ? "ASC" : dir === "desc" ? "DESC" : void 0;
 function modernToLegacyAggregationClause(select) {
   return Object.entries(select).flatMap(([propAndMetric, aggregationType]) => {
     if (propAndMetric === "$count") {
@@ -380,6 +544,13 @@ function modernToLegacyGroupByClause(groupByClause) {
           maxGroupCount: type.$exactWithLimit
         }];
       }
+    } else if ("$exact" in type) {
+      return [{
+        type: "exact",
+        field,
+        maxGroupCount: type.$exact?.$limit ?? void 0,
+        defaultValue: type.$exact.$defaultValue ?? void 0
+      }];
     } else if ("$fixedWidth" in type) {
       return [{
         type: "fixedWidth",
@@ -410,23 +581,21 @@ function convertRange(range) {
 }
 
 // src/object/aggregate.ts
-async function aggregate(clientCtx, objectType, objectSet = chunkX7WGNFZ4_cjs.resolveBaseObjectSetType(objectType), req) {
-  chunkX7WGNFZ4_cjs.resolveBaseObjectSetType(objectType);
+async function aggregate(clientCtx, objectType, objectSet = chunk37QC7LR3_cjs.resolveBaseObjectSetType(objectType), req) {
+  chunk37QC7LR3_cjs.resolveBaseObjectSetType(objectType);
   const body = {
     aggregation: modernToLegacyAggregationClause(req.$select),
-    groupBy: [],
-    where: undefined
-  };
+    groupBy: []};
   if (req.$groupBy) {
     body.groupBy = modernToLegacyGroupByClause(req.$groupBy);
   }
-  const result = await chunkX7WGNFZ4_cjs.OntologyObjectSet_exports.aggregate(chunkX7WGNFZ4_cjs.addUserAgentAndRequestContextHeaders(clientCtx, objectType), await clientCtx.ontologyRid, {
+  const result = await chunk37QC7LR3_cjs.OntologyObjectSet_exports.aggregate(chunk37QC7LR3_cjs.addUserAgentAndRequestContextHeaders(clientCtx, objectType), await clientCtx.ontologyRid, {
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
   });
   if (!req.$groupBy) {
-    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "no group by clause should mean only one data result") : invariant5__default.default(false) : undefined;
+    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "no group by clause should mean only one data result") : invariant3__default.default(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
       ...legacyToModernSingleAggregationResult(result.data[0])
@@ -522,7 +691,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#logger = client.logger?.child({}, {
       msgPrefix: "<OSW> "
     });
-    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Stack must be a URL") : invariant5__default.default(false) : undefined;
+    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Stack must be a URL") : invariant3__default.default(false) : void 0;
   }
   async subscribe(objectType, objectSet, listener, properties = []) {
     const objOrInterfaceDef = objectType.type === "object" ? await this.#client.ontologyProvider.getObjectDefinition(objectType.apiName) : await this.#client.ontologyProvider.getInterfaceDefinition(objectType.apiName);
@@ -536,14 +705,14 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     const sub = {
       listener: fillOutListener(listener),
       objectSet,
-      primaryKeyPropertyName: objOrInterfaceDef.type === "interface" ? undefined : objOrInterfaceDef.primaryKeyApiName,
+      primaryKeyPropertyName: objOrInterfaceDef.type === "interface" ? void 0 : objOrInterfaceDef.primaryKeyApiName,
       requestedProperties: objectProperties,
       requestedReferenceProperties: referenceProperties,
       status: "preparing",
       // 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" ? undefined : objOrInterfaceDef.apiName
+      interfaceApiName: objOrInterfaceDef.type === "object" ? void 0 : objOrInterfaceDef.apiName
     };
     this.#subscriptions.set(sub.subscriptionId, sub);
     void this.#initiateSubscribe(sub);
@@ -562,7 +731,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
    */
   async #initiateSubscribe(sub) {
     if (process.env.NODE_ENV !== "production") {
-      this.#logger?.trace("#initiateSubscribe()");
+      this.#logger?.debug("#initiateSubscribe()");
     }
     try {
       await this.#ensureWebsocket();
@@ -580,7 +749,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   }
   #sendSubscribeMessage() {
     if (process.env.NODE_ENV !== "production") {
-      this.#logger?.trace("#sendSubscribeMessage()");
+      this.#logger?.debug("#sendSubscribeMessage()");
     }
     const readySubs = [...this.#subscriptions.values()].filter(isReady);
     const id = nextUuid();
@@ -601,7 +770,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       })
     };
     if (process.env.NODE_ENV !== "production") {
-      this.#logger?.trace({
+      this.#logger?.debug({
         payload: subscribe
       }, "sending subscribe message");
     }
@@ -621,7 +790,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     }
     this.#maybeDisconnectTimeout = setTimeout(
       () => {
-        this.#maybeDisconnectTimeout = undefined;
+        this.#maybeDisconnectTimeout = void 0;
         if (this.#subscriptions.size === 0) {
           this.#cycleWebsocket();
         }
@@ -648,7 +817,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         this.#lastWsConnect = Date.now();
         if (this.#ws == null) {
           if (process.env.NODE_ENV !== "production") {
-            this.#logger?.trace("Creating websocket");
+            this.#logger?.debug("Creating websocket");
           }
           this.#ws = new WebSocket__default.default(url, [`Bearer-${token}`]);
           this.#ws.addEventListener("close", this.#onClose);
@@ -685,22 +854,26 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   #onMessage = async (message) => {
     const data = JSON.parse(message.data.toString());
     if (process.env.NODE_ENV !== "production") {
-      this.#logger?.trace({
+      this.#logger?.debug({
         payload: data
       }, "received message from ws");
     }
     switch (data.type) {
       case "objectSetChanged":
-        return void this.#handleMessage_objectSetChanged(data);
+        await this.#handleMessage_objectSetChanged(data);
+        return;
       case "refreshObjectSet":
-        return void this.#handleMessage_refreshObjectSet(data);
+        this.#handleMessage_refreshObjectSet(data);
+        return;
       case "subscribeResponses":
-        return void this.#handleMessage_subscribeResponses(data);
+        this.#handleMessage_subscribeResponses(data);
+        return;
       case "subscriptionClosed": {
-        return void this.#handleMessage_subscriptionClosed(data);
+        this.#handleMessage_subscriptionClosed(data);
+        return;
       }
       default:
-        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Unexpected message type") : invariant5__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "Unexpected message type") : invariant3__default.default(false) ;
     }
   };
   #handleMessage_objectSetChanged = async (payload) => {
@@ -711,20 +884,20 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     const osdkObjectsWithReferenceUpdates = await Promise.all(referenceUpdates.map(async (o) => {
       const osdkObjectArray = await this.#client.objectFactory2(this.#client, [{
         __apiName: o.objectType,
-        __primaryKey: sub.primaryKeyPropertyName != null ? o.primaryKey[sub.primaryKeyPropertyName] : undefined,
+        __primaryKey: sub.primaryKeyPropertyName != null ? o.primaryKey[sub.primaryKeyPropertyName] : void 0,
         ...o.primaryKey,
         [o.property]: o.value
-      }], sub.interfaceApiName, false, undefined, false, await this.#fetchInterfaceMapping(o.objectType, sub.interfaceApiName));
-      const singleOsdkObject = osdkObjectArray[0] ?? undefined;
+      }], sub.interfaceApiName, {}, false, void 0, false, await this.#fetchInterfaceMapping(o.objectType, sub.interfaceApiName));
+      const singleOsdkObject = osdkObjectArray[0] ?? void 0;
       return singleOsdkObject != null ? {
         object: singleOsdkObject,
         state: "ADDED_OR_UPDATED"
-      } : undefined;
+      } : void 0;
     }));
-    for (const osdkObject of osdkObjectsWithReferenceUpdates) {
-      if (osdkObject != null) {
+    for (const update of osdkObjectsWithReferenceUpdates) {
+      if (update != null) {
         try {
-          sub.listener.onChange?.(osdkObject);
+          sub.listener.onChange?.(update);
         } catch (error) {
           this.#logger?.error(error, "Error in onChange callback");
           this.#tryCatchOnError(sub, false, error);
@@ -736,12 +909,12 @@ 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, undefined, false, await this.#fetchInterfaceMapping(o.object.__apiName, sub.interfaceApiName));
-      const singleOsdkObject = osdkObjectArray[0] ?? undefined;
+      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 ? {
         object: singleOsdkObject,
         state: o.state
-      } : undefined;
+      } : void 0;
     }));
     for (const osdkObject of osdkObjects) {
       if (osdkObject != null) {
@@ -765,7 +938,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   }
   #handleMessage_refreshObjectSet = (payload) => {
     const sub = this.#subscriptions.get(payload.id);
-    !sub ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Expected subscription id ${payload.id}`) : invariant5__default.default(false) : undefined;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Expected subscription id ${payload.id}`) : invariant3__default.default(false) : void 0;
     try {
       sub.listener.onOutOfDate();
     } catch (error) {
@@ -779,7 +952,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       responses
     } = payload;
     const subs = this.#pendingSubscriptions.get(id);
-    !subs ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `should have a pending subscription for ${id}`) : invariant5__default.default(false) : undefined;
+    !subs ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `should have a pending subscription for ${id}`) : invariant3__default.default(false) : void 0;
     this.#pendingSubscriptions.delete(id);
     for (let i = 0; i < responses.length; i++) {
       const sub = subs[i];
@@ -795,7 +968,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         case "success":
           const shouldFireOutOfDate = sub.status === "expired" || sub.status === "reconnecting";
           if (process.env.NODE_ENV !== "production") {
-            this.#logger?.trace({
+            this.#logger?.debug({
               shouldFireOutOfDate
             }, "success");
           }
@@ -821,13 +994,13 @@ 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" ? invariant5__default.default(false, `Expected subscription id ${payload.id}`) : invariant5__default.default(false) : undefined;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, `Expected subscription id ${payload.id}`) : invariant3__default.default(false) : void 0;
     this.#tryCatchOnError(sub, true, payload.cause);
     this.#unsubscribe(sub, "error");
   }
   #onClose = (event) => {
     if (process.env.NODE_ENV !== "production") {
-      this.#logger?.trace({
+      this.#logger?.debug({
         event
       }, "Received close event from ws", event);
     }
@@ -841,12 +1014,12 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       if (this.#ws.readyState !== WebSocket__default.default.CLOSING && this.#ws.readyState !== WebSocket__default.default.CLOSED) {
         this.#ws.close();
       }
-      this.#ws = undefined;
+      this.#ws = void 0;
     }
     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" ? invariant5__default.default(false, "should not have done/error subscriptions still") : invariant5__default.default(false) : undefined;
+          !(s.status !== "done" && s.status !== "error") ? process.env.NODE_ENV !== "production" ? invariant3__default.default(false, "should not have done/error subscriptions still") : invariant3__default.default(false) : void 0;
         }
       }
       for (const s of this.#subscriptions.values()) {
@@ -895,15 +1068,15 @@ function getWireObjectSet(objectSet) {
   return objectSetDefinitions.get(objectSet);
 }
 var objectSetDefinitions = /* @__PURE__ */ new WeakMap();
-function createObjectSet(objectType, clientCtx, objectSet = chunkX7WGNFZ4_cjs.resolveBaseObjectSetType(objectType)) {
+function createObjectSet(objectType, clientCtx, objectSet = chunk37QC7LR3_cjs.resolveBaseObjectSetType(objectType)) {
   const base = {
     aggregate: aggregate.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
       finalMethodCall: "aggregate"
     })), objectType, objectSet),
-    fetchPage: chunkX7WGNFZ4_cjs.fetchPageInternal.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
+    fetchPage: chunk37QC7LR3_cjs.fetchPageInternal.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
       finalMethodCall: "fetchPage"
     })), objectType, objectSet),
-    fetchPageWithErrors: chunkX7WGNFZ4_cjs.fetchPageWithErrorsInternal.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
+    fetchPageWithErrors: chunk37QC7LR3_cjs.fetchPageWithErrorsInternal.bind(globalThis, augmentRequestContext(clientCtx, (_) => ({
       finalMethodCall: "fetchPageWithErrors"
     })), objectType, objectSet),
     where: (clause) => {
@@ -935,12 +1108,13 @@ function createObjectSet(objectType, clientCtx, objectSet = chunkX7WGNFZ4_cjs.re
       });
     },
     asyncIter: async function* (args) {
-      let $nextPageToken = undefined;
+      let $nextPageToken = void 0;
       do {
-        const result = await chunkX7WGNFZ4_cjs.fetchPageInternal(augmentRequestContext(clientCtx, (_) => ({
+        const result = await chunk37QC7LR3_cjs.fetchPageInternal(augmentRequestContext(clientCtx, (_) => ({
           finalMethodCall: "asyncIter"
         })), objectType, objectSet, {
           ...args,
+          $pageSize: 1e4,
           $nextPageToken
         });
         $nextPageToken = result.nextPageToken;
@@ -953,12 +1127,12 @@ function createObjectSet(objectType, clientCtx, objectSet = chunkX7WGNFZ4_cjs.re
       return await fetchSingle(augmentRequestContext(clientCtx, (_) => ({
         finalMethodCall: "fetchOne"
       })), objectType, options, await createWithPk(clientCtx, objectType, objectSet, primaryKey));
-    } : undefined,
+    } : void 0,
     fetchOneWithErrors: isObjectTypeDefinition(objectType) ? async (primaryKey, options) => {
       return await fetchSingleWithErrors(augmentRequestContext(clientCtx, (_) => ({
         finalMethodCall: "fetchOneWithErrors"
       })), objectType, options, await createWithPk(clientCtx, objectType, objectSet, primaryKey));
-    } : undefined,
+    } : void 0,
     subscribe: (listener, opts) => {
       const pendingSubscribe = ObjectSetListenerWebsocket.getInstance(clientCtx).subscribe(objectType, objectSet, listener, opts?.properties);
       return {
@@ -971,7 +1145,7 @@ function createObjectSet(objectType, clientCtx, objectSet = chunkX7WGNFZ4_cjs.re
       for (const key of Object.keys(clause)) {
         const derivedPropertyDefinition = clause[key](createWithPropertiesObjectSet(objectType, {
           type: "methodInput"
-        }, definitionMap));
+        }, definitionMap, true));
         derivedProperties[key] = definitionMap.get(derivedPropertyDefinition);
       }
       return clientCtx.objectSetFactory(objectType, clientCtx, {
@@ -1010,6 +1184,8 @@ async function createWithPk(clientCtx, objectType, objectSet, primaryKey) {
   return withPk;
 }
 
+exports.BaseLogger = BaseLogger;
+exports.MinimalLogger = MinimalLogger;
 exports.augmentRequestContext = augmentRequestContext;
 exports.createObjectSet = createObjectSet;
 exports.extractNamespace = extractNamespace;
@@ -1020,5 +1196,5 @@ exports.hydrateAttachmentFromRid = hydrateAttachmentFromRid;
 exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
-//# sourceMappingURL=chunk-T5UE6BI7.cjs.map
-//# sourceMappingURL=chunk-T5UE6BI7.cjs.map
+//# sourceMappingURL=chunk-33GHS3X4.cjs.map
+//# sourceMappingURL=chunk-33GHS3X4.cjs.map