@osdk/client 2.8.0-beta.11 → 2.8.0-beta.13

package/build/esm/observable/internal/list/InterfaceListQuery.js

@@ -16,20 +16,16 @@
 
 import groupBy from "object.groupby";
 import invariant from "tiny-invariant";
+import { additionalContext } from "../../../Client.js";
 import { ObjectDefRef } from "../../../object/convertWireToOsdkObjects/InternalSymbols.js";
-import { ListQuery, PIVOT_IDX, RDP_IDX } from "./ListQuery.js";
+import { ListQuery, PIVOT_IDX, RDP_IDX, RIDS_IDX } from "./ListQuery.js";
 export class InterfaceListQuery extends ListQuery {
   createObjectSet(store) {
     const rdpConfig = this.cacheKey.otherKeys[RDP_IDX];
     const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];
+    const rids = this.cacheKey.otherKeys[RIDS_IDX];
     if (pivotInfo != null) {
-      const sourceSet = pivotInfo.sourceTypeKind === "interface" ? store.client({
-        type: "interface",
-        apiName: pivotInfo.sourceType
-      }) : store.client({
-        type: "object",
-        apiName: pivotInfo.sourceType
-      });
+      const sourceSet = createSourceSetForPivot(store, pivotInfo, rids);
       let objectSet = sourceSet.where(this.canonicalWhere).pivotTo(pivotInfo.linkName);
       if (rdpConfig != null) {
         objectSet = objectSet.withProperties(rdpConfig);
@@ -43,10 +39,20 @@ export class InterfaceListQuery extends ListQuery {
       type: "interface",
       apiName: this.apiName
     };
+    const clientCtx = store.client[additionalContext];
+    let objectSet;
+    if (rids != null) {
+      objectSet = clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
+        type: "static",
+        objects: [...rids]
+      });
+    } else {
+      objectSet = store.client(objectTypeDef);
+    }
     if (rdpConfig != null) {
-      return store.client(objectTypeDef).withProperties(rdpConfig).where(this.canonicalWhere);
+      objectSet = objectSet.withProperties(rdpConfig);
     }
-    return store.client(objectTypeDef).where(this.canonicalWhere);
+    return objectSet.where(this.canonicalWhere);
   }
   async revalidateObjectType(apiName) {
     const objectMetadata = await this.store.client.fetchMetadata({
@@ -91,6 +97,28 @@ export class InterfaceListQuery extends ListQuery {
     };
   }
 }
+function createSourceSetForPivot(store, pivotInfo, rids) {
+  const clientCtx = store.client[additionalContext];
+  if (rids != null) {
+    return clientCtx.objectSetFactory({
+      type: "object",
+      apiName: pivotInfo.sourceType
+    }, clientCtx, {
+      type: "static",
+      objects: [...rids]
+    });
+  }
+  if (pivotInfo.sourceTypeKind === "interface") {
+    return store.client({
+      type: "interface",
+      apiName: pivotInfo.sourceType
+    });
+  }
+  return store.client({
+    type: "object",
+    apiName: pivotInfo.sourceType
+  });
+}
 
 // Hopefully this can go away when we can just request the full object properties on first load
 async function reloadDataAsFullObjects(client, data) {

package/build/esm/observable/internal/list/InterfaceListQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterfaceListQuery.js","names":["groupBy","invariant","ObjectDefRef","ListQuery","PIVOT_IDX","RDP_IDX","InterfaceListQuery","createObjectSet","store","rdpConfig","cacheKey","otherKeys","pivotInfo","sourceSet","sourceTypeKind","client","type","apiName","sourceType","objectSet","where","canonicalWhere","pivotTo","linkName","withProperties","objectTypeDef","revalidateObjectType","objectMetadata","fetchMetadata","interfaceMap","revalidate","postProcessFetchedData","data","reloadDataAsFullObjects","createPayload","params","resolvedList","resolvedData","map","obj","$as","isOptimistic","fetchMore","hasMore","nextPageToken","status","lastUpdated","extractRelevantObjects","changes","matchesApiName","object","added","Array","from","addedObjects","filter","modified","modifiedObjects","all","strictMatches","Set","sortaMatches","length","groups","x","$objectType","objectTypeToPrimaryKeyToObject","Object","fromEntries","Promise","entries","objects","objectDef","primaryKeyApiName","$in","$primaryKey","result","fetchPage","$includeRid","fullObject","process","env","NODE_ENV"],"sources":["InterfaceListQuery.ts"],"sourcesContent":["/*\n * Copyright 2025 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  DerivedProperty,\n  InterfaceDefinition,\n  ObjectOrInterfaceDefinition,\n  ObjectSet,\n  ObjectTypeDefinition,\n  Osdk,\n  WhereClause,\n} from \"@osdk/api\";\nimport groupBy from \"object.groupby\";\nimport invariant from \"tiny-invariant\";\nimport type { Client } from \"../../../Client.js\";\nimport type { InterfaceHolder } from \"../../../object/convertWireToOsdkObjects/InterfaceHolder.js\";\nimport { ObjectDefRef } from \"../../../object/convertWireToOsdkObjects/InternalSymbols.js\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.js\";\nimport type { ListPayload } from \"../../ListPayload.js\";\nimport type { CollectionConnectableParams } from \"../base-list/BaseCollectionQuery.js\";\nimport type { Changes } from \"../Changes.js\";\nimport type { Rdp } from \"../RdpCanonicalizer.js\";\nimport type { SimpleWhereClause } from \"../SimpleWhereClause.js\";\nimport type { Store } from \"../Store.js\";\nimport { ListQuery, PIVOT_IDX, RDP_IDX } from \"./ListQuery.js\";\n\ntype ExtractRelevantObjectsResult = Record<\"added\" | \"modified\", {\n  all: (ObjectHolder | InterfaceHolder)[];\n  strictMatches: Set<(ObjectHolder | InterfaceHolder)>;\n  sortaMatches: Set<(ObjectHolder | InterfaceHolder)>;\n}>;\n\nexport class InterfaceListQuery extends ListQuery {\n  protected createObjectSet(store: Store): ObjectSet<ObjectTypeDefinition> {\n    const rdpConfig = this.cacheKey.otherKeys[RDP_IDX];\n    const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];\n\n    if (pivotInfo != null) {\n      const sourceSet = (pivotInfo.sourceTypeKind === \"interface\"\n        ? store.client({\n          type: \"interface\",\n          apiName: pivotInfo.sourceType,\n        } as InterfaceDefinition)\n        : store.client({\n          type: \"object\",\n          apiName: pivotInfo.sourceType,\n        } as ObjectTypeDefinition)) as ObjectSet<ObjectOrInterfaceDefinition>;\n\n      let objectSet = sourceSet\n        .where(this.canonicalWhere as WhereClause<any>)\n        .pivotTo(pivotInfo.linkName);\n\n      if (rdpConfig != null) {\n        objectSet = objectSet.withProperties(\n          rdpConfig as DerivedProperty.Clause<ObjectTypeDefinition>,\n        );\n      }\n\n      // intersectWith for pivot queries is deferred to fetchPageData\n      // where the target type can be resolved asynchronously\n      return objectSet;\n    }\n\n    const type: string = \"interface\" as const;\n    const objectTypeDef = {\n      type,\n      apiName: this.apiName,\n    } as ObjectTypeDefinition;\n\n    if (rdpConfig != null) {\n      return store.client(objectTypeDef)\n        .withProperties(rdpConfig as Rdp)\n        .where(this.canonicalWhere);\n    }\n\n    return store.client(objectTypeDef)\n      .where(this.canonicalWhere);\n  }\n\n  async revalidateObjectType(apiName: string): Promise<void> {\n    const objectMetadata = await this.store.client.fetchMetadata({\n      type: \"object\",\n      apiName,\n    });\n\n    if (this.apiName in objectMetadata.interfaceMap) {\n      await this.revalidate(/* force */ true);\n    }\n  }\n\n  protected async postProcessFetchedData(\n    data: Osdk.Instance<any>[],\n  ): Promise<Osdk.Instance<any>[]> {\n    return reloadDataAsFullObjects(this.store.client, data);\n  }\n\n  protected createPayload(\n    params: CollectionConnectableParams,\n  ): ListPayload {\n    const resolvedList = params.resolvedData.map((obj: ObjectHolder) =>\n      obj.$as(this.apiName)\n    );\n\n    return {\n      resolvedList,\n      isOptimistic: params.isOptimistic,\n      fetchMore: this.fetchMore,\n      hasMore: this.nextPageToken != null,\n      status: params.status,\n      lastUpdated: params.lastUpdated,\n    };\n  }\n\n  protected extractRelevantObjects(\n    changes: Changes,\n  ): ExtractRelevantObjectsResult {\n    const matchesApiName = ([, object]: [unknown, ObjectHolder]) => {\n      return this.apiName in object[ObjectDefRef].interfaceMap;\n    };\n\n    const added = Array.from(changes.addedObjects).filter(matchesApiName).map((\n      [, object],\n    ) => object.$as(this.apiName));\n\n    const modified = Array.from(changes.modifiedObjects).filter(matchesApiName)\n      .map((\n        [, object],\n      ) => object.$as(this.apiName));\n\n    return {\n      added: {\n        all: added,\n        strictMatches: new Set(),\n        sortaMatches: new Set(),\n      },\n      modified: {\n        all: modified,\n        strictMatches: new Set(),\n        sortaMatches: new Set(),\n      },\n    };\n  }\n}\n\n// Hopefully this can go away when we can just request the full object properties on first load\nasync function reloadDataAsFullObjects(\n  client: Client,\n  data: Osdk.Instance<any>[],\n) {\n  if (data.length === 0) {\n    return data;\n  }\n\n  const groups = groupBy(data, (x) => x.$objectType);\n  const objectTypeToPrimaryKeyToObject = Object.fromEntries(\n    await Promise.all(\n      Object.entries(groups).map<\n        Promise<\n          [\n            /** objectType **/ string,\n            Record<string | number, Osdk.Instance<ObjectTypeDefinition>>,\n          ]\n        >\n      >(async ([apiName, objects]) => {\n        // Interface query results don't have ObjectDefRef, so we fetch metadata to get primaryKeyApiName\n        const objectDef = await client.fetchMetadata({\n          type: \"object\",\n          apiName,\n        });\n        const where: SimpleWhereClause = {\n          [objectDef.primaryKeyApiName]: {\n            $in: objects.map(x => x.$primaryKey),\n          },\n        };\n\n        const result = await client(\n          objectDef as ObjectTypeDefinition,\n        ).where(\n          where as Parameters<ObjectSet<ObjectTypeDefinition>[\"where\"]>[0],\n        ).fetchPage({ $includeRid: true });\n        return [\n          apiName,\n          Object.fromEntries(result.data.map(\n            x => [x.$primaryKey, x],\n          )),\n        ];\n      }),\n    ),\n  );\n\n  return data.map((obj) => {\n    const fullObject =\n      objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];\n    invariant(\n      fullObject,\n      `Could not find object ${obj.$objectType} ${obj.$primaryKey}`,\n    );\n    return fullObject;\n  });\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"InterfaceListQuery.js","names":["groupBy","invariant","additionalContext","ObjectDefRef","ListQuery","PIVOT_IDX","RDP_IDX","RIDS_IDX","InterfaceListQuery","createObjectSet","store","rdpConfig","cacheKey","otherKeys","pivotInfo","rids","sourceSet","createSourceSetForPivot","objectSet","where","canonicalWhere","pivotTo","linkName","withProperties","objectTypeDef","type","apiName","clientCtx","client","objectSetFactory","objects","revalidateObjectType","objectMetadata","fetchMetadata","interfaceMap","revalidate","postProcessFetchedData","data","reloadDataAsFullObjects","createPayload","params","resolvedList","resolvedData","map","obj","$as","isOptimistic","fetchMore","hasMore","nextPageToken","status","lastUpdated","extractRelevantObjects","changes","matchesApiName","object","added","Array","from","addedObjects","filter","modified","modifiedObjects","all","strictMatches","Set","sortaMatches","sourceType","sourceTypeKind","length","groups","x","$objectType","objectTypeToPrimaryKeyToObject","Object","fromEntries","Promise","entries","objectDef","primaryKeyApiName","$in","$primaryKey","result","fetchPage","$includeRid","fullObject","process","env","NODE_ENV"],"sources":["InterfaceListQuery.ts"],"sourcesContent":["/*\n * Copyright 2025 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  DerivedProperty,\n  InterfaceDefinition,\n  ObjectOrInterfaceDefinition,\n  ObjectSet,\n  ObjectTypeDefinition,\n  Osdk,\n  WhereClause,\n} from \"@osdk/api\";\nimport groupBy from \"object.groupby\";\nimport invariant from \"tiny-invariant\";\nimport { additionalContext, type Client } from \"../../../Client.js\";\nimport type { InterfaceHolder } from \"../../../object/convertWireToOsdkObjects/InterfaceHolder.js\";\nimport { ObjectDefRef } from \"../../../object/convertWireToOsdkObjects/InternalSymbols.js\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.js\";\nimport type { ListPayload } from \"../../ListPayload.js\";\nimport type { CollectionConnectableParams } from \"../base-list/BaseCollectionQuery.js\";\nimport type { Changes } from \"../Changes.js\";\nimport type { PivotInfo } from \"../PivotCanonicalizer.js\";\nimport type { Rdp } from \"../RdpCanonicalizer.js\";\nimport type { SimpleWhereClause } from \"../SimpleWhereClause.js\";\nimport type { Store } from \"../Store.js\";\nimport { ListQuery, PIVOT_IDX, RDP_IDX, RIDS_IDX } from \"./ListQuery.js\";\n\ntype ExtractRelevantObjectsResult = Record<\"added\" | \"modified\", {\n  all: (ObjectHolder | InterfaceHolder)[];\n  strictMatches: Set<(ObjectHolder | InterfaceHolder)>;\n  sortaMatches: Set<(ObjectHolder | InterfaceHolder)>;\n}>;\n\nexport class InterfaceListQuery extends ListQuery {\n  protected createObjectSet(store: Store): ObjectSet<ObjectTypeDefinition> {\n    const rdpConfig = this.cacheKey.otherKeys[RDP_IDX];\n    const pivotInfo = this.cacheKey.otherKeys[PIVOT_IDX];\n    const rids = this.cacheKey.otherKeys[RIDS_IDX];\n\n    if (pivotInfo != null) {\n      const sourceSet = createSourceSetForPivot(store, pivotInfo, rids);\n\n      let objectSet = sourceSet\n        .where(this.canonicalWhere as WhereClause<any>)\n        .pivotTo(pivotInfo.linkName);\n\n      if (rdpConfig != null) {\n        objectSet = objectSet.withProperties(\n          rdpConfig as DerivedProperty.Clause<ObjectTypeDefinition>,\n        );\n      }\n\n      // intersectWith for pivot queries is deferred to fetchPageData\n      // where the target type can be resolved asynchronously\n      return objectSet;\n    }\n\n    const type: string = \"interface\" as const;\n    const objectTypeDef = {\n      type,\n      apiName: this.apiName,\n    } as ObjectTypeDefinition;\n\n    const clientCtx = store.client[additionalContext];\n    let objectSet: ObjectSet<ObjectTypeDefinition>;\n    if (rids != null) {\n      objectSet = clientCtx.objectSetFactory(\n        objectTypeDef,\n        clientCtx,\n        { type: \"static\", objects: [...rids] },\n      );\n    } else {\n      objectSet = store.client(objectTypeDef);\n    }\n\n    if (rdpConfig != null) {\n      objectSet = objectSet.withProperties(rdpConfig as Rdp);\n    }\n\n    return objectSet.where(this.canonicalWhere);\n  }\n\n  async revalidateObjectType(apiName: string): Promise<void> {\n    const objectMetadata = await this.store.client.fetchMetadata({\n      type: \"object\",\n      apiName,\n    });\n\n    if (this.apiName in objectMetadata.interfaceMap) {\n      await this.revalidate(/* force */ true);\n    }\n  }\n\n  protected async postProcessFetchedData(\n    data: Osdk.Instance<any>[],\n  ): Promise<Osdk.Instance<any>[]> {\n    return reloadDataAsFullObjects(this.store.client, data);\n  }\n\n  protected createPayload(\n    params: CollectionConnectableParams,\n  ): ListPayload {\n    const resolvedList = params.resolvedData.map((obj: ObjectHolder) =>\n      obj.$as(this.apiName)\n    );\n\n    return {\n      resolvedList,\n      isOptimistic: params.isOptimistic,\n      fetchMore: this.fetchMore,\n      hasMore: this.nextPageToken != null,\n      status: params.status,\n      lastUpdated: params.lastUpdated,\n    };\n  }\n\n  protected extractRelevantObjects(\n    changes: Changes,\n  ): ExtractRelevantObjectsResult {\n    const matchesApiName = ([, object]: [unknown, ObjectHolder]) => {\n      return this.apiName in object[ObjectDefRef].interfaceMap;\n    };\n\n    const added = Array.from(changes.addedObjects).filter(matchesApiName).map((\n      [, object],\n    ) => object.$as(this.apiName));\n\n    const modified = Array.from(changes.modifiedObjects).filter(matchesApiName)\n      .map((\n        [, object],\n      ) => object.$as(this.apiName));\n\n    return {\n      added: {\n        all: added,\n        strictMatches: new Set(),\n        sortaMatches: new Set(),\n      },\n      modified: {\n        all: modified,\n        strictMatches: new Set(),\n        sortaMatches: new Set(),\n      },\n    };\n  }\n}\n\nfunction createSourceSetForPivot(\n  store: Store,\n  pivotInfo: PivotInfo,\n  rids: string[] | undefined,\n): ObjectSet<ObjectOrInterfaceDefinition> {\n  const clientCtx = store.client[additionalContext];\n\n  if (rids != null) {\n    return clientCtx.objectSetFactory(\n      {\n        type: \"object\",\n        apiName: pivotInfo.sourceType,\n      } as ObjectTypeDefinition,\n      clientCtx,\n      { type: \"static\", objects: [...rids] },\n    );\n  }\n\n  if (pivotInfo.sourceTypeKind === \"interface\") {\n    return store.client({\n      type: \"interface\",\n      apiName: pivotInfo.sourceType,\n    } as InterfaceDefinition) as ObjectSet<ObjectOrInterfaceDefinition>;\n  }\n\n  return store.client({\n    type: \"object\",\n    apiName: pivotInfo.sourceType,\n  } as ObjectTypeDefinition) as ObjectSet<ObjectOrInterfaceDefinition>;\n}\n\n// Hopefully this can go away when we can just request the full object properties on first load\nasync function reloadDataAsFullObjects(\n  client: Client,\n  data: Osdk.Instance<any>[],\n) {\n  if (data.length === 0) {\n    return data;\n  }\n\n  const groups = groupBy(data, (x) => x.$objectType);\n  const objectTypeToPrimaryKeyToObject = Object.fromEntries(\n    await Promise.all(\n      Object.entries(groups).map<\n        Promise<\n          [\n            /** objectType **/ string,\n            Record<string | number, Osdk.Instance<ObjectTypeDefinition>>,\n          ]\n        >\n      >(async ([apiName, objects]) => {\n        // Interface query results don't have ObjectDefRef, so we fetch metadata to get primaryKeyApiName\n        const objectDef = await client.fetchMetadata({\n          type: \"object\",\n          apiName,\n        });\n        const where: SimpleWhereClause = {\n          [objectDef.primaryKeyApiName]: {\n            $in: objects.map(x => x.$primaryKey),\n          },\n        };\n\n        const result = await client(\n          objectDef as ObjectTypeDefinition,\n        ).where(\n          where as Parameters<ObjectSet<ObjectTypeDefinition>[\"where\"]>[0],\n        ).fetchPage({ $includeRid: true });\n        return [\n          apiName,\n          Object.fromEntries(result.data.map(\n            x => [x.$primaryKey, x],\n          )),\n        ];\n      }),\n    ),\n  );\n\n  return data.map((obj) => {\n    const fullObject =\n      objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];\n    invariant(\n      fullObject,\n      `Could not find object ${obj.$objectType} ${obj.$primaryKey}`,\n    );\n    return fullObject;\n  });\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAWA,OAAOA,OAAO,MAAM,gBAAgB;AACpC,OAAOC,SAAS,MAAM,gBAAgB;AACtC,SAASC,iBAAiB,QAAqB,oBAAoB;AAEnE,SAASC,YAAY,QAAQ,6DAA6D;AAS1F,SAASC,SAAS,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,gBAAgB;AAQxE,OAAO,MAAMC,kBAAkB,SAASJ,SAAS,CAAC;EACtCK,eAAeA,CAACC,KAAY,EAAmC;IACvE,MAAMC,SAAS,GAAG,IAAI,CAACC,QAAQ,CAACC,SAAS,CAACP,OAAO,CAAC;IAClD,MAAMQ,SAAS,GAAG,IAAI,CAACF,QAAQ,CAACC,SAAS,CAACR,SAAS,CAAC;IACpD,MAAMU,IAAI,GAAG,IAAI,CAACH,QAAQ,CAACC,SAAS,CAACN,QAAQ,CAAC;IAE9C,IAAIO,SAAS,IAAI,IAAI,EAAE;MACrB,MAAME,SAAS,GAAGC,uBAAuB,CAACP,KAAK,EAAEI,SAAS,EAAEC,IAAI,CAAC;MAEjE,IAAIG,SAAS,GAAGF,SAAS,CACtBG,KAAK,CAAC,IAAI,CAACC,cAAkC,CAAC,CAC9CC,OAAO,CAACP,SAAS,CAACQ,QAAQ,CAAC;MAE9B,IAAIX,SAAS,IAAI,IAAI,EAAE;QACrBO,SAAS,GAAGA,SAAS,CAACK,cAAc,CAClCZ,SACF,CAAC;MACH;;MAEA;MACA;MACA,OAAOO,SAAS;IAClB;IAGA,MAAMM,aAAa,GAAG;MACpBC,IAAI,EAFe,WAEf;MACJC,OAAO,EAAE,IAAI,CAACA;IAChB,CAAyB;IAEzB,MAAMC,SAAS,GAAGjB,KAAK,CAACkB,MAAM,CAAC1B,iBAAiB,CAAC;IACjD,IAAIgB,SAA0C;IAC9C,IAAIH,IAAI,IAAI,IAAI,EAAE;MAChBG,SAAS,GAAGS,SAAS,CAACE,gBAAgB,CACpCL,aAAa,EACbG,SAAS,EACT;QAAEF,IAAI,EAAE,QAAQ;QAAEK,OAAO,EAAE,CAAC,GAAGf,IAAI;MAAE,CACvC,CAAC;IACH,CAAC,MAAM;MACLG,SAAS,GAAGR,KAAK,CAACkB,MAAM,CAACJ,aAAa,CAAC;IACzC;IAEA,IAAIb,SAAS,IAAI,IAAI,EAAE;MACrBO,SAAS,GAAGA,SAAS,CAACK,cAAc,CAACZ,SAAgB,CAAC;IACxD;IAEA,OAAOO,SAAS,CAACC,KAAK,CAAC,IAAI,CAACC,cAAc,CAAC;EAC7C;EAEA,MAAMW,oBAAoBA,CAACL,OAAe,EAAiB;IACzD,MAAMM,cAAc,GAAG,MAAM,IAAI,CAACtB,KAAK,CAACkB,MAAM,CAACK,aAAa,CAAC;MAC3DR,IAAI,EAAE,QAAQ;MACdC;IACF,CAAC,CAAC;IAEF,IAAI,IAAI,CAACA,OAAO,IAAIM,cAAc,CAACE,YAAY,EAAE;MAC/C,MAAM,IAAI,CAACC,UAAU,CAAC,WAAY,IAAI,CAAC;IACzC;EACF;EAEA,MAAgBC,sBAAsBA,CACpCC,IAA0B,EACK;IAC/B,OAAOC,uBAAuB,CAAC,IAAI,CAAC5B,KAAK,CAACkB,MAAM,EAAES,IAAI,CAAC;EACzD;EAEUE,aAAaA,CACrBC,MAAmC,EACtB;IACb,MAAMC,YAAY,GAAGD,MAAM,CAACE,YAAY,CAACC,GAAG,CAAEC,GAAiB,IAC7DA,GAAG,CAACC,GAAG,CAAC,IAAI,CAACnB,OAAO,CACtB,CAAC;IAED,OAAO;MACLe,YAAY;MACZK,YAAY,EAAEN,MAAM,CAACM,YAAY;MACjCC,SAAS,EAAE,IAAI,CAACA,SAAS;MACzBC,OAAO,EAAE,IAAI,CAACC,aAAa,IAAI,IAAI;MACnCC,MAAM,EAAEV,MAAM,CAACU,MAAM;MACrBC,WAAW,EAAEX,MAAM,CAACW;IACtB,CAAC;EACH;EAEUC,sBAAsBA,CAC9BC,OAAgB,EACc;IAC9B,MAAMC,cAAc,GAAGA,CAAC,GAAGC,MAAM,CAA0B,KAAK;MAC9D,OAAO,IAAI,CAAC7B,OAAO,IAAI6B,MAAM,CAACpD,YAAY,CAAC,CAAC+B,YAAY;IAC1D,CAAC;IAED,MAAMsB,KAAK,GAAGC,KAAK,CAACC,IAAI,CAACL,OAAO,CAACM,YAAY,CAAC,CAACC,MAAM,CAACN,cAAc,CAAC,CAACX,GAAG,CAAC,CACxE,GAAGY,MAAM,CAAC,KACPA,MAAM,CAACV,GAAG,CAAC,IAAI,CAACnB,OAAO,CAAC,CAAC;IAE9B,MAAMmC,QAAQ,GAAGJ,KAAK,CAACC,IAAI,CAACL,OAAO,CAACS,eAAe,CAAC,CAACF,MAAM,CAACN,cAAc,CAAC,CACxEX,GAAG,CAAC,CACH,GAAGY,MAAM,CAAC,KACPA,MAAM,CAACV,GAAG,CAAC,IAAI,CAACnB,OAAO,CAAC,CAAC;IAEhC,OAAO;MACL8B,KAAK,EAAE;QACLO,GAAG,EAAEP,KAAK;QACVQ,aAAa,EAAE,IAAIC,GAAG,CAAC,CAAC;QACxBC,YAAY,EAAE,IAAID,GAAG,CAAC;MACxB,CAAC;MACDJ,QAAQ,EAAE;QACRE,GAAG,EAAEF,QAAQ;QACbG,aAAa,EAAE,IAAIC,GAAG,CAAC,CAAC;QACxBC,YAAY,EAAE,IAAID,GAAG,CAAC;MACxB;IACF,CAAC;EACH;AACF;AAEA,SAAShD,uBAAuBA,CAC9BP,KAAY,EACZI,SAAoB,EACpBC,IAA0B,EACc;EACxC,MAAMY,SAAS,GAAGjB,KAAK,CAACkB,MAAM,CAAC1B,iBAAiB,CAAC;EAEjD,IAAIa,IAAI,IAAI,IAAI,EAAE;IAChB,OAAOY,SAAS,CAACE,gBAAgB,CAC/B;MACEJ,IAAI,EAAE,QAAQ;MACdC,OAAO,EAAEZ,SAAS,CAACqD;IACrB,CAAC,EACDxC,SAAS,EACT;MAAEF,IAAI,EAAE,QAAQ;MAAEK,OAAO,EAAE,CAAC,GAAGf,IAAI;IAAE,CACvC,CAAC;EACH;EAEA,IAAID,SAAS,CAACsD,cAAc,KAAK,WAAW,EAAE;IAC5C,OAAO1D,KAAK,CAACkB,MAAM,CAAC;MAClBH,IAAI,EAAE,WAAW;MACjBC,OAAO,EAAEZ,SAAS,CAACqD;IACrB,CAAwB,CAAC;EAC3B;EAEA,OAAOzD,KAAK,CAACkB,MAAM,CAAC;IAClBH,IAAI,EAAE,QAAQ;IACdC,OAAO,EAAEZ,SAAS,CAACqD;EACrB,CAAyB,CAAC;AAC5B;;AAEA;AACA,eAAe7B,uBAAuBA,CACpCV,MAAc,EACdS,IAA0B,EAC1B;EACA,IAAIA,IAAI,CAACgC,MAAM,KAAK,CAAC,EAAE;IACrB,OAAOhC,IAAI;EACb;EAEA,MAAMiC,MAAM,GAAGtE,OAAO,CAACqC,IAAI,EAAGkC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAAC;EAClD,MAAMC,8BAA8B,GAAGC,MAAM,CAACC,WAAW,CACvD,MAAMC,OAAO,CAACb,GAAG,CACfW,MAAM,CAACG,OAAO,CAACP,MAAM,CAAC,CAAC3B,GAAG,CAOxB,OAAO,CAACjB,OAAO,EAAEI,OAAO,CAAC,KAAK;IAC9B;IACA,MAAMgD,SAAS,GAAG,MAAMlD,MAAM,CAACK,aAAa,CAAC;MAC3CR,IAAI,EAAE,QAAQ;MACdC;IACF,CAAC,CAAC;IACF,MAAMP,KAAwB,GAAG;MAC/B,CAAC2D,SAAS,CAACC,iBAAiB,GAAG;QAC7BC,GAAG,EAAElD,OAAO,CAACa,GAAG,CAAC4B,CAAC,IAAIA,CAAC,CAACU,WAAW;MACrC;IACF,CAAC;IAED,MAAMC,MAAM,GAAG,MAAMtD,MAAM,CACzBkD,SACF,CAAC,CAAC3D,KAAK,CACLA,KACF,CAAC,CAACgE,SAAS,CAAC;MAAEC,WAAW,EAAE;IAAK,CAAC,CAAC;IAClC,OAAO,CACL1D,OAAO,EACPgD,MAAM,CAACC,WAAW,CAACO,MAAM,CAAC7C,IAAI,CAACM,GAAG,CAChC4B,CAAC,IAAI,CAACA,CAAC,CAACU,WAAW,EAAEV,CAAC,CACxB,CAAC,CAAC,CACH;EACH,CAAC,CACH,CACF,CAAC;EAED,OAAOlC,IAAI,CAACM,GAAG,CAAEC,GAAG,IAAK;IACvB,MAAMyC,UAAU,GACdZ,8BAA8B,CAAC7B,GAAG,CAAC4B,WAAW,CAAC,CAAC5B,GAAG,CAACqC,WAAW,CAAC;IAClE,CACEI,UAAU,GAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBADZvF,SAAS,QAEP,yBAAyB2C,GAAG,CAAC4B,WAAW,IAAI5B,GAAG,CAACqC,WAAW,EAAE,IAF/DhF,SAAS;IAIT,OAAOoF,UAAU;EACnB,CAAC,CAAC;AACJ","ignoreList":[]}

package/build/esm/queries/applyQuery.js

@@ -34,7 +34,8 @@ export async function applyQuery(client, query, params) {
     parameters: params ? await remapQueryParams(params, client, (await qd).parameters) : {}
   }, {
     version: query.isFixedVersion ? query.version : undefined,
-    transactionId: client.transactionId
+    transactionId: client.transactionId,
+    branch: client.branch
   });
   const objectOutputDefs = await getRequiredDefinitions((await qd).output, client);
   const remappedResponse = await remapQueryResponse(client, (await qd).output, response.value, objectOutputDefs);

package/build/esm/queries/applyQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"applyQuery.js","names":["OntologiesV2","invariant","createObjectSet","hydrateAttachmentFromRidInternal","addUserAgentAndRequestContextHeaders","augmentRequestContext","createObjectSpecifierFromInterfaceSpecifier","createObjectSpecifierFromPrimaryKey","toDataValueQueries","applyQuery","client","query","params","qd","ontologyProvider","getQueryDefinition","apiName","isFixedVersion","version","undefined","flushEdits","response","Queries","execute","finalMethodCall","ontologyRid","parameters","remapQueryParams","transactionId","objectOutputDefs","getRequiredDefinitions","output","remappedResponse","remapQueryResponse","value","paramTypes","parameterMap","key","Object","entries","responseDataType","responseValue","definitions","nullable","Error","type","i","length","array","set","def","get","object","createQueryObjectResponse","interface","createQueryInterfaceResponse","objectSet","objectSets","objectType","reference","subtype","struct","requiresConversion","map","Array","isArray","process","env","NODE_ENV","entry","keyType","getObjectSpecifier","valueType","result","groups","push","subResult","subKey","dataType","Map","objectDef","getObjectDefinition","interfaceDef","getInterfaceDefinition","types","allDefs","Promise","all","defs","structValues","values","some","primaryKey","objectTypeApiName","$apiName","$title","$objectType","$primaryKey","$objectSpecifier","interfaceSpecifier","primaryKeyValue"],"sources":["applyQuery.ts"],"sourcesContent":["/*\n * Copyright 2024 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  AllowedBucketKeyTypes,\n  AllowedBucketTypes,\n  CompileTimeMetadata,\n  InterfaceDefinition,\n  ObjectOrInterfaceDefinition,\n  ObjectTypeDefinition,\n  OsdkBase,\n  PrimaryKeyType,\n  QueryDataTypeDefinition,\n  QueryDefinition,\n  QueryMetadata,\n  QueryParameterDefinition,\n} from \"@osdk/api\";\nimport type { DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { createObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { hydrateAttachmentFromRidInternal } from \"../public-utils/hydrateAttachmentFromRid.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport { augmentRequestContext } from \"../util/augmentRequestContext.js\";\nimport {\n  createObjectSpecifierFromInterfaceSpecifier,\n  createObjectSpecifierFromPrimaryKey,\n} from \"../util/objectSpecifierUtils.js\";\nimport { toDataValueQueries } from \"../util/toDataValueQueries.js\";\nimport type { QueryParameterType, QueryReturnType } from \"./types.js\";\n\nexport async function applyQuery<\n  QD extends QueryDefinition<any>,\n  P extends QueryParameterType<CompileTimeMetadata<QD>[\"parameters\"]>,\n>(\n  client: MinimalClient,\n  query: QD,\n  params?: P,\n): Promise<\n  QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>\n> {\n  // We fire and forget so if a function has no parameters we don't unnecessarily load all metadata\n  const qd: Promise<QueryMetadata> = client.ontologyProvider.getQueryDefinition(\n    query.apiName,\n    query.isFixedVersion ? query.version : undefined,\n  );\n\n  if (client.flushEdits != null) {\n    await client.flushEdits();\n  }\n\n  const response = await OntologiesV2.Queries.execute(\n    addUserAgentAndRequestContextHeaders(\n      augmentRequestContext(client, _ => ({ finalMethodCall: \"applyQuery\" })),\n      query,\n    ),\n    await client.ontologyRid,\n    query.apiName,\n    {\n      parameters: params\n        ? await remapQueryParams(\n          params as { [parameterId: string]: any },\n          client,\n          (await qd).parameters,\n        )\n        : {},\n    },\n    {\n      version: query.isFixedVersion ? query.version : undefined,\n      transactionId: client.transactionId,\n    },\n  );\n\n  const objectOutputDefs = await getRequiredDefinitions(\n    (await qd).output,\n    client,\n  );\n  const remappedResponse = await remapQueryResponse(\n    client,\n    (await qd).output,\n    response.value,\n    objectOutputDefs,\n  );\n  return remappedResponse as QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>;\n}\n\nasync function remapQueryParams(\n  params: { [parameterId: string]: any },\n  client: MinimalClient,\n  paramTypes: Record<string, QueryParameterDefinition<any>>,\n): Promise<{ [parameterId: string]: any }> {\n  const parameterMap: { [parameterName: string]: unknown } = {};\n  for (const [key, value] of Object.entries(params)) {\n    parameterMap[key] = await toDataValueQueries(\n      value,\n      client,\n      paramTypes[key],\n    );\n  }\n  return parameterMap;\n}\n\nasync function remapQueryResponse<\n  Q extends ObjectTypeDefinition,\n  T extends QueryDataTypeDefinition<Q | never>,\n>(\n  client: MinimalClient,\n  responseDataType: T,\n  responseValue: DataValue,\n  definitions: Map<string, ObjectOrInterfaceDefinition>,\n): Promise<QueryReturnType<T>> {\n  // handle null responses\n  if (responseValue == null) {\n    if (responseDataType.nullable) {\n      return undefined as unknown as QueryReturnType<typeof responseDataType>;\n    } else {\n      throw new Error(\"Got null response when nullable was not allowed\");\n    }\n  }\n\n  switch (responseDataType.type) {\n    case \"union\": {\n      throw new Error(\"Union return types are not yet supported\");\n    }\n\n    case \"array\": {\n      for (let i = 0; i < responseValue.length; i++) {\n        responseValue[i] = await remapQueryResponse(\n          client,\n          responseDataType.array,\n          responseValue[i],\n          definitions,\n        );\n      }\n\n      return responseValue as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"set\": {\n      for (let i = 0; i < responseValue.length; i++) {\n        responseValue[i] = await remapQueryResponse(\n          client,\n          responseDataType.set,\n          responseValue[i],\n          definitions,\n        );\n      }\n\n      return responseValue as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"attachment\": {\n      return hydrateAttachmentFromRidInternal(\n        client,\n        responseValue,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"object\": {\n      const def = definitions.get(responseDataType.object);\n      if (!def || def.type !== \"object\") {\n        throw new Error(\n          `Missing definition for ${responseDataType.object}`,\n        );\n      }\n      return createQueryObjectResponse(\n        responseValue,\n        def,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"interface\": {\n      const def = definitions.get(responseDataType.interface);\n      if (!def || def.type !== \"interface\") {\n        throw new Error(\n          `Missing definition for ${responseDataType.interface}`,\n        );\n      }\n\n      return createQueryInterfaceResponse(\n        responseValue,\n        def,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"objectSet\": {\n      const def = definitions.get(responseDataType.objectSet);\n      if (!def) {\n        throw new Error(\n          `Missing definition for ${responseDataType.objectSet}`,\n        );\n      }\n      if (typeof responseValue === \"string\") {\n        return createObjectSet(def, client, {\n          type: \"intersect\",\n          objectSets: [\n            { type: \"base\", objectType: responseDataType.objectSet },\n            { type: \"reference\", reference: responseValue },\n          ],\n        }) as QueryReturnType<typeof responseDataType>;\n      }\n\n      return createObjectSet(\n        def,\n        client,\n        responseValue,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"struct\": {\n      // figure out what keys need to be fixed up\n      for (const [key, subtype] of Object.entries(responseDataType.struct)) {\n        if (requiresConversion(subtype)) {\n          responseValue[key] = await remapQueryResponse(\n            client,\n            subtype,\n            responseValue[key],\n            definitions,\n          );\n        }\n      }\n\n      return responseValue as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"map\": {\n      const map = {} as any;\n\n      invariant(Array.isArray(responseValue), \"Expected array entry\");\n      for (const entry of responseValue) {\n        invariant(entry.key != null, \"Expected key\");\n        invariant(entry.value != null, \"Expected value\");\n        const key = responseDataType.keyType.type === \"object\"\n          ? getObjectSpecifier(\n            entry.key,\n            responseDataType.keyType.object,\n            definitions,\n          )\n          : entry.key;\n        const value = await remapQueryResponse(\n          client,\n          responseDataType.valueType,\n          entry.value,\n          definitions,\n        );\n        map[key] = value;\n      }\n      return map;\n    }\n\n    case \"twoDimensionalAggregation\": {\n      const result: {\n        key: AllowedBucketKeyTypes;\n        value: AllowedBucketTypes;\n      }[] = [];\n      for (const { key, value } of responseValue.groups) {\n        result.push({ key, value });\n      }\n      return result as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"threeDimensionalAggregation\": {\n      const result: {\n        key: AllowedBucketKeyTypes;\n        groups: { key: AllowedBucketKeyTypes; value: AllowedBucketTypes }[];\n      }[] = [];\n      for (const { key, groups } of responseValue.groups) {\n        const subResult: { key: any; value: any }[] = [];\n        for (const { key: subKey, value } of groups) {\n          subResult.push({ key: subKey, value });\n        }\n        result.push({ key, groups: subResult });\n      }\n      return result as QueryReturnType<typeof responseDataType>;\n    }\n  }\n\n  return responseValue as QueryReturnType<typeof responseDataType>;\n}\n\nasync function getRequiredDefinitions(\n  dataType: QueryDataTypeDefinition,\n  client: MinimalClient,\n): Promise<Map<string, ObjectOrInterfaceDefinition>> {\n  const result = new Map<string, ObjectOrInterfaceDefinition>();\n  switch (dataType.type) {\n    case \"objectSet\": {\n      const objectDef = await client.ontologyProvider.getObjectDefinition(\n        dataType.objectSet,\n      );\n      result.set(dataType.objectSet, objectDef);\n      break;\n    }\n    case \"interfaceObjectSet\": {\n      const interfaceDef = await client.ontologyProvider.getInterfaceDefinition(\n        dataType.objectSet,\n      );\n      result.set(dataType.objectSet, interfaceDef);\n      break;\n    }\n    case \"object\": {\n      const objectDef = await client.ontologyProvider.getObjectDefinition(\n        dataType.object,\n      );\n      result.set(dataType.object, objectDef);\n      break;\n    }\n\n    case \"interface\": {\n      const interfaceDef = await client.ontologyProvider.getInterfaceDefinition(\n        dataType.interface,\n      );\n      result.set(dataType.interface, interfaceDef);\n      break;\n    }\n\n    case \"set\": {\n      return getRequiredDefinitions(dataType.set, client);\n    }\n    case \"array\": {\n      return getRequiredDefinitions(dataType.array, client);\n    }\n\n    case \"map\": {\n      const types = [dataType.keyType, dataType.valueType];\n\n      const allDefs = await Promise.all(\n        types.map(value => getRequiredDefinitions(value, client)),\n      );\n\n      for (const defs of allDefs) {\n        for (const [type, objectDef] of defs) {\n          result.set(type, objectDef);\n        }\n      }\n      break;\n    }\n\n    case \"struct\": {\n      const structValues = Object.values(dataType.struct);\n\n      const allDefs = await Promise.all(\n        structValues.map(value => getRequiredDefinitions(value, client)),\n      );\n\n      for (const defs of allDefs) {\n        for (const [type, objectDef] of defs) {\n          result.set(type, objectDef);\n        }\n      }\n      break;\n    }\n    case \"attachment\":\n    case \"boolean\":\n    case \"date\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"threeDimensionalAggregation\":\n    case \"timestamp\":\n    case \"twoDimensionalAggregation\":\n    case \"union\":\n      break;\n    default: {\n      const _: never = dataType;\n      break;\n    }\n  }\n\n  return result;\n}\nfunction requiresConversion(dataType: QueryDataTypeDefinition) {\n  switch (dataType.type) {\n    case \"boolean\":\n    case \"date\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"timestamp\":\n      return false;\n\n    case \"union\":\n      return true;\n\n    case \"struct\":\n      return Object.values(dataType.struct).some(requiresConversion);\n\n    case \"set\":\n      return requiresConversion(dataType.set);\n\n    case \"attachment\":\n    case \"objectSet\":\n    case \"twoDimensionalAggregation\":\n    case \"threeDimensionalAggregation\":\n    case \"object\":\n      return true;\n\n    default:\n      return false;\n  }\n}\n\nfunction getObjectSpecifier(\n  primaryKey: any,\n  objectTypeApiName: string,\n  definitions: Map<string, ObjectOrInterfaceDefinition>,\n): string {\n  const def = definitions.get(objectTypeApiName);\n  if (!def || def.type !== \"object\") {\n    throw new Error(\n      `Missing definition for ${objectTypeApiName}`,\n    );\n  }\n  return createObjectSpecifierFromPrimaryKey(\n    def,\n    primaryKey,\n  );\n}\n\nexport function createQueryObjectResponse<\n  Q extends ObjectTypeDefinition,\n>(\n  primaryKey: PrimaryKeyType<Q>,\n  objectDef: Q,\n): OsdkBase<Q> {\n  return {\n    $apiName: objectDef.apiName,\n    $title: undefined,\n    $objectType: objectDef.apiName,\n    $primaryKey: primaryKey,\n    $objectSpecifier: createObjectSpecifierFromPrimaryKey(\n      objectDef,\n      primaryKey,\n    ),\n  };\n}\n\nexport function createQueryInterfaceResponse<\n  Q extends InterfaceDefinition,\n>(\n  interfaceSpecifier: {\n    objectTypeApiName: string;\n    primaryKeyValue: PrimaryKeyType<Q>;\n  },\n  interfaceDef: Q,\n): OsdkBase<Q> {\n  return {\n    $apiName: interfaceDef.apiName,\n    $title: undefined,\n    $objectType: interfaceSpecifier.objectTypeApiName,\n    $primaryKey: interfaceSpecifier.primaryKeyValue,\n    $objectSpecifier: createObjectSpecifierFromInterfaceSpecifier(\n      interfaceDef,\n      interfaceSpecifier,\n    ),\n  };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAiBA,OAAO,KAAKA,YAAY,MAAM,0BAA0B;AACxD,OAAOC,SAAS,MAAM,gBAAgB;AAEtC,SAASC,eAAe,QAAQ,iCAAiC;AACjE,SAASC,gCAAgC,QAAQ,6CAA6C;AAC9F,SAASC,oCAAoC,QAAQ,iDAAiD;AACtG,SAASC,qBAAqB,QAAQ,kCAAkC;AACxE,SACEC,2CAA2C,EAC3CC,mCAAmC,QAC9B,iCAAiC;AACxC,SAASC,kBAAkB,QAAQ,+BAA+B;AAGlE,OAAO,eAAeC,UAAUA,CAI9BC,MAAqB,EACrBC,KAAS,EACTC,MAAU,EAGV;EACA;EACA,MAAMC,EAA0B,GAAGH,MAAM,CAACI,gBAAgB,CAACC,kBAAkB,CAC3EJ,KAAK,CAACK,OAAO,EACbL,KAAK,CAACM,cAAc,GAAGN,KAAK,CAACO,OAAO,GAAGC,SACzC,CAAC;EAED,IAAIT,MAAM,CAACU,UAAU,IAAI,IAAI,EAAE;IAC7B,MAAMV,MAAM,CAACU,UAAU,CAAC,CAAC;EAC3B;EAEA,MAAMC,QAAQ,GAAG,MAAMrB,YAAY,CAACsB,OAAO,CAACC,OAAO,CACjDnB,oCAAoC,CAClCC,qBAAqB,CAACK,MAAM,EAAE,OAAM;IAAEc,eAAe,EAAE;EAAa,CAAC,CAAC,CAAC,EACvEb,KACF,CAAC,EACD,MAAMD,MAAM,CAACe,WAAW,EACxBd,KAAK,CAACK,OAAO,EACb;IACEU,UAAU,EAAEd,MAAM,GACd,MAAMe,gBAAgB,CACtBf,MAAM,EACNF,MAAM,EACN,CAAC,MAAMG,EAAE,EAAEa,UACb,CAAC,GACC,CAAC;EACP,CAAC,EACD;IACER,OAAO,EAAEP,KAAK,CAACM,cAAc,GAAGN,KAAK,CAACO,OAAO,GAAGC,SAAS;IACzDS,aAAa,EAAElB,MAAM,CAACkB;EACxB,CACF,CAAC;EAED,MAAMC,gBAAgB,GAAG,MAAMC,sBAAsB,CACnD,CAAC,MAAMjB,EAAE,EAAEkB,MAAM,EACjBrB,MACF,CAAC;EACD,MAAMsB,gBAAgB,GAAG,MAAMC,kBAAkB,CAC/CvB,MAAM,EACN,CAAC,MAAMG,EAAE,EAAEkB,MAAM,EACjBV,QAAQ,CAACa,KAAK,EACdL,gBACF,CAAC;EACD,OAAOG,gBAAgB;AACzB;AAEA,eAAeL,gBAAgBA,CAC7Bf,MAAsC,EACtCF,MAAqB,EACrByB,UAAyD,EAChB;EACzC,MAAMC,YAAkD,GAAG,CAAC,CAAC;EAC7D,KAAK,MAAM,CAACC,GAAG,EAAEH,KAAK,CAAC,IAAII,MAAM,CAACC,OAAO,CAAC3B,MAAM,CAAC,EAAE;IACjDwB,YAAY,CAACC,GAAG,CAAC,GAAG,MAAM7B,kBAAkB,CAC1C0B,KAAK,EACLxB,MAAM,EACNyB,UAAU,CAACE,GAAG,CAChB,CAAC;EACH;EACA,OAAOD,YAAY;AACrB;AAEA,eAAeH,kBAAkBA,CAI/BvB,MAAqB,EACrB8B,gBAAmB,EACnBC,aAAwB,EACxBC,WAAqD,EACxB;EAC7B;EACA,IAAID,aAAa,IAAI,IAAI,EAAE;IACzB,IAAID,gBAAgB,CAACG,QAAQ,EAAE;MAC7B,OAAOxB,SAAS;IAClB,CAAC,MAAM;MACL,MAAM,IAAIyB,KAAK,CAAC,iDAAiD,CAAC;IACpE;EACF;EAEA,QAAQJ,gBAAgB,CAACK,IAAI;IAC3B,KAAK,OAAO;MAAE;QACZ,MAAM,IAAID,KAAK,CAAC,0CAA0C,CAAC;MAC7D;IAEA,KAAK,OAAO;MAAE;QACZ,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGL,aAAa,CAACM,MAAM,EAAED,CAAC,EAAE,EAAE;UAC7CL,aAAa,CAACK,CAAC,CAAC,GAAG,MAAMb,kBAAkB,CACzCvB,MAAM,EACN8B,gBAAgB,CAACQ,KAAK,EACtBP,aAAa,CAACK,CAAC,CAAC,EAChBJ,WACF,CAAC;QACH;QAEA,OAAOD,aAAa;MACtB;IAEA,KAAK,KAAK;MAAE;QACV,KAAK,IAAIK,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGL,aAAa,CAACM,MAAM,EAAED,CAAC,EAAE,EAAE;UAC7CL,aAAa,CAACK,CAAC,CAAC,GAAG,MAAMb,kBAAkB,CACzCvB,MAAM,EACN8B,gBAAgB,CAACS,GAAG,EACpBR,aAAa,CAACK,CAAC,CAAC,EAChBJ,WACF,CAAC;QACH;QAEA,OAAOD,aAAa;MACtB;IAEA,KAAK,YAAY;MAAE;QACjB,OAAOtC,gCAAgC,CACrCO,MAAM,EACN+B,aACF,CAAC;MAGH;IAEA,KAAK,QAAQ;MAAE;QACb,MAAMS,GAAG,GAAGR,WAAW,CAACS,GAAG,CAACX,gBAAgB,CAACY,MAAM,CAAC;QACpD,IAAI,CAACF,GAAG,IAAIA,GAAG,CAACL,IAAI,KAAK,QAAQ,EAAE;UACjC,MAAM,IAAID,KAAK,CACb,0BAA0BJ,gBAAgB,CAACY,MAAM,EACnD,CAAC;QACH;QACA,OAAOC,yBAAyB,CAC9BZ,aAAa,EACbS,GACF,CAAC;MAGH;IAEA,KAAK,WAAW;MAAE;QAChB,MAAMA,GAAG,GAAGR,WAAW,CAACS,GAAG,CAACX,gBAAgB,CAACc,SAAS,CAAC;QACvD,IAAI,CAACJ,GAAG,IAAIA,GAAG,CAACL,IAAI,KAAK,WAAW,EAAE;UACpC,MAAM,IAAID,KAAK,CACb,0BAA0BJ,gBAAgB,CAACc,SAAS,EACtD,CAAC;QACH;QAEA,OAAOC,4BAA4B,CACjCd,aAAa,EACbS,GACF,CAAC;MAGH;IAEA,KAAK,WAAW;MAAE;QAChB,MAAMA,GAAG,GAAGR,WAAW,CAACS,GAAG,CAACX,gBAAgB,CAACgB,SAAS,CAAC;QACvD,IAAI,CAACN,GAAG,EAAE;UACR,MAAM,IAAIN,KAAK,CACb,0BAA0BJ,gBAAgB,CAACgB,SAAS,EACtD,CAAC;QACH;QACA,IAAI,OAAOf,aAAa,KAAK,QAAQ,EAAE;UACrC,OAAOvC,eAAe,CAACgD,GAAG,EAAExC,MAAM,EAAE;YAClCmC,IAAI,EAAE,WAAW;YACjBY,UAAU,EAAE,CACV;cAAEZ,IAAI,EAAE,MAAM;cAAEa,UAAU,EAAElB,gBAAgB,CAACgB;YAAU,CAAC,EACxD;cAAEX,IAAI,EAAE,WAAW;cAAEc,SAAS,EAAElB;YAAc,CAAC;UAEnD,CAAC,CAAC;QACJ;QAEA,OAAOvC,eAAe,CACpBgD,GAAG,EACHxC,MAAM,EACN+B,aACF,CAAC;MAGH;IAEA,KAAK,QAAQ;MAAE;QACb;QACA,KAAK,MAAM,CAACJ,GAAG,EAAEuB,OAAO,CAAC,IAAItB,MAAM,CAACC,OAAO,CAACC,gBAAgB,CAACqB,MAAM,CAAC,EAAE;UACpE,IAAIC,kBAAkB,CAACF,OAAO,CAAC,EAAE;YAC/BnB,aAAa,CAACJ,GAAG,CAAC,GAAG,MAAMJ,kBAAkB,CAC3CvB,MAAM,EACNkD,OAAO,EACPnB,aAAa,CAACJ,GAAG,CAAC,EAClBK,WACF,CAAC;UACH;QACF;QAEA,OAAOD,aAAa;MACtB;IAEA,KAAK,KAAK;MAAE;QACV,MAAMsB,GAAG,GAAG,CAAC,CAAQ;QAErB,CAAUC,KAAK,CAACC,OAAO,CAACxB,aAAa,CAAC,GAAAyB,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAtCnE,SAAS,QAA+B,sBAAsB,IAA9DA,SAAS;QACT,KAAK,MAAMoE,KAAK,IAAI5B,aAAa,EAAE;UACjC,EAAU4B,KAAK,CAAChC,GAAG,IAAI,IAAI,IAAA6B,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAA3BnE,SAAS,QAAoB,cAAc,IAA3CA,SAAS;UACT,EAAUoE,KAAK,CAACnC,KAAK,IAAI,IAAI,IAAAgC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAA7BnE,SAAS,QAAsB,gBAAgB,IAA/CA,SAAS;UACT,MAAMoC,GAAG,GAAGG,gBAAgB,CAAC8B,OAAO,CAACzB,IAAI,KAAK,QAAQ,GAClD0B,kBAAkB,CAClBF,KAAK,CAAChC,GAAG,EACTG,gBAAgB,CAAC8B,OAAO,CAAClB,MAAM,EAC/BV,WACF,CAAC,GACC2B,KAAK,CAAChC,GAAG;UACb,MAAMH,KAAK,GAAG,MAAMD,kBAAkB,CACpCvB,MAAM,EACN8B,gBAAgB,CAACgC,SAAS,EAC1BH,KAAK,CAACnC,KAAK,EACXQ,WACF,CAAC;UACDqB,GAAG,CAAC1B,GAAG,CAAC,GAAGH,KAAK;QAClB;QACA,OAAO6B,GAAG;MACZ;IAEA,KAAK,2BAA2B;MAAE;QAChC,MAAMU,MAGH,GAAG,EAAE;QACR,KAAK,MAAM;UAAEpC,GAAG;UAAEH;QAAM,CAAC,IAAIO,aAAa,CAACiC,MAAM,EAAE;UACjDD,MAAM,CAACE,IAAI,CAAC;YAAEtC,GAAG;YAAEH;UAAM,CAAC,CAAC;QAC7B;QACA,OAAOuC,MAAM;MACf;IAEA,KAAK,6BAA6B;MAAE;QAClC,MAAMA,MAGH,GAAG,EAAE;QACR,KAAK,MAAM;UAAEpC,GAAG;UAAEqC;QAAO,CAAC,IAAIjC,aAAa,CAACiC,MAAM,EAAE;UAClD,MAAME,SAAqC,GAAG,EAAE;UAChD,KAAK,MAAM;YAAEvC,GAAG,EAAEwC,MAAM;YAAE3C;UAAM,CAAC,IAAIwC,MAAM,EAAE;YAC3CE,SAAS,CAACD,IAAI,CAAC;cAAEtC,GAAG,EAAEwC,MAAM;cAAE3C;YAAM,CAAC,CAAC;UACxC;UACAuC,MAAM,CAACE,IAAI,CAAC;YAAEtC,GAAG;YAAEqC,MAAM,EAAEE;UAAU,CAAC,CAAC;QACzC;QACA,OAAOH,MAAM;MACf;EACF;EAEA,OAAOhC,aAAa;AACtB;AAEA,eAAeX,sBAAsBA,CACnCgD,QAAiC,EACjCpE,MAAqB,EAC8B;EACnD,MAAM+D,MAAM,GAAG,IAAIM,GAAG,CAAsC,CAAC;EAC7D,QAAQD,QAAQ,CAACjC,IAAI;IACnB,KAAK,WAAW;MAAE;QAChB,MAAMmC,SAAS,GAAG,MAAMtE,MAAM,CAACI,gBAAgB,CAACmE,mBAAmB,CACjEH,QAAQ,CAACtB,SACX,CAAC;QACDiB,MAAM,CAACxB,GAAG,CAAC6B,QAAQ,CAACtB,SAAS,EAAEwB,SAAS,CAAC;QACzC;MACF;IACA,KAAK,oBAAoB;MAAE;QACzB,MAAME,YAAY,GAAG,MAAMxE,MAAM,CAACI,gBAAgB,CAACqE,sBAAsB,CACvEL,QAAQ,CAACtB,SACX,CAAC;QACDiB,MAAM,CAACxB,GAAG,CAAC6B,QAAQ,CAACtB,SAAS,EAAE0B,YAAY,CAAC;QAC5C;MACF;IACA,KAAK,QAAQ;MAAE;QACb,MAAMF,SAAS,GAAG,MAAMtE,MAAM,CAACI,gBAAgB,CAACmE,mBAAmB,CACjEH,QAAQ,CAAC1B,MACX,CAAC;QACDqB,MAAM,CAACxB,GAAG,CAAC6B,QAAQ,CAAC1B,MAAM,EAAE4B,SAAS,CAAC;QACtC;MACF;IAEA,KAAK,WAAW;MAAE;QAChB,MAAME,YAAY,GAAG,MAAMxE,MAAM,CAACI,gBAAgB,CAACqE,sBAAsB,CACvEL,QAAQ,CAACxB,SACX,CAAC;QACDmB,MAAM,CAACxB,GAAG,CAAC6B,QAAQ,CAACxB,SAAS,EAAE4B,YAAY,CAAC;QAC5C;MACF;IAEA,KAAK,KAAK;MAAE;QACV,OAAOpD,sBAAsB,CAACgD,QAAQ,CAAC7B,GAAG,EAAEvC,MAAM,CAAC;MACrD;IACA,KAAK,OAAO;MAAE;QACZ,OAAOoB,sBAAsB,CAACgD,QAAQ,CAAC9B,KAAK,EAAEtC,MAAM,CAAC;MACvD;IAEA,KAAK,KAAK;MAAE;QACV,MAAM0E,KAAK,GAAG,CAACN,QAAQ,CAACR,OAAO,EAAEQ,QAAQ,CAACN,SAAS,CAAC;QAEpD,MAAMa,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC/BH,KAAK,CAACrB,GAAG,CAAC7B,KAAK,IAAIJ,sBAAsB,CAACI,KAAK,EAAExB,MAAM,CAAC,CAC1D,CAAC;QAED,KAAK,MAAM8E,IAAI,IAAIH,OAAO,EAAE;UAC1B,KAAK,MAAM,CAACxC,IAAI,EAAEmC,SAAS,CAAC,IAAIQ,IAAI,EAAE;YACpCf,MAAM,CAACxB,GAAG,CAACJ,IAAI,EAAEmC,SAAS,CAAC;UAC7B;QACF;QACA;MACF;IAEA,KAAK,QAAQ;MAAE;QACb,MAAMS,YAAY,GAAGnD,MAAM,CAACoD,MAAM,CAACZ,QAAQ,CAACjB,MAAM,CAAC;QAEnD,MAAMwB,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC/BE,YAAY,CAAC1B,GAAG,CAAC7B,KAAK,IAAIJ,sBAAsB,CAACI,KAAK,EAAExB,MAAM,CAAC,CACjE,CAAC;QAED,KAAK,MAAM8E,IAAI,IAAIH,OAAO,EAAE;UAC1B,KAAK,MAAM,CAACxC,IAAI,EAAEmC,SAAS,CAAC,IAAIQ,IAAI,EAAE;YACpCf,MAAM,CAACxB,GAAG,CAACJ,IAAI,EAAEmC,SAAS,CAAC;UAC7B;QACF;QACA;MACF;IACA,KAAK,YAAY;IACjB,KAAK,SAAS;IACd,KAAK,MAAM;IACX,KAAK,QAAQ;IACb,KAAK,OAAO;IACZ,KAAK,SAAS;IACd,KAAK,MAAM;IACX,KAAK,QAAQ;IACb,KAAK,6BAA6B;IAClC,KAAK,WAAW;IAChB,KAAK,2BAA2B;IAChC,KAAK,OAAO;MACV;IACF;MAAS;QAEP;MACF;EACF;EAEA,OAAOP,MAAM;AACf;AACA,SAASX,kBAAkBA,CAACgB,QAAiC,EAAE;EAC7D,QAAQA,QAAQ,CAACjC,IAAI;IACnB,KAAK,SAAS;IACd,KAAK,MAAM;IACX,KAAK,QAAQ;IACb,KAAK,OAAO;IACZ,KAAK,SAAS;IACd,KAAK,MAAM;IACX,KAAK,QAAQ;IACb,KAAK,WAAW;MACd,OAAO,KAAK;IAEd,KAAK,OAAO;MACV,OAAO,IAAI;IAEb,KAAK,QAAQ;MACX,OAAOP,MAAM,CAACoD,MAAM,CAACZ,QAAQ,CAACjB,MAAM,CAAC,CAAC8B,IAAI,CAAC7B,kBAAkB,CAAC;IAEhE,KAAK,KAAK;MACR,OAAOA,kBAAkB,CAACgB,QAAQ,CAAC7B,GAAG,CAAC;IAEzC,KAAK,YAAY;IACjB,KAAK,WAAW;IAChB,KAAK,2BAA2B;IAChC,KAAK,6BAA6B;IAClC,KAAK,QAAQ;MACX,OAAO,IAAI;IAEb;MACE,OAAO,KAAK;EAChB;AACF;AAEA,SAASsB,kBAAkBA,CACzBqB,UAAe,EACfC,iBAAyB,EACzBnD,WAAqD,EAC7C;EACR,MAAMQ,GAAG,GAAGR,WAAW,CAACS,GAAG,CAAC0C,iBAAiB,CAAC;EAC9C,IAAI,CAAC3C,GAAG,IAAIA,GAAG,CAACL,IAAI,KAAK,QAAQ,EAAE;IACjC,MAAM,IAAID,KAAK,CACb,0BAA0BiD,iBAAiB,EAC7C,CAAC;EACH;EACA,OAAOtF,mCAAmC,CACxC2C,GAAG,EACH0C,UACF,CAAC;AACH;AAEA,OAAO,SAASvC,yBAAyBA,CAGvCuC,UAA6B,EAC7BZ,SAAY,EACC;EACb,OAAO;IACLc,QAAQ,EAAEd,SAAS,CAAChE,OAAO;IAC3B+E,MAAM,EAAE5E,SAAS;IACjB6E,WAAW,EAAEhB,SAAS,CAAChE,OAAO;IAC9BiF,WAAW,EAAEL,UAAU;IACvBM,gBAAgB,EAAE3F,mCAAmC,CACnDyE,SAAS,EACTY,UACF;EACF,CAAC;AACH;AAEA,OAAO,SAASrC,4BAA4BA,CAG1C4C,kBAGC,EACDjB,YAAe,EACF;EACb,OAAO;IACLY,QAAQ,EAAEZ,YAAY,CAAClE,OAAO;IAC9B+E,MAAM,EAAE5E,SAAS;IACjB6E,WAAW,EAAEG,kBAAkB,CAACN,iBAAiB;IACjDI,WAAW,EAAEE,kBAAkB,CAACC,eAAe;IAC/CF,gBAAgB,EAAE5F,2CAA2C,CAC3D4E,YAAY,EACZiB,kBACF;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"applyQuery.js","names":["OntologiesV2","invariant","createObjectSet","hydrateAttachmentFromRidInternal","addUserAgentAndRequestContextHeaders","augmentRequestContext","createObjectSpecifierFromInterfaceSpecifier","createObjectSpecifierFromPrimaryKey","toDataValueQueries","applyQuery","client","query","params","qd","ontologyProvider","getQueryDefinition","apiName","isFixedVersion","version","undefined","flushEdits","response","Queries","execute","finalMethodCall","ontologyRid","parameters","remapQueryParams","transactionId","branch","objectOutputDefs","getRequiredDefinitions","output","remappedResponse","remapQueryResponse","value","paramTypes","parameterMap","key","Object","entries","responseDataType","responseValue","definitions","nullable","Error","type","i","length","array","set","def","get","object","createQueryObjectResponse","interface","createQueryInterfaceResponse","objectSet","objectSets","objectType","reference","subtype","struct","requiresConversion","map","Array","isArray","process","env","NODE_ENV","entry","keyType","getObjectSpecifier","valueType","result","groups","push","subResult","subKey","dataType","Map","objectDef","getObjectDefinition","interfaceDef","getInterfaceDefinition","types","allDefs","Promise","all","defs","structValues","values","some","primaryKey","objectTypeApiName","$apiName","$title","$objectType","$primaryKey","$objectSpecifier","interfaceSpecifier","primaryKeyValue"],"sources":["applyQuery.ts"],"sourcesContent":["/*\n * Copyright 2024 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  AllowedBucketKeyTypes,\n  AllowedBucketTypes,\n  CompileTimeMetadata,\n  InterfaceDefinition,\n  ObjectOrInterfaceDefinition,\n  ObjectTypeDefinition,\n  OsdkBase,\n  PrimaryKeyType,\n  QueryDataTypeDefinition,\n  QueryDefinition,\n  QueryMetadata,\n  QueryParameterDefinition,\n} from \"@osdk/api\";\nimport type { DataValue } from \"@osdk/foundry.ontologies\";\nimport * as OntologiesV2 from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport type { MinimalClient } from \"../MinimalClientContext.js\";\nimport { createObjectSet } from \"../objectSet/createObjectSet.js\";\nimport { hydrateAttachmentFromRidInternal } from \"../public-utils/hydrateAttachmentFromRid.js\";\nimport { addUserAgentAndRequestContextHeaders } from \"../util/addUserAgentAndRequestContextHeaders.js\";\nimport { augmentRequestContext } from \"../util/augmentRequestContext.js\";\nimport {\n  createObjectSpecifierFromInterfaceSpecifier,\n  createObjectSpecifierFromPrimaryKey,\n} from \"../util/objectSpecifierUtils.js\";\nimport { toDataValueQueries } from \"../util/toDataValueQueries.js\";\nimport type { QueryParameterType, QueryReturnType } from \"./types.js\";\n\nexport async function applyQuery<\n  QD extends QueryDefinition<any>,\n  P extends QueryParameterType<CompileTimeMetadata<QD>[\"parameters\"]>,\n>(\n  client: MinimalClient,\n  query: QD,\n  params?: P,\n): Promise<\n  QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>\n> {\n  // We fire and forget so if a function has no parameters we don't unnecessarily load all metadata\n  const qd: Promise<QueryMetadata> = client.ontologyProvider.getQueryDefinition(\n    query.apiName,\n    query.isFixedVersion ? query.version : undefined,\n  );\n\n  if (client.flushEdits != null) {\n    await client.flushEdits();\n  }\n\n  const response = await OntologiesV2.Queries.execute(\n    addUserAgentAndRequestContextHeaders(\n      augmentRequestContext(client, _ => ({ finalMethodCall: \"applyQuery\" })),\n      query,\n    ),\n    await client.ontologyRid,\n    query.apiName,\n    {\n      parameters: params\n        ? await remapQueryParams(\n          params as { [parameterId: string]: any },\n          client,\n          (await qd).parameters,\n        )\n        : {},\n    },\n    {\n      version: query.isFixedVersion ? query.version : undefined,\n      transactionId: client.transactionId,\n      branch: client.branch,\n    },\n  );\n\n  const objectOutputDefs = await getRequiredDefinitions(\n    (await qd).output,\n    client,\n  );\n  const remappedResponse = await remapQueryResponse(\n    client,\n    (await qd).output,\n    response.value,\n    objectOutputDefs,\n  );\n  return remappedResponse as QueryReturnType<CompileTimeMetadata<QD>[\"output\"]>;\n}\n\nasync function remapQueryParams(\n  params: { [parameterId: string]: any },\n  client: MinimalClient,\n  paramTypes: Record<string, QueryParameterDefinition<any>>,\n): Promise<{ [parameterId: string]: any }> {\n  const parameterMap: { [parameterName: string]: unknown } = {};\n  for (const [key, value] of Object.entries(params)) {\n    parameterMap[key] = await toDataValueQueries(\n      value,\n      client,\n      paramTypes[key],\n    );\n  }\n  return parameterMap;\n}\n\nasync function remapQueryResponse<\n  Q extends ObjectTypeDefinition,\n  T extends QueryDataTypeDefinition<Q | never>,\n>(\n  client: MinimalClient,\n  responseDataType: T,\n  responseValue: DataValue,\n  definitions: Map<string, ObjectOrInterfaceDefinition>,\n): Promise<QueryReturnType<T>> {\n  // handle null responses\n  if (responseValue == null) {\n    if (responseDataType.nullable) {\n      return undefined as unknown as QueryReturnType<typeof responseDataType>;\n    } else {\n      throw new Error(\"Got null response when nullable was not allowed\");\n    }\n  }\n\n  switch (responseDataType.type) {\n    case \"union\": {\n      throw new Error(\"Union return types are not yet supported\");\n    }\n\n    case \"array\": {\n      for (let i = 0; i < responseValue.length; i++) {\n        responseValue[i] = await remapQueryResponse(\n          client,\n          responseDataType.array,\n          responseValue[i],\n          definitions,\n        );\n      }\n\n      return responseValue as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"set\": {\n      for (let i = 0; i < responseValue.length; i++) {\n        responseValue[i] = await remapQueryResponse(\n          client,\n          responseDataType.set,\n          responseValue[i],\n          definitions,\n        );\n      }\n\n      return responseValue as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"attachment\": {\n      return hydrateAttachmentFromRidInternal(\n        client,\n        responseValue,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"object\": {\n      const def = definitions.get(responseDataType.object);\n      if (!def || def.type !== \"object\") {\n        throw new Error(\n          `Missing definition for ${responseDataType.object}`,\n        );\n      }\n      return createQueryObjectResponse(\n        responseValue,\n        def,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"interface\": {\n      const def = definitions.get(responseDataType.interface);\n      if (!def || def.type !== \"interface\") {\n        throw new Error(\n          `Missing definition for ${responseDataType.interface}`,\n        );\n      }\n\n      return createQueryInterfaceResponse(\n        responseValue,\n        def,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"objectSet\": {\n      const def = definitions.get(responseDataType.objectSet);\n      if (!def) {\n        throw new Error(\n          `Missing definition for ${responseDataType.objectSet}`,\n        );\n      }\n      if (typeof responseValue === \"string\") {\n        return createObjectSet(def, client, {\n          type: \"intersect\",\n          objectSets: [\n            { type: \"base\", objectType: responseDataType.objectSet },\n            { type: \"reference\", reference: responseValue },\n          ],\n        }) as QueryReturnType<typeof responseDataType>;\n      }\n\n      return createObjectSet(\n        def,\n        client,\n        responseValue,\n      ) as QueryReturnType<\n        typeof responseDataType\n      >;\n    }\n\n    case \"struct\": {\n      // figure out what keys need to be fixed up\n      for (const [key, subtype] of Object.entries(responseDataType.struct)) {\n        if (requiresConversion(subtype)) {\n          responseValue[key] = await remapQueryResponse(\n            client,\n            subtype,\n            responseValue[key],\n            definitions,\n          );\n        }\n      }\n\n      return responseValue as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"map\": {\n      const map = {} as any;\n\n      invariant(Array.isArray(responseValue), \"Expected array entry\");\n      for (const entry of responseValue) {\n        invariant(entry.key != null, \"Expected key\");\n        invariant(entry.value != null, \"Expected value\");\n        const key = responseDataType.keyType.type === \"object\"\n          ? getObjectSpecifier(\n            entry.key,\n            responseDataType.keyType.object,\n            definitions,\n          )\n          : entry.key;\n        const value = await remapQueryResponse(\n          client,\n          responseDataType.valueType,\n          entry.value,\n          definitions,\n        );\n        map[key] = value;\n      }\n      return map;\n    }\n\n    case \"twoDimensionalAggregation\": {\n      const result: {\n        key: AllowedBucketKeyTypes;\n        value: AllowedBucketTypes;\n      }[] = [];\n      for (const { key, value } of responseValue.groups) {\n        result.push({ key, value });\n      }\n      return result as QueryReturnType<typeof responseDataType>;\n    }\n\n    case \"threeDimensionalAggregation\": {\n      const result: {\n        key: AllowedBucketKeyTypes;\n        groups: { key: AllowedBucketKeyTypes; value: AllowedBucketTypes }[];\n      }[] = [];\n      for (const { key, groups } of responseValue.groups) {\n        const subResult: { key: any; value: any }[] = [];\n        for (const { key: subKey, value } of groups) {\n          subResult.push({ key: subKey, value });\n        }\n        result.push({ key, groups: subResult });\n      }\n      return result as QueryReturnType<typeof responseDataType>;\n    }\n  }\n\n  return responseValue as QueryReturnType<typeof responseDataType>;\n}\n\nasync function getRequiredDefinitions(\n  dataType: QueryDataTypeDefinition,\n  client: MinimalClient,\n): Promise<Map<string, ObjectOrInterfaceDefinition>> {\n  const result = new Map<string, ObjectOrInterfaceDefinition>();\n  switch (dataType.type) {\n    case \"objectSet\": {\n      const objectDef = await client.ontologyProvider.getObjectDefinition(\n        dataType.objectSet,\n      );\n      result.set(dataType.objectSet, objectDef);\n      break;\n    }\n    case \"interfaceObjectSet\": {\n      const interfaceDef = await client.ontologyProvider.getInterfaceDefinition(\n        dataType.objectSet,\n      );\n      result.set(dataType.objectSet, interfaceDef);\n      break;\n    }\n    case \"object\": {\n      const objectDef = await client.ontologyProvider.getObjectDefinition(\n        dataType.object,\n      );\n      result.set(dataType.object, objectDef);\n      break;\n    }\n\n    case \"interface\": {\n      const interfaceDef = await client.ontologyProvider.getInterfaceDefinition(\n        dataType.interface,\n      );\n      result.set(dataType.interface, interfaceDef);\n      break;\n    }\n\n    case \"set\": {\n      return getRequiredDefinitions(dataType.set, client);\n    }\n    case \"array\": {\n      return getRequiredDefinitions(dataType.array, client);\n    }\n\n    case \"map\": {\n      const types = [dataType.keyType, dataType.valueType];\n\n      const allDefs = await Promise.all(\n        types.map(value => getRequiredDefinitions(value, client)),\n      );\n\n      for (const defs of allDefs) {\n        for (const [type, objectDef] of defs) {\n          result.set(type, objectDef);\n        }\n      }\n      break;\n    }\n\n    case \"struct\": {\n      const structValues = Object.values(dataType.struct);\n\n      const allDefs = await Promise.all(\n        structValues.map(value => getRequiredDefinitions(value, client)),\n      );\n\n      for (const defs of allDefs) {\n        for (const [type, objectDef] of defs) {\n          result.set(type, objectDef);\n        }\n      }\n      break;\n    }\n    case \"attachment\":\n    case \"boolean\":\n    case \"date\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"threeDimensionalAggregation\":\n    case \"timestamp\":\n    case \"twoDimensionalAggregation\":\n    case \"union\":\n      break;\n    default: {\n      const _: never = dataType;\n      break;\n    }\n  }\n\n  return result;\n}\nfunction requiresConversion(dataType: QueryDataTypeDefinition) {\n  switch (dataType.type) {\n    case \"boolean\":\n    case \"date\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"timestamp\":\n      return false;\n\n    case \"union\":\n      return true;\n\n    case \"struct\":\n      return Object.values(dataType.struct).some(requiresConversion);\n\n    case \"set\":\n      return requiresConversion(dataType.set);\n\n    case \"attachment\":\n    case \"objectSet\":\n    case \"twoDimensionalAggregation\":\n    case \"threeDimensionalAggregation\":\n    case \"object\":\n      return true;\n\n    default:\n      return false;\n  }\n}\n\nfunction getObjectSpecifier(\n  primaryKey: any,\n  objectTypeApiName: string,\n  definitions: Map<string, ObjectOrInterfaceDefinition>,\n): string {\n  const def = definitions.get(objectTypeApiName);\n  if (!def || def.type !== \"object\") {\n    throw new Error(\n      `Missing definition for ${objectTypeApiName}`,\n    );\n  }\n  return createObjectSpecifierFromPrimaryKey(\n    def,\n    primaryKey,\n  );\n}\n\nexport function createQueryObjectResponse<\n  Q extends ObjectTypeDefinition,\n>(\n  primaryKey: PrimaryKeyType<Q>,\n  objectDef: Q,\n): OsdkBase<Q> {\n  return {\n    $apiName: objectDef.apiName,\n    $title: undefined,\n    $objectType: objectDef.apiName,\n    $primaryKey: primaryKey,\n    $objectSpecifier: createObjectSpecifierFromPrimaryKey(\n      objectDef,\n      primaryKey,\n    ),\n  };\n}\n\nexport function createQueryInterfaceResponse<\n  Q extends InterfaceDefinition,\n>(\n  interfaceSpecifier: {\n    objectTypeApiName: string;\n    primaryKeyValue: PrimaryKeyType<Q>;\n  },\n  interfaceDef: Q,\n): OsdkBase<Q> {\n  return {\n    $apiName: interfaceDef.apiName,\n    $title: undefined,\n    $objectType: interfaceSpecifier.objectTypeApiName,\n    $primaryKey: interfaceSpecifier.primaryKeyValue,\n    $objectSpecifier: createObjectSpecifierFromInterfaceSpecifier(\n      interfaceDef,\n      interfaceSpecifier,\n    ),\n  };\n}\n"],"mappings":"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","ignoreList":[]}

package/build/esm/util/UserAgent.js

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

package/build/types/observable/internal/list/InterfaceListQuery.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAIE,WACA,sBACA,YAEK,WAAY;AAInB,cAAc,uBAAuB,6DAA8D;AAEnG,cAAc,oBAAoB,0DAA2D;AAC7F,cAAc,mBAAmB,sBAAuB;AACxD,cAAc,mCAAmC,qCAAsC;AACvF,cAAc,eAAe,eAAgB;AAG7C,cAAc,aAAa,aAAc;AACzC,SAAS,iBAAqC,gBAAiB;KAE1D,+BAA+B,OAAO,UAAU,YAAY;CAC/D,MAAM,eAAe;CACrB,eAAe,KAAK,eAAe;CACnC,cAAc,KAAK,eAAe;AACnC;AAED,OAAO,cAAM,2BAA2B,UAAU;CAChD,UAAU,gBAAgBA,OAAO,QAAQ,UAAU;CA8CnD,AAAM,qBAAqBC,kBAAkB;CAW7C,UAAgB,uBACdC,MAAM,KAAK,kBACV,QAAQ,KAAK;CAIhB,UAAU,cACRC,QAAQ,8BACP;CAeH,UAAU,uBACRC,SAAS,UACR;AA2BJ","names":["store: Store","apiName: string","data: Osdk.Instance<any>[]","params: CollectionConnectableParams","changes: Changes"],"sources":["../../../../../src/observable/internal/list/InterfaceListQuery.ts"],"version":3,"file":"InterfaceListQuery.d.ts"}
+{"mappings":"AAgBA,cAIE,WACA,sBACA,YAEK,WAAY;AAInB,cAAc,uBAAuB,6DAA8D;AAEnG,cAAc,oBAAoB,0DAA2D;AAC7F,cAAc,mBAAmB,sBAAuB;AACxD,cAAc,mCAAmC,qCAAsC;AACvF,cAAc,eAAe,eAAgB;AAI7C,cAAc,aAAa,aAAc;AACzC,SAAS,iBAA+C,gBAAiB;KAEpE,+BAA+B,OAAO,UAAU,YAAY;CAC/D,MAAM,eAAe;CACrB,eAAe,KAAK,eAAe;CACnC,cAAc,KAAK,eAAe;AACnC;AAED,OAAO,cAAM,2BAA2B,UAAU;CAChD,UAAU,gBAAgBA,OAAO,QAAQ,UAAU;CAgDnD,AAAM,qBAAqBC,kBAAkB;CAW7C,UAAgB,uBACdC,MAAM,KAAK,kBACV,QAAQ,KAAK;CAIhB,UAAU,cACRC,QAAQ,8BACP;CAeH,UAAU,uBACRC,SAAS,UACR;AA2BJ","names":["store: Store","apiName: string","data: Osdk.Instance<any>[]","params: CollectionConnectableParams","changes: Changes"],"sources":["../../../../../src/observable/internal/list/InterfaceListQuery.ts"],"version":3,"file":"InterfaceListQuery.d.ts"}

package/build/types/queries/applyQuery.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAGE,qBACA,qBAEA,sBACA,UACA,gBAEA,uBAGK,WAAY;AAInB,cAAc,qBAAqB,4BAA6B;AAUhE,cAAc,oBAAoB,uBAAuB,YAAa;AAEtE,OAAO,iBAAe;CACpB,WAAW;CACX,UAAU,mBAAmB,oBAAoB,IAAI;EAErDA,QAAQ,eACRC,OAAO,IACPC,SAAS,IACR,QACD,gBAAgB,oBAAoB,IAAI;AAwY1C,OAAO,iBAAS,0BACd,UAAU,sBAEVC,YAAY,eAAe,IAC3BC,WAAW,IACV,SAAS;AAaZ,OAAO,iBAAS,6BACd,UAAU,qBAEVC,oBAAoB;CAClB;CACA,iBAAiB,eAAe;AACjC,GACDC,cAAc,IACb,SAAS","names":["client: MinimalClient","query: QD","params?: P","primaryKey: PrimaryKeyType<Q>","objectDef: Q","interfaceSpecifier: {\n    objectTypeApiName: string;\n    primaryKeyValue: PrimaryKeyType<Q>;\n  }","interfaceDef: Q"],"sources":["../../../src/queries/applyQuery.ts"],"version":3,"file":"applyQuery.d.ts"}
+{"mappings":"AAgBA,cAGE,qBACA,qBAEA,sBACA,UACA,gBAEA,uBAGK,WAAY;AAInB,cAAc,qBAAqB,4BAA6B;AAUhE,cAAc,oBAAoB,uBAAuB,YAAa;AAEtE,OAAO,iBAAe;CACpB,WAAW;CACX,UAAU,mBAAmB,oBAAoB,IAAI;EAErDA,QAAQ,eACRC,OAAO,IACPC,SAAS,IACR,QACD,gBAAgB,oBAAoB,IAAI;AAyY1C,OAAO,iBAAS,0BACd,UAAU,sBAEVC,YAAY,eAAe,IAC3BC,WAAW,IACV,SAAS;AAaZ,OAAO,iBAAS,6BACd,UAAU,qBAEVC,oBAAoB;CAClB;CACA,iBAAiB,eAAe;AACjC,GACDC,cAAc,IACb,SAAS","names":["client: MinimalClient","query: QD","params?: P","primaryKey: PrimaryKeyType<Q>","objectDef: Q","interfaceSpecifier: {\n    objectTypeApiName: string;\n    primaryKeyValue: PrimaryKeyType<Q>;\n  }","interfaceDef: Q"],"sources":["../../../src/queries/applyQuery.ts"],"version":3,"file":"applyQuery.d.ts"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/client",
-  "version": "2.8.0-beta.11",
+  "version": "2.8.0-beta.13",
   "description": "",
   "access": "public",
   "license": "Apache-2.0",
@@ -56,9 +56,9 @@
     }
   },
   "dependencies": {
-    "@osdk/foundry.core": "2.47.0",
-    "@osdk/foundry.mediasets": "2.47.0",
-    "@osdk/foundry.ontologies": "2.47.0",
+    "@osdk/foundry.core": "2.50.0",
+    "@osdk/foundry.mediasets": "2.50.0",
+    "@osdk/foundry.ontologies": "2.50.0",
     "@osdk/shared.client": "^1.0.1",
     "@osdk/shared.client2": "^1.0.0",
     "@types/geojson": "^7946.0.16",
@@ -75,10 +75,10 @@
     "tiny-invariant": "^1.3.3",
     "type-fest": "^4.41.0",
     "ws": "^8.18.3",
-    "@osdk/api": "2.8.0-beta.11",
-    "@osdk/generator-converters": "2.8.0-beta.11",
-    "@osdk/client.unstable": "2.8.0-beta.11",
+    "@osdk/api": "2.8.0-beta.13",
+    "@osdk/client.unstable": "2.8.0-beta.13",
     "@osdk/shared.client.impl": "~1.8.0-beta.1",
+    "@osdk/generator-converters": "2.8.0-beta.13",
     "@osdk/shared.net.errors": "~2.8.0-beta.1",
     "@osdk/shared.net.fetch": "~1.8.0-beta.1"
   },
@@ -101,10 +101,10 @@
     "ts-expect": "^1.3.0",
     "typescript": "~5.5.4",
     "zod": "^3.25.76",
-    "@osdk/client.test.ontology": "~2.8.0-beta.11",
-    "@osdk/monorepo.api-extractor": "~0.7.0-beta.1",
+    "@osdk/client.test.ontology": "~2.8.0-beta.13",
     "@osdk/shared.test": "~2.8.0-beta.2",
-    "@osdk/monorepo.tsconfig": "~0.7.0-beta.1"
+    "@osdk/monorepo.tsconfig": "~0.7.0-beta.1",
+    "@osdk/monorepo.api-extractor": "~0.7.0-beta.1"
   },
   "publishConfig": {
     "access": "public"