@osdk/client 2.8.0-beta.21 → 2.8.0-beta.22

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @osdk/client
 
+## 2.8.0-beta.22
+
+### Minor Changes
+
+- cbfa135: Fix aggregation return type for empty object sets
+- f4604c2: fix aggregate endpoint errors crashing instead of surfacing server error
+
+### Patch Changes
+
+- @osdk/api@2.8.0-beta.22
+- @osdk/client.unstable@2.8.0-beta.22
+- @osdk/generator-converters@2.8.0-beta.22
+
 ## 2.8.0-beta.21
 
 ### Minor Changes

package/build/browser/internal/conversions/legacyToModernSingleAggregationResult.js

@@ -14,23 +14,38 @@
  * limitations under the License.
  */
 
-import invariant from "tiny-invariant";
+import { splitAggregationKey } from "./modernToLegacyAggregationClause.js";
+
 /** @internal */
-export function legacyToModernSingleAggregationResult(entry) {
-  return entry.metrics.reduce((accumulator, curValue) => {
-    const parts = curValue.name.split(".");
-    if (parts[0] === "count") {
-      return accumulator;
+export function legacyToModernSingleAggregationResult(entry, select) {
+  const result = {};
+
+  // Seed the result with undefined for every selected metric so that
+  // properties are always present, even when the server returns no metrics
+  // (e.g. aggregating over 0 objects).
+  for (const selectKey of Object.keys(select)) {
+    if (selectKey === "$count") {
+      continue;
     }
-    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant(false, "assumed we were getting a `${key}.${type}`") : invariant(false) : void 0;
-    const property = parts[0];
-    const metricType = parts[1];
-    if (!(property in accumulator)) {
-      accumulator[property] = {}; // fixme?
+    const {
+      property,
+      metric
+    } = splitAggregationKey(selectKey);
+    (result[property] ??= {})[metric] = undefined;
+  }
+  for (const {
+    name,
+    value
+  } of entry.metrics) {
+    if (name === "count") {
+      continue;
     }
-    accumulator[property][metricType] = curValue.value; // fixme?
-
-    return accumulator;
-  }, {});
+    const [property, metricType] = name.split(".");
+    if (result[property]) {
+      // guard against an unknown metric name
+      result[property][metricType] = value;
+    }
+  }
+  return result;
 }
 //# sourceMappingURL=legacyToModernSingleAggregationResult.js.map

package/build/browser/internal/conversions/legacyToModernSingleAggregationResult.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacyToModernSingleAggregationResult.js","names":["invariant","legacyToModernSingleAggregationResult","entry","metrics","reduce","accumulator","curValue","parts","name","split","length","process","env","NODE_ENV","property","metricType","value"],"sources":["legacyToModernSingleAggregationResult.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  AggregationClause,\n  AggregationResultsWithoutGroups,\n  ObjectOrInterfaceDefinition,\n} from \"@osdk/api\";\nimport type { AggregateObjectsResponseV2 } from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport type { ArrayElement } from \"../../util/ArrayElement.js\";\n\n/** @internal */\nexport function legacyToModernSingleAggregationResult<\n  Q extends ObjectOrInterfaceDefinition,\n  AC extends AggregationClause<Q>,\n>(\n  entry: ArrayElement<AggregateObjectsResponseV2[\"data\"]>,\n): AggregationResultsWithoutGroups<Q, AC> {\n  return entry.metrics.reduce(\n    (accumulator: AggregationResultsWithoutGroups<Q, AC>, curValue) => {\n      const parts = curValue.name.split(\".\");\n      if (parts[0] === \"count\") {\n        return accumulator;\n      }\n      invariant(\n        parts.length === 2,\n        \"assumed we were getting a `${key}.${type}`\",\n      );\n      const property = parts[0] as keyof AggregationResultsWithoutGroups<Q, AC>;\n      const metricType = parts[1];\n      if (!(property in accumulator)) {\n        accumulator[property] = {} as any; // fixme?\n      }\n      (accumulator[property] as any)[metricType] = curValue.value; // fixme?\n\n      return accumulator;\n    },\n    {} as AggregationResultsWithoutGroups<Q, AC>,\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA,OAAOA,SAAS,MAAM,gBAAgB;AAGtC;AACA,OAAO,SAASC,qCAAqCA,CAInDC,KAAuD,EACf;EACxC,OAAOA,KAAK,CAACC,OAAO,CAACC,MAAM,CACzB,CAACC,WAAmD,EAAEC,QAAQ,KAAK;IACjE,MAAMC,KAAK,GAAGD,QAAQ,CAACE,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC;IACtC,IAAIF,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;MACxB,OAAOF,WAAW;IACpB;IACA,EACEE,KAAK,CAACG,MAAM,KAAK,CAAC,IAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBADpBb,SAAS,QAEP,4CAA4C,IAF9CA,SAAS;IAIT,MAAMc,QAAQ,GAAGP,KAAK,CAAC,CAAC,CAAiD;IACzE,MAAMQ,UAAU,GAAGR,KAAK,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAEO,QAAQ,IAAIT,WAAW,CAAC,EAAE;MAC9BA,WAAW,CAACS,QAAQ,CAAC,GAAG,CAAC,CAAQ,CAAC,CAAC;IACrC;IACCT,WAAW,CAACS,QAAQ,CAAC,CAASC,UAAU,CAAC,GAAGT,QAAQ,CAACU,KAAK,CAAC,CAAC;;IAE7D,OAAOX,WAAW;EACpB,CAAC,EACD,CAAC,CACH,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"legacyToModernSingleAggregationResult.js","names":["splitAggregationKey","legacyToModernSingleAggregationResult","entry","select","result","selectKey","Object","keys","property","metric","undefined","name","value","metrics","metricType","split"],"sources":["legacyToModernSingleAggregationResult.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  AggregationClause,\n  AggregationResultsWithoutGroups,\n  ObjectOrInterfaceDefinition,\n} from \"@osdk/api\";\nimport type { AggregateObjectsResponseV2 } from \"@osdk/foundry.ontologies\";\nimport type { ArrayElement } from \"../../util/ArrayElement.js\";\nimport { splitAggregationKey } from \"./modernToLegacyAggregationClause.js\";\n\n/** @internal */\nexport function legacyToModernSingleAggregationResult<\n  Q extends ObjectOrInterfaceDefinition,\n  AC extends AggregationClause<Q>,\n>(\n  entry: ArrayElement<AggregateObjectsResponseV2[\"data\"]>,\n  select: AC,\n): AggregationResultsWithoutGroups<Q, AC> {\n  const result: Record<string, Record<string, any>> = {};\n\n  // Seed the result with undefined for every selected metric so that\n  // properties are always present, even when the server returns no metrics\n  // (e.g. aggregating over 0 objects).\n  for (const selectKey of Object.keys(select)) {\n    if (selectKey === \"$count\") {\n      continue;\n    }\n    const { property, metric } = splitAggregationKey(selectKey);\n    (result[property] ??= {})[metric] = undefined;\n  }\n\n  for (const { name, value } of entry.metrics) {\n    if (name === \"count\") {\n      continue;\n    }\n    const [property, metricType] = name.split(\".\");\n    if (result[property]) { // guard against an unknown metric name\n      result[property][metricType] = value;\n    }\n  }\n\n  return result as AggregationResultsWithoutGroups<Q, AC>;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA,SAASA,mBAAmB,QAAQ,sCAAsC;;AAE1E;AACA,OAAO,SAASC,qCAAqCA,CAInDC,KAAuD,EACvDC,MAAU,EAC8B;EACxC,MAAMC,MAA2C,GAAG,CAAC,CAAC;;EAEtD;EACA;EACA;EACA,KAAK,MAAMC,SAAS,IAAIC,MAAM,CAACC,IAAI,CAACJ,MAAM,CAAC,EAAE;IAC3C,IAAIE,SAAS,KAAK,QAAQ,EAAE;MAC1B;IACF;IACA,MAAM;MAAEG,QAAQ;MAAEC;IAAO,CAAC,GAAGT,mBAAmB,CAACK,SAAS,CAAC;IAC3D,CAACD,MAAM,CAACI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAEC,MAAM,CAAC,GAAGC,SAAS;EAC/C;EAEA,KAAK,MAAM;IAAEC,IAAI;IAAEC;EAAM,CAAC,IAAIV,KAAK,CAACW,OAAO,EAAE;IAC3C,IAAIF,IAAI,KAAK,OAAO,EAAE;MACpB;IACF;IACA,MAAM,CAACH,QAAQ,EAAEM,UAAU,CAAC,GAAGH,IAAI,CAACI,KAAK,CAAC,GAAG,CAAC;IAC9C,IAAIX,MAAM,CAACI,QAAQ,CAAC,EAAE;MAAE;MACtBJ,MAAM,CAACI,QAAQ,CAAC,CAACM,UAAU,CAAC,GAAGF,KAAK;IACtC;EACF;EAEA,OAAOR,MAAM;AACf","ignoreList":[]}

package/build/browser/internal/conversions/modernToLegacyAggregationClause.js

@@ -16,6 +16,15 @@
 
 const directionFieldMap = dir => dir === "asc" ? "ASC" : dir === "desc" ? "DESC" : undefined;
 
+/** @internal */
+export function splitAggregationKey(key) {
+  const colonPos = key.lastIndexOf(":");
+  return {
+    property: key.slice(0, colonPos),
+    metric: key.slice(colonPos + 1)
+  };
+}
+
 /** @internal */
 export function modernToLegacyAggregationClause(select) {
   return Object.entries(select).flatMap(([propAndMetric, aggregationType]) => {
@@ -26,9 +35,10 @@ export function modernToLegacyAggregationClause(select) {
         direction: directionFieldMap(aggregationType)
       };
     }
-    const colonPos = propAndMetric.lastIndexOf(":");
-    const property = propAndMetric.slice(0, colonPos);
-    const metric = propAndMetric.slice(colonPos + 1);
+    const {
+      property,
+      metric
+    } = splitAggregationKey(propAndMetric);
     return [{
       type: metric,
       name: `${property}.${metric}`,

package/build/browser/internal/conversions/modernToLegacyAggregationClause.js.map

@@ -1 +1 @@
-{"version":3,"file":"modernToLegacyAggregationClause.js","names":["directionFieldMap","dir","undefined","modernToLegacyAggregationClause","select","Object","entries","flatMap","propAndMetric","aggregationType","type","name","direction","colonPos","lastIndexOf","property","slice","metric","field"],"sources":["modernToLegacyAggregationClause.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { AggregationClause } from \"@osdk/api\";\nimport type { AggregationV2 } from \"@osdk/foundry.ontologies\";\n\nconst directionFieldMap = (dir?: \"asc\" | \"desc\" | \"unordered\") =>\n  dir === \"asc\" ? \"ASC\" : dir === \"desc\" ? \"DESC\" : undefined;\n\n/** @internal */\nexport function modernToLegacyAggregationClause<\n  AC extends AggregationClause<any>,\n>(select: AC) {\n  return Object.entries(select).flatMap<AggregationV2>(\n    ([propAndMetric, aggregationType]) => {\n      if (propAndMetric === \"$count\") {\n        return {\n          type: \"count\",\n          name: \"count\",\n          direction: directionFieldMap(aggregationType),\n        };\n      }\n\n      const colonPos = propAndMetric.lastIndexOf(\":\");\n      const property = propAndMetric.slice(0, colonPos);\n      const metric = propAndMetric.slice(colonPos + 1);\n\n      return [\n        {\n          type: metric as\n            | \"approximateDistinct\"\n            | \"exactDistinct\"\n            | \"min\"\n            | \"max\"\n            | \"sum\"\n            | \"avg\"\n            | \"approximateDistinct\"\n            | \"exactDistinct\",\n          name: `${property}.${metric}`,\n          direction: directionFieldMap(aggregationType),\n          field: property,\n        },\n      ];\n    },\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA,MAAMA,iBAAiB,GAAIC,GAAkC,IAC3DA,GAAG,KAAK,KAAK,GAAG,KAAK,GAAGA,GAAG,KAAK,MAAM,GAAG,MAAM,GAAGC,SAAS;;AAE7D;AACA,OAAO,SAASC,+BAA+BA,CAE7CC,MAAU,EAAE;EACZ,OAAOC,MAAM,CAACC,OAAO,CAACF,MAAM,CAAC,CAACG,OAAO,CACnC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;IACpC,IAAID,aAAa,KAAK,QAAQ,EAAE;MAC9B,OAAO;QACLE,IAAI,EAAE,OAAO;QACbC,IAAI,EAAE,OAAO;QACbC,SAAS,EAAEZ,iBAAiB,CAACS,eAAe;MAC9C,CAAC;IACH;IAEA,MAAMI,QAAQ,GAAGL,aAAa,CAACM,WAAW,CAAC,GAAG,CAAC;IAC/C,MAAMC,QAAQ,GAAGP,aAAa,CAACQ,KAAK,CAAC,CAAC,EAAEH,QAAQ,CAAC;IACjD,MAAMI,MAAM,GAAGT,aAAa,CAACQ,KAAK,CAACH,QAAQ,GAAG,CAAC,CAAC;IAEhD,OAAO,CACL;MACEH,IAAI,EAAEO,MAQa;MACnBN,IAAI,EAAE,GAAGI,QAAQ,IAAIE,MAAM,EAAE;MAC7BL,SAAS,EAAEZ,iBAAiB,CAACS,eAAe,CAAC;MAC7CS,KAAK,EAAEH;IACT,CAAC,CACF;EACH,CACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"modernToLegacyAggregationClause.js","names":["directionFieldMap","dir","undefined","splitAggregationKey","key","colonPos","lastIndexOf","property","slice","metric","modernToLegacyAggregationClause","select","Object","entries","flatMap","propAndMetric","aggregationType","type","name","direction","field"],"sources":["modernToLegacyAggregationClause.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { AggregationClause } from \"@osdk/api\";\nimport type { AggregationV2 } from \"@osdk/foundry.ontologies\";\n\nconst directionFieldMap = (dir?: \"asc\" | \"desc\" | \"unordered\") =>\n  dir === \"asc\" ? \"ASC\" : dir === \"desc\" ? \"DESC\" : undefined;\n\n/** @internal */\nexport function splitAggregationKey(key: string): {\n  property: string;\n  metric: string;\n} {\n  const colonPos = key.lastIndexOf(\":\");\n  return { property: key.slice(0, colonPos), metric: key.slice(colonPos + 1) };\n}\n\n/** @internal */\nexport function modernToLegacyAggregationClause<\n  AC extends AggregationClause<any>,\n>(select: AC) {\n  return Object.entries(select).flatMap<AggregationV2>(\n    ([propAndMetric, aggregationType]) => {\n      if (propAndMetric === \"$count\") {\n        return {\n          type: \"count\",\n          name: \"count\",\n          direction: directionFieldMap(aggregationType),\n        };\n      }\n\n      const { property, metric } = splitAggregationKey(propAndMetric);\n\n      return [\n        {\n          type: metric as\n            | \"approximateDistinct\"\n            | \"exactDistinct\"\n            | \"min\"\n            | \"max\"\n            | \"sum\"\n            | \"avg\"\n            | \"approximateDistinct\"\n            | \"exactDistinct\",\n          name: `${property}.${metric}`,\n          direction: directionFieldMap(aggregationType),\n          field: property,\n        },\n      ];\n    },\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA,MAAMA,iBAAiB,GAAIC,GAAkC,IAC3DA,GAAG,KAAK,KAAK,GAAG,KAAK,GAAGA,GAAG,KAAK,MAAM,GAAG,MAAM,GAAGC,SAAS;;AAE7D;AACA,OAAO,SAASC,mBAAmBA,CAACC,GAAW,EAG7C;EACA,MAAMC,QAAQ,GAAGD,GAAG,CAACE,WAAW,CAAC,GAAG,CAAC;EACrC,OAAO;IAAEC,QAAQ,EAAEH,GAAG,CAACI,KAAK,CAAC,CAAC,EAAEH,QAAQ,CAAC;IAAEI,MAAM,EAAEL,GAAG,CAACI,KAAK,CAACH,QAAQ,GAAG,CAAC;EAAE,CAAC;AAC9E;;AAEA;AACA,OAAO,SAASK,+BAA+BA,CAE7CC,MAAU,EAAE;EACZ,OAAOC,MAAM,CAACC,OAAO,CAACF,MAAM,CAAC,CAACG,OAAO,CACnC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;IACpC,IAAID,aAAa,KAAK,QAAQ,EAAE;MAC9B,OAAO;QACLE,IAAI,EAAE,OAAO;QACbC,IAAI,EAAE,OAAO;QACbC,SAAS,EAAEnB,iBAAiB,CAACgB,eAAe;MAC9C,CAAC;IACH;IAEA,MAAM;MAAET,QAAQ;MAAEE;IAAO,CAAC,GAAGN,mBAAmB,CAACY,aAAa,CAAC;IAE/D,OAAO,CACL;MACEE,IAAI,EAAER,MAQa;MACnBS,IAAI,EAAE,GAAGX,QAAQ,IAAIE,MAAM,EAAE;MAC7BU,SAAS,EAAEnB,iBAAiB,CAACgB,eAAe,CAAC;MAC7CI,KAAK,EAAEb;IACT,CAAC,CACF;EACH,CACF,CAAC;AACH","ignoreList":[]}

package/build/browser/object/aggregate.js

@@ -51,14 +51,14 @@ export async function aggregate(clientCtx, objectType, objectSet = resolveBaseOb
     !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, "no group by clause should mean only one data result") : invariant(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
-      ...legacyToModernSingleAggregationResult(result.data[0])
+      ...legacyToModernSingleAggregationResult(result.data[0], req.$select)
     };
   }
   const ret = result.data.map(entry => {
     return {
       $group: entry.group,
       ...aggregationToCountResult(entry),
-      ...legacyToModernSingleAggregationResult(entry)
+      ...legacyToModernSingleAggregationResult(entry, req.$select)
     };
   }); // fixme
 

package/build/browser/object/aggregate.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate.js","names":["OntologyObjectSets","invariant","legacyToModernSingleAggregationResult","modernToLegacyAggregationClause","modernToLegacyGroupByClause","addUserAgentAndRequestContextHeaders","resolveBaseObjectSetType","aggregate","clientCtx","objectType","objectSet","req","body","aggregation","$select","groupBy","where","undefined","$groupBy","flushEdits","result","ontologyRid","branch","transactionId","data","Array","isArray","Error","JSON","stringify","length","process","env","NODE_ENV","aggregationToCountResult","ret","map","entry","$group","group","aggregateResult","metrics","name","$count","value"],"sources":["aggregate.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  AggregateOpts,\n  AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy,\n  AggregationResultsWithGroups,\n  AggregationsResults,\n  ObjectOrInterfaceDefinition,\n} from \"@osdk/api\";\nimport type {\n  AggregateObjectsRequestV2,\n  AggregateObjectsResponseV2,\n  ObjectSet,\n} from \"@osdk/foundry.ontologies\";\nimport * as OntologyObjectSets from \"@osdk/foundry.ontologies/OntologyObjectSet\";\nimport invariant from \"tiny-invariant\";\nimport { legacyToModernSingleAggregationResult } from \"../internal/conversions/legacyToModernSingleAggregationResult.js\";\nimport { modernToLegacyAggregationClause } from \"../internal/conversions/modernToLegacyAggregationClause.js\";\nimport { modernToLegacyGroupByClause } from \"../internal/conversions/modernToLegacyGroupByClause.js\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport type { ArrayElement } from \"../util/ArrayElement.js\";\nimport { resolveBaseObjectSetType } from \"../util/objectSetUtils.js\";\n\n/** @internal */\nexport async function aggregate<\n  Q extends ObjectOrInterfaceDefinition,\n  AO extends AggregateOpts<Q>,\n>(\n  clientCtx: MinimalClient,\n  objectType: Q,\n  objectSet: ObjectSet = resolveBaseObjectSetType(objectType),\n  req: AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy<Q, AO>,\n): Promise<AggregationsResults<Q, AO>> {\n  const resolvedObjectSet = resolveBaseObjectSetType(objectType);\n  const body: AggregateObjectsRequestV2 = {\n    aggregation: modernToLegacyAggregationClause<AO[\"$select\"]>(\n      req.$select,\n    ),\n    groupBy: [],\n    where: undefined,\n  };\n\n  if (req.$groupBy) {\n    body.groupBy = modernToLegacyGroupByClause(req.$groupBy);\n  }\n\n  if (clientCtx.flushEdits != null) {\n    await clientCtx.flushEdits();\n  }\n\n  const result = await OntologyObjectSets.aggregate(\n    addUserAgentAndRequestContextHeaders(clientCtx, objectType),\n    await clientCtx.ontologyRid,\n    {\n      objectSet,\n      groupBy: body.groupBy,\n      aggregation: body.aggregation,\n    },\n    { branch: clientCtx.branch, transactionId: clientCtx.transactionId },\n  );\n\n  if (!result.data || !Array.isArray(result.data)) {\n    throw new Error(\n      `Aggregation request failed: ${JSON.stringify(result)}`,\n    );\n  }\n\n  if (!req.$groupBy) {\n    invariant(\n      result.data.length === 1,\n      \"no group by clause should mean only one data result\",\n    );\n\n    return {\n      ...aggregationToCountResult(result.data[0]),\n      ...legacyToModernSingleAggregationResult(\n        result.data[0],\n      ),\n    } as any;\n  }\n\n  const ret: AggregationResultsWithGroups<Q, AO[\"$select\"], any> = result.data\n    .map((entry) => {\n      return {\n        $group: entry.group as any,\n        ...aggregationToCountResult(entry),\n        ...legacyToModernSingleAggregationResult(entry),\n      };\n    }) as any; // fixme\n\n  return ret as any; // FIXME\n}\n\nfunction aggregationToCountResult(\n  entry: ArrayElement<AggregateObjectsResponseV2[\"data\"]>,\n): { $count: number } | undefined {\n  for (const aggregateResult of entry.metrics) {\n    if (aggregateResult.name === \"count\") {\n      return { $count: aggregateResult.value };\n    }\n  }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA,OAAO,KAAKA,kBAAkB,MAAM,4CAA4C;AAChF,OAAOC,SAAS,MAAM,gBAAgB;AACtC,SAASC,qCAAqC,QAAQ,kEAAkE;AACxH,SAASC,+BAA+B,QAAQ,4DAA4D;AAC5G,SAASC,2BAA2B,QAAQ,wDAAwD;AAEpG,SAASC,oCAAoC,QAAQ,iDAAiD;AAEtG,SAASC,wBAAwB,QAAQ,2BAA2B;;AAEpE;AACA,OAAO,eAAeC,SAASA,CAI7BC,SAAwB,EACxBC,UAAa,EACbC,SAAoB,GAAGJ,wBAAwB,CAACG,UAAU,CAAC,EAC3DE,GAA0E,EACrC;EACXL,wBAAwB,CAACG,UAAU,CAAC;EAC9D,MAAMG,IAA+B,GAAG;IACtCC,WAAW,EAAEV,+BAA+B,CAC1CQ,GAAG,CAACG,OACN,CAAC;IACDC,OAAO,EAAE,EAAE;IACXC,KAAK,EAAEC;EACT,CAAC;EAED,IAAIN,GAAG,CAACO,QAAQ,EAAE;IAChBN,IAAI,CAACG,OAAO,GAAGX,2BAA2B,CAACO,GAAG,CAACO,QAAQ,CAAC;EAC1D;EAEA,IAAIV,SAAS,CAACW,UAAU,IAAI,IAAI,EAAE;IAChC,MAAMX,SAAS,CAACW,UAAU,CAAC,CAAC;EAC9B;EAEA,MAAMC,MAAM,GAAG,MAAMpB,kBAAkB,CAACO,SAAS,CAC/CF,oCAAoC,CAACG,SAAS,EAAEC,UAAU,CAAC,EAC3D,MAAMD,SAAS,CAACa,WAAW,EAC3B;IACEX,SAAS;IACTK,OAAO,EAAEH,IAAI,CAACG,OAAO;IACrBF,WAAW,EAAED,IAAI,CAACC;EACpB,CAAC,EACD;IAAES,MAAM,EAAEd,SAAS,CAACc,MAAM;IAAEC,aAAa,EAAEf,SAAS,CAACe;EAAc,CACrE,CAAC;EAED,IAAI,CAACH,MAAM,CAACI,IAAI,IAAI,CAACC,KAAK,CAACC,OAAO,CAACN,MAAM,CAACI,IAAI,CAAC,EAAE;IAC/C,MAAM,IAAIG,KAAK,CACb,+BAA+BC,IAAI,CAACC,SAAS,CAACT,MAAM,CAAC,EACvD,CAAC;EACH;EAEA,IAAI,CAACT,GAAG,CAACO,QAAQ,EAAE;IACjB,EACEE,MAAM,CAACI,IAAI,CAACM,MAAM,KAAK,CAAC,IAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAD1BhC,SAAS,QAEP,qDAAqD,IAFvDA,SAAS;IAKT,OAAO;MACL,GAAGiC,wBAAwB,CAACd,MAAM,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;MAC3C,GAAGtB,qCAAqC,CACtCkB,MAAM,CAACI,IAAI,CAAC,CAAC,CACf;IACF,CAAC;EACH;EAEA,MAAMW,GAAwD,GAAGf,MAAM,CAACI,IAAI,CACzEY,GAAG,CAAEC,KAAK,IAAK;IACd,OAAO;MACLC,MAAM,EAAED,KAAK,CAACE,KAAY;MAC1B,GAAGL,wBAAwB,CAACG,KAAK,CAAC;MAClC,GAAGnC,qCAAqC,CAACmC,KAAK;IAChD,CAAC;EACH,CAAC,CAAQ,CAAC,CAAC;;EAEb,OAAOF,GAAG,CAAQ,CAAC;AACrB;AAEA,SAASD,wBAAwBA,CAC/BG,KAAuD,EACvB;EAChC,KAAK,MAAMG,eAAe,IAAIH,KAAK,CAACI,OAAO,EAAE;IAC3C,IAAID,eAAe,CAACE,IAAI,KAAK,OAAO,EAAE;MACpC,OAAO;QAAEC,MAAM,EAAEH,eAAe,CAACI;MAAM,CAAC;IAC1C;EACF;AACF","ignoreList":[]}
+{"version":3,"file":"aggregate.js","names":["OntologyObjectSets","invariant","legacyToModernSingleAggregationResult","modernToLegacyAggregationClause","modernToLegacyGroupByClause","addUserAgentAndRequestContextHeaders","resolveBaseObjectSetType","aggregate","clientCtx","objectType","objectSet","req","body","aggregation","$select","groupBy","where","undefined","$groupBy","flushEdits","result","ontologyRid","branch","transactionId","data","Array","isArray","Error","JSON","stringify","length","process","env","NODE_ENV","aggregationToCountResult","ret","map","entry","$group","group","aggregateResult","metrics","name","$count","value"],"sources":["aggregate.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  AggregateOpts,\n  AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy,\n  AggregationResultsWithGroups,\n  AggregationsResults,\n  ObjectOrInterfaceDefinition,\n} from \"@osdk/api\";\nimport type {\n  AggregateObjectsRequestV2,\n  AggregateObjectsResponseV2,\n  ObjectSet,\n} from \"@osdk/foundry.ontologies\";\nimport * as OntologyObjectSets from \"@osdk/foundry.ontologies/OntologyObjectSet\";\nimport invariant from \"tiny-invariant\";\nimport { legacyToModernSingleAggregationResult } from \"../internal/conversions/legacyToModernSingleAggregationResult.js\";\nimport { modernToLegacyAggregationClause } from \"../internal/conversions/modernToLegacyAggregationClause.js\";\nimport { modernToLegacyGroupByClause } from \"../internal/conversions/modernToLegacyGroupByClause.js\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport type { ArrayElement } from \"../util/ArrayElement.js\";\nimport { resolveBaseObjectSetType } from \"../util/objectSetUtils.js\";\n\n/** @internal */\nexport async function aggregate<\n  Q extends ObjectOrInterfaceDefinition,\n  AO extends AggregateOpts<Q>,\n>(\n  clientCtx: MinimalClient,\n  objectType: Q,\n  objectSet: ObjectSet = resolveBaseObjectSetType(objectType),\n  req: AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy<Q, AO>,\n): Promise<AggregationsResults<Q, AO>> {\n  const resolvedObjectSet = resolveBaseObjectSetType(objectType);\n  const body: AggregateObjectsRequestV2 = {\n    aggregation: modernToLegacyAggregationClause<AO[\"$select\"]>(\n      req.$select,\n    ),\n    groupBy: [],\n    where: undefined,\n  };\n\n  if (req.$groupBy) {\n    body.groupBy = modernToLegacyGroupByClause(req.$groupBy);\n  }\n\n  if (clientCtx.flushEdits != null) {\n    await clientCtx.flushEdits();\n  }\n\n  const result = await OntologyObjectSets.aggregate(\n    addUserAgentAndRequestContextHeaders(clientCtx, objectType),\n    await clientCtx.ontologyRid,\n    {\n      objectSet,\n      groupBy: body.groupBy,\n      aggregation: body.aggregation,\n    },\n    { branch: clientCtx.branch, transactionId: clientCtx.transactionId },\n  );\n\n  if (!result.data || !Array.isArray(result.data)) {\n    throw new Error(\n      `Aggregation request failed: ${JSON.stringify(result)}`,\n    );\n  }\n\n  if (!req.$groupBy) {\n    invariant(\n      result.data.length === 1,\n      \"no group by clause should mean only one data result\",\n    );\n\n    return {\n      ...aggregationToCountResult(result.data[0]),\n      ...legacyToModernSingleAggregationResult(\n        result.data[0],\n        req.$select,\n      ),\n    } as any;\n  }\n\n  const ret: AggregationResultsWithGroups<Q, AO[\"$select\"], any> = result.data\n    .map((entry) => {\n      return {\n        $group: entry.group as any,\n        ...aggregationToCountResult(entry),\n        ...legacyToModernSingleAggregationResult(entry, req.$select),\n      };\n    }) as any; // fixme\n\n  return ret as any; // FIXME\n}\n\nfunction aggregationToCountResult(\n  entry: ArrayElement<AggregateObjectsResponseV2[\"data\"]>,\n): { $count: number } | undefined {\n  for (const aggregateResult of entry.metrics) {\n    if (aggregateResult.name === \"count\") {\n      return { $count: aggregateResult.value };\n    }\n  }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA,OAAO,KAAKA,kBAAkB,MAAM,4CAA4C;AAChF,OAAOC,SAAS,MAAM,gBAAgB;AACtC,SAASC,qCAAqC,QAAQ,kEAAkE;AACxH,SAASC,+BAA+B,QAAQ,4DAA4D;AAC5G,SAASC,2BAA2B,QAAQ,wDAAwD;AAEpG,SAASC,oCAAoC,QAAQ,iDAAiD;AAEtG,SAASC,wBAAwB,QAAQ,2BAA2B;;AAEpE;AACA,OAAO,eAAeC,SAASA,CAI7BC,SAAwB,EACxBC,UAAa,EACbC,SAAoB,GAAGJ,wBAAwB,CAACG,UAAU,CAAC,EAC3DE,GAA0E,EACrC;EACXL,wBAAwB,CAACG,UAAU,CAAC;EAC9D,MAAMG,IAA+B,GAAG;IACtCC,WAAW,EAAEV,+BAA+B,CAC1CQ,GAAG,CAACG,OACN,CAAC;IACDC,OAAO,EAAE,EAAE;IACXC,KAAK,EAAEC;EACT,CAAC;EAED,IAAIN,GAAG,CAACO,QAAQ,EAAE;IAChBN,IAAI,CAACG,OAAO,GAAGX,2BAA2B,CAACO,GAAG,CAACO,QAAQ,CAAC;EAC1D;EAEA,IAAIV,SAAS,CAACW,UAAU,IAAI,IAAI,EAAE;IAChC,MAAMX,SAAS,CAACW,UAAU,CAAC,CAAC;EAC9B;EAEA,MAAMC,MAAM,GAAG,MAAMpB,kBAAkB,CAACO,SAAS,CAC/CF,oCAAoC,CAACG,SAAS,EAAEC,UAAU,CAAC,EAC3D,MAAMD,SAAS,CAACa,WAAW,EAC3B;IACEX,SAAS;IACTK,OAAO,EAAEH,IAAI,CAACG,OAAO;IACrBF,WAAW,EAAED,IAAI,CAACC;EACpB,CAAC,EACD;IAAES,MAAM,EAAEd,SAAS,CAACc,MAAM;IAAEC,aAAa,EAAEf,SAAS,CAACe;EAAc,CACrE,CAAC;EAED,IAAI,CAACH,MAAM,CAACI,IAAI,IAAI,CAACC,KAAK,CAACC,OAAO,CAACN,MAAM,CAACI,IAAI,CAAC,EAAE;IAC/C,MAAM,IAAIG,KAAK,CACb,+BAA+BC,IAAI,CAACC,SAAS,CAACT,MAAM,CAAC,EACvD,CAAC;EACH;EAEA,IAAI,CAACT,GAAG,CAACO,QAAQ,EAAE;IACjB,EACEE,MAAM,CAACI,IAAI,CAACM,MAAM,KAAK,CAAC,IAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAD1BhC,SAAS,QAEP,qDAAqD,IAFvDA,SAAS;IAKT,OAAO;MACL,GAAGiC,wBAAwB,CAACd,MAAM,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;MAC3C,GAAGtB,qCAAqC,CACtCkB,MAAM,CAACI,IAAI,CAAC,CAAC,CAAC,EACdb,GAAG,CAACG,OACN;IACF,CAAC;EACH;EAEA,MAAMqB,GAAwD,GAAGf,MAAM,CAACI,IAAI,CACzEY,GAAG,CAAEC,KAAK,IAAK;IACd,OAAO;MACLC,MAAM,EAAED,KAAK,CAACE,KAAY;MAC1B,GAAGL,wBAAwB,CAACG,KAAK,CAAC;MAClC,GAAGnC,qCAAqC,CAACmC,KAAK,EAAE1B,GAAG,CAACG,OAAO;IAC7D,CAAC;EACH,CAAC,CAAQ,CAAC,CAAC;;EAEb,OAAOqB,GAAG,CAAQ,CAAC;AACrB;AAEA,SAASD,wBAAwBA,CAC/BG,KAAuD,EACvB;EAChC,KAAK,MAAMG,eAAe,IAAIH,KAAK,CAACI,OAAO,EAAE;IAC3C,IAAID,eAAe,CAACE,IAAI,KAAK,OAAO,EAAE;MACpC,OAAO;QAAEC,MAAM,EAAEH,eAAe,CAACI;MAAM,CAAC;IAC1C;EACF;AACF","ignoreList":[]}

package/build/browser/util/UserAgent.js

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-export const USER_AGENT = `osdk-client/${"2.8.0-beta.21"}`;
-export const OBSERVABLE_USER_AGENT = `osdk-observable-client/${"2.8.0-beta.21"}`;
+export const USER_AGENT = `osdk-client/${"2.8.0-beta.22"}`;
+export const OBSERVABLE_USER_AGENT = `osdk-observable-client/${"2.8.0-beta.22"}`;
 //# sourceMappingURL=UserAgent.js.map

package/build/cjs/{chunk-3XHX3RLX.cjs → chunk-R7OP6A6S.cjs}

@@ -921,25 +921,16 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
     }
   };
 }
-function legacyToModernSingleAggregationResult(entry) {
-  return entry.metrics.reduce((accumulator, curValue) => {
-    const parts = curValue.name.split(".");
-    if (parts[0] === "count") {
-      return accumulator;
-    }
-    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant4__default.default(false) : void 0;
-    const property = parts[0];
-    const metricType = parts[1];
-    if (!(property in accumulator)) {
-      accumulator[property] = {};
-    }
-    accumulator[property][metricType] = curValue.value;
-    return accumulator;
-  }, {});
-}
 
 // src/internal/conversions/modernToLegacyAggregationClause.ts
 var directionFieldMap = (dir) => dir === "asc" ? "ASC" : dir === "desc" ? "DESC" : void 0;
+function splitAggregationKey(key) {
+  const colonPos = key.lastIndexOf(":");
+  return {
+    property: key.slice(0, colonPos),
+    metric: key.slice(colonPos + 1)
+  };
+}
 function modernToLegacyAggregationClause(select) {
   return Object.entries(select).flatMap(([propAndMetric, aggregationType]) => {
     if (propAndMetric === "$count") {
@@ -949,9 +940,10 @@ function modernToLegacyAggregationClause(select) {
         direction: directionFieldMap(aggregationType)
       };
     }
-    const colonPos = propAndMetric.lastIndexOf(":");
-    const property = propAndMetric.slice(0, colonPos);
-    const metric = propAndMetric.slice(colonPos + 1);
+    const {
+      property,
+      metric
+    } = splitAggregationKey(propAndMetric);
     return [{
       type: metric,
       name: `${property}.${metric}`,
@@ -960,6 +952,34 @@ function modernToLegacyAggregationClause(select) {
     }];
   });
 }
+
+// src/internal/conversions/legacyToModernSingleAggregationResult.ts
+function legacyToModernSingleAggregationResult(entry, select) {
+  const result = {};
+  for (const selectKey of Object.keys(select)) {
+    if (selectKey === "$count") {
+      continue;
+    }
+    const {
+      property,
+      metric
+    } = splitAggregationKey(selectKey);
+    (result[property] ??= {})[metric] = void 0;
+  }
+  for (const {
+    name,
+    value
+  } of entry.metrics) {
+    if (name === "count") {
+      continue;
+    }
+    const [property, metricType] = name.split(".");
+    if (result[property]) {
+      result[property][metricType] = value;
+    }
+  }
+  return result;
+}
 function modernToLegacyGroupByClause(groupByClause) {
   if (!groupByClause) return [];
   return Object.entries(groupByClause).flatMap(([field, type]) => {
@@ -1040,14 +1060,14 @@ async function aggregate2(clientCtx, objectType, objectSet = resolveBaseObjectSe
     !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "no group by clause should mean only one data result") : invariant4__default.default(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
-      ...legacyToModernSingleAggregationResult(result.data[0])
+      ...legacyToModernSingleAggregationResult(result.data[0], req.$select)
     };
   }
   const ret = result.data.map((entry) => {
     return {
       $group: entry.group,
       ...aggregationToCountResult(entry),
-      ...legacyToModernSingleAggregationResult(entry)
+      ...legacyToModernSingleAggregationResult(entry, req.$select)
     };
   });
   return ret;
@@ -1449,5 +1469,5 @@ exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.upload = upload;
-//# sourceMappingURL=chunk-3XHX3RLX.cjs.map
-//# sourceMappingURL=chunk-3XHX3RLX.cjs.map
+//# sourceMappingURL=chunk-R7OP6A6S.cjs.map
+//# sourceMappingURL=chunk-R7OP6A6S.cjs.map