@osdk/client 2.6.0-beta.2 → 2.6.0-beta.4

package/build/cjs/{chunk-6L3MX4LH.cjs → chunk-VNLY3YOJ.cjs}

@@ -2,9 +2,9 @@
 
 var chunkQ7SFCCGT_cjs = require('./chunk-Q7SFCCGT.cjs');
 var shared_net_errors = require('@osdk/shared.net.errors');
-var api = require('@osdk/api');
-var invariant5 = require('tiny-invariant');
 var shared_net_fetch = require('@osdk/shared.net.fetch');
+var invariant5 = require('tiny-invariant');
+var api = require('@osdk/api');
 var WebSocket = require('isomorphic-ws');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -342,202 +342,13 @@ var _streamValues = [1, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/strea
 function streamValues($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamValues, ...args);
 }
+
+// src/internal/conversions/extractNamespace.ts
 function extractNamespace(fqApiName) {
   const last = fqApiName.lastIndexOf(".");
   if (last === -1) return [void 0, fqApiName];
   return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
 }
-function modernToLegacyWhereClause(whereClause, objectOrInterface) {
-  if ("$and" in whereClause) {
-    return {
-      type: "and",
-      value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
-    };
-  } else if ("$or" in whereClause) {
-    return {
-      type: "or",
-      value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
-    };
-  } else if ("$not" in whereClause) {
-    return {
-      type: "not",
-      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface)
-    };
-  }
-  const parts = Object.entries(whereClause);
-  if (parts.length === 1) {
-    return handleWherePair(parts[0], objectOrInterface);
-  }
-  return {
-    type: "and",
-    value: parts.map((v) => handleWherePair(v, objectOrInterface))
-  };
-}
-function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
-    /**
-     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
-     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
-     * Once we solidify that this is the way forward, I can remove field and clean this up
-     */
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: {
-      topLeft: {
-        type: "Point",
-        coordinates: [bbox[0], bbox[3]]
-      },
-      bottomRight: {
-        type: "Point",
-        coordinates: [bbox[2], bbox[1]]
-      }
-    }
-  };
-}
-function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType,
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: {
-      type: "Polygon",
-      coordinates
-    }
-  };
-}
-function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector) {
-  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant5__default.default(false) : void 0;
-  const propertyIdentifier = structFieldSelector != null ? {
-    type: "structField",
-    ...structFieldSelector,
-    propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
-  } : void 0;
-  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
-  if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
-    return {
-      type: "eq",
-      ...propertyIdentifier != null && {
-        propertyIdentifier
-      },
-      field,
-      value: filter
-    };
-  }
-  const keysOfFilter = Object.keys(filter);
-  const hasDollarSign = keysOfFilter.some((key) => key.startsWith("$"));
-  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant5__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) : void 0;
-    const structFieldApiName = keysOfFilter[0];
-    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
-      propertyApiName: fieldName,
-      structFieldApiName
-    });
-  }
-  const firstKey = keysOfFilter[0];
-  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
-  if (firstKey === "$ne") {
-    return {
-      type: "not",
-      value: {
-        type: "eq",
-        ...propertyIdentifier != null && {
-          propertyIdentifier
-        },
-        field,
-        value: filter[firstKey]
-      }
-    };
-  }
-  if (firstKey === "$within") {
-    const withinBody = filter[firstKey];
-    if (Array.isArray(withinBody)) {
-      return makeGeoFilterBbox(withinBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
-      return makeGeoFilterBbox(withinBody.$bbox, firstKey, propertyIdentifier, field);
-    } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
-      return {
-        type: "withinDistanceOf",
-        ...propertyIdentifier != null && {
-          propertyIdentifier
-        },
-        field,
-        value: {
-          center: Array.isArray(withinBody.$of) ? {
-            type: "Point",
-            coordinates: withinBody.$of
-          } : withinBody.$of,
-          distance: {
-            value: withinBody.$distance[0],
-            unit: api.DistanceUnitMapping[withinBody.$distance[1]]
-          }
-        }
-      };
-    } else {
-      const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, fieldName);
-    }
-  }
-  if (firstKey === "$intersects") {
-    const intersectsBody = filter[firstKey];
-    if (Array.isArray(intersectsBody)) {
-      return makeGeoFilterBbox(intersectsBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
-      return makeGeoFilterBbox(intersectsBody.$bbox, firstKey, propertyIdentifier, field);
-    } else {
-      const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
-    }
-  }
-  if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
-    return {
-      type: firstKey.substring(1),
-      ...propertyIdentifier != null && {
-        propertyIdentifier
-      },
-      field,
-      value: typeof filter[firstKey] === "string" ? filter[firstKey] : filter[firstKey]["term"],
-      fuzzy: typeof filter[firstKey] === "string" ? false : filter[firstKey]["fuzzySearch"] ?? false
-    };
-  }
-  if (firstKey === "$contains" && filter[firstKey] instanceof Object) {
-    const structFilter = Object.entries(filter[firstKey]);
-    !(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) : void 0;
-    const structFieldApiName = structFilter[0][0];
-    !(structFilter[0][1] != null && Object.keys(structFilter[0][1]).length === 1 && "$eq" in structFilter[0][1]) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Cannot filter on a struct field in an array with anything other than a single $eq") : invariant5__default.default(false) : void 0;
-    return {
-      type: "contains",
-      propertyIdentifier: {
-        type: "structField",
-        propertyApiName: fieldName,
-        structFieldApiName
-      },
-      value: structFilter[0][1]["$eq"]
-    };
-  }
-  return {
-    type: firstKey.substring(1),
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: filter[firstKey]
-  };
-}
-function fullyQualifyPropName(fieldName, objectOrInterface) {
-  if (objectOrInterface.type === "interface") {
-    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
-    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
-    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
-  }
-  return fieldName;
-}
 var addUserAgentAndRequestContextHeaders = (client, withMetadata) => ({
   ...client,
   fetch: shared_net_fetch.createFetchHeaderMutator(client.fetch, (headers) => {
@@ -1087,6 +898,224 @@ async function fetchSingleWithErrors(client, objectType, args, objectSet) {
     };
   }
 }
+
+// src/internal/conversions/fullyQualifyPropName.ts
+function fullyQualifyPropName(fieldName, objectOrInterface) {
+  if (objectOrInterface.type === "interface") {
+    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
+    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
+    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
+  }
+  return fieldName;
+}
+
+// src/internal/conversions/makeGeoFilterBbox.ts
+function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
+  return {
+    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
+    /**
+     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
+     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
+     * Once we solidify that this is the way forward, I can remove field and clean this up
+     */
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: {
+      topLeft: {
+        type: "Point",
+        coordinates: [bbox[0], bbox[3]]
+      },
+      bottomRight: {
+        type: "Point",
+        coordinates: [bbox[2], bbox[1]]
+      }
+    }
+  };
+}
+
+// src/internal/conversions/makeGeoFilterPolygon.ts
+function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
+  return {
+    type: filterType,
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: {
+      type: "Polygon",
+      coordinates
+    }
+  };
+}
+
+// src/internal/conversions/makeGeoFilterIntersects.ts
+function makeGeoFilterIntersects(intersectsBody, propertyIdentifier, field) {
+  if (Array.isArray(intersectsBody)) {
+    return makeGeoFilterBbox(intersectsBody, "$intersects", propertyIdentifier, field);
+  } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
+    return makeGeoFilterBbox(intersectsBody.$bbox, "$intersects", propertyIdentifier, field);
+  } else {
+    const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
+    return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
+  }
+}
+function makeGeoFilterWithin(withinBody, propertyIdentifier, field) {
+  if (Array.isArray(withinBody)) {
+    return makeGeoFilterBbox(withinBody, "$within", propertyIdentifier, field);
+  } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
+    return makeGeoFilterBbox(withinBody.$bbox, "$within", propertyIdentifier, field);
+  } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
+    return {
+      type: "withinDistanceOf",
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: {
+        center: Array.isArray(withinBody.$of) ? {
+          type: "Point",
+          coordinates: withinBody.$of
+        } : withinBody.$of,
+        distance: {
+          value: withinBody.$distance[0],
+          unit: api.DistanceUnitMapping[withinBody.$distance[1]]
+        }
+      }
+    };
+  } else {
+    const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
+    return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, field);
+  }
+}
+
+// src/internal/conversions/modernToLegacyWhereClause.ts
+function isAndClause(whereClause) {
+  return "$and" in whereClause && whereClause.$and !== void 0;
+}
+function isOrClause(whereClause) {
+  return "$or" in whereClause && whereClause.$or !== void 0;
+}
+function isNotClause(whereClause) {
+  return "$not" in whereClause && whereClause.$not !== void 0;
+}
+function modernToLegacyWhereClause(whereClause, objectOrInterface, rdpNames) {
+  if (isAndClause(whereClause)) {
+    return {
+      type: "and",
+      value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface, rdpNames))
+    };
+  } else if (isOrClause(whereClause)) {
+    return {
+      type: "or",
+      value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface, rdpNames))
+    };
+  } else if (isNotClause(whereClause)) {
+    return {
+      type: "not",
+      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface, rdpNames)
+    };
+  }
+  const parts = Object.entries(whereClause);
+  if (parts.length === 1) {
+    return handleWherePair(parts[0], objectOrInterface, void 0, rdpNames);
+  }
+  return {
+    type: "and",
+    value: parts.map((v) => handleWherePair(v, objectOrInterface, void 0, rdpNames))
+  };
+}
+function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector, rdpNames) {
+  !(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) : void 0;
+  const isRdp = !structFieldSelector && rdpNames?.has(fieldName);
+  const propertyIdentifier = isRdp ? {
+    type: "property",
+    apiName: fieldName
+  } : structFieldSelector != null ? {
+    type: "structField",
+    ...structFieldSelector,
+    propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
+  } : void 0;
+  const field = !isRdp && structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
+  if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
+    return {
+      type: "eq",
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: filter
+    };
+  }
+  const keysOfFilter = Object.keys(filter);
+  const hasDollarSign = keysOfFilter.some((key) => key.startsWith("$"));
+  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant5__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) : void 0;
+    const structFieldApiName = keysOfFilter[0];
+    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
+      propertyApiName: fieldName,
+      structFieldApiName
+    }, rdpNames);
+  }
+  const firstKey = keysOfFilter[0];
+  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
+  if (firstKey === "$ne") {
+    return {
+      type: "not",
+      value: {
+        type: "eq",
+        ...propertyIdentifier != null && {
+          propertyIdentifier
+        },
+        field,
+        value: filter[firstKey]
+      }
+    };
+  }
+  if (firstKey === "$within") {
+    return makeGeoFilterWithin(filter[firstKey], propertyIdentifier, field);
+  }
+  if (firstKey === "$intersects") {
+    return makeGeoFilterIntersects(filter[firstKey], propertyIdentifier, field);
+  }
+  if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
+    return {
+      type: firstKey.substring(1),
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: typeof filter[firstKey] === "string" ? filter[firstKey] : filter[firstKey]["term"],
+      fuzzy: typeof filter[firstKey] === "string" ? false : filter[firstKey]["fuzzySearch"] ?? false
+    };
+  }
+  if (firstKey === "$contains" && filter[firstKey] instanceof Object) {
+    const structFilter = Object.entries(filter[firstKey]);
+    !(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) : void 0;
+    const structFieldApiName = structFilter[0][0];
+    !(structFilter[0][1] != null && Object.keys(structFilter[0][1]).length === 1 && "$eq" in structFilter[0][1]) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Cannot filter on a struct field in an array with anything other than a single $eq") : invariant5__default.default(false) : void 0;
+    return {
+      type: "contains",
+      propertyIdentifier: {
+        type: "structField",
+        propertyApiName: fieldName,
+        structFieldApiName
+      },
+      value: structFilter[0][1]["$eq"]
+    };
+  }
+  return {
+    type: firstKey.substring(1),
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: filter[firstKey]
+  };
+}
 function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
   const definition = {
     abs() {
@@ -1172,10 +1201,11 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
       }, definitionMap);
     },
     where: (clause) => {
+      const rdpNames = new Set(definitionMap.keys());
       return createWithPropertiesObjectSet(objectType, {
         type: "filter",
         objectSet,
-        where: modernToLegacyWhereClause(clause, objectType)
+        where: modernToLegacyWhereClause(clause, objectType, rdpNames)
       }, definitionMap);
     },
     aggregate: (aggregation, opt) => {
@@ -1462,6 +1492,7 @@ var EXPONENTIAL_BACKOFF_MAX_DELAY_MS = 6e4;
 var EXPONENTIAL_BACKOFF_MULTIPLIER = 2;
 var EXPONENTIAL_BACKOFF_JITTER_FACTOR = 0.3;
 var WEBSOCKET_IDLE_DISCONNECT_DELAY_MS = 15e3;
+var WEBSOCKET_HEARTBEAT_INTERVAL_MS = 45 * 1e3;
 function doNothing() {
 }
 function fillOutListener({
@@ -1511,6 +1542,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   #subscriptions = /* @__PURE__ */ new Map();
   #endedSubscriptions = /* @__PURE__ */ new Set();
   #maybeDisconnectTimeout;
+  #heartbeatInterval;
   // DO NOT CONSTRUCT DIRECTLY. ONLY EXPOSED AS A TESTING SEAM
   constructor(client, {
     minimumReconnectDelayMs = MINIMUM_RECONNECT_DELAY_MS
@@ -1689,6 +1721,14 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#isFirstConnection = false;
     this.#backoff.reset();
     this.#sendSubscribeMessage();
+    if (this.#heartbeatInterval) {
+      clearInterval(this.#heartbeatInterval);
+    }
+    this.#heartbeatInterval = setInterval(() => {
+      if (this.#ws?.readyState === WebSocket__default.default.OPEN) {
+        this.#sendSubscribeMessage();
+      }
+    }, WEBSOCKET_HEARTBEAT_INTERVAL_MS);
   };
   #onMessage = async (message) => {
     const data = JSON.parse(String(message.data));
@@ -1846,6 +1886,10 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     this.#cycleWebsocket();
   };
   #cycleWebsocket = () => {
+    if (this.#heartbeatInterval) {
+      clearInterval(this.#heartbeatInterval);
+      this.#heartbeatInterval = void 0;
+    }
     if (this.#ws) {
       this.#ws.removeEventListener("open", this.#onOpen);
       this.#ws.removeEventListener("message", this.#onMessage);
@@ -2077,6 +2121,7 @@ exports.additionalContext = additionalContext;
 exports.augment = augment;
 exports.augmentRequestContext = augmentRequestContext;
 exports.createObjectSet = createObjectSet;
+exports.createWithPropertiesObjectSet = createWithPropertiesObjectSet;
 exports.extractNamespace = extractNamespace;
 exports.fetchPage = fetchPage;
 exports.fetchSingle = fetchSingle;
@@ -2088,5 +2133,5 @@ exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-6L3MX4LH.cjs.map
-//# sourceMappingURL=chunk-6L3MX4LH.cjs.map
+//# sourceMappingURL=chunk-VNLY3YOJ.cjs.map
+//# sourceMappingURL=chunk-VNLY3YOJ.cjs.map