@osdk/client 2.5.0-beta.7 → 2.5.0-beta.9

package/build/cjs/{chunk-5KDG5ZET.cjs → chunk-MKL3HEQ5.cjs}

@@ -2,9 +2,9 @@
 
 var chunkQ7SFCCGT_cjs = require('./chunk-Q7SFCCGT.cjs');
 var shared_net_errors = require('@osdk/shared.net.errors');
-var shared_net_fetch = require('@osdk/shared.net.fetch');
-var invariant5 = require('tiny-invariant');
 var api = require('@osdk/api');
+var invariant5 = require('tiny-invariant');
+var shared_net_fetch = require('@osdk/shared.net.fetch');
 var WebSocket = require('isomorphic-ws');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -337,6 +337,187 @@ var _streamValues = [1, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/strea
 function streamValues($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamValues, ...args);
 }
+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
+    };
+  }
+  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) => {
@@ -599,9 +780,7 @@ function resolveInterfaceObjectSet(objectSet, interfaceTypeApiName, args) {
   } : objectSet;
 }
 async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
-  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, {
-    osdkMetadata: void 0
-  }), await client.ontologyRid, applyFetchArgs(args, {
+  const requestBody = await applyFetchArgs(args, {
     objectSet: {
       type: "static",
       objects: rids
@@ -609,7 +788,13 @@ async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
     select: args?.$select ?? [],
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
-  }), {
+  }, client, {
+    type: "object",
+    apiName: ""
+  });
+  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, {
+    osdkMetadata: void 0
+  }), await client.ontologyRid, requestBody, {
     preview: true
   });
   return Promise.resolve({
@@ -620,14 +805,20 @@ async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
 }
 async function fetchInterfacePage(client, interfaceType, args, objectSet, useSnapshot = false) {
   if (args.$__UNSTABLE_useOldInterfaceApis) {
-    const result2 = await OntologyInterface_exports.search(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
+    const baseRequestBody = {
       augmentedProperties: {},
       augmentedSharedPropertyTypes: {},
       otherInterfaceTypes: [],
       selectedObjectTypes: [],
-      selectedSharedPropertyTypes: args.$select ?? [],
+      selectedSharedPropertyTypes: args.$select ? [...args.$select] : [],
       where: objectSetToSearchJsonV2(objectSet, interfaceType.apiName)
-    }), {
+    };
+    const requestBody2 = await applyFetchArgs(args, baseRequestBody, client, interfaceType);
+    if (requestBody2.selectedSharedPropertyTypes.length > 0) {
+      const remapped = remapPropertyNames(interfaceType, requestBody2.selectedSharedPropertyTypes);
+      requestBody2.selectedSharedPropertyTypes = Array.from(remapped);
+    }
+    const result2 = await OntologyInterface_exports.search(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, interfaceType.apiName, requestBody2, {
       preview: true
     });
     result2.data = await client.objectFactory(
@@ -641,12 +832,13 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     return result2;
   }
   const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, interfaceType.apiName, args);
-  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, applyFetchArgs(args, {
+  const requestBody = await buildAndRemapRequestBody(args, {
     objectSet: resolvedInterfaceObjectSet,
-    select: args?.$select ?? [],
+    select: args?.$select ? [...args.$select] : [],
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
-  }), {
+  }, client, interfaceType);
+  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, requestBody, {
     preview: true,
     branch: client.branch
   });
@@ -683,7 +875,31 @@ async function fetchPageWithErrorsInternal(client, objectType, objectSet, args =
 async function fetchPage(client, objectType, args, objectSet = resolveBaseObjectSetType(objectType)) {
   return fetchPageInternal(client, objectType, objectSet, args);
 }
-function applyFetchArgs(args, body) {
+async function buildAndRemapRequestBody(args, baseBody, client, objectType) {
+  const requestBody = await applyFetchArgs(args, baseBody, client, objectType);
+  if (requestBody.select != null && requestBody.select.length > 0) {
+    const remapped = remapPropertyNames(objectType, requestBody.select);
+    return {
+      ...requestBody,
+      select: remapped
+    };
+  }
+  return requestBody;
+}
+function remapPropertyNames(objectOrInterface, propertyNames) {
+  if (objectOrInterface == null) {
+    return propertyNames;
+  }
+  if (objectOrInterface.type === "interface") {
+    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
+    return propertyNames.map((name) => {
+      const [fieldApiNamespace, fieldShortName] = extractNamespace(name);
+      return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : name;
+    });
+  }
+  return propertyNames;
+}
+async function applyFetchArgs(args, body, _client, objectType) {
   if (args?.$nextPageToken) {
     body.pageToken = args.$nextPageToken;
   }
@@ -692,28 +908,34 @@ function applyFetchArgs(args, body) {
   }
   const orderBy = args?.$orderBy;
   if (orderBy) {
-    body.orderBy = orderBy === "relevance" ? {
-      orderType: "relevance",
-      fields: []
-    } : {
-      fields: Object.entries(orderBy).map(([field, direction]) => ({
-        field,
-        direction
-      }))
-    };
+    if (orderBy === "relevance") {
+      body.orderBy = {
+        orderType: "relevance",
+        fields: []
+      };
+    } else {
+      const orderByEntries = Object.entries(orderBy);
+      const fieldNames = orderByEntries.map(([field]) => field);
+      const remappedFields = remapPropertyNames(objectType, fieldNames);
+      body.orderBy = {
+        fields: orderByEntries.map(([, direction], index) => ({
+          field: remappedFields[index],
+          direction
+        }))
+      };
+    }
   }
   return body;
 }
 async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot = false) {
   void client.ontologyProvider.getObjectDefinition(objectType.apiName);
-  const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, applyFetchArgs(args, {
+  const requestBody = await buildAndRemapRequestBody(args, {
     objectSet,
-    // We have to do the following case because LoadObjectSetRequestV2 isn't readonly
-    select: args?.$select ?? [],
-    // FIXME?
+    select: args?.$select ? [...args.$select] : [],
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
-  }), {
+  }, client, objectType);
+  const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, requestBody, {
     branch: client.branch
   });
   return Promise.resolve({
@@ -839,187 +1061,6 @@ async function fetchSingleWithErrors(client, objectType, args, objectSet) {
     };
   }
 }
-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
-    };
-  }
-  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;
-}
 function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
   const definition = {
     abs() {
@@ -1956,5 +1997,5 @@ exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-5KDG5ZET.cjs.map
-//# sourceMappingURL=chunk-5KDG5ZET.cjs.map
+//# sourceMappingURL=chunk-MKL3HEQ5.cjs.map
+//# sourceMappingURL=chunk-MKL3HEQ5.cjs.map