@osdk/react 0.10.0-beta.4 → 0.10.0-beta.6

package/build/esm/new/useOsdkObject.js

@@ -24,10 +24,10 @@ import { OsdkContext2 } from "./OsdkContext2.js";
  */
 
 /**
- * Loads an object by type and primary key.
+ * Loads an object or interface instance by type and primary key.
  *
- * @param type
- * @param primaryKey
+ * @param type The object type or interface definition
+ * @param primaryKey The primary key of the object
  * @param enabled Enable or disable the query (defaults to true)
  */
 
@@ -46,11 +46,10 @@ export function useOsdkObject(...args) {
 
   // Extract enabled flag - 2nd param for instance signature, 3rd for type signature
   const enabled = isInstanceSignature ? typeof args[1] === "boolean" ? args[1] : true : typeof args[2] === "boolean" ? args[2] : true;
-
-  // TODO: Figure out what the correct default behavior is for the various scenarios
   const mode = isInstanceSignature ? "offline" : undefined;
-  const objectType = isInstanceSignature ? args[0].$objectType : args[0].apiName;
+  const typeOrApiName = isInstanceSignature ? args[0].$objectType : args[0];
   const primaryKey = isInstanceSignature ? args[0].$primaryKey : args[1];
+  const apiNameString = typeof typeOrApiName === "string" ? typeOrApiName : typeOrApiName.apiName;
   const {
     subscribe,
     getSnapShot
@@ -58,27 +57,30 @@ export function useOsdkObject(...args) {
     if (!enabled) {
       return makeExternalStore(() => ({
         unsubscribe: () => {}
-      }), `object ${objectType} ${primaryKey} [DISABLED]`);
+      }), `object ${apiNameString} ${primaryKey} [DISABLED]`);
     }
-    return makeExternalStore(observer => observableClient.observeObject(objectType, primaryKey, {
+    return makeExternalStore(observer => observableClient.observeObject(typeOrApiName, primaryKey, {
       mode
-    }, observer), `object ${objectType} ${primaryKey}`);
-  }, [enabled, observableClient, objectType, primaryKey, mode]);
+    }, observer), `object ${apiNameString} ${primaryKey}`);
+  }, [enabled, observableClient, typeOrApiName, apiNameString, primaryKey, mode]);
   const payload = React.useSyncExternalStore(subscribe, getSnapShot);
-  let error;
-  if (payload && "error" in payload && payload.error) {
-    error = payload.error;
-  } else if (payload?.status === "error") {
-    error = new Error("Failed to load object");
-  }
-  return {
-    object: payload?.object,
-    isLoading: enabled ? payload?.status === "loading" || payload?.status === "init" || !payload : false,
-    isOptimistic: !!payload?.isOptimistic,
-    error,
-    forceUpdate: () => {
-      throw new Error("not implemented");
+  const forceUpdate = React.useCallback(() => {
+    throw new Error("not implemented");
+  }, []);
+  return React.useMemo(() => {
+    let error;
+    if (payload && "error" in payload && payload.error) {
+      error = payload.error;
+    } else if (payload?.status === "error") {
+      error = new Error("Failed to load object");
     }
-  };
+    return {
+      object: payload?.object,
+      isLoading: enabled ? payload?.status === "loading" || payload?.status === "init" || !payload : false,
+      isOptimistic: !!payload?.isOptimistic,
+      error,
+      forceUpdate
+    };
+  }, [payload, enabled, forceUpdate]);
 }
 //# sourceMappingURL=useOsdkObject.js.map

package/build/esm/new/useOsdkObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"useOsdkObject.js","names":["React","makeExternalStore","OsdkContext2","useOsdkObject","args","observableClient","useContext","isInstanceSignature","enabled","mode","undefined","objectType","$objectType","apiName","primaryKey","$primaryKey","subscribe","getSnapShot","useMemo","unsubscribe","observer","observeObject","payload","useSyncExternalStore","error","status","Error","object","isLoading","isOptimistic","forceUpdate"],"sources":["useOsdkObject.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 { ObjectTypeDefinition, Osdk, PrimaryKeyType } from \"@osdk/api\";\nimport type { ObserveObjectCallbackArgs } from \"@osdk/client/unstable-do-not-use\";\nimport React from \"react\";\nimport { makeExternalStore } from \"./makeExternalStore.js\";\nimport { OsdkContext2 } from \"./OsdkContext2.js\";\n\nexport interface UseOsdkObjectResult<Q extends ObjectTypeDefinition> {\n  object: Osdk.Instance<Q> | undefined;\n  isLoading: boolean;\n\n  error: Error | undefined;\n\n  /**\n   * Refers to whether the object is optimistic or not.\n   */\n  isOptimistic: boolean;\n  forceUpdate: () => void;\n}\n\n/**\n * @param obj an existing `Osdk.Instance` object to get metadata for.\n * @param enabled Enable or disable the query (defaults to true)\n */\nexport function useOsdkObject<Q extends ObjectTypeDefinition>(\n  obj: Osdk.Instance<Q>,\n  enabled?: boolean,\n): UseOsdkObjectResult<Q>;\n/**\n * Loads an object by type and primary key.\n *\n * @param type\n * @param primaryKey\n * @param enabled Enable or disable the query (defaults to true)\n */\nexport function useOsdkObject<Q extends ObjectTypeDefinition>(\n  type: Q,\n  primaryKey: PrimaryKeyType<Q>,\n  enabled?: boolean,\n): UseOsdkObjectResult<Q>;\n/*\n    Implementation of useOsdkObject\n */\nexport function useOsdkObject<Q extends ObjectTypeDefinition>(\n  ...args:\n    | [obj: Osdk.Instance<Q>, enabled?: boolean]\n    | [type: Q, primaryKey: PrimaryKeyType<Q>, enabled?: boolean]\n): UseOsdkObjectResult<Q> {\n  const { observableClient } = React.useContext(OsdkContext2);\n\n  // Check if first arg is an instance to discriminate signatures\n  // TypeScript cannot narrow rest parameter unions with optional parameters,\n  // so we must use type assertions after runtime discrimination\n  const isInstanceSignature = \"$objectType\" in args[0];\n\n  // Extract enabled flag - 2nd param for instance signature, 3rd for type signature\n  const enabled = isInstanceSignature\n    ? (typeof args[1] === \"boolean\" ? args[1] : true)\n    : (typeof args[2] === \"boolean\" ? args[2] : true);\n\n  // TODO: Figure out what the correct default behavior is for the various scenarios\n  const mode = isInstanceSignature ? \"offline\" : undefined;\n  const objectType = isInstanceSignature\n    ? (args[0] as Osdk.Instance<Q>).$objectType\n    : (args[0] as Q).apiName;\n  const primaryKey = isInstanceSignature\n    ? (args[0] as Osdk.Instance<Q>).$primaryKey\n    : (args[1] as PrimaryKeyType<Q>);\n\n  const { subscribe, getSnapShot } = React.useMemo(\n    () => {\n      if (!enabled) {\n        return makeExternalStore<ObserveObjectCallbackArgs<Q>>(\n          () => ({ unsubscribe: () => {} }),\n          `object ${objectType} ${primaryKey} [DISABLED]`,\n        );\n      }\n      return makeExternalStore<ObserveObjectCallbackArgs<Q>>(\n        (observer) =>\n          observableClient.observeObject(\n            objectType,\n            primaryKey,\n            {\n              mode,\n            },\n            observer,\n          ),\n        `object ${objectType} ${primaryKey}`,\n      );\n    },\n    [enabled, observableClient, objectType, primaryKey, mode],\n  );\n\n  const payload = React.useSyncExternalStore(subscribe, getSnapShot);\n\n  let error: Error | undefined;\n  if (payload && \"error\" in payload && payload.error) {\n    error = payload.error;\n  } else if (payload?.status === \"error\") {\n    error = new Error(\"Failed to load object\");\n  }\n\n  return {\n    object: payload?.object as Osdk.Instance<Q> | undefined,\n    isLoading: enabled\n      ? (payload?.status === \"loading\" || payload?.status === \"init\"\n        || !payload)\n      : false,\n    isOptimistic: !!payload?.isOptimistic,\n    error,\n    forceUpdate: () => {\n      throw new Error(\"not implemented\");\n    },\n  };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,iBAAiB,QAAQ,wBAAwB;AAC1D,SAASC,YAAY,QAAQ,mBAAmB;;AAehD;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA,OAAO,SAASC,aAAaA,CAC3B,GAAGC,IAE4D,EACvC;EACxB,MAAM;IAAEC;EAAiB,CAAC,GAAGL,KAAK,CAACM,UAAU,CAACJ,YAAY,CAAC;;EAE3D;EACA;EACA;EACA,MAAMK,mBAAmB,GAAG,aAAa,IAAIH,IAAI,CAAC,CAAC,CAAC;;EAEpD;EACA,MAAMI,OAAO,GAAGD,mBAAmB,GAC9B,OAAOH,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,GAAGA,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,GAC7C,OAAOA,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,GAAGA,IAAI,CAAC,CAAC,CAAC,GAAG,IAAK;;EAEnD;EACA,MAAMK,IAAI,GAAGF,mBAAmB,GAAG,SAAS,GAAGG,SAAS;EACxD,MAAMC,UAAU,GAAGJ,mBAAmB,GACjCH,IAAI,CAAC,CAAC,CAAC,CAAsBQ,WAAW,GACxCR,IAAI,CAAC,CAAC,CAAC,CAAOS,OAAO;EAC1B,MAAMC,UAAU,GAAGP,mBAAmB,GACjCH,IAAI,CAAC,CAAC,CAAC,CAAsBW,WAAW,GACxCX,IAAI,CAAC,CAAC,CAAuB;EAElC,MAAM;IAAEY,SAAS;IAAEC;EAAY,CAAC,GAAGjB,KAAK,CAACkB,OAAO,CAC9C,MAAM;IACJ,IAAI,CAACV,OAAO,EAAE;MACZ,OAAOP,iBAAiB,CACtB,OAAO;QAAEkB,WAAW,EAAEA,CAAA,KAAM,CAAC;MAAE,CAAC,CAAC,EACjC,UAAUR,UAAU,IAAIG,UAAU,aACpC,CAAC;IACH;IACA,OAAOb,iBAAiB,CACrBmB,QAAQ,IACPf,gBAAgB,CAACgB,aAAa,CAC5BV,UAAU,EACVG,UAAU,EACV;MACEL;IACF,CAAC,EACDW,QACF,CAAC,EACH,UAAUT,UAAU,IAAIG,UAAU,EACpC,CAAC;EACH,CAAC,EACD,CAACN,OAAO,EAAEH,gBAAgB,EAAEM,UAAU,EAAEG,UAAU,EAAEL,IAAI,CAC1D,CAAC;EAED,MAAMa,OAAO,GAAGtB,KAAK,CAACuB,oBAAoB,CAACP,SAAS,EAAEC,WAAW,CAAC;EAElE,IAAIO,KAAwB;EAC5B,IAAIF,OAAO,IAAI,OAAO,IAAIA,OAAO,IAAIA,OAAO,CAACE,KAAK,EAAE;IAClDA,KAAK,GAAGF,OAAO,CAACE,KAAK;EACvB,CAAC,MAAM,IAAIF,OAAO,EAAEG,MAAM,KAAK,OAAO,EAAE;IACtCD,KAAK,GAAG,IAAIE,KAAK,CAAC,uBAAuB,CAAC;EAC5C;EAEA,OAAO;IACLC,MAAM,EAAEL,OAAO,EAAEK,MAAsC;IACvDC,SAAS,EAAEpB,OAAO,GACbc,OAAO,EAAEG,MAAM,KAAK,SAAS,IAAIH,OAAO,EAAEG,MAAM,KAAK,MAAM,IACzD,CAACH,OAAO,GACX,KAAK;IACTO,YAAY,EAAE,CAAC,CAACP,OAAO,EAAEO,YAAY;IACrCL,KAAK;IACLM,WAAW,EAAEA,CAAA,KAAM;MACjB,MAAM,IAAIJ,KAAK,CAAC,iBAAiB,CAAC;IACpC;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"useOsdkObject.js","names":["React","makeExternalStore","OsdkContext2","useOsdkObject","args","observableClient","useContext","isInstanceSignature","enabled","mode","undefined","typeOrApiName","$objectType","primaryKey","$primaryKey","apiNameString","apiName","subscribe","getSnapShot","useMemo","unsubscribe","observer","observeObject","payload","useSyncExternalStore","forceUpdate","useCallback","Error","error","status","object","isLoading","isOptimistic"],"sources":["useOsdkObject.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  ObjectOrInterfaceDefinition,\n  Osdk,\n  PrimaryKeyType,\n} from \"@osdk/api\";\nimport type { ObserveObjectCallbackArgs } from \"@osdk/client/unstable-do-not-use\";\nimport React from \"react\";\nimport { makeExternalStore } from \"./makeExternalStore.js\";\nimport { OsdkContext2 } from \"./OsdkContext2.js\";\n\nexport interface UseOsdkObjectResult<\n  Q extends ObjectOrInterfaceDefinition,\n> {\n  object: Osdk.Instance<Q> | undefined;\n  isLoading: boolean;\n\n  error: Error | undefined;\n\n  /**\n   * Refers to whether the object is optimistic or not.\n   */\n  isOptimistic: boolean;\n  forceUpdate: () => void;\n}\n\n/**\n * @param obj an existing `Osdk.Instance` object to get metadata for.\n * @param enabled Enable or disable the query (defaults to true)\n */\nexport function useOsdkObject<\n  Q extends ObjectOrInterfaceDefinition,\n>(\n  obj: Osdk.Instance<Q>,\n  enabled?: boolean,\n): UseOsdkObjectResult<Q>;\n/**\n * Loads an object or interface instance by type and primary key.\n *\n * @param type The object type or interface definition\n * @param primaryKey The primary key of the object\n * @param enabled Enable or disable the query (defaults to true)\n */\nexport function useOsdkObject<\n  Q extends ObjectOrInterfaceDefinition,\n>(\n  type: Q,\n  primaryKey: PrimaryKeyType<Q>,\n  enabled?: boolean,\n): UseOsdkObjectResult<Q>;\n/*\n    Implementation of useOsdkObject\n */\nexport function useOsdkObject<\n  Q extends ObjectOrInterfaceDefinition,\n>(\n  ...args:\n    | [obj: Osdk.Instance<Q>, enabled?: boolean]\n    | [type: Q, primaryKey: PrimaryKeyType<Q>, enabled?: boolean]\n): UseOsdkObjectResult<Q> {\n  const { observableClient } = React.useContext(OsdkContext2);\n\n  // Check if first arg is an instance to discriminate signatures\n  // TypeScript cannot narrow rest parameter unions with optional parameters,\n  // so we must use type assertions after runtime discrimination\n  const isInstanceSignature = \"$objectType\" in args[0];\n\n  // Extract enabled flag - 2nd param for instance signature, 3rd for type signature\n  const enabled = isInstanceSignature\n    ? (typeof args[1] === \"boolean\" ? args[1] : true)\n    : (typeof args[2] === \"boolean\" ? args[2] : true);\n\n  const mode = isInstanceSignature ? \"offline\" : undefined;\n\n  const typeOrApiName = isInstanceSignature\n    ? (args[0] as Osdk.Instance<Q>).$objectType\n    : (args[0] as Q);\n\n  const primaryKey = isInstanceSignature\n    ? (args[0] as Osdk.Instance<Q>).$primaryKey\n    : (args[1] as PrimaryKeyType<Q>);\n\n  const apiNameString = typeof typeOrApiName === \"string\"\n    ? typeOrApiName\n    : typeOrApiName.apiName;\n\n  const { subscribe, getSnapShot } = React.useMemo(\n    () => {\n      if (!enabled) {\n        return makeExternalStore<ObserveObjectCallbackArgs<Q>>(\n          () => ({ unsubscribe: () => {} }),\n          `object ${apiNameString} ${primaryKey} [DISABLED]`,\n        );\n      }\n      return makeExternalStore<ObserveObjectCallbackArgs<Q>>(\n        (observer) =>\n          observableClient.observeObject(\n            typeOrApiName,\n            primaryKey,\n            {\n              mode,\n            },\n            observer,\n          ),\n        `object ${apiNameString} ${primaryKey}`,\n      );\n    },\n    [enabled, observableClient, typeOrApiName, apiNameString, primaryKey, mode],\n  );\n\n  const payload = React.useSyncExternalStore(subscribe, getSnapShot);\n\n  const forceUpdate = React.useCallback(() => {\n    throw new Error(\"not implemented\");\n  }, []);\n\n  return React.useMemo(() => {\n    let error: Error | undefined;\n    if (payload && \"error\" in payload && payload.error) {\n      error = payload.error;\n    } else if (payload?.status === \"error\") {\n      error = new Error(\"Failed to load object\");\n    }\n\n    return {\n      object: payload?.object as Osdk.Instance<Q> | undefined,\n      isLoading: enabled\n        ? (payload?.status === \"loading\" || payload?.status === \"init\"\n          || !payload)\n        : false,\n      isOptimistic: !!payload?.isOptimistic,\n      error,\n      forceUpdate,\n    };\n  }, [payload, enabled, forceUpdate]);\n}\n"],"mappings":"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","ignoreList":[]}

package/build/esm/new/useOsdkObjects.js

@@ -69,19 +69,21 @@ export function useOsdkObjects(type, options) {
     }, observer), process.env.NODE_ENV !== "production" ? `list ${type.apiName} ${stableRids ? `[${stableRids.length} rids]` : ""} ${JSON.stringify(stableCanonWhere)}` : void 0);
   }, [enabled, observableClient, type.apiName, type.type, stableRids, stableCanonWhere, dedupeIntervalMs, pageSize, stableOrderBy, streamUpdates, stableWithProperties, autoFetchMore, stableIntersectWith, pivotTo]);
   const listPayload = React.useSyncExternalStore(subscribe, getSnapShot);
-  let error;
-  if (listPayload && "error" in listPayload && listPayload.error) {
-    error = listPayload.error;
-  } else if (listPayload?.status === "error") {
-    error = new Error("Failed to load objects");
-  }
-  return {
-    fetchMore: listPayload?.hasMore ? listPayload.fetchMore : undefined,
-    error,
-    data: listPayload?.resolvedList,
-    isLoading: enabled ? listPayload?.status === "loading" || listPayload?.status === "init" || !listPayload : false,
-    isOptimistic: listPayload?.isOptimistic ?? false,
-    totalCount: listPayload?.totalCount
-  };
+  return React.useMemo(() => {
+    let error;
+    if (listPayload && "error" in listPayload && listPayload.error) {
+      error = listPayload.error;
+    } else if (listPayload?.status === "error") {
+      error = new Error("Failed to load objects");
+    }
+    return {
+      fetchMore: listPayload?.hasMore ? listPayload.fetchMore : undefined,
+      error,
+      data: listPayload?.resolvedList,
+      isLoading: enabled ? listPayload?.status === "loading" || listPayload?.status === "init" || !listPayload : false,
+      isOptimistic: listPayload?.isOptimistic ?? false,
+      totalCount: listPayload?.totalCount
+    };
+  }, [listPayload, enabled]);
 }
 //# sourceMappingURL=useOsdkObjects.js.map

package/build/esm/new/useOsdkObjects.js.map

@@ -1 +1 @@
-{"version":3,"file":"useOsdkObjects.js","names":["React","makeExternalStore","OsdkContext2","EMPTY_WHERE","useOsdkObjects","type","options","observableClient","useContext","pageSize","dedupeIntervalMs","withProperties","enabled","rids","where","orderBy","streamUpdates","autoFetchMore","intersectWith","pivotTo","canonWhere","canonicalizeWhereClause","stableCanonWhere","useMemo","JSON","stringify","stableRids","stableWithProperties","stableIntersectWith","stableOrderBy","subscribe","getSnapShot","unsubscribe","process","env","NODE_ENV","apiName","observer","observeList","dedupeInterval","length","listPayload","useSyncExternalStore","error","status","Error","fetchMore","hasMore","undefined","data","resolvedList","isLoading","isOptimistic","totalCount"],"sources":["useOsdkObjects.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  LinkedType,\n  LinkNames,\n  ObjectOrInterfaceDefinition,\n  Osdk,\n  PropertyKeys,\n  SimplePropertyDef,\n  WhereClause,\n} from \"@osdk/api\";\nimport type { ObserveObjectsCallbackArgs } from \"@osdk/client/unstable-do-not-use\";\nimport React from \"react\";\nimport { makeExternalStore } from \"./makeExternalStore.js\";\nimport { OsdkContext2 } from \"./OsdkContext2.js\";\n\nexport interface UseOsdkObjectsOptions<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n> {\n  /**\n   * Fetch objects by their RIDs (Resource Identifiers).\n   * When provided, starts with a static objectset containing these RIDs.\n   * Can be combined with `where` to filter the RID set, and with `orderBy` to sort results.\n   *\n   * @example\n   * // Fetch specific objects by RID\n   * useOsdkObjects(Employee, { rids: ['ri.foo.123', 'ri.foo.456'] })\n   *\n   * @example\n   * // Fetch specific objects by RID, filtered by status\n   * useOsdkObjects(Employee, {\n   *   rids: ['ri.foo.123', 'ri.foo.456', 'ri.foo.789'],\n   *   where: { status: 'active' }\n   * })\n   */\n  rids?: readonly string[];\n\n  /**\n   * Standard OSDK Where clause with RDP support.\n   * When used with `rids`, filters the RID set.\n   * When used alone, filters all objects of the type.\n   */\n  where?: WhereClause<T, RDPs>;\n\n  /**\n   * Sort results by one or more properties.\n   */\n  orderBy?: {\n    [K in PropertyKeys<T>]?: \"asc\" | \"desc\";\n  };\n\n  /**\n   * The preferred page size for the list.\n   */\n  pageSize?: number;\n\n  /**\n   * Define derived properties (RDPs) to be computed server-side and attached to each object.\n   * These properties will be available on the returned objects alongside their regular properties.\n   */\n  withProperties?: { [K in keyof RDPs]: DerivedProperty.Creator<T, RDPs[K]> };\n\n  /**\n   * The number of milliseconds to wait after the last observed list change.\n   *\n   * Two uses of `useOsdkObjects` with the same parameters will only trigger one\n   * network request if the second is within `dedupeIntervalMs`.\n   */\n  dedupeIntervalMs?: number;\n\n  /**\n   * Enable or disable the query.\n   *\n   * When `false`, the query will not automatically execute. It will still\n   * return any cached data, but will not fetch from the server.\n   *\n   * @default true\n   */\n  enabled?: boolean;\n\n  /**\n   * Intersect the results with additional object sets.\n   * Each element defines a where clause for an object set to intersect with.\n   * The final result will only include objects that match ALL conditions.\n   */\n  intersectWith?: Array<{\n    where: WhereClause<T, RDPs>;\n  }>;\n\n  /**\n   * Pivot to related objects through a link.\n   * This changes the return type from T to the linked object type.\n   */\n  pivotTo?: LinkNames<T>;\n\n  /**\n   * Causes the list to automatically fetch more as soon as the previous page\n   * has been loaded. If a number is provided, it will continue to automatically\n   * fetch more until the list is at least that long.\n   *\n   * - `true`: Fetch all available pages automatically\n   * - `number`: Fetch pages until at least this many items are loaded\n   * - `undefined` (default): Only fetch the first page, user must call fetchMore()\n   */\n  autoFetchMore?: boolean | number;\n\n  streamUpdates?: boolean;\n}\n\nexport interface UseOsdkListResult<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n> {\n  /**\n   * Function to fetch more pages (undefined if no more pages)\n   */\n  fetchMore: (() => Promise<void>) | undefined;\n\n  /**\n   * The fetched data with derived properties\n   */\n  data:\n    | Osdk.Instance<T, \"$allBaseProperties\", PropertyKeys<T>, RDPs>[]\n    | undefined;\n\n  /**\n   * Whether data is currently being loaded\n   */\n  isLoading: boolean;\n\n  /**\n   * Any error that occurred during fetching\n   */\n  error: Error | undefined;\n\n  /**\n   * Refers to whether the ordered list of objects (only considering the $primaryKey)\n   * is optimistic or not.\n   *\n   * If you need to know if the contents of the list are optimistic you can\n   * do that on a per object basis with useOsdkObject\n   */\n  isOptimistic: boolean;\n\n  /**\n   * The total count of objects matching the query (if available from the API)\n   */\n  totalCount?: string;\n}\n\nconst EMPTY_WHERE = {};\n\ndeclare const process: {\n  env: {\n    NODE_ENV: \"development\" | \"production\";\n  };\n};\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  L extends LinkNames<Q>,\n>(\n  type: Q,\n  options: UseOsdkObjectsOptions<Q> & { pivotTo: L },\n): UseOsdkListResult<LinkedType<Q, L>>;\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  type: Q,\n  options?: UseOsdkObjectsOptions<Q, RDPs>,\n): UseOsdkListResult<Q, RDPs>;\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  type: Q,\n  options?: UseOsdkObjectsOptions<Q, RDPs>,\n):\n  | UseOsdkListResult<Q, RDPs>\n  | UseOsdkListResult<LinkedType<Q, LinkNames<Q>>>\n{\n  const { observableClient } = React.useContext(OsdkContext2);\n\n  const {\n    pageSize,\n    dedupeIntervalMs,\n    withProperties,\n    enabled = true,\n    rids,\n    where,\n    orderBy,\n    streamUpdates,\n    autoFetchMore,\n    intersectWith,\n    pivotTo,\n  } = options ?? {};\n\n  const canonWhere = observableClient.canonicalizeWhereClause<\n    Q,\n    RDPs\n  >(where ?? EMPTY_WHERE);\n\n  const stableCanonWhere = React.useMemo(\n    () => canonWhere,\n    [JSON.stringify(canonWhere)],\n  );\n\n  const stableRids = React.useMemo(\n    () => rids,\n    [JSON.stringify(rids)],\n  );\n\n  const stableWithProperties = React.useMemo(\n    () => withProperties,\n    [JSON.stringify(withProperties)],\n  );\n\n  const stableIntersectWith = React.useMemo(\n    () => intersectWith,\n    [JSON.stringify(intersectWith)],\n  );\n\n  const stableOrderBy = React.useMemo(\n    () => orderBy,\n    [JSON.stringify(orderBy)],\n  );\n\n  const { subscribe, getSnapShot } = React.useMemo(\n    () => {\n      if (!enabled) {\n        return makeExternalStore<\n          ObserveObjectsCallbackArgs<Q, RDPs>\n        >(\n          () => ({ unsubscribe: () => {} }),\n          process.env.NODE_ENV !== \"production\"\n            ? `list ${type.apiName} [DISABLED]`\n            : void 0,\n        );\n      }\n\n      return makeExternalStore<\n        ObserveObjectsCallbackArgs<Q, RDPs>\n      >(\n        (observer) =>\n          observableClient.observeList({\n            type,\n            rids: stableRids,\n            where: stableCanonWhere,\n            dedupeInterval: dedupeIntervalMs ?? 2_000,\n            pageSize,\n            orderBy: stableOrderBy,\n            streamUpdates,\n            withProperties: stableWithProperties,\n            autoFetchMore,\n            ...(stableIntersectWith\n              ? { intersectWith: stableIntersectWith }\n              : {}),\n            ...(pivotTo ? { pivotTo } : {}),\n          }, observer),\n        process.env.NODE_ENV !== \"production\"\n          ? `list ${type.apiName} ${\n            stableRids ? `[${stableRids.length} rids]` : \"\"\n          } ${JSON.stringify(stableCanonWhere)}`\n          : void 0,\n      );\n    },\n    [\n      enabled,\n      observableClient,\n      type.apiName,\n      type.type,\n      stableRids,\n      stableCanonWhere,\n      dedupeIntervalMs,\n      pageSize,\n      stableOrderBy,\n      streamUpdates,\n      stableWithProperties,\n      autoFetchMore,\n      stableIntersectWith,\n      pivotTo,\n    ],\n  );\n\n  const listPayload = React.useSyncExternalStore(subscribe, getSnapShot);\n\n  let error: Error | undefined;\n  if (listPayload && \"error\" in listPayload && listPayload.error) {\n    error = listPayload.error;\n  } else if (listPayload?.status === \"error\") {\n    error = new Error(\"Failed to load objects\");\n  }\n\n  return {\n    fetchMore: listPayload?.hasMore ? listPayload.fetchMore : undefined,\n    error,\n    data: listPayload?.resolvedList,\n    isLoading: enabled\n      ? (listPayload?.status === \"loading\" || listPayload?.status === \"init\"\n        || !listPayload)\n      : false,\n    isOptimistic: listPayload?.isOptimistic ?? false,\n    totalCount: listPayload?.totalCount,\n  };\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useOsdkObjects.js","names":["React","makeExternalStore","OsdkContext2","EMPTY_WHERE","useOsdkObjects","type","options","observableClient","useContext","pageSize","dedupeIntervalMs","withProperties","enabled","rids","where","orderBy","streamUpdates","autoFetchMore","intersectWith","pivotTo","canonWhere","canonicalizeWhereClause","stableCanonWhere","useMemo","JSON","stringify","stableRids","stableWithProperties","stableIntersectWith","stableOrderBy","subscribe","getSnapShot","unsubscribe","process","env","NODE_ENV","apiName","observer","observeList","dedupeInterval","length","listPayload","useSyncExternalStore","error","status","Error","fetchMore","hasMore","undefined","data","resolvedList","isLoading","isOptimistic","totalCount"],"sources":["useOsdkObjects.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  LinkedType,\n  LinkNames,\n  ObjectOrInterfaceDefinition,\n  Osdk,\n  PropertyKeys,\n  SimplePropertyDef,\n  WhereClause,\n} from \"@osdk/api\";\nimport type { ObserveObjectsCallbackArgs } from \"@osdk/client/unstable-do-not-use\";\nimport React from \"react\";\nimport { makeExternalStore } from \"./makeExternalStore.js\";\nimport { OsdkContext2 } from \"./OsdkContext2.js\";\n\nexport interface UseOsdkObjectsOptions<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n> {\n  /**\n   * Fetch objects by their RIDs (Resource Identifiers).\n   * When provided, starts with a static objectset containing these RIDs.\n   * Can be combined with `where` to filter the RID set, and with `orderBy` to sort results.\n   *\n   * @example\n   * // Fetch specific objects by RID\n   * useOsdkObjects(Employee, { rids: ['ri.foo.123', 'ri.foo.456'] })\n   *\n   * @example\n   * // Fetch specific objects by RID, filtered by status\n   * useOsdkObjects(Employee, {\n   *   rids: ['ri.foo.123', 'ri.foo.456', 'ri.foo.789'],\n   *   where: { status: 'active' }\n   * })\n   */\n  rids?: readonly string[];\n\n  /**\n   * Standard OSDK Where clause with RDP support.\n   * When used with `rids`, filters the RID set.\n   * When used alone, filters all objects of the type.\n   */\n  where?: WhereClause<T, RDPs>;\n\n  /**\n   * Sort results by one or more properties.\n   */\n  orderBy?: {\n    [K in PropertyKeys<T>]?: \"asc\" | \"desc\";\n  };\n\n  /**\n   * The preferred page size for the list.\n   */\n  pageSize?: number;\n\n  /**\n   * Define derived properties (RDPs) to be computed server-side and attached to each object.\n   * These properties will be available on the returned objects alongside their regular properties.\n   */\n  withProperties?: { [K in keyof RDPs]: DerivedProperty.Creator<T, RDPs[K]> };\n\n  /**\n   * The number of milliseconds to wait after the last observed list change.\n   *\n   * Two uses of `useOsdkObjects` with the same parameters will only trigger one\n   * network request if the second is within `dedupeIntervalMs`.\n   */\n  dedupeIntervalMs?: number;\n\n  /**\n   * Enable or disable the query.\n   *\n   * When `false`, the query will not automatically execute. It will still\n   * return any cached data, but will not fetch from the server.\n   *\n   * @default true\n   */\n  enabled?: boolean;\n\n  /**\n   * Intersect the results with additional object sets.\n   * Each element defines a where clause for an object set to intersect with.\n   * The final result will only include objects that match ALL conditions.\n   */\n  intersectWith?: Array<{\n    where: WhereClause<T, RDPs>;\n  }>;\n\n  /**\n   * Pivot to related objects through a link.\n   * This changes the return type from T to the linked object type.\n   */\n  pivotTo?: LinkNames<T>;\n\n  /**\n   * Causes the list to automatically fetch more as soon as the previous page\n   * has been loaded. If a number is provided, it will continue to automatically\n   * fetch more until the list is at least that long.\n   *\n   * - `true`: Fetch all available pages automatically\n   * - `number`: Fetch pages until at least this many items are loaded\n   * - `undefined` (default): Only fetch the first page, user must call fetchMore()\n   */\n  autoFetchMore?: boolean | number;\n\n  streamUpdates?: boolean;\n}\n\nexport interface UseOsdkListResult<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n  EXTRA_OPTIONS extends never | \"$rid\" = never,\n> {\n  /**\n   * Function to fetch more pages (undefined if no more pages)\n   */\n  fetchMore: (() => Promise<void>) | undefined;\n\n  /**\n   * The fetched data with derived properties\n   */\n  data:\n    | Osdk.Instance<\n      T,\n      \"$allBaseProperties\" | EXTRA_OPTIONS,\n      PropertyKeys<T>,\n      RDPs\n    >[]\n    | undefined;\n\n  /**\n   * Whether data is currently being loaded\n   */\n  isLoading: boolean;\n\n  /**\n   * Any error that occurred during fetching\n   */\n  error: Error | undefined;\n\n  /**\n   * Refers to whether the ordered list of objects (only considering the $primaryKey)\n   * is optimistic or not.\n   *\n   * If you need to know if the contents of the list are optimistic you can\n   * do that on a per object basis with useOsdkObject\n   */\n  isOptimistic: boolean;\n\n  /**\n   * The total count of objects matching the query (if available from the API)\n   */\n  totalCount?: string;\n}\n\nconst EMPTY_WHERE = {};\n\ndeclare const process: {\n  env: {\n    NODE_ENV: \"development\" | \"production\";\n  };\n};\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  L extends LinkNames<Q>,\n>(\n  type: Q,\n  options: UseOsdkObjectsOptions<Q> & { pivotTo: L; rids: readonly string[] },\n): UseOsdkListResult<LinkedType<Q, L>, {}, \"$rid\">;\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  L extends LinkNames<Q>,\n>(\n  type: Q,\n  options: UseOsdkObjectsOptions<Q> & { pivotTo: L },\n): UseOsdkListResult<LinkedType<Q, L>>;\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  type: Q,\n  options: UseOsdkObjectsOptions<Q, RDPs> & { rids: readonly string[] },\n): UseOsdkListResult<Q, RDPs, \"$rid\">;\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  type: Q,\n  options?: UseOsdkObjectsOptions<Q, RDPs>,\n): UseOsdkListResult<Q, RDPs>;\n\nexport function useOsdkObjects<\n  Q extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  type: Q,\n  options?: UseOsdkObjectsOptions<Q, RDPs>,\n):\n  | UseOsdkListResult<Q, RDPs>\n  | UseOsdkListResult<Q, RDPs, \"$rid\">\n  | UseOsdkListResult<LinkedType<Q, LinkNames<Q>>>\n  | UseOsdkListResult<LinkedType<Q, LinkNames<Q>>, {}, \"$rid\">\n{\n  const { observableClient } = React.useContext(OsdkContext2);\n\n  const {\n    pageSize,\n    dedupeIntervalMs,\n    withProperties,\n    enabled = true,\n    rids,\n    where,\n    orderBy,\n    streamUpdates,\n    autoFetchMore,\n    intersectWith,\n    pivotTo,\n  } = options ?? {};\n\n  const canonWhere = observableClient.canonicalizeWhereClause<\n    Q,\n    RDPs\n  >(where ?? EMPTY_WHERE);\n\n  const stableCanonWhere = React.useMemo(\n    () => canonWhere,\n    [JSON.stringify(canonWhere)],\n  );\n\n  const stableRids = React.useMemo(\n    () => rids,\n    [JSON.stringify(rids)],\n  );\n\n  const stableWithProperties = React.useMemo(\n    () => withProperties,\n    [JSON.stringify(withProperties)],\n  );\n\n  const stableIntersectWith = React.useMemo(\n    () => intersectWith,\n    [JSON.stringify(intersectWith)],\n  );\n\n  const stableOrderBy = React.useMemo(\n    () => orderBy,\n    [JSON.stringify(orderBy)],\n  );\n\n  const { subscribe, getSnapShot } = React.useMemo(\n    () => {\n      if (!enabled) {\n        return makeExternalStore<\n          ObserveObjectsCallbackArgs<Q, RDPs>\n        >(\n          () => ({ unsubscribe: () => {} }),\n          process.env.NODE_ENV !== \"production\"\n            ? `list ${type.apiName} [DISABLED]`\n            : void 0,\n        );\n      }\n\n      return makeExternalStore<\n        ObserveObjectsCallbackArgs<Q, RDPs>\n      >(\n        (observer) =>\n          observableClient.observeList({\n            type,\n            rids: stableRids,\n            where: stableCanonWhere,\n            dedupeInterval: dedupeIntervalMs ?? 2_000,\n            pageSize,\n            orderBy: stableOrderBy,\n            streamUpdates,\n            withProperties: stableWithProperties,\n            autoFetchMore,\n            ...(stableIntersectWith\n              ? { intersectWith: stableIntersectWith }\n              : {}),\n            ...(pivotTo ? { pivotTo } : {}),\n          }, observer),\n        process.env.NODE_ENV !== \"production\"\n          ? `list ${type.apiName} ${\n            stableRids ? `[${stableRids.length} rids]` : \"\"\n          } ${JSON.stringify(stableCanonWhere)}`\n          : void 0,\n      );\n    },\n    [\n      enabled,\n      observableClient,\n      type.apiName,\n      type.type,\n      stableRids,\n      stableCanonWhere,\n      dedupeIntervalMs,\n      pageSize,\n      stableOrderBy,\n      streamUpdates,\n      stableWithProperties,\n      autoFetchMore,\n      stableIntersectWith,\n      pivotTo,\n    ],\n  );\n\n  const listPayload = React.useSyncExternalStore(subscribe, getSnapShot);\n\n  return React.useMemo(() => {\n    let error: Error | undefined;\n    if (listPayload && \"error\" in listPayload && listPayload.error) {\n      error = listPayload.error;\n    } else if (listPayload?.status === \"error\") {\n      error = new Error(\"Failed to load objects\");\n    }\n\n    return {\n      fetchMore: listPayload?.hasMore ? listPayload.fetchMore : undefined,\n      error,\n      data: listPayload?.resolvedList,\n      isLoading: enabled\n        ? (listPayload?.status === \"loading\" || listPayload?.status === \"init\"\n          || !listPayload)\n        : false,\n      isOptimistic: listPayload?.isOptimistic ?? false,\n      totalCount: listPayload?.totalCount,\n    };\n  }, [listPayload, enabled]);\n}\n"],"mappings":"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","ignoreList":[]}

package/build/types/intellisense.test.helpers/useOsdkObjectsWithRids.d.ts

@@ -0,0 +1 @@
+export {};

package/build/types/intellisense.test.helpers/useOsdkObjectsWithRids.d.ts.map

@@ -0,0 +1 @@
+{"mappings":"","names":[],"sources":["../../../src/intellisense.test.helpers/useOsdkObjectsWithRids.ts"],"version":3,"file":"useOsdkObjectsWithRids.d.ts"}

package/build/types/new/makeExternalStore.d.ts

@@ -8,3 +8,14 @@ export declare function makeExternalStore<X>(createObservation: (callback: Obser
 	subscribe: (notifyUpdate: () => void) => () => void
 	getSnapShot: () => Snapshot<X>
 };
+/**
+* Like makeExternalStore but for async subscription creation.
+*
+* Uses an isActive flag to handle race conditions:
+* If cleanup runs before promise resolves, the stale subscription is
+* immediately unsubscribed when it eventually resolves
+*/
+export declare function makeExternalStoreAsync<X>(createObservation: (callback: Observer<X | undefined>) => Promise<Unsubscribable>, _name?: string, initialValue?: Snapshot<X>): {
+	subscribe: (notifyUpdate: () => void) => () => void
+	getSnapShot: () => Snapshot<X>
+};

package/build/types/new/makeExternalStore.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,UACA,sBACK,kCAAmC;AAE1C,YAAY,SAAS,KACjB,IAAI;CAAE,QAAQ;AAAO,KACpB,QAAQ,KAAK;CAAE,QAAQ;AAAO;AAGnC,OAAO,iBAAS,kBAAkB,GAChCA,oBAAoBC,UAAU,SAAS,mBAAmB,gBAC1DC,gBACAC,eAAe,SAAS,KACvB;CACD,YAAYC;CACZ,mBAAmB,SAAS;AAC7B","names":["createObservation: (callback: Observer<X | undefined>) => Unsubscribable","callback: Observer<X | undefined>","_name?: string","initialValue?: Snapshot<X>","notifyUpdate: () => void"],"sources":["../../../src/new/makeExternalStore.ts"],"version":3,"file":"makeExternalStore.d.ts"}
+{"mappings":"AAgBA,cACE,UACA,sBACK,kCAAmC;AAE1C,YAAY,SAAS,KACjB,IAAI;CAAE,QAAQ;AAAO,KACpB,QAAQ,KAAK;CAAE,QAAQ;AAAO;AAGnC,OAAO,iBAAS,kBAAkB,GAChCA,oBAAoBC,UAAU,SAAS,mBAAmB,gBAC1DC,gBACAC,eAAe,SAAS,KACvB;CACD,YAAYC;CACZ,mBAAmB,SAAS;AAC7B;;;;;;;;AAyCD,OAAO,iBAAS,uBAAuB,GACrCC,oBACEJ,UAAU,SAAS,mBAChB,QAAQ,iBACbC,gBACAC,eAAe,SAAS,KACvB;CACD,YAAYC;CACZ,mBAAmB,SAAS;AAC7B","names":["createObservation: (callback: Observer<X | undefined>) => Unsubscribable","callback: Observer<X | undefined>","_name?: string","initialValue?: Snapshot<X>","notifyUpdate: () => void","createObservation: (\n    callback: Observer<X | undefined>,\n  ) => Promise<Unsubscribable>"],"sources":["../../../src/new/makeExternalStore.ts"],"version":3,"file":"makeExternalStore.d.ts"}

package/build/types/new/useObjectSet.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,iBACA,WACA,WACA,sBACA,MACA,cACA,mBACA,mBACK,WAAY;AAUnB,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,QAAQ,YAAY,GAAG;;;;CAKvB,oBAAoB,WAAW,QAAO,gBAAgB,QAAQ,GAAG,KAAK;;;;CAKtE,QAAQ,UAAU;;;;CAKlB,YAAY,UAAU;;;;CAKtB,WAAW,UAAU;;;;CAKrB,UAAU,UAAU;;;;CAKpB;;;;CAKA,aACG,KAAK,aAAa,OAAM,QAAQ;;;;CAMnC;;;;;;;;CASA;;;;;;;;CASA;;;;;;;;;;;;;;;;;;;;CAqBA;AACD;AAED,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,MACI,KAAK,SAAS,GAAG,sBAAsB,aAAa,IAAI;;;;CAM5D;;;;CAKA,OAAO;;;;CAKP,kBAAkB;;;;CAKlB,WAAW,UAAU,GAAG;;;;CAKxB;AACD;;;;;;;;;;;;AAmBD,OAAO,iBAAS;CACd,UAAU;CACV,iBAAiB,eAAe;CAChC,aAAa,eAAe,qBAAqB,CAAE;EAEnDA,eAAe,UAAU,GAAG,WAC5BC,UAAS,oBAAoB,GAAG,QAC/B,mBAAmB,GAAG","names":["baseObjectSet: ObjectSet<Q, BaseRDPs>","options: UseObjectSetOptions<Q, RDPs>"],"sources":["../../../src/new/useObjectSet.tsx"],"version":3,"file":"useObjectSet.d.ts"}
+{"mappings":"AAgBA,cACE,iBACA,WACA,WACA,sBACA,MACA,cACA,mBACA,mBACK,WAAY;AAUnB,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,QAAQ,YAAY,GAAG;;;;CAKvB,oBAAoB,WAAW,QAAO,gBAAgB,QAAQ,GAAG,KAAK;;;;CAKtE,QAAQ,UAAU;;;;CAKlB,YAAY,UAAU;;;;CAKtB,WAAW,UAAU;;;;CAKrB,UAAU,UAAU;;;;CAKpB;;;;CAKA,aACG,KAAK,aAAa,OAAM,QAAQ;;;;CAMnC;;;;;;;;CASA;;;;;;;;CASA;;;;;;;;;;;;;;;;;;;;CAqBA;AACD;AAED,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,MACI,KAAK,SAAS,GAAG,sBAAsB,aAAa,IAAI;;;;CAM5D;;;;CAKA,OAAO;;;;CAKP,kBAAkB;;;;CAKlB,WAAW,UAAU,GAAG;;;;CAKxB;AACD;;;;;;;;;;;;AAoBD,OAAO,iBAAS;CACd,UAAU;CACV,iBAAiB,eAAe;CAChC,aAAa,eAAe,qBAAqB,CAAE;EAEnDA,eAAe,UAAU,GAAG,WAC5BC,UAAS,oBAAoB,GAAG,QAC/B,mBAAmB,GAAG","names":["baseObjectSet: ObjectSet<Q, BaseRDPs>","options: UseObjectSetOptions<Q, RDPs>"],"sources":["../../../src/new/useObjectSet.tsx"],"version":3,"file":"useObjectSet.d.ts"}

package/build/types/new/useOsdkAggregation.d.ts

@@ -1,5 +1,6 @@
-import type { AggregateOpts, AggregationsResults, DerivedProperty, ObjectOrInterfaceDefinition, SimplePropertyDef, WhereClause } from "@osdk/api";
-export interface UseOsdkAggregationOptions<
+import type { AggregateOpts, AggregationsResults, DerivedProperty, ObjectOrInterfaceDefinition, ObjectSet, SimplePropertyDef, WhereClause } from "@osdk/api";
+import type { ObjectTypeDefinition } from "@osdk/client";
+interface UseOsdkAggregationBaseOptions<
 	T extends ObjectOrInterfaceDefinition,
 	A extends AggregateOpts<T>,
 	RDPs extends Record<string, SimplePropertyDef> = {}
@@ -14,6 +15,14 @@ export interface UseOsdkAggregationOptions<
 	*/
 	withProperties?: { [K in keyof RDPs] : DerivedProperty.Creator<T, RDPs[K]> };
 	/**
+	* Intersect the main query with additional filtered object sets.
+	* Each entry creates a separate object set with its own where clause,
+	* and the final result is the intersection of all sets.
+	*/
+	intersectWith?: Array<{
+		where: WhereClause<T, RDPs>
+	}>;
+	/**
 	* Aggregation options including groupBy and select
 	*/
 	aggregate: A;
@@ -25,6 +34,21 @@ export interface UseOsdkAggregationOptions<
 	*/
 	dedupeIntervalMs?: number;
 }
+export interface UseOsdkAggregationOptions<
+	T extends ObjectOrInterfaceDefinition,
+	A extends AggregateOpts<T>,
+	RDPs extends Record<string, SimplePropertyDef> = {}
+> extends UseOsdkAggregationBaseOptions<T, A, RDPs> {}
+export interface UseOsdkAggregationOptionsWithObjectSet<
+	T extends ObjectTypeDefinition,
+	A extends AggregateOpts<T>,
+	RDPs extends Record<string, SimplePropertyDef> = {}
+> extends UseOsdkAggregationBaseOptions<T, A, RDPs> {
+	/**
+	* The ObjectSet to aggregate on. Enables aggregation on pivoted, filtered, or composed ObjectSets.
+	*/
+	objectSet: ObjectSet<T>;
+}
 export interface UseOsdkAggregationResult<
 	T extends ObjectOrInterfaceDefinition,
 	A extends AggregateOpts<T>
@@ -46,6 +70,7 @@ export interface UseOsdkAggregationResult<
 *
 * @example
 * ```tsx
+* // Basic aggregation without ObjectSet
 * const { data, isLoading, error } = useOsdkAggregation(Employee, {
 *   where: { department: "Engineering" },
 *   aggregate: {
@@ -56,10 +81,23 @@ export interface UseOsdkAggregationResult<
 *     }
 *   }
 * });
+*
+* // With a pivoted ObjectSet
+* const pivotedSet = useMemo(() => $(Employee).pivotTo("primaryOffice"), []);
+* const { data } = useOsdkAggregation(Office, {
+*   objectSet: pivotedSet,
+*   aggregate: { $select: { $count: "unordered" } }
+* });
 * ```
 */
 export declare function useOsdkAggregation<
 	Q extends ObjectOrInterfaceDefinition,
 	const A extends AggregateOpts<Q>,
 	RDPs extends Record<string, SimplePropertyDef> = {}
->(type: Q, { where, withProperties, aggregate, dedupeIntervalMs }: UseOsdkAggregationOptions<Q, A, RDPs>): UseOsdkAggregationResult<Q, A>;
+>(type: Q, options: UseOsdkAggregationOptions<Q, A, RDPs>): UseOsdkAggregationResult<Q, A>;
+export declare function useOsdkAggregation<
+	Q extends ObjectTypeDefinition,
+	const A extends AggregateOpts<Q>,
+	RDPs extends Record<string, SimplePropertyDef> = {}
+>(type: Q, options: UseOsdkAggregationOptionsWithObjectSet<Q, A, RDPs>): UseOsdkAggregationResult<Q, A>;
+export {};

package/build/types/new/useOsdkAggregation.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,eACA,qBACA,iBACA,6BACA,mBACA,mBACK,WAAY;AAMnB,iBAAiB;CACf,UAAU;CACV,UAAU,cAAc;CACxB,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,QAAQ,YAAY,GAAG;;;;;CAMvB,oBAAoB,WAAW,QAAO,gBAAgB,QAAQ,GAAG,KAAK;;;;CAKtE,WAAW;;;;;;;CAQX;AACD;AAED,iBAAiB;CACf,UAAU;CACV,UAAU,cAAc;EACxB;CACA,MAAM,oBAAoB,GAAG;CAC7B;CACA,OAAO;CACP;AACD;;;;;;;;;;;;;;;;;;;;;;;;;AAkCD,OAAO,iBAAS;CACd,UAAU;OACJ,UAAU,cAAc;CAC9B,aAAa,eAAe,qBAAqB,CAAE;EAEnDA,MAAM,GACN,EACE,OACA,gBACA,WACA,kBACsC,EAArC,0BAA0B,GAAG,GAAG,QAClC,yBAAyB,GAAG","names":["type: Q"],"sources":["../../../src/new/useOsdkAggregation.ts"],"version":3,"file":"useOsdkAggregation.d.ts"}
+{"mappings":"AAgBA,cACE,eACA,qBACA,iBACA,6BACA,WACA,mBACA,mBACK,WAAY;AACnB,cAAc,4BAA4B,cAAe;UAU/C;CACR,UAAU;CACV,UAAU,cAAc;CACxB,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,QAAQ,YAAY,GAAG;;;;;CAMvB,oBAAoB,WAAW,QAAO,gBAAgB,QAAQ,GAAG,KAAK;;;;;;CAOtE,gBAAgB,MAAM;EACpB,OAAO,YAAY,GAAG;CACvB;;;;CAKD,WAAW;;;;;;;CAQX;AACD;AAED,iBAAiB;CACf,UAAU;CACV,UAAU,cAAc;CACxB,aAAa,eAAe,qBAAqB,CAAE;UAC3C,8BAA8B,GAAG,GAAG,MAAM,CAAE;AAEtD,iBAAiB;CACf,UAAU;CACV,UAAU,cAAc;CACxB,aAAa,eAAe,qBAAqB,CAAE;UAC3C,8BAA8B,GAAG,GAAG,MAAM;;;;CAIlD,WAAW,UAAU;AACtB;AAID,iBAAiB;CACf,UAAU;CACV,UAAU,cAAc;EACxB;CACA,MAAM,oBAAoB,GAAG;CAC7B;CACA,OAAO;CACP;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwCD,OAAO,iBAAS;CACd,UAAU;OACJ,UAAU,cAAc;CAC9B,aAAa,eAAe,qBAAqB,CAAE;EAEnDA,MAAM,GACNC,SAAS,0BAA0B,GAAG,GAAG,QACxC,yBAAyB,GAAG;AAC/B,OAAO,iBAAS;CACd,UAAU;OACJ,UAAU,cAAc;CAC9B,aAAa,eAAe,qBAAqB,CAAE;EAEnDD,MAAM,GACNE,SAAS,uCAAuC,GAAG,GAAG,QACrD,yBAAyB,GAAG","names":["type: Q","options: UseOsdkAggregationOptions<Q, A, RDPs>","options: UseOsdkAggregationOptionsWithObjectSet<Q, A, RDPs>"],"sources":["../../../src/new/useOsdkAggregation.ts"],"version":3,"file":"useOsdkAggregation.d.ts"}

package/build/types/new/useOsdkObject.d.ts

@@ -1,5 +1,5 @@
-import type { ObjectTypeDefinition, Osdk, PrimaryKeyType } from "@osdk/api";
-export interface UseOsdkObjectResult<Q extends ObjectTypeDefinition> {
+import type { ObjectOrInterfaceDefinition, Osdk, PrimaryKeyType } from "@osdk/api";
+export interface UseOsdkObjectResult<Q extends ObjectOrInterfaceDefinition> {
 	object: Osdk.Instance<Q> | undefined;
 	isLoading: boolean;
 	error: Error | undefined;
@@ -13,12 +13,12 @@ export interface UseOsdkObjectResult<Q extends ObjectTypeDefinition> {
 * @param obj an existing `Osdk.Instance` object to get metadata for.
 * @param enabled Enable or disable the query (defaults to true)
 */
-export declare function useOsdkObject<Q extends ObjectTypeDefinition>(obj: Osdk.Instance<Q>, enabled?: boolean): UseOsdkObjectResult<Q>;
+export declare function useOsdkObject<Q extends ObjectOrInterfaceDefinition>(obj: Osdk.Instance<Q>, enabled?: boolean): UseOsdkObjectResult<Q>;
 /**
-* Loads an object by type and primary key.
+* Loads an object or interface instance by type and primary key.
 *
-* @param type
-* @param primaryKey
+* @param type The object type or interface definition
+* @param primaryKey The primary key of the object
 * @param enabled Enable or disable the query (defaults to true)
 */
-export declare function useOsdkObject<Q extends ObjectTypeDefinition>(type: Q, primaryKey: PrimaryKeyType<Q>, enabled?: boolean): UseOsdkObjectResult<Q>;
+export declare function useOsdkObject<Q extends ObjectOrInterfaceDefinition>(type: Q, primaryKey: PrimaryKeyType<Q>, enabled?: boolean): UseOsdkObjectResult<Q>;

package/build/types/new/useOsdkObject.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,sBAAsB,MAAM,sBAAsB,WAAY;AAM5E,iBAAiB,oBAAoB,UAAU,sBAAsB;CACnE,QAAQ,KAAK,SAAS;CACtB;CAEA,OAAO;;;;CAKP;CACA;AACD;;;;;AAMD,OAAO,iBAAS,cAAc,UAAU,sBACtCA,KAAK,KAAK,SAAS,IACnBC,oBACC,oBAAoB;;;;;;;;AAQvB,OAAO,iBAAS,cAAc,UAAU,sBACtCC,MAAM,GACNC,YAAY,eAAe,IAC3BF,oBACC,oBAAoB","names":["obj: Osdk.Instance<Q>","enabled?: boolean","type: Q","primaryKey: PrimaryKeyType<Q>"],"sources":["../../../src/new/useOsdkObject.ts"],"version":3,"file":"useOsdkObject.d.ts"}
+{"mappings":"AAgBA,cACE,6BACA,MACA,sBACK,WAAY;AAMnB,iBAAiB,oBACf,UAAU,6BACV;CACA,QAAQ,KAAK,SAAS;CACtB;CAEA,OAAO;;;;CAKP;CACA;AACD;;;;;AAMD,OAAO,iBAAS,cACd,UAAU,6BAEVA,KAAK,KAAK,SAAS,IACnBC,oBACC,oBAAoB;;;;;;;;AAQvB,OAAO,iBAAS,cACd,UAAU,6BAEVC,MAAM,GACNC,YAAY,eAAe,IAC3BF,oBACC,oBAAoB","names":["obj: Osdk.Instance<Q>","enabled?: boolean","type: Q","primaryKey: PrimaryKeyType<Q>"],"sources":["../../../src/new/useOsdkObject.ts"],"version":3,"file":"useOsdkObject.d.ts"}

package/build/types/new/useOsdkObjects.d.ts

@@ -82,7 +82,8 @@ export interface UseOsdkObjectsOptions<
 }
 export interface UseOsdkListResult<
 	T extends ObjectOrInterfaceDefinition,
-	RDPs extends Record<string, SimplePropertyDef> = {}
+	RDPs extends Record<string, SimplePropertyDef> = {},
+	EXTRA_OPTIONS extends never | "$rid" = never
 > {
 	/**
 	* Function to fetch more pages (undefined if no more pages)
@@ -91,7 +92,7 @@ export interface UseOsdkListResult<
 	/**
 	* The fetched data with derived properties
 	*/
-	data: Osdk.Instance<T, "$allBaseProperties", PropertyKeys<T>, RDPs>[] | undefined;
+	data: Osdk.Instance<T, "$allBaseProperties" | EXTRA_OPTIONS, PropertyKeys<T>, RDPs>[] | undefined;
 	/**
 	* Whether data is currently being loaded
 	*/
@@ -113,12 +114,25 @@ export interface UseOsdkListResult<
 	*/
 	totalCount?: string;
 }
+export declare function useOsdkObjects<
+	Q extends ObjectOrInterfaceDefinition,
+	L extends LinkNames<Q>
+>(type: Q, options: UseOsdkObjectsOptions<Q> & {
+	pivotTo: L
+	rids: readonly string[]
+}): UseOsdkListResult<LinkedType<Q, L>, {}, "$rid">;
 export declare function useOsdkObjects<
 	Q extends ObjectOrInterfaceDefinition,
 	L extends LinkNames<Q>
 >(type: Q, options: UseOsdkObjectsOptions<Q> & {
 	pivotTo: L
 }): UseOsdkListResult<LinkedType<Q, L>>;
+export declare function useOsdkObjects<
+	Q extends ObjectOrInterfaceDefinition,
+	RDPs extends Record<string, SimplePropertyDef> = {}
+>(type: Q, options: UseOsdkObjectsOptions<Q, RDPs> & {
+	rids: readonly string[]
+}): UseOsdkListResult<Q, RDPs, "$rid">;
 export declare function useOsdkObjects<
 	Q extends ObjectOrInterfaceDefinition,
 	RDPs extends Record<string, SimplePropertyDef> = {}

package/build/types/new/useOsdkObjects.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,iBACA,YACA,WACA,6BACA,MACA,cACA,mBACA,mBACK,WAAY;AAMnB,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;;;;;;;;;;;;;;CAiBA;;;;;;CAOA,QAAQ,YAAY,GAAG;;;;CAKvB,aACG,KAAK,aAAa,OAAM,QAAQ;;;;CAMnC;;;;;CAMA,oBAAoB,WAAW,QAAO,gBAAgB,QAAQ,GAAG,KAAK;;;;;;;CAQtE;;;;;;;;;CAUA;;;;;;CAOA,gBAAgB,MAAM;EACpB,OAAO,YAAY,GAAG;CACvB;;;;;CAMD,UAAU,UAAU;;;;;;;;;;CAWpB;CAEA;AACD;AAED,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;CAIA,kBAAkB;;;;CAKlB,MACI,KAAK,SAAS,GAAG,sBAAsB,aAAa,IAAI;;;;CAM5D;;;;CAKA,OAAO;;;;;;;;CASP;;;;CAKA;AACD;AAUD,OAAO,iBAAS;CACd,UAAU;CACV,UAAU,UAAU;EAEpBA,MAAM,GACNC,SAAS,sBAAsB,KAAK;CAAE,SAAS;AAAG,IACjD,kBAAkB,WAAW,GAAG;AAEnC,OAAO,iBAAS;CACd,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EAEnDD,MAAM,GACNE,UAAU,sBAAsB,GAAG,QAClC,kBAAkB,GAAG","names":["type: Q","options: UseOsdkObjectsOptions<Q> & { pivotTo: L }","options?: UseOsdkObjectsOptions<Q, RDPs>"],"sources":["../../../src/new/useOsdkObjects.ts"],"version":3,"file":"useOsdkObjects.d.ts"}
+{"mappings":"AAgBA,cACE,iBACA,YACA,WACA,6BACA,MACA,cACA,mBACA,mBACK,WAAY;AAMnB,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EACnD;;;;;;;;;;;;;;;;;CAiBA;;;;;;CAOA,QAAQ,YAAY,GAAG;;;;CAKvB,aACG,KAAK,aAAa,OAAM,QAAQ;;;;CAMnC;;;;;CAMA,oBAAoB,WAAW,QAAO,gBAAgB,QAAQ,GAAG,KAAK;;;;;;;CAQtE;;;;;;;;;CAUA;;;;;;CAOA,gBAAgB,MAAM;EACpB,OAAO,YAAY,GAAG;CACvB;;;;;CAMD,UAAU,UAAU;;;;;;;;;;CAWpB;CAEA;AACD;AAED,iBAAiB;CACf,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;CACnD,8BAA8B;EAC9B;;;;CAIA,kBAAkB;;;;CAKlB,MACI,KAAK,SACL,GACA,uBAAuB,eACvB,aAAa,IACb;;;;CAOJ;;;;CAKA,OAAO;;;;;;;;CASP;;;;CAKA;AACD;AAUD,OAAO,iBAAS;CACd,UAAU;CACV,UAAU,UAAU;EAEpBA,MAAM,GACNC,SAAS,sBAAsB,KAAK;CAAE,SAAS;CAAG;AAAyB,IAC1E,kBAAkB,WAAW,GAAG,IAAI,CAAE,GAAE;AAE3C,OAAO,iBAAS;CACd,UAAU;CACV,UAAU,UAAU;EAEpBD,MAAM,GACNE,SAAS,sBAAsB,KAAK;CAAE,SAAS;AAAG,IACjD,kBAAkB,WAAW,GAAG;AAEnC,OAAO,iBAAS;CACd,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EAEnDF,MAAM,GACNG,SAAS,sBAAsB,GAAG,QAAQ;CAAE;AAAyB,IACpE,kBAAkB,GAAG,MAAM;AAE9B,OAAO,iBAAS;CACd,UAAU;CACV,aAAa,eAAe,qBAAqB,CAAE;EAEnDH,MAAM,GACNI,UAAU,sBAAsB,GAAG,QAClC,kBAAkB,GAAG","names":["type: Q","options: UseOsdkObjectsOptions<Q> & { pivotTo: L; rids: readonly string[] }","options: UseOsdkObjectsOptions<Q> & { pivotTo: L }","options: UseOsdkObjectsOptions<Q, RDPs> & { rids: readonly string[] }","options?: UseOsdkObjectsOptions<Q, RDPs>"],"sources":["../../../src/new/useOsdkObjects.ts"],"version":3,"file":"useOsdkObjects.d.ts"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/react",
-  "version": "0.10.0-beta.4",
+  "version": "0.10.0-beta.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -53,8 +53,8 @@
     }
   },
   "devDependencies": {
-    "@osdk/foundry.admin": "2.45.0",
-    "@osdk/foundry.core": "2.45.0",
+    "@osdk/foundry.admin": "2.47.0",
+    "@osdk/foundry.core": "2.47.0",
     "@testing-library/react": "^16.3.0",
     "@types/react": "^18.3.24",
     "find-up": "^8.0.0",
@@ -67,11 +67,11 @@
     "react": "^18.3.1",
     "tiny-invariant": "^1.3.3",
     "typescript": "~5.5.4",
-    "@osdk/api": "2.8.0-beta.6",
+    "@osdk/api": "2.8.0-beta.12",
     "@osdk/monorepo.api-extractor": "~0.7.0-beta.1",
-    "@osdk/client.test.ontology": "2.8.0-beta.6",
-    "@osdk/monorepo.tsconfig": "~0.7.0-beta.1",
-    "@osdk/client": "2.8.0-beta.6"
+    "@osdk/client": "2.8.0-beta.12",
+    "@osdk/client.test.ontology": "2.8.0-beta.12",
+    "@osdk/monorepo.tsconfig": "~0.7.0-beta.1"
   },
   "publishConfig": {
     "access": "public"