@osdk/client 2.7.0-beta.10 → 2.7.0-beta.12

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

@@ -16,7 +16,7 @@
 
 import groupBy from "object.groupby";
 import invariant from "tiny-invariant";
-import { ObjectDefRef, UnderlyingOsdkObject } from "../../../object/convertWireToOsdkObjects/InternalSymbols.js";
+import { ObjectDefRef } from "../../../object/convertWireToOsdkObjects/InternalSymbols.js";
 import { ListQuery, RDP_IDX } from "./ListQuery.js";
 export class InterfaceListQuery extends ListQuery {
   createObjectSet(store) {
@@ -42,6 +42,17 @@ export class InterfaceListQuery extends ListQuery {
   async postProcessFetchedData(data) {
     return reloadDataAsFullObjects(this.store.client, data);
   }
+  createPayload(params) {
+    const resolvedList = params.resolvedData.map(obj => obj.$as(this.apiName));
+    return {
+      resolvedList,
+      isOptimistic: params.isOptimistic,
+      fetchMore: this.fetchMore,
+      hasMore: this.nextPageToken != null,
+      status: params.status,
+      lastUpdated: params.lastUpdated
+    };
+  }
   extractRelevantObjects(changes) {
     const matchesApiName = ([, object]) => {
       return this.apiName in object[ObjectDefRef].interfaceMap;
@@ -65,12 +76,16 @@ export class InterfaceListQuery extends ListQuery {
 
 // Hopefully this can go away when we can just request the full object properties on first load
 async function reloadDataAsFullObjects(client, data) {
+  if (data.length === 0) {
+    return data;
+  }
   const groups = groupBy(data, x => x.$objectType);
   const objectTypeToPrimaryKeyToObject = Object.fromEntries(await Promise.all(Object.entries(groups).map(async ([apiName, objects]) => {
-    // to keep InternalSimpleOsdkInstance simple, we make both the `ObjectDefRef` and
-    // the `InterfaceDefRef` optional but we know that the right one is on there
-    // thus we can `!`
-    const objectDef = objects[0][UnderlyingOsdkObject][ObjectDefRef];
+    // Interface query results don't have ObjectDefRef, so we fetch metadata to get primaryKeyApiName
+    const objectDef = await client.fetchMetadata({
+      type: "object",
+      apiName
+    });
     const where = {
       [objectDef.primaryKeyApiName]: {
         $in: objects.map(x => x.$primaryKey)
@@ -79,10 +94,10 @@ async function reloadDataAsFullObjects(client, data) {
     const result = await client(objectDef).where(where).fetchPage();
     return [apiName, Object.fromEntries(result.data.map(x => [x.$primaryKey, x]))];
   })));
-  data = data.map(obj => {
-    !objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey] ? process.env.NODE_ENV !== "production" ? invariant(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant(false) : void 0;
-    return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
+  return data.map(obj => {
+    const fullObject = objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];
+    !fullObject ? process.env.NODE_ENV !== "production" ? invariant(false, `Could not find object ${obj.$objectType} ${obj.$primaryKey}`) : invariant(false) : void 0;
+    return fullObject;
   });
-  return data;
 }
 //# sourceMappingURL=InterfaceListQuery.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"InterfaceListQuery.js","names":["groupBy","invariant","ObjectDefRef","UnderlyingOsdkObject","ListQuery","RDP_IDX","InterfaceListQuery","createObjectSet","store","rdpConfig","cacheKey","otherKeys","objectTypeDef","type","apiName","client","withProperties","where","canonicalWhere","revalidateObjectType","objectMetadata","fetchMetadata","interfaceMap","revalidate","postProcessFetchedData","data","reloadDataAsFullObjects","extractRelevantObjects","changes","matchesApiName","object","added","Array","from","addedObjects","filter","map","$as","modified","modifiedObjects","all","strictMatches","Set","sortaMatches","groups","x","$objectType","objectTypeToPrimaryKeyToObject","Object","fromEntries","Promise","entries","objects","objectDef","primaryKeyApiName","$in","$primaryKey","result","fetchPage","obj","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 { ObjectSet, ObjectTypeDefinition, Osdk } 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 {\n  ObjectDefRef,\n  UnderlyingOsdkObject,\n} from \"../../../object/convertWireToOsdkObjects/InternalSymbols.js\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.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, 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 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 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  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        // to keep InternalSimpleOsdkInstance simple, we make both the `ObjectDefRef` and\n        // the `InterfaceDefRef` optional but we know that the right one is on there\n        // thus we can `!`\n        const objectDef = (objects[0] as ObjectHolder)[UnderlyingOsdkObject][\n          ObjectDefRef\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();\n        return [\n          apiName,\n          Object.fromEntries(result.data.map(\n            x => [x.$primaryKey, x],\n          )),\n        ];\n      }),\n    ),\n  );\n\n  data = data.map((obj) => {\n    invariant(\n      objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey],\n      `Could not find object ${obj.$objectType} ${obj.$primaryKey}`,\n    );\n    return objectTypeToPrimaryKeyToObject[obj.$objectType][obj.$primaryKey];\n  });\n\n  return data;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"InterfaceListQuery.js","names":["groupBy","invariant","ObjectDefRef","ListQuery","RDP_IDX","InterfaceListQuery","createObjectSet","store","rdpConfig","cacheKey","otherKeys","objectTypeDef","type","apiName","client","withProperties","where","canonicalWhere","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","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 { ObjectSet, ObjectTypeDefinition, Osdk } 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, 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 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();\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":[]}

package/build/browser/observable/internal/object/ObjectsHelper.js

@@ -41,10 +41,8 @@ export class ObjectsHelper extends AbstractHelper {
    * @internal
    */
   storeOsdkInstances(values, batch, rdpConfig) {
-    // update the cache for any object that has changed
-    // and save the mapped values to return
     return values.map(v => this.getQuery({
-      apiName: v.$apiName,
+      apiName: v.$objectType ?? v.$apiName,
       pk: v.$primaryKey
     }, rdpConfig).writeToStore(v, "loaded", batch).cacheKey);
   }

package/build/browser/observable/internal/object/ObjectsHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectsHelper.js","names":["deepEqual","AbstractHelper","tombstone","mergeObjectFields","ObjectQuery","ObjectsHelper","observe","options","subFn","getQuery","rdpConfig","apiName","pk","objectCacheKey","cacheKeys","get","undefined","store","queries","subjects","dedupeInterval","storeOsdkInstances","values","batch","map","v","$apiName","$primaryKey","writeToStore","cacheKey","propagateWrite","sourceCacheKey","value","status","existing","read","dataChanged","statusChanged","valueToWrite","write","changes","registerObject","metadata","objectCacheKeyRegistry","getMetadata","relatedKeys","getVariants","primaryKey","Set","targetKey","isKeyActive","targetCurrentValue","merged","mergeForTarget","isObjectHolder","key","subject","peek","observed","sourceValue","targetCacheKey","sourceRdpFields","getRdpFieldSet","targetRdpFields"],"sources":["ObjectsHelper.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  InterfaceDefinition,\n  ObjectTypeDefinition,\n  Osdk,\n} from \"@osdk/api\";\nimport deepEqual from \"fast-deep-equal\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.js\";\nimport type { ObjectPayload } from \"../../ObjectPayload.js\";\nimport type { ObserveObjectOptions } from \"../../ObservableClient.js\";\nimport type { Observer, Status } from \"../../ObservableClient/common.js\";\nimport { AbstractHelper } from \"../AbstractHelper.js\";\nimport type { BatchContext } from \"../BatchContext.js\";\nimport type { Canonical } from \"../Canonical.js\";\nimport type { QuerySubscription } from \"../QuerySubscription.js\";\nimport type { Rdp } from \"../RdpCanonicalizer.js\";\nimport { tombstone } from \"../tombstone.js\";\nimport { mergeObjectFields } from \"../utils/rdpFieldOperations.js\";\nimport { type ObjectCacheKey } from \"./ObjectCacheKey.js\";\nimport { ObjectQuery } from \"./ObjectQuery.js\";\n\nexport class ObjectsHelper extends AbstractHelper<\n  ObjectQuery,\n  ObserveObjectOptions<any>\n> {\n  observe<T extends ObjectTypeDefinition | InterfaceDefinition>(\n    options: ObserveObjectOptions<T>,\n    subFn: Observer<ObjectPayload>,\n  ): QuerySubscription<ObjectQuery> {\n    return super.observe(options, subFn);\n  }\n\n  getQuery<T extends ObjectTypeDefinition | InterfaceDefinition>(\n    options: ObserveObjectOptions<T>,\n    rdpConfig?: Canonical<Rdp> | null,\n  ): ObjectQuery {\n    const apiName = typeof options.apiName === \"string\"\n      ? options.apiName\n      : options.apiName.apiName;\n    const { pk } = options;\n\n    const objectCacheKey = this.cacheKeys.get<ObjectCacheKey>(\n      \"object\",\n      apiName,\n      pk,\n      rdpConfig ?? undefined,\n    );\n\n    return this.store.queries.get(objectCacheKey, () =>\n      new ObjectQuery(\n        this.store,\n        this.store.subjects.get(objectCacheKey),\n        apiName,\n        pk,\n        objectCacheKey,\n        { dedupeInterval: 0 },\n      ));\n  }\n\n  /**\n   * Internal helper method for writing objects to the store and returning their\n   * object keys. For list queries with RDPs, the rdpConfig is included in the\n   * cache key to ensure proper data isolation.\n   * @internal\n   */\n  public storeOsdkInstances(\n    values: Array<ObjectHolder> | Array<Osdk.Instance<any, any, any>>,\n    batch: BatchContext,\n    rdpConfig?: Canonical<Rdp> | null,\n  ): ObjectCacheKey[] {\n    // update the cache for any object that has changed\n    // and save the mapped values to return\n    return values.map(v =>\n      this.getQuery({\n        apiName: v.$apiName,\n        pk: v.$primaryKey as string | number,\n      }, rdpConfig).writeToStore(\n        v as ObjectHolder,\n        \"loaded\",\n        batch,\n      ).cacheKey\n    );\n  }\n\n  /**\n   * Write an object to cache and propagate to all related cache keys\n   * @internal\n   */\n  public propagateWrite(\n    sourceCacheKey: ObjectCacheKey,\n    value: ObjectHolder | typeof tombstone,\n    status: Status,\n    batch: BatchContext,\n  ): void {\n    const existing = batch.read(sourceCacheKey);\n    const dataChanged = !existing\n      || existing.value === undefined\n      || value === tombstone\n      || !deepEqual(existing.value, value);\n    const statusChanged = !existing || existing.status !== status;\n\n    if (!dataChanged && !statusChanged) {\n      return;\n    }\n\n    const valueToWrite = !dataChanged && existing ? existing.value : value;\n    batch.write(sourceCacheKey, valueToWrite, status);\n\n    if (value !== tombstone) {\n      batch.changes.registerObject(sourceCacheKey, value, !existing);\n    }\n\n    const metadata = this.store.objectCacheKeyRegistry.getMetadata(\n      sourceCacheKey,\n    );\n\n    const relatedKeys = metadata\n      ? this.store.objectCacheKeyRegistry.getVariants(\n        metadata.apiName,\n        metadata.primaryKey,\n      )\n      : new Set([sourceCacheKey]);\n\n    for (const targetKey of relatedKeys) {\n      if (targetKey === sourceCacheKey || !this.isKeyActive(targetKey)) {\n        continue;\n      }\n\n      if (value === tombstone) {\n        batch.write(targetKey, tombstone, status);\n        continue;\n      }\n\n      const targetCurrentValue = batch.read(targetKey)?.value;\n      const merged = this.mergeForTarget(\n        value,\n        targetCurrentValue && this.isObjectHolder(targetCurrentValue)\n          ? targetCurrentValue\n          : undefined,\n        sourceCacheKey,\n        targetKey,\n      );\n\n      batch.write(targetKey, merged, status);\n    }\n  }\n\n  /**\n   * Check if a cache key is actively observed\n   */\n  private isKeyActive(key: ObjectCacheKey): boolean {\n    const subject = this.store.subjects.peek(key);\n    return subject?.observed === true;\n  }\n\n  /**\n   * Type guard to check if a value is an ObjectHolder\n   */\n  private isObjectHolder(\n    value: ObjectHolder | undefined,\n  ): value is ObjectHolder {\n    return value != null\n      && typeof value === \"object\"\n      && \"$apiName\" in value\n      && \"$primaryKey\" in value;\n  }\n\n  /**\n   * Merge object data for a specific target cache key, preserving RDP fields\n   */\n  private mergeForTarget(\n    sourceValue: ObjectHolder,\n    targetCurrentValue: ObjectHolder | undefined,\n    sourceCacheKey: ObjectCacheKey,\n    targetCacheKey: ObjectCacheKey,\n  ): ObjectHolder {\n    const sourceRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(\n      sourceCacheKey,\n    );\n    const targetRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(\n      targetCacheKey,\n    );\n\n    return mergeObjectFields(\n      sourceValue,\n      sourceRdpFields,\n      targetRdpFields,\n      targetCurrentValue,\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ObjectsHelper.js","names":["deepEqual","AbstractHelper","tombstone","mergeObjectFields","ObjectQuery","ObjectsHelper","observe","options","subFn","getQuery","rdpConfig","apiName","pk","objectCacheKey","cacheKeys","get","undefined","store","queries","subjects","dedupeInterval","storeOsdkInstances","values","batch","map","v","$objectType","$apiName","$primaryKey","writeToStore","cacheKey","propagateWrite","sourceCacheKey","value","status","existing","read","dataChanged","statusChanged","valueToWrite","write","changes","registerObject","metadata","objectCacheKeyRegistry","getMetadata","relatedKeys","getVariants","primaryKey","Set","targetKey","isKeyActive","targetCurrentValue","merged","mergeForTarget","isObjectHolder","key","subject","peek","observed","sourceValue","targetCacheKey","sourceRdpFields","getRdpFieldSet","targetRdpFields"],"sources":["ObjectsHelper.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  InterfaceDefinition,\n  ObjectTypeDefinition,\n  Osdk,\n} from \"@osdk/api\";\nimport deepEqual from \"fast-deep-equal\";\nimport type { ObjectHolder } from \"../../../object/convertWireToOsdkObjects/ObjectHolder.js\";\nimport type { ObjectPayload } from \"../../ObjectPayload.js\";\nimport type { ObserveObjectOptions } from \"../../ObservableClient.js\";\nimport type { Observer, Status } from \"../../ObservableClient/common.js\";\nimport { AbstractHelper } from \"../AbstractHelper.js\";\nimport type { BatchContext } from \"../BatchContext.js\";\nimport type { Canonical } from \"../Canonical.js\";\nimport type { QuerySubscription } from \"../QuerySubscription.js\";\nimport type { Rdp } from \"../RdpCanonicalizer.js\";\nimport { tombstone } from \"../tombstone.js\";\nimport { mergeObjectFields } from \"../utils/rdpFieldOperations.js\";\nimport { type ObjectCacheKey } from \"./ObjectCacheKey.js\";\nimport { ObjectQuery } from \"./ObjectQuery.js\";\n\nexport class ObjectsHelper extends AbstractHelper<\n  ObjectQuery,\n  ObserveObjectOptions<any>\n> {\n  observe<T extends ObjectTypeDefinition | InterfaceDefinition>(\n    options: ObserveObjectOptions<T>,\n    subFn: Observer<ObjectPayload>,\n  ): QuerySubscription<ObjectQuery> {\n    return super.observe(options, subFn);\n  }\n\n  getQuery<T extends ObjectTypeDefinition | InterfaceDefinition>(\n    options: ObserveObjectOptions<T>,\n    rdpConfig?: Canonical<Rdp> | null,\n  ): ObjectQuery {\n    const apiName = typeof options.apiName === \"string\"\n      ? options.apiName\n      : options.apiName.apiName;\n    const { pk } = options;\n\n    const objectCacheKey = this.cacheKeys.get<ObjectCacheKey>(\n      \"object\",\n      apiName,\n      pk,\n      rdpConfig ?? undefined,\n    );\n\n    return this.store.queries.get(objectCacheKey, () =>\n      new ObjectQuery(\n        this.store,\n        this.store.subjects.get(objectCacheKey),\n        apiName,\n        pk,\n        objectCacheKey,\n        { dedupeInterval: 0 },\n      ));\n  }\n\n  /**\n   * Internal helper method for writing objects to the store and returning their\n   * object keys. For list queries with RDPs, the rdpConfig is included in the\n   * cache key to ensure proper data isolation.\n   * @internal\n   */\n  public storeOsdkInstances(\n    values: Array<ObjectHolder> | Array<Osdk.Instance<any, any, any>>,\n    batch: BatchContext,\n    rdpConfig?: Canonical<Rdp> | null,\n  ): ObjectCacheKey[] {\n    return values.map(v =>\n      this.getQuery({\n        apiName: v.$objectType ?? v.$apiName,\n        pk: v.$primaryKey as string | number,\n      }, rdpConfig).writeToStore(\n        v as ObjectHolder,\n        \"loaded\",\n        batch,\n      ).cacheKey\n    );\n  }\n\n  /**\n   * Write an object to cache and propagate to all related cache keys\n   * @internal\n   */\n  public propagateWrite(\n    sourceCacheKey: ObjectCacheKey,\n    value: ObjectHolder | typeof tombstone,\n    status: Status,\n    batch: BatchContext,\n  ): void {\n    const existing = batch.read(sourceCacheKey);\n    const dataChanged = !existing\n      || existing.value === undefined\n      || value === tombstone\n      || !deepEqual(existing.value, value);\n    const statusChanged = !existing || existing.status !== status;\n\n    if (!dataChanged && !statusChanged) {\n      return;\n    }\n\n    const valueToWrite = !dataChanged && existing ? existing.value : value;\n    batch.write(sourceCacheKey, valueToWrite, status);\n\n    if (value !== tombstone) {\n      batch.changes.registerObject(sourceCacheKey, value, !existing);\n    }\n\n    const metadata = this.store.objectCacheKeyRegistry.getMetadata(\n      sourceCacheKey,\n    );\n\n    const relatedKeys = metadata\n      ? this.store.objectCacheKeyRegistry.getVariants(\n        metadata.apiName,\n        metadata.primaryKey,\n      )\n      : new Set([sourceCacheKey]);\n\n    for (const targetKey of relatedKeys) {\n      if (targetKey === sourceCacheKey || !this.isKeyActive(targetKey)) {\n        continue;\n      }\n\n      if (value === tombstone) {\n        batch.write(targetKey, tombstone, status);\n        continue;\n      }\n\n      const targetCurrentValue = batch.read(targetKey)?.value;\n      const merged = this.mergeForTarget(\n        value,\n        targetCurrentValue && this.isObjectHolder(targetCurrentValue)\n          ? targetCurrentValue\n          : undefined,\n        sourceCacheKey,\n        targetKey,\n      );\n\n      batch.write(targetKey, merged, status);\n    }\n  }\n\n  /**\n   * Check if a cache key is actively observed\n   */\n  private isKeyActive(key: ObjectCacheKey): boolean {\n    const subject = this.store.subjects.peek(key);\n    return subject?.observed === true;\n  }\n\n  /**\n   * Type guard to check if a value is an ObjectHolder\n   */\n  private isObjectHolder(\n    value: ObjectHolder | undefined,\n  ): value is ObjectHolder {\n    return value != null\n      && typeof value === \"object\"\n      && \"$apiName\" in value\n      && \"$primaryKey\" in value;\n  }\n\n  /**\n   * Merge object data for a specific target cache key, preserving RDP fields\n   */\n  private mergeForTarget(\n    sourceValue: ObjectHolder,\n    targetCurrentValue: ObjectHolder | undefined,\n    sourceCacheKey: ObjectCacheKey,\n    targetCacheKey: ObjectCacheKey,\n  ): ObjectHolder {\n    const sourceRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(\n      sourceCacheKey,\n    );\n    const targetRdpFields = this.store.objectCacheKeyRegistry.getRdpFieldSet(\n      targetCacheKey,\n    );\n\n    return mergeObjectFields(\n      sourceValue,\n      sourceRdpFields,\n      targetRdpFields,\n      targetCurrentValue,\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/public/unstable-do-not-use.js.map

@@ -1 +1 @@
-{"version":3,"file":"unstable-do-not-use.js","names":["augment","computeObjectSetCacheKey","createObservableClient","getMetaTagContent","getOsdkConfig","createClientWithTransaction"],"sources":["unstable-do-not-use.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\nexport { augment } from \"../object/fetchPage.js\";\n\n// THIS IS NOT THE FINAL NAME DO NOT SHIP LIKE THIS\nexport type { ActionSignatureFromDef } from \"../actions/applyAction.js\";\nexport { computeObjectSetCacheKey } from \"../observable/computeObjectSetCacheKey.js\";\nexport { createObservableClient } from \"../observable/ObservableClient.js\";\nexport type {\n  ObservableClient,\n  ObserveAggregationArgs,\n  ObserveObjectCallbackArgs,\n  ObserveObjectsCallbackArgs,\n  ObserveObjectSetArgs,\n  Unsubscribable,\n} from \"../observable/ObservableClient.js\";\nexport type { Observer } from \"../observable/ObservableClient/common.js\";\nexport type { ObserveLinks } from \"../observable/ObservableClient/ObserveLink.js\";\nexport {\n  getMetaTagContent,\n  getOsdkConfig,\n} from \"../public-utils/osdkConfig.js\";\nexport type { OsdkConfig } from \"../public-utils/osdkConfig.js\";\n\nexport { createClientWithTransaction } from \"../createClient.js\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,OAAO,QAAQ,wBAAwB;;AAEhD;;AAEA,SAASC,wBAAwB,QAAQ,2CAA2C;AACpF,SAASC,sBAAsB,QAAQ,mCAAmC;AAW1E,SACEC,iBAAiB,EACjBC,aAAa,QACR,+BAA+B;AAGtC,SAASC,2BAA2B,QAAQ,oBAAoB","ignoreList":[]}
+{"version":3,"file":"unstable-do-not-use.js","names":["augment","computeObjectSetCacheKey","createObservableClient","getMetaTagContent","getOsdkConfig","createClientWithTransaction"],"sources":["unstable-do-not-use.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\nexport { augment } from \"../object/fetchPage.js\";\n\n// THIS IS NOT THE FINAL NAME DO NOT SHIP LIKE THIS\nexport type { ActionSignatureFromDef } from \"../actions/applyAction.js\";\nexport { computeObjectSetCacheKey } from \"../observable/computeObjectSetCacheKey.js\";\nexport { createObservableClient } from \"../observable/ObservableClient.js\";\nexport type {\n  ObservableClient,\n  ObserveAggregationArgs,\n  ObserveFunctionCallbackArgs,\n  ObserveFunctionOptions,\n  ObserveObjectCallbackArgs,\n  ObserveObjectsCallbackArgs,\n  ObserveObjectSetArgs,\n  Unsubscribable,\n} from \"../observable/ObservableClient.js\";\nexport type { Observer } from \"../observable/ObservableClient/common.js\";\nexport type { ObserveLinks } from \"../observable/ObservableClient/ObserveLink.js\";\nexport {\n  getMetaTagContent,\n  getOsdkConfig,\n} from \"../public-utils/osdkConfig.js\";\nexport type { OsdkConfig } from \"../public-utils/osdkConfig.js\";\n\nexport { createClientWithTransaction } from \"../createClient.js\";\nexport type { QueryParameterType, QueryReturnType } from \"../queries/types.js\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,OAAO,QAAQ,wBAAwB;;AAEhD;;AAEA,SAASC,wBAAwB,QAAQ,2CAA2C;AACpF,SAASC,sBAAsB,QAAQ,mCAAmC;AAa1E,SACEC,iBAAiB,EACjBC,aAAa,QACR,+BAA+B;AAGtC,SAASC,2BAA2B,QAAQ,oBAAoB","ignoreList":[]}

package/build/browser/util/UserAgent.js

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

package/build/browser/util/isObjectSpecifiersObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"isObjectSpecifiersObject.js","names":["isObjectSpecifiersObject","o","$apiName","$primaryKey"],"sources":["isObjectSpecifiersObject.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 { PrimaryKeyTypes } from \"@osdk/api\";\n\nexport function isObjectSpecifiersObject(\n  o: any,\n): o is { $apiName: string; $primaryKey: PrimaryKeyTypes } {\n  return o && typeof o === \"object\" && typeof o.$apiName === \"string\"\n    && o.$primaryKey != null;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,OAAO,SAASA,wBAAwBA,CACtCC,CAAM,EACmD;EACzD,OAAOA,CAAC,IAAI,OAAOA,CAAC,KAAK,QAAQ,IAAI,OAAOA,CAAC,CAACC,QAAQ,KAAK,QAAQ,IAC9DD,CAAC,CAACE,WAAW,IAAI,IAAI;AAC5B","ignoreList":[]}
+{"version":3,"file":"isObjectSpecifiersObject.js","names":["isObjectSpecifiersObject","o","$apiName","$primaryKey"],"sources":["isObjectSpecifiersObject.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 { PrimaryKeyTypes } from \"@osdk/api\";\n\nexport function isObjectSpecifiersObject(\n  o: any,\n): o is {\n  $apiName: string;\n  $objectType?: string;\n  $primaryKey: PrimaryKeyTypes;\n} {\n  return o && typeof o === \"object\" && typeof o.$apiName === \"string\"\n    && o.$primaryKey != null;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,OAAO,SAASA,wBAAwBA,CACtCC,CAAM,EAKN;EACA,OAAOA,CAAC,IAAI,OAAOA,CAAC,KAAK,QAAQ,IAAI,OAAOA,CAAC,CAACC,QAAQ,KAAK,QAAQ,IAC9DD,CAAC,CAACE,WAAW,IAAI,IAAI;AAC5B","ignoreList":[]}

package/build/cjs/{Client-DaUJl7jZ.d.cts → Client-Cmx6x_V1.d.cts}

@@ -63,4 +63,4 @@ interface Client extends SharedClient, OldSharedClient {
     fetchMetadata<Q extends (ObjectTypeDefinition | InterfaceDefinition | ActionDefinition<any> | QueryDefinition<any>)>(o: Q): Promise<Q extends ObjectTypeDefinition ? ObjectMetadata : Q extends InterfaceDefinition ? InterfaceMetadata : Q extends ActionDefinition<any> ? ActionMetadata : Q extends QueryDefinition<any> ? QueryMetadata : never>;
 }
 
-export type { ActionSignatureFromDef as A, Client as C };
+export type { ActionSignatureFromDef as A, Client as C, QueryReturnType as Q, QueryParameterType as a };

package/build/cjs/{chunk-RDZ5NKAI.cjs → chunk-4HXJEKQT.cjs}

@@ -1757,7 +1757,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     });
     !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant4__default.default(false, "Stack must be a URL") : invariant4__default.default(false) : void 0;
   }
-  async subscribe(objectType, objectSet, listener, properties = []) {
+  async subscribe(objectType, objectSet, listener, properties = [], shouldLoadRids = false) {
     const objOrInterfaceDef = objectType.type === "object" ? await this.#client.ontologyProvider.getObjectDefinition(objectType.apiName) : await this.#client.ontologyProvider.getInterfaceDefinition(objectType.apiName);
     let objectProperties = [];
     let referenceProperties = [];
@@ -1776,7 +1776,8 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       // Since we don't have a real subscription id yet but we need to keep
       // track of this reference, we can just use a random uuid.
       subscriptionId: `TMP-${nextUuid()}}`,
-      interfaceApiName: objOrInterfaceDef.type === "object" ? void 0 : objOrInterfaceDef.apiName
+      interfaceApiName: objOrInterfaceDef.type === "object" ? void 0 : objOrInterfaceDef.apiName,
+      loadRids: shouldLoadRids
     };
     this.#subscriptions.set(sub.subscriptionId, sub);
     void this.#initiateSubscribe(sub);
@@ -1829,7 +1830,10 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         return {
           objectSet,
           propertySet: requestedProperties,
-          referenceSet: requestedReferenceProperties
+          referenceSet: requestedReferenceProperties,
+          objectLoadingResponseOptions: {
+            shouldLoadObjectRids: true
+          }
         };
       })
     };
@@ -1987,9 +1991,14 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       }
       const osdkObjectArray = await this.#client.objectFactory2(this.#client, [o.object], sub.interfaceApiName, {}, void 0, false, void 0, false, await this.#fetchInterfaceMapping(o.object.__apiName, sub.interfaceApiName));
       const singleOsdkObject = osdkObjectArray[0] ?? void 0;
-      return singleOsdkObject != null ? {
+      const rid = singleOsdkObject["$rid"];
+      return singleOsdkObject != null ? rid === void 0 ? {
         object: singleOsdkObject,
         state: o.state
+      } : {
+        object: singleOsdkObject,
+        state: o.state,
+        rid
       } : void 0;
     }));
     for (const osdkObject of osdkObjects) {
@@ -2233,7 +2242,7 @@ function createObjectSet(objectType, clientCtx, objectSet = resolveBaseObjectSet
       })), objectType, options, await createWithPk(clientCtx, objectType, objectSet, primaryKey));
     } : void 0,
     subscribe: (listener, opts) => {
-      const pendingSubscribe = ObjectSetListenerWebsocket.getInstance(clientCtx).subscribe(objectType, objectSet, listener, opts?.properties);
+      const pendingSubscribe = ObjectSetListenerWebsocket.getInstance(clientCtx).subscribe(objectType, objectSet, listener, opts?.properties, opts?.includeRid);
       return {
         unsubscribe: async () => (await pendingSubscribe)()
       };
@@ -2343,5 +2352,5 @@ exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-RDZ5NKAI.cjs.map
-//# sourceMappingURL=chunk-RDZ5NKAI.cjs.map
+//# sourceMappingURL=chunk-4HXJEKQT.cjs.map
+//# sourceMappingURL=chunk-4HXJEKQT.cjs.map