@osdk/react 0.10.0 → 0.10.1-main-20260407074313

package/build/browser/new/useOsdkObjects.js

@@ -15,9 +15,9 @@
  */
 
 import React from "react";
+import { extractPayloadError, isPayloadLoading } from "./hookUtils.js";
 import { makeExternalStore } from "./makeExternalStore.js";
 import { OsdkContext2 } from "./OsdkContext2.js";
-const EMPTY_WHERE = {};
 export function useOsdkObjects(type, options) {
   const {
     observableClient
@@ -37,13 +37,14 @@ export function useOsdkObjects(type, options) {
     $select,
     $loadPropertySecurityMetadata
   } = options ?? {};
-  const canonWhere = observableClient.canonicalizeWhereClause(where ?? EMPTY_WHERE);
-  const stableCanonWhere = React.useMemo(() => canonWhere, [JSON.stringify(canonWhere)]);
+  const canonOptions = observableClient.canonicalizeOptions({
+    where,
+    withProperties,
+    orderBy,
+    intersectWith,
+    $select
+  });
   const stableRids = React.useMemo(() => rids, [JSON.stringify(rids)]);
-  const stableWithProperties = React.useMemo(() => withProperties, [JSON.stringify(withProperties)]);
-  const stableIntersectWith = React.useMemo(() => intersectWith, [JSON.stringify(intersectWith)]);
-  const stableOrderBy = React.useMemo(() => orderBy, [JSON.stringify(orderBy)]);
-  const stableSelect = React.useMemo(() => $select, [JSON.stringify($select)]);
   const {
     subscribe,
     getSnapShot
@@ -56,43 +57,41 @@ export function useOsdkObjects(type, options) {
     return makeExternalStore(observer => observableClient.observeList({
       type,
       rids: stableRids,
-      where: stableCanonWhere,
+      where: canonOptions.where,
       dedupeInterval: dedupeIntervalMs ?? 2_000,
       pageSize,
-      orderBy: stableOrderBy,
+      orderBy: canonOptions.orderBy,
       streamUpdates,
-      withProperties: stableWithProperties,
+      withProperties: canonOptions.withProperties,
       autoFetchMore,
-      ...(stableIntersectWith ? {
-        intersectWith: stableIntersectWith
+      ...(canonOptions.intersectWith ? {
+        intersectWith: canonOptions.intersectWith
       } : {}),
       ...(pivotTo ? {
         pivotTo
       } : {}),
-      ...(stableSelect ? {
-        select: stableSelect
+      ...(canonOptions.$select ? {
+        select: canonOptions.$select
       } : {}),
       ...($loadPropertySecurityMetadata ? {
         $loadPropertySecurityMetadata
       } : {})
-    }, 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, stableSelect, $loadPropertySecurityMetadata]);
+    }, observer), process.env.NODE_ENV !== "production" ? `list ${type.apiName} ${stableRids ? `[${stableRids.length} rids]` : ""} ${JSON.stringify(canonOptions.where)}` : void 0);
+  }, [enabled, observableClient, type.apiName, type.type, stableRids, canonOptions.where, dedupeIntervalMs, pageSize, canonOptions.orderBy, streamUpdates, canonOptions.withProperties, autoFetchMore, canonOptions.intersectWith, pivotTo, canonOptions.$select, $loadPropertySecurityMetadata]);
   const listPayload = React.useSyncExternalStore(subscribe, getSnapShot);
-  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]);
+  const refetch = React.useCallback(async () => {
+    await observableClient.invalidateObjectType(type.apiName);
+  }, [observableClient, type.apiName]);
+  return React.useMemo(() => ({
+    fetchMore: listPayload?.hasMore ? listPayload.fetchMore : undefined,
+    error: extractPayloadError(listPayload, "Failed to load objects"),
+    data: listPayload?.resolvedList,
+    isLoading: isPayloadLoading(listPayload, enabled),
+    isOptimistic: listPayload?.isOptimistic ?? false,
+    totalCount: listPayload?.totalCount,
+    hasMore: listPayload?.hasMore ?? false,
+    objectSet: listPayload?.objectSet,
+    refetch
+  }), [listPayload, enabled, refetch]);
 }
 //# sourceMappingURL=useOsdkObjects.js.map

package/build/browser/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","$select","$loadPropertySecurityMetadata","canonWhere","canonicalizeWhereClause","stableCanonWhere","useMemo","JSON","stringify","stableRids","stableWithProperties","stableIntersectWith","stableOrderBy","stableSelect","subscribe","getSnapShot","unsubscribe","process","env","NODE_ENV","apiName","observer","observeList","dedupeInterval","select","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  /**\n   * Restrict which properties are returned for each object.\n   * When provided, only the specified properties will be fetched,\n   * reducing payload sizes for list views.\n   *\n   * @example\n   * // Only fetch name and status properties\n   * useOsdkObjects(Employee, { $select: [\"name\", \"status\"] })\n   */\n  $select?: readonly PropertyKeys<T>[];\n\n  /**\n   * When true, loads per-property security metadata (marking requirements)\n   * alongside each object. The returned objects will have `$propertySecurities`\n   * populated with conjunctive/disjunctive marking requirements per property.\n   */\n  $loadPropertySecurityMetadata?: 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    $select,\n    $loadPropertySecurityMetadata,\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 stableSelect = React.useMemo(\n    () => $select,\n    [JSON.stringify($select)],\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            ...(stableSelect ? { select: stableSelect } : {}),\n            ...($loadPropertySecurityMetadata\n              ? { $loadPropertySecurityMetadata }\n              : {}),\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      stableSelect,\n      $loadPropertySecurityMetadata,\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":[]}
+{"version":3,"file":"useOsdkObjects.js","names":["React","extractPayloadError","isPayloadLoading","makeExternalStore","OsdkContext2","useOsdkObjects","type","options","observableClient","useContext","pageSize","dedupeIntervalMs","withProperties","enabled","rids","where","orderBy","streamUpdates","autoFetchMore","intersectWith","pivotTo","$select","$loadPropertySecurityMetadata","canonOptions","canonicalizeOptions","stableRids","useMemo","JSON","stringify","subscribe","getSnapShot","unsubscribe","process","env","NODE_ENV","apiName","observer","observeList","dedupeInterval","select","length","listPayload","useSyncExternalStore","refetch","useCallback","invalidateObjectType","fetchMore","hasMore","undefined","error","data","resolvedList","isLoading","isOptimistic","totalCount","objectSet"],"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  ObjectSet,\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 { extractPayloadError, isPayloadLoading } from \"./hookUtils.js\";\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  /**\n   * Restrict which properties are returned for each object.\n   * When provided, only the specified properties will be fetched,\n   * reducing payload sizes for list views.\n   *\n   * @example\n   * // Only fetch name and status properties\n   * useOsdkObjects(Employee, { $select: [\"name\", \"status\"] })\n   */\n  $select?: readonly PropertyKeys<T>[];\n\n  /**\n   * When true, loads per-property security metadata (marking requirements)\n   * alongside each object. The returned objects will have `$propertySecurities`\n   * populated with conjunctive/disjunctive marking requirements per property.\n   */\n  $loadPropertySecurityMetadata?: 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  hasMore: boolean;\n\n  objectSet: ObjectSet<T, RDPs> | undefined;\n\n  refetch: () => Promise<void>;\n}\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    $select,\n    $loadPropertySecurityMetadata,\n  } = options ?? {};\n\n  const canonOptions = observableClient.canonicalizeOptions({\n    where,\n    withProperties,\n    orderBy,\n    intersectWith,\n    $select,\n  });\n\n  const stableRids = React.useMemo(\n    () => rids,\n    [JSON.stringify(rids)],\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: canonOptions.where,\n            dedupeInterval: dedupeIntervalMs ?? 2_000,\n            pageSize,\n            orderBy: canonOptions.orderBy,\n            streamUpdates,\n            withProperties: canonOptions.withProperties,\n            autoFetchMore,\n            ...(canonOptions.intersectWith\n              ? { intersectWith: canonOptions.intersectWith }\n              : {}),\n            ...(pivotTo ? { pivotTo } : {}),\n            ...(canonOptions.$select ? { select: canonOptions.$select } : {}),\n            ...($loadPropertySecurityMetadata\n              ? { $loadPropertySecurityMetadata }\n              : {}),\n          }, observer),\n        process.env.NODE_ENV !== \"production\"\n          ? `list ${type.apiName} ${\n            stableRids ? `[${stableRids.length} rids]` : \"\"\n          } ${JSON.stringify(canonOptions.where)}`\n          : void 0,\n      );\n    },\n    [\n      enabled,\n      observableClient,\n      type.apiName,\n      type.type,\n      stableRids,\n      canonOptions.where,\n      dedupeIntervalMs,\n      pageSize,\n      canonOptions.orderBy,\n      streamUpdates,\n      canonOptions.withProperties,\n      autoFetchMore,\n      canonOptions.intersectWith,\n      pivotTo,\n      canonOptions.$select,\n      $loadPropertySecurityMetadata,\n    ],\n  );\n\n  const listPayload = React.useSyncExternalStore(subscribe, getSnapShot);\n\n  const refetch = React.useCallback(async () => {\n    await observableClient.invalidateObjectType(type.apiName);\n  }, [observableClient, type.apiName]);\n\n  return React.useMemo(() => ({\n    fetchMore: listPayload?.hasMore ? listPayload.fetchMore : undefined,\n    error: extractPayloadError(listPayload, \"Failed to load objects\"),\n    data: listPayload?.resolvedList,\n    isLoading: isPayloadLoading(listPayload, enabled),\n    isOptimistic: listPayload?.isOptimistic ?? false,\n    totalCount: listPayload?.totalCount,\n    hasMore: listPayload?.hasMore ?? false,\n    objectSet: listPayload?.objectSet,\n    refetch,\n  }), [listPayload, enabled, refetch]);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,mBAAmB,EAAEC,gBAAgB,QAAQ,gBAAgB;AACtE,SAASC,iBAAiB,QAAQ,wBAAwB;AAC1D,SAASC,YAAY,QAAQ,mBAAmB;AA6MhD,OAAO,SAASC,cAAcA,CAI5BC,IAAO,EACPC,OAAwC,EAM1C;EACE,MAAM;IAAEC;EAAiB,CAAC,GAAGR,KAAK,CAACS,UAAU,CAACL,YAAY,CAAC;EAE3D,MAAM;IACJM,QAAQ;IACRC,gBAAgB;IAChBC,cAAc;IACdC,OAAO,GAAG,IAAI;IACdC,IAAI;IACJC,KAAK;IACLC,OAAO;IACPC,aAAa;IACbC,aAAa;IACbC,aAAa;IACbC,OAAO;IACPC,OAAO;IACPC;EACF,CAAC,GAAGf,OAAO,IAAI,CAAC,CAAC;EAEjB,MAAMgB,YAAY,GAAGf,gBAAgB,CAACgB,mBAAmB,CAAC;IACxDT,KAAK;IACLH,cAAc;IACdI,OAAO;IACPG,aAAa;IACbE;EACF,CAAC,CAAC;EAEF,MAAMI,UAAU,GAAGzB,KAAK,CAAC0B,OAAO,CAC9B,MAAMZ,IAAI,EACV,CAACa,IAAI,CAACC,SAAS,CAACd,IAAI,CAAC,CACvB,CAAC;EAED,MAAM;IAAEe,SAAS;IAAEC;EAAY,CAAC,GAAG9B,KAAK,CAAC0B,OAAO,CAC9C,MAAM;IACJ,IAAI,CAACb,OAAO,EAAE;MACZ,OAAOV,iBAAiB,CAGtB,OAAO;QAAE4B,WAAW,EAAEA,CAAA,KAAM,CAAC;MAAE,CAAC,CAAC,EACjCC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,GACjC,QAAQ5B,IAAI,CAAC6B,OAAO,aAAa,GACjC,KAAK,CACX,CAAC;IACH;IAEA,OAAOhC,iBAAiB,CAGrBiC,QAAQ,IACP5B,gBAAgB,CAAC6B,WAAW,CAAC;MAC3B/B,IAAI;MACJQ,IAAI,EAAEW,UAAU;MAChBV,KAAK,EAAEQ,YAAY,CAACR,KAAK;MACzBuB,cAAc,EAAE3B,gBAAgB,IAAI,KAAK;MACzCD,QAAQ;MACRM,OAAO,EAAEO,YAAY,CAACP,OAAO;MAC7BC,aAAa;MACbL,cAAc,EAAEW,YAAY,CAACX,cAAc;MAC3CM,aAAa;MACb,IAAIK,YAAY,CAACJ,aAAa,GAC1B;QAAEA,aAAa,EAAEI,YAAY,CAACJ;MAAc,CAAC,GAC7C,CAAC,CAAC,CAAC;MACP,IAAIC,OAAO,GAAG;QAAEA;MAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;MAC/B,IAAIG,YAAY,CAACF,OAAO,GAAG;QAAEkB,MAAM,EAAEhB,YAAY,CAACF;MAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;MACjE,IAAIC,6BAA6B,GAC7B;QAAEA;MAA8B,CAAC,GACjC,CAAC,CAAC;IACR,CAAC,EAAEc,QAAQ,CAAC,EACdJ,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,GACjC,QAAQ5B,IAAI,CAAC6B,OAAO,IACpBV,UAAU,GAAG,IAAIA,UAAU,CAACe,MAAM,QAAQ,GAAG,EAAE,IAC7Cb,IAAI,CAACC,SAAS,CAACL,YAAY,CAACR,KAAK,CAAC,EAAE,GACtC,KAAK,CACX,CAAC;EACH,CAAC,EACD,CACEF,OAAO,EACPL,gBAAgB,EAChBF,IAAI,CAAC6B,OAAO,EACZ7B,IAAI,CAACA,IAAI,EACTmB,UAAU,EACVF,YAAY,CAACR,KAAK,EAClBJ,gBAAgB,EAChBD,QAAQ,EACRa,YAAY,CAACP,OAAO,EACpBC,aAAa,EACbM,YAAY,CAACX,cAAc,EAC3BM,aAAa,EACbK,YAAY,CAACJ,aAAa,EAC1BC,OAAO,EACPG,YAAY,CAACF,OAAO,EACpBC,6BAA6B,CAEjC,CAAC;EAED,MAAMmB,WAAW,GAAGzC,KAAK,CAAC0C,oBAAoB,CAACb,SAAS,EAAEC,WAAW,CAAC;EAEtE,MAAMa,OAAO,GAAG3C,KAAK,CAAC4C,WAAW,CAAC,YAAY;IAC5C,MAAMpC,gBAAgB,CAACqC,oBAAoB,CAACvC,IAAI,CAAC6B,OAAO,CAAC;EAC3D,CAAC,EAAE,CAAC3B,gBAAgB,EAAEF,IAAI,CAAC6B,OAAO,CAAC,CAAC;EAEpC,OAAOnC,KAAK,CAAC0B,OAAO,CAAC,OAAO;IAC1BoB,SAAS,EAAEL,WAAW,EAAEM,OAAO,GAAGN,WAAW,CAACK,SAAS,GAAGE,SAAS;IACnEC,KAAK,EAAEhD,mBAAmB,CAACwC,WAAW,EAAE,wBAAwB,CAAC;IACjES,IAAI,EAAET,WAAW,EAAEU,YAAY;IAC/BC,SAAS,EAAElD,gBAAgB,CAACuC,WAAW,EAAE5B,OAAO,CAAC;IACjDwC,YAAY,EAAEZ,WAAW,EAAEY,YAAY,IAAI,KAAK;IAChDC,UAAU,EAAEb,WAAW,EAAEa,UAAU;IACnCP,OAAO,EAAEN,WAAW,EAAEM,OAAO,IAAI,KAAK;IACtCQ,SAAS,EAAEd,WAAW,EAAEc,SAAS;IACjCZ;EACF,CAAC,CAAC,EAAE,CAACF,WAAW,EAAE5B,OAAO,EAAE8B,OAAO,CAAC,CAAC;AACtC","ignoreList":[]}

package/build/cjs/public/experimental.cjs

@@ -28,6 +28,25 @@ function OsdkProvider2({
     }
   }, children));
 }
+
+// src/new/hookUtils.ts
+function extractPayloadError(payload, fallbackMessage) {
+  if (payload && "error" in payload && payload.error) {
+    return payload.error;
+  }
+  if (payload?.status === "error") {
+    return new Error(fallbackMessage);
+  }
+  return void 0;
+}
+function isPayloadLoading(payload, enabled) {
+  if (!enabled) {
+    return false;
+  }
+  return payload?.status === "loading" || payload?.status === "init" || !payload;
+}
+
+// src/new/useLinks.ts
 var emptyArray = Object.freeze([]);
 var emptyMap = /* @__PURE__ */ new Map();
 function useLinks(objects, linkName, options = {}) {
@@ -38,9 +57,11 @@ function useLinks(objects, linkName, options = {}) {
     enabled = true,
     ...otherOptions
   } = options;
-  const stableWhere = React4__default.default.useMemo(() => otherOptions.where, [JSON.stringify(otherOptions.where)]);
-  const stableOrderBy = React4__default.default.useMemo(() => otherOptions.orderBy, [JSON.stringify(otherOptions.orderBy)]);
-  const stableSelect = React4__default.default.useMemo(() => otherOptions.$select, [JSON.stringify(otherOptions.$select)]);
+  const canonOptions = observableClient.canonicalizeOptions({
+    where: otherOptions.where,
+    orderBy: otherOptions.orderBy,
+    $select: otherOptions.$select
+  });
   const objectsKey = React4__default.default.useMemo(() => {
     if (objects === void 0) return "";
     const arr = Array.isArray(objects) ? objects : [objects];
@@ -61,23 +82,23 @@ function useLinks(objects, linkName, options = {}) {
     }
     return chunkZUNR45SJ_cjs.makeExternalStore((observer) => observableClient.observeLinks(objectsArray, linkName, {
       linkName,
-      where: stableWhere,
+      where: canonOptions.where,
       pageSize: otherOptions.pageSize,
-      orderBy: stableOrderBy,
+      orderBy: canonOptions.orderBy,
       mode: otherOptions.mode,
       dedupeInterval: otherOptions.dedupeIntervalMs ?? 2e3,
-      ...stableSelect ? {
-        select: stableSelect
+      ...canonOptions.$select ? {
+        select: canonOptions.$select
       } : {}
     }, observer), `links ${linkName} for ${objectsKey}`);
-  }, [enabled, observableClient, objectsArray, objectsKey, linkName, stableWhere, otherOptions.pageSize, stableOrderBy, otherOptions.mode, otherOptions.dedupeIntervalMs, stableSelect]);
+  }, [enabled, observableClient, objectsArray, objectsKey, linkName, canonOptions.where, otherOptions.pageSize, canonOptions.orderBy, otherOptions.mode, otherOptions.dedupeIntervalMs, canonOptions.$select]);
   const payload = React4__default.default.useSyncExternalStore(subscribe, getSnapShot);
   return React4__default.default.useMemo(() => ({
     links: payload?.resolvedList,
     linkedObjectsBySourcePrimaryKey: payload?.linkedObjectsBySourcePrimaryKey ?? emptyMap,
-    isLoading: enabled ? payload?.status === "loading" || payload?.status === "init" || !payload : false,
+    isLoading: isPayloadLoading(payload, enabled),
     isOptimistic: payload?.isOptimistic ?? false,
-    error: payload?.error,
+    error: extractPayloadError(payload, "Failed to load links"),
     fetchMore: payload?.hasMore ? payload?.fetchMore : void 0,
     hasMore: payload?.hasMore ?? false
   }), [payload, enabled]);
@@ -88,11 +109,12 @@ function useObjectSet(baseObjectSet, options = {}) {
     observableClient
   } = React4__default.default.useContext(chunkZUNR45SJ_cjs.OsdkContext2);
   const {
-    enabled = true,
+    enabled: enabledOption = true,
     streamUpdates,
     ...otherOptions
   } = options;
-  const objectTypeKey = enabled ? baseObjectSet.$objectSetInternals.def.apiName : OBJECT_TYPE_PLACEHOLDER;
+  const enabled = enabledOption && baseObjectSet != null;
+  const objectTypeKey = enabled && baseObjectSet ? baseObjectSet.$objectSetInternals.def.apiName : OBJECT_TYPE_PLACEHOLDER;
   const previousObjectTypeRef = React4__default.default.useRef(objectTypeKey);
   const previousCompletedPayloadRef = React4__default.default.useRef();
   const objectTypeChanged = previousObjectTypeRef.current !== objectTypeKey;
@@ -100,17 +122,18 @@ function useObjectSet(baseObjectSet, options = {}) {
     previousObjectTypeRef.current = objectTypeKey;
     previousCompletedPayloadRef.current = void 0;
   }
-  const stableKey = unstableDoNotUse.computeObjectSetCacheKey(baseObjectSet, {
+  const canonOptions = observableClient.canonicalizeOptions({
     where: otherOptions.where,
     withProperties: otherOptions.withProperties,
+    orderBy: otherOptions.orderBy,
     union: otherOptions.union,
     intersect: otherOptions.intersect,
     subtract: otherOptions.subtract,
-    pivotTo: otherOptions.pivotTo,
-    pageSize: otherOptions.pageSize,
-    orderBy: otherOptions.orderBy,
-    select: otherOptions.$select
+    $select: otherOptions.$select
   });
+  const objectSetKey = baseObjectSet ? JSON.stringify(unstableDoNotUse.getWireObjectSet(baseObjectSet)) : void 0;
+  const baseObjectSetRef = React4__default.default.useRef(baseObjectSet);
+  baseObjectSetRef.current = baseObjectSet;
   const {
     subscribe,
     getSnapShot
@@ -119,42 +142,57 @@ function useObjectSet(baseObjectSet, options = {}) {
       return chunkZUNR45SJ_cjs.makeExternalStore(() => ({
         unsubscribe: () => {
         }
-      }), process.env.NODE_ENV !== "production" ? `objectSet ${stableKey} [DISABLED]` : void 0);
+      }), process.env.NODE_ENV !== "production" ? `objectSet [DISABLED]` : void 0);
     }
     const initialValue = objectTypeChanged ? void 0 : previousCompletedPayloadRef.current;
     return chunkZUNR45SJ_cjs.makeExternalStore((observer) => {
-      const subscription = observableClient.observeObjectSet(baseObjectSet, {
-        where: otherOptions.where,
-        withProperties: otherOptions.withProperties,
-        union: otherOptions.union,
-        intersect: otherOptions.intersect,
-        subtract: otherOptions.subtract,
+      if (!baseObjectSetRef.current) {
+        return {
+          unsubscribe: () => {
+          }
+        };
+      }
+      const subscription = observableClient.observeObjectSet(baseObjectSetRef.current, {
+        where: canonOptions.where,
+        withProperties: canonOptions.withProperties,
+        union: canonOptions.union,
+        intersect: canonOptions.intersect,
+        subtract: canonOptions.subtract,
         pivotTo: otherOptions.pivotTo,
         pageSize: otherOptions.pageSize,
-        orderBy: otherOptions.orderBy,
+        orderBy: canonOptions.orderBy,
         dedupeInterval: otherOptions.dedupeIntervalMs ?? 2e3,
         autoFetchMore: otherOptions.autoFetchMore,
         streamUpdates,
-        select: otherOptions.$select
+        select: canonOptions.$select
       }, observer);
       return subscription;
-    }, process.env.NODE_ENV !== "production" ? `objectSet ${stableKey}` : void 0, initialValue);
-  }, [enabled, observableClient, stableKey, streamUpdates, objectTypeChanged]);
+    }, process.env.NODE_ENV !== "production" ? `objectSet ${objectTypeKey}` : void 0, initialValue);
+  }, [enabled, observableClient, objectSetKey, canonOptions.where, canonOptions.withProperties, canonOptions.orderBy, canonOptions.union, canonOptions.intersect, canonOptions.subtract, canonOptions.$select, otherOptions.pivotTo, otherOptions.pageSize, otherOptions.autoFetchMore, otherOptions.dedupeIntervalMs, streamUpdates, objectTypeKey]);
   const payload = React4__default.default.useSyncExternalStore(subscribe, getSnapShot);
   if (payload && isPayloadCompleted(payload)) {
     previousCompletedPayloadRef.current = payload;
   }
+  const typeApiName = baseObjectSet?.$objectSetInternals.def.apiName;
+  const refetch = React4__default.default.useCallback(async () => {
+    if (typeApiName) {
+      await observableClient.invalidateObjectType(typeApiName);
+    }
+  }, [observableClient, typeApiName]);
   return React4__default.default.useMemo(() => {
     const lastLoaded = isPayloadCompleted(payload) ? payload : previousCompletedPayloadRef.current;
     return {
       data: lastLoaded?.resolvedList,
-      isLoading: !isPayloadCompleted(payload),
-      error: lastLoaded && "error" in lastLoaded ? lastLoaded.error : void 0,
+      isLoading: enabled ? !isPayloadCompleted(payload) : false,
+      error: extractPayloadError(lastLoaded, "Failed to load object set"),
+      isOptimistic: payload?.isOptimistic ?? false,
       fetchMore: payload?.hasMore ? payload.fetchMore : void 0,
-      objectSet: payload?.objectSet || baseObjectSet,
-      totalCount: lastLoaded?.totalCount
+      hasMore: payload?.hasMore ?? false,
+      objectSet: lastLoaded?.objectSet,
+      totalCount: lastLoaded?.totalCount,
+      refetch
     };
-  }, [payload, baseObjectSet]);
+  }, [payload, refetch, enabled]);
 }
 function isPayloadCompleted(payload) {
   if (payload != null && "error" in payload) {
@@ -289,10 +327,9 @@ function useOsdkAction(actionDef) {
     validationResult
   }), [applyAction, validateAction, error, data, isPending, isValidating, validationResult]);
 }
-var EMPTY_WHERE = {};
 function useOsdkAggregation(type, options) {
   const {
-    where = EMPTY_WHERE,
+    where,
     withProperties,
     intersectWith,
     aggregate,
@@ -302,59 +339,53 @@ function useOsdkAggregation(type, options) {
   const {
     observableClient
   } = React4__default.default.useContext(chunkZUNR45SJ_cjs.OsdkContext2);
-  const canonWhere = observableClient.canonicalizeWhereClause(where);
-  const stableCanonWhere = React4__default.default.useMemo(() => canonWhere, [JSON.stringify(canonWhere)]);
+  const canonOptions = observableClient.canonicalizeOptions({
+    where,
+    withProperties,
+    aggregate,
+    intersectWith
+  });
+  const objectSetKey = objectSet ? JSON.stringify(unstableDoNotUse.getWireObjectSet(objectSet)) : void 0;
   const objectSetRef = React4__default.default.useRef(objectSet);
   objectSetRef.current = objectSet;
-  const objectSetKeyString = objectSet ? unstableDoNotUse.computeObjectSetCacheKey(objectSet) : void 0;
-  const stableWithProperties = React4__default.default.useMemo(() => withProperties, [JSON.stringify(withProperties)]);
-  const stableAggregate = React4__default.default.useMemo(() => aggregate, [JSON.stringify(aggregate)]);
-  const stableIntersectWith = React4__default.default.useMemo(() => intersectWith, [JSON.stringify(intersectWith)]);
   const {
     subscribe,
     getSnapShot
   } = React4__default.default.useMemo(() => {
-    if (objectSetKeyString && objectSetRef.current) {
+    const currentObjectSet = objectSetRef.current;
+    if (currentObjectSet) {
       return chunkZUNR45SJ_cjs.makeExternalStoreAsync((observer) => observableClient.observeAggregation({
         type,
-        objectSet: objectSetRef.current,
-        where: stableCanonWhere,
-        withProperties: stableWithProperties,
-        intersectWith: stableIntersectWith,
-        aggregate: stableAggregate,
+        objectSet: currentObjectSet,
+        where: canonOptions.where,
+        withProperties: canonOptions.withProperties,
+        intersectWith: canonOptions.intersectWith,
+        aggregate: canonOptions.aggregate,
         dedupeInterval: dedupeIntervalMs ?? 2e3
-      }, observer), process.env.NODE_ENV !== "production" ? `aggregation ${type.apiName} ${objectSetKeyString} ${JSON.stringify(stableCanonWhere)}` : void 0);
+      }, observer), process.env.NODE_ENV !== "production" ? `aggregation ${type.apiName} ${JSON.stringify(canonOptions.where)}` : void 0);
     }
     return chunkZUNR45SJ_cjs.makeExternalStore((observer) => (
       // eslint-disable-next-line @typescript-eslint/no-deprecated
       observableClient.observeAggregation({
         type,
-        where: stableCanonWhere,
-        withProperties: stableWithProperties,
-        intersectWith: stableIntersectWith,
-        aggregate: stableAggregate,
+        where: canonOptions.where,
+        withProperties: canonOptions.withProperties,
+        intersectWith: canonOptions.intersectWith,
+        aggregate: canonOptions.aggregate,
         dedupeInterval: dedupeIntervalMs ?? 2e3
       }, observer)
-    ), process.env.NODE_ENV !== "production" ? `aggregation ${type.apiName} ${JSON.stringify(stableCanonWhere)}` : void 0);
-  }, [observableClient, type.apiName, type.type, objectSetKeyString, stableCanonWhere, stableWithProperties, stableIntersectWith, stableAggregate, dedupeIntervalMs]);
+    ), process.env.NODE_ENV !== "production" ? `aggregation ${type.apiName} ${JSON.stringify(canonOptions.where)}` : void 0);
+  }, [observableClient, type.apiName, type.type, objectSetKey, canonOptions.where, canonOptions.withProperties, canonOptions.intersectWith, canonOptions.aggregate, dedupeIntervalMs]);
   const payload = React4__default.default.useSyncExternalStore(subscribe, getSnapShot);
   const refetch = React4__default.default.useCallback(async () => {
     await observableClient.invalidateObjectType(type.apiName);
   }, [observableClient, type.apiName]);
-  return React4__default.default.useMemo(() => {
-    let error;
-    if (payload && "error" in payload && payload.error) {
-      error = payload.error;
-    } else if (payload?.status === "error") {
-      error = new Error("Failed to execute aggregation");
-    }
-    return {
-      data: payload?.result,
-      isLoading: payload?.status === "loading" || payload?.status === "init" || !payload,
-      error,
-      refetch
-    };
-  }, [payload, refetch]);
+  return React4__default.default.useMemo(() => ({
+    data: payload?.result,
+    isLoading: isPayloadLoading(payload, true),
+    error: extractPayloadError(payload, "Failed to execute aggregation"),
+    refetch
+  }), [payload, refetch]);
 }
 function useOsdkFunction(queryDef, options = {}) {
   const {
@@ -461,7 +492,6 @@ function useOsdkObject(...args) {
     };
   }, [payload, enabled, forceUpdate]);
 }
-var EMPTY_WHERE2 = {};
 function useOsdkObjects(type, options) {
   const {
     observableClient
@@ -481,13 +511,14 @@ function useOsdkObjects(type, options) {
     $select,
     $loadPropertySecurityMetadata
   } = options ?? {};
-  const canonWhere = observableClient.canonicalizeWhereClause(where ?? EMPTY_WHERE2);
-  const stableCanonWhere = React4__default.default.useMemo(() => canonWhere, [JSON.stringify(canonWhere)]);
+  const canonOptions = observableClient.canonicalizeOptions({
+    where,
+    withProperties,
+    orderBy,
+    intersectWith,
+    $select
+  });
   const stableRids = React4__default.default.useMemo(() => rids, [JSON.stringify(rids)]);
-  const stableWithProperties = React4__default.default.useMemo(() => withProperties, [JSON.stringify(withProperties)]);
-  const stableIntersectWith = React4__default.default.useMemo(() => intersectWith, [JSON.stringify(intersectWith)]);
-  const stableOrderBy = React4__default.default.useMemo(() => orderBy, [JSON.stringify(orderBy)]);
-  const stableSelect = React4__default.default.useMemo(() => $select, [JSON.stringify($select)]);
   const {
     subscribe,
     getSnapShot
@@ -501,44 +532,42 @@ function useOsdkObjects(type, options) {
     return chunkZUNR45SJ_cjs.makeExternalStore((observer) => observableClient.observeList({
       type,
       rids: stableRids,
-      where: stableCanonWhere,
+      where: canonOptions.where,
       dedupeInterval: dedupeIntervalMs ?? 2e3,
       pageSize,
-      orderBy: stableOrderBy,
+      orderBy: canonOptions.orderBy,
       streamUpdates,
-      withProperties: stableWithProperties,
+      withProperties: canonOptions.withProperties,
       autoFetchMore,
-      ...stableIntersectWith ? {
-        intersectWith: stableIntersectWith
+      ...canonOptions.intersectWith ? {
+        intersectWith: canonOptions.intersectWith
       } : {},
       ...pivotTo ? {
         pivotTo
       } : {},
-      ...stableSelect ? {
-        select: stableSelect
+      ...canonOptions.$select ? {
+        select: canonOptions.$select
       } : {},
       ...$loadPropertySecurityMetadata ? {
         $loadPropertySecurityMetadata
       } : {}
-    }, 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, stableSelect, $loadPropertySecurityMetadata]);
+    }, observer), process.env.NODE_ENV !== "production" ? `list ${type.apiName} ${stableRids ? `[${stableRids.length} rids]` : ""} ${JSON.stringify(canonOptions.where)}` : void 0);
+  }, [enabled, observableClient, type.apiName, type.type, stableRids, canonOptions.where, dedupeIntervalMs, pageSize, canonOptions.orderBy, streamUpdates, canonOptions.withProperties, autoFetchMore, canonOptions.intersectWith, pivotTo, canonOptions.$select, $loadPropertySecurityMetadata]);
   const listPayload = React4__default.default.useSyncExternalStore(subscribe, getSnapShot);
-  return React4__default.default.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 : void 0,
-      error,
-      data: listPayload?.resolvedList,
-      isLoading: enabled ? listPayload?.status === "loading" || listPayload?.status === "init" || !listPayload : false,
-      isOptimistic: listPayload?.isOptimistic ?? false,
-      totalCount: listPayload?.totalCount
-    };
-  }, [listPayload, enabled]);
+  const refetch = React4__default.default.useCallback(async () => {
+    await observableClient.invalidateObjectType(type.apiName);
+  }, [observableClient, type.apiName]);
+  return React4__default.default.useMemo(() => ({
+    fetchMore: listPayload?.hasMore ? listPayload.fetchMore : void 0,
+    error: extractPayloadError(listPayload, "Failed to load objects"),
+    data: listPayload?.resolvedList,
+    isLoading: isPayloadLoading(listPayload, enabled),
+    isOptimistic: listPayload?.isOptimistic ?? false,
+    totalCount: listPayload?.totalCount,
+    hasMore: listPayload?.hasMore ?? false,
+    objectSet: listPayload?.objectSet,
+    refetch
+  }), [listPayload, enabled, refetch]);
 }
 function useDebouncedCallback(callback, delay) {
   const timeoutRef = React4__default.default.useRef();