@deephaven/jsapi-bootstrap 0.60.1-object-fetcher.6 → 0.60.1-object-fetcher.7

package/dist/DeferredApiBootstrap.d.ts

@@ -5,11 +5,11 @@ type DeferredApiBootstrapProps = React.PropsWithChildren<{
     /**
      * Options to use when fetching the deferred API.
      */
-    descriptor: VariableDescriptor;
+    widget: VariableDescriptor;
 }>;
 /**
  * Does not render children until the deferred API is resolved.
  */
-export declare const DeferredApiBootstrap: React.MemoExoticComponent<({ children, onError, descriptor, }: DeferredApiBootstrapProps) => JSX.Element | null>;
+export declare const DeferredApiBootstrap: React.MemoExoticComponent<({ children, onError, widget, }: DeferredApiBootstrapProps) => JSX.Element | null>;
 export default DeferredApiBootstrap;
 //# sourceMappingURL=DeferredApiBootstrap.d.ts.map

package/dist/DeferredApiBootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeferredApiBootstrap.d.ts","sourceRoot":"","sources":["../src/DeferredApiBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,KAAK,yBAAyB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC;;OAEG;IACH,UAAU,EAAE,kBAAkB,CAAC;CAChC,CAAC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,oBAAoB,iEAK5B,yBAAyB,KAAG,WAAW,GAAG,IAAI,CAYlD,CAAC;AAIF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"DeferredApiBootstrap.d.ts","sourceRoot":"","sources":["../src/DeferredApiBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,KAAK,yBAAyB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,oBAAoB,6DAK5B,yBAAyB,KAAG,WAAW,GAAG,IAAI,CAYlD,CAAC;AAIF,eAAe,oBAAoB,CAAC"}

package/dist/DeferredApiBootstrap.js

@@ -9,9 +9,9 @@ export var DeferredApiBootstrap = /*#__PURE__*/React.memo(_ref => {
   var {
     children,
     onError,
-    descriptor
+    widget
   } = _ref;
-  var [api, apiError] = useDeferredApi(descriptor);
+  var [api, apiError] = useDeferredApi(widget);
   if (apiError != null) {
     onError === null || onError === void 0 ? void 0 : onError(apiError);
     return null;

package/dist/DeferredApiBootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeferredApiBootstrap.js","names":["React","useDeferredApi","ApiContext","jsx","_jsx","DeferredApiBootstrap","memo","_ref","children","onError","descriptor","api","apiError","Provider","value","displayName"],"sources":["../src/DeferredApiBootstrap.tsx"],"sourcesContent":["import React from 'react';\nimport { VariableDescriptor } from '@deephaven/jsapi-types';\nimport useDeferredApi from './useDeferredApi';\nimport { ApiContext } from './ApiBootstrap';\n\ntype DeferredApiBootstrapProps = React.PropsWithChildren<{\n  onError?: (error: unknown) => void;\n  /**\n   * Options to use when fetching the deferred API.\n   */\n  descriptor: VariableDescriptor;\n}>;\n\n/**\n * Does not render children until the deferred API is resolved.\n */\nexport const DeferredApiBootstrap = React.memo(\n  ({\n    children,\n    onError,\n    descriptor,\n  }: DeferredApiBootstrapProps): JSX.Element | null => {\n    const [api, apiError] = useDeferredApi(descriptor);\n    if (apiError != null) {\n      onError?.(apiError);\n      return null;\n    }\n    if (api == null) {\n      // Still waiting for the API to load\n      return null;\n    }\n    return <ApiContext.Provider value={api}>{children}</ApiContext.Provider>;\n  }\n);\n\nDeferredApiBootstrap.displayName = 'DeferredApiBootstrap';\n\nexport default DeferredApiBootstrap;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AAAC,OAEnBC,cAAc;AAAA,SACZC,UAAU;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAUnB;AACA;AACA;AACA,OAAO,IAAMC,oBAAoB,gBAAGL,KAAK,CAACM,IAAI,CAC5CC,IAAA,IAIqD;EAAA,IAJpD;IACCC,QAAQ;IACRC,OAAO;IACPC;EACyB,CAAC,GAAAH,IAAA;EAC1B,IAAM,CAACI,GAAG,EAAEC,QAAQ,CAAC,GAAGX,cAAc,CAACS,UAAU,CAAC;EAClD,IAAIE,QAAQ,IAAI,IAAI,EAAE;IACpBH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAGG,QAAQ,CAAC;IACnB,OAAO,IAAI;EACb;EACA,IAAID,GAAG,IAAI,IAAI,EAAE;IACf;IACA,OAAO,IAAI;EACb;EACA,oBAAOP,IAAA,CAACF,UAAU,CAACW,QAAQ;IAACC,KAAK,EAAEH,GAAI;IAAAH,QAAA,EAAEA;EAAQ,CAAsB,CAAC;AAC1E,CACF,CAAC;AAEDH,oBAAoB,CAACU,WAAW,GAAG,sBAAsB;AAEzD,eAAeV,oBAAoB"}
+{"version":3,"file":"DeferredApiBootstrap.js","names":["React","useDeferredApi","ApiContext","jsx","_jsx","DeferredApiBootstrap","memo","_ref","children","onError","widget","api","apiError","Provider","value","displayName"],"sources":["../src/DeferredApiBootstrap.tsx"],"sourcesContent":["import React from 'react';\nimport { VariableDescriptor } from '@deephaven/jsapi-types';\nimport useDeferredApi from './useDeferredApi';\nimport { ApiContext } from './ApiBootstrap';\n\ntype DeferredApiBootstrapProps = React.PropsWithChildren<{\n  onError?: (error: unknown) => void;\n  /**\n   * Options to use when fetching the deferred API.\n   */\n  widget: VariableDescriptor;\n}>;\n\n/**\n * Does not render children until the deferred API is resolved.\n */\nexport const DeferredApiBootstrap = React.memo(\n  ({\n    children,\n    onError,\n    widget,\n  }: DeferredApiBootstrapProps): JSX.Element | null => {\n    const [api, apiError] = useDeferredApi(widget);\n    if (apiError != null) {\n      onError?.(apiError);\n      return null;\n    }\n    if (api == null) {\n      // Still waiting for the API to load\n      return null;\n    }\n    return <ApiContext.Provider value={api}>{children}</ApiContext.Provider>;\n  }\n);\n\nDeferredApiBootstrap.displayName = 'DeferredApiBootstrap';\n\nexport default DeferredApiBootstrap;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AAAC,OAEnBC,cAAc;AAAA,SACZC,UAAU;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAUnB;AACA;AACA;AACA,OAAO,IAAMC,oBAAoB,gBAAGL,KAAK,CAACM,IAAI,CAC5CC,IAAA,IAIqD;EAAA,IAJpD;IACCC,QAAQ;IACRC,OAAO;IACPC;EACyB,CAAC,GAAAH,IAAA;EAC1B,IAAM,CAACI,GAAG,EAAEC,QAAQ,CAAC,GAAGX,cAAc,CAACS,MAAM,CAAC;EAC9C,IAAIE,QAAQ,IAAI,IAAI,EAAE;IACpBH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAGG,QAAQ,CAAC;IACnB,OAAO,IAAI;EACb;EACA,IAAID,GAAG,IAAI,IAAI,EAAE;IACf;IACA,OAAO,IAAI;EACb;EACA,oBAAOP,IAAA,CAACF,UAAU,CAACW,QAAQ;IAACC,KAAK,EAAEH,GAAI;IAAAH,QAAA,EAAEA;EAAQ,CAAsB,CAAC;AAC1E,CACF,CAAC;AAEDH,oBAAoB,CAACU,WAAW,GAAG,sBAAsB;AAEzD,eAAeV,oBAAoB"}

package/dist/useDeferredApi.d.ts

@@ -8,11 +8,11 @@ import type { dh as DhType, VariableDescriptor } from '@deephaven/jsapi-types';
 export type DeferredApiFetcher = (descriptor?: VariableDescriptor) => Promise<DhType>;
 export declare const DeferredApiContext: import("react").Context<DhType | DeferredApiFetcher | null>;
 /**
- * Retrieve the API for the current context, given the descriptor provided.
+ * Retrieve the API for the current context, given the widget provided.
  * The API may need to be loaded, and will return `null` until it is ready.
- * @param descriptor The object descriptor to use to fetch the API
+ * @param widget The widget descriptor to use to fetch the API
  * @returns A tuple with the API instance, and an error if one occurred.
  */
-export declare function useDeferredApi(descriptor: VariableDescriptor): [DhType | null, unknown | null];
+export declare function useDeferredApi(widget: VariableDescriptor): [DhType | null, unknown | null];
 export default useDeferredApi;
 //# sourceMappingURL=useDeferredApi.d.ts.map

package/dist/useDeferredApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDeferredApi.d.ts","sourceRoot":"","sources":["../src/useDeferredApi.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG/E;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAC/B,UAAU,CAAC,EAAE,kBAAkB,KAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB,eAAO,MAAM,kBAAkB,6DAExB,CAAC;AAER;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,kBAAkB,GAC7B,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC,CAkDjC;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"useDeferredApi.d.ts","sourceRoot":"","sources":["../src/useDeferredApi.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG/E;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAC/B,UAAU,CAAC,EAAE,kBAAkB,KAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB,eAAO,MAAM,kBAAkB,6DAExB,CAAC;AAER;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,kBAAkB,GACzB,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC,CAkDjC;AAED,eAAe,cAAc,CAAC"}

package/dist/useDeferredApi.js

@@ -10,12 +10,12 @@ import { ApiContext } from "./ApiBootstrap.js";
 export var DeferredApiContext = /*#__PURE__*/createContext(null);
 
 /**
- * Retrieve the API for the current context, given the descriptor provided.
+ * Retrieve the API for the current context, given the widget provided.
  * The API may need to be loaded, and will return `null` until it is ready.
- * @param descriptor The object descriptor to use to fetch the API
+ * @param widget The widget descriptor to use to fetch the API
  * @returns A tuple with the API instance, and an error if one occurred.
  */
-export function useDeferredApi(descriptor) {
+export function useDeferredApi(widget) {
   var [api, setApi] = useState(null);
   var [error, setError] = useState(null);
   var deferredApi = useContext(DeferredApiContext);
@@ -39,7 +39,7 @@ export function useDeferredApi(descriptor) {
       _loadApi = _asyncToGenerator(function* () {
         if (typeof deferredApi === 'function') {
           try {
-            var newApi = yield deferredApi(descriptor);
+            var newApi = yield deferredApi(widget);
             if (!isCancelled) {
               setApi(newApi);
               setError(null);
@@ -60,7 +60,7 @@ export function useDeferredApi(descriptor) {
     return () => {
       isCancelled = true;
     };
-  }, [contextApi, deferredApi, descriptor]);
+  }, [contextApi, deferredApi, widget]);
   return [api, error];
 }
 export default useDeferredApi;

package/dist/useDeferredApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDeferredApi.js","names":["createContext","useContext","useEffect","useState","ApiContext","DeferredApiContext","useDeferredApi","descriptor","api","setApi","error","setError","deferredApi","contextApi","Error","isCancelled","loadApi","_loadApi","apply","arguments","_asyncToGenerator","newApi","e"],"sources":["../src/useDeferredApi.ts"],"sourcesContent":["import { createContext, useContext, useEffect, useState } from 'react';\nimport type { dh as DhType, VariableDescriptor } from '@deephaven/jsapi-types';\nimport { ApiContext } from './ApiBootstrap';\n\n/**\n * Function to fetch an API based on a provided descriptor object.\n * Depending on the context there may be more properties on the descriptor,\n * providing more information about the object, such as a session ID.\n */\nexport type DeferredApiFetcher = (\n  descriptor?: VariableDescriptor\n) => Promise<DhType>;\n\nexport const DeferredApiContext = createContext<\n  DhType | DeferredApiFetcher | null\n>(null);\n\n/**\n * Retrieve the API for the current context, given the descriptor provided.\n * The API may need to be loaded, and will return `null` until it is ready.\n * @param descriptor The object descriptor to use to fetch the API\n * @returns A tuple with the API instance, and an error if one occurred.\n */\nexport function useDeferredApi(\n  descriptor: VariableDescriptor\n): [DhType | null, unknown | null] {\n  const [api, setApi] = useState<DhType | null>(null);\n  const [error, setError] = useState<unknown | null>(null);\n  const deferredApi = useContext(DeferredApiContext);\n  const contextApi = useContext(ApiContext);\n\n  useEffect(() => {\n    if (deferredApi == null) {\n      if (contextApi != null) {\n        setApi(contextApi);\n        setError(null);\n        return;\n      }\n      setApi(null);\n      setError(\n        new Error(\n          'No API available in useDeferredApi. Was code wrapped in ApiBootstrap or DeferredApiContext.Provider?'\n        )\n      );\n      return;\n    }\n    let isCancelled = false;\n\n    async function loadApi() {\n      if (typeof deferredApi === 'function') {\n        try {\n          const newApi = await deferredApi(descriptor);\n          if (!isCancelled) {\n            setApi(newApi);\n            setError(null);\n          }\n        } catch (e) {\n          if (!isCancelled) {\n            setApi(null);\n            setError(e);\n          }\n        }\n      } else {\n        setApi(deferredApi);\n      }\n    }\n\n    loadApi();\n\n    return () => {\n      isCancelled = true;\n    };\n  }, [contextApi, deferredApi, descriptor]);\n\n  return [api, error];\n}\n\nexport default useDeferredApi;\n"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAAC,SAE9DC,UAAU;AAEnB;AACA;AACA;AACA;AACA;AAKA,OAAO,IAAMC,kBAAkB,gBAAGL,aAAa,CAE7C,IAAI,CAAC;;AAEP;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASM,cAAcA,CAC5BC,UAA8B,EACG;EACjC,IAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAGN,QAAQ,CAAgB,IAAI,CAAC;EACnD,IAAM,CAACO,KAAK,EAAEC,QAAQ,CAAC,GAAGR,QAAQ,CAAiB,IAAI,CAAC;EACxD,IAAMS,WAAW,GAAGX,UAAU,CAACI,kBAAkB,CAAC;EAClD,IAAMQ,UAAU,GAAGZ,UAAU,CAACG,UAAU,CAAC;EAEzCF,SAAS,CAAC,MAAM;IACd,IAAIU,WAAW,IAAI,IAAI,EAAE;MACvB,IAAIC,UAAU,IAAI,IAAI,EAAE;QACtBJ,MAAM,CAACI,UAAU,CAAC;QAClBF,QAAQ,CAAC,IAAI,CAAC;QACd;MACF;MACAF,MAAM,CAAC,IAAI,CAAC;MACZE,QAAQ,CACN,IAAIG,KAAK,CACP,sGACF,CACF,CAAC;MACD;IACF;IACA,IAAIC,WAAW,GAAG,KAAK;IAAC,SAETC,OAAOA,CAAA;MAAA,OAAAC,QAAA,CAAAC,KAAA,OAAAC,SAAA;IAAA;IAAA,SAAAF,SAAA;MAAAA,QAAA,GAAAG,iBAAA,CAAtB,aAAyB;QACvB,IAAI,OAAOR,WAAW,KAAK,UAAU,EAAE;UACrC,IAAI;YACF,IAAMS,MAAM,SAAST,WAAW,CAACL,UAAU,CAAC;YAC5C,IAAI,CAACQ,WAAW,EAAE;cAChBN,MAAM,CAACY,MAAM,CAAC;cACdV,QAAQ,CAAC,IAAI,CAAC;YAChB;UACF,CAAC,CAAC,OAAOW,CAAC,EAAE;YACV,IAAI,CAACP,WAAW,EAAE;cAChBN,MAAM,CAAC,IAAI,CAAC;cACZE,QAAQ,CAACW,CAAC,CAAC;YACb;UACF;QACF,CAAC,MAAM;UACLb,MAAM,CAACG,WAAW,CAAC;QACrB;MACF,CAAC;MAAA,OAAAK,QAAA,CAAAC,KAAA,OAAAC,SAAA;IAAA;IAEDH,OAAO,CAAC,CAAC;IAET,OAAO,MAAM;MACXD,WAAW,GAAG,IAAI;IACpB,CAAC;EACH,CAAC,EAAE,CAACF,UAAU,EAAED,WAAW,EAAEL,UAAU,CAAC,CAAC;EAEzC,OAAO,CAACC,GAAG,EAAEE,KAAK,CAAC;AACrB;AAEA,eAAeJ,cAAc"}
+{"version":3,"file":"useDeferredApi.js","names":["createContext","useContext","useEffect","useState","ApiContext","DeferredApiContext","useDeferredApi","widget","api","setApi","error","setError","deferredApi","contextApi","Error","isCancelled","loadApi","_loadApi","apply","arguments","_asyncToGenerator","newApi","e"],"sources":["../src/useDeferredApi.ts"],"sourcesContent":["import { createContext, useContext, useEffect, useState } from 'react';\nimport type { dh as DhType, VariableDescriptor } from '@deephaven/jsapi-types';\nimport { ApiContext } from './ApiBootstrap';\n\n/**\n * Function to fetch an API based on a provided descriptor object.\n * Depending on the context there may be more properties on the descriptor,\n * providing more information about the object, such as a session ID.\n */\nexport type DeferredApiFetcher = (\n  descriptor?: VariableDescriptor\n) => Promise<DhType>;\n\nexport const DeferredApiContext = createContext<\n  DhType | DeferredApiFetcher | null\n>(null);\n\n/**\n * Retrieve the API for the current context, given the widget provided.\n * The API may need to be loaded, and will return `null` until it is ready.\n * @param widget The widget descriptor to use to fetch the API\n * @returns A tuple with the API instance, and an error if one occurred.\n */\nexport function useDeferredApi(\n  widget: VariableDescriptor\n): [DhType | null, unknown | null] {\n  const [api, setApi] = useState<DhType | null>(null);\n  const [error, setError] = useState<unknown | null>(null);\n  const deferredApi = useContext(DeferredApiContext);\n  const contextApi = useContext(ApiContext);\n\n  useEffect(() => {\n    if (deferredApi == null) {\n      if (contextApi != null) {\n        setApi(contextApi);\n        setError(null);\n        return;\n      }\n      setApi(null);\n      setError(\n        new Error(\n          'No API available in useDeferredApi. Was code wrapped in ApiBootstrap or DeferredApiContext.Provider?'\n        )\n      );\n      return;\n    }\n    let isCancelled = false;\n\n    async function loadApi() {\n      if (typeof deferredApi === 'function') {\n        try {\n          const newApi = await deferredApi(widget);\n          if (!isCancelled) {\n            setApi(newApi);\n            setError(null);\n          }\n        } catch (e) {\n          if (!isCancelled) {\n            setApi(null);\n            setError(e);\n          }\n        }\n      } else {\n        setApi(deferredApi);\n      }\n    }\n\n    loadApi();\n\n    return () => {\n      isCancelled = true;\n    };\n  }, [contextApi, deferredApi, widget]);\n\n  return [api, error];\n}\n\nexport default useDeferredApi;\n"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAAC,SAE9DC,UAAU;AAEnB;AACA;AACA;AACA;AACA;AAKA,OAAO,IAAMC,kBAAkB,gBAAGL,aAAa,CAE7C,IAAI,CAAC;;AAEP;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASM,cAAcA,CAC5BC,MAA0B,EACO;EACjC,IAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAGN,QAAQ,CAAgB,IAAI,CAAC;EACnD,IAAM,CAACO,KAAK,EAAEC,QAAQ,CAAC,GAAGR,QAAQ,CAAiB,IAAI,CAAC;EACxD,IAAMS,WAAW,GAAGX,UAAU,CAACI,kBAAkB,CAAC;EAClD,IAAMQ,UAAU,GAAGZ,UAAU,CAACG,UAAU,CAAC;EAEzCF,SAAS,CAAC,MAAM;IACd,IAAIU,WAAW,IAAI,IAAI,EAAE;MACvB,IAAIC,UAAU,IAAI,IAAI,EAAE;QACtBJ,MAAM,CAACI,UAAU,CAAC;QAClBF,QAAQ,CAAC,IAAI,CAAC;QACd;MACF;MACAF,MAAM,CAAC,IAAI,CAAC;MACZE,QAAQ,CACN,IAAIG,KAAK,CACP,sGACF,CACF,CAAC;MACD;IACF;IACA,IAAIC,WAAW,GAAG,KAAK;IAAC,SAETC,OAAOA,CAAA;MAAA,OAAAC,QAAA,CAAAC,KAAA,OAAAC,SAAA;IAAA;IAAA,SAAAF,SAAA;MAAAA,QAAA,GAAAG,iBAAA,CAAtB,aAAyB;QACvB,IAAI,OAAOR,WAAW,KAAK,UAAU,EAAE;UACrC,IAAI;YACF,IAAMS,MAAM,SAAST,WAAW,CAACL,MAAM,CAAC;YACxC,IAAI,CAACQ,WAAW,EAAE;cAChBN,MAAM,CAACY,MAAM,CAAC;cACdV,QAAQ,CAAC,IAAI,CAAC;YAChB;UACF,CAAC,CAAC,OAAOW,CAAC,EAAE;YACV,IAAI,CAACP,WAAW,EAAE;cAChBN,MAAM,CAAC,IAAI,CAAC;cACZE,QAAQ,CAACW,CAAC,CAAC;YACb;UACF;QACF,CAAC,MAAM;UACLb,MAAM,CAACG,WAAW,CAAC;QACrB;MACF,CAAC;MAAA,OAAAK,QAAA,CAAAC,KAAA,OAAAC,SAAA;IAAA;IAEDH,OAAO,CAAC,CAAC;IAET,OAAO,MAAM;MACXD,WAAW,GAAG,IAAI;IACpB,CAAC;EACH,CAAC,EAAE,CAACF,UAAU,EAAED,WAAW,EAAEL,MAAM,CAAC,CAAC;EAErC,OAAO,CAACC,GAAG,EAAEE,KAAK,CAAC;AACrB;AAEA,eAAeJ,cAAc"}

package/dist/useObjectFetcher.d.ts

@@ -27,11 +27,18 @@ export declare function isVariableDescriptor(value: unknown): value is VariableD
 export type ObjectFetcher<T = unknown> = (descriptor: VariableDescriptor) => Promise<T>;
 export declare const ObjectFetcherContext: import("react").Context<ObjectFetcher<unknown> | null>;
 /**
- * Get the serializable descriptor for a variable definition.
- * @param definition Variable definition to get the serialized descriptor for
- * @returns Descriptor object that is serializable
+ * Gets a descriptor that only has the ID or name set, but not both.
+ * API will throw an error if both are set when fetching from the connection.
+ * @param descriptor Variable descriptor to sanitize
+ * @returns Descriptor object that has either the ID or name set, but not both.
  */
-export declare function getVariableDescriptor(definition: Partial<VariableDefinition>): NameVariableDescriptor | IdVariableDescriptor;
+export declare function sanitizeVariableDescriptor(descriptor: Partial<VariableDescriptor>): NameVariableDescriptor | IdVariableDescriptor;
+/**
+ * Get the variable descriptor for a definition.
+ * @param definition Definition to get the variable descriptor from
+ * @returns Serializable VariableDescriptor object
+ */
+export declare function getVariableDescriptor(definition: Partial<VariableDefinition>): VariableDescriptor;
 /**
  * Use a function to fetch an object based on provided metadata
  * @returns Function to asynchronously fetch an object based on provided metadata

package/dist/useObjectFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useObjectFetcher.d.ts","sourceRoot":"","sources":["../src/useObjectFetcher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAIhF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,sBAAsB,CAOjC;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,oBAAoB,CAO/B;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAE7B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI,CACvC,UAAU,EAAE,kBAAkB,KAC3B,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhB,eAAO,MAAM,oBAAoB,wDAA4C,CAAC;AAE9E;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,sBAAsB,GAAG,oBAAoB,CAkB/C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,OAAO,KAAK,aAAa,CAAC,CAAC,CAAC,CAKhE"}
+{"version":3,"file":"useObjectFetcher.d.ts","sourceRoot":"","sources":["../src/useObjectFetcher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAIhF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,sBAAsB,CAOjC;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,oBAAoB,CAO/B;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAE7B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI,CACvC,UAAU,EAAE,kBAAkB,KAC3B,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhB,eAAO,MAAM,oBAAoB,wDAA4C,CAAC;AAE9E;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,sBAAsB,GAAG,oBAAoB,CAe/C;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACtC,kBAAkB,CAMpB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,OAAO,KAAK,aAAa,CAAC,CAAC,CAAC,CAKhE"}

package/dist/useObjectFetcher.js

@@ -26,26 +26,41 @@ export function isVariableDescriptor(value) {
 export var ObjectFetcherContext = /*#__PURE__*/createContext(null);
 
 /**
- * Get the serializable descriptor for a variable definition.
- * @param definition Variable definition to get the serialized descriptor for
- * @returns Descriptor object that is serializable
+ * Gets a descriptor that only has the ID or name set, but not both.
+ * API will throw an error if both are set when fetching from the connection.
+ * @param descriptor Variable descriptor to sanitize
+ * @returns Descriptor object that has either the ID or name set, but not both.
  */
-export function getVariableDescriptor(definition) {
+export function sanitizeVariableDescriptor(descriptor) {
   // Can't use a spread operator because of how the GWT compiled code defines properties on the object: https://github.com/gwtproject/gwt/issues/9913
-  if (isIdVariableDescriptor(definition)) {
+  if (isIdVariableDescriptor(descriptor)) {
     return {
-      id: definition.id,
-      type: definition.type
+      id: descriptor.id,
+      type: descriptor.type
     };
   }
-  if (definition.type != null && (definition.title != null || definition.name != null)) {
-    var _ref, _definition$title;
+  if (isNameVariableDescriptor(descriptor)) {
+    var _descriptor$name;
     return {
-      name: (_ref = (_definition$title = definition.title) !== null && _definition$title !== void 0 ? _definition$title : definition.name) !== null && _ref !== void 0 ? _ref : '',
-      type: definition.type
+      name: (_descriptor$name = descriptor.name) !== null && _descriptor$name !== void 0 ? _descriptor$name : '',
+      type: descriptor.type
     };
   }
-  throw new Error("Can't get a descriptor for definition: ".concat(definition));
+  throw new Error("Invalid descriptor: ".concat(descriptor));
+}
+
+/**
+ * Get the variable descriptor for a definition.
+ * @param definition Definition to get the variable descriptor from
+ * @returns Serializable VariableDescriptor object
+ */
+export function getVariableDescriptor(definition) {
+  var _definition$type, _definition$title;
+  return {
+    type: (_definition$type = definition.type) !== null && _definition$type !== void 0 ? _definition$type : '',
+    name: (_definition$title = definition.title) !== null && _definition$title !== void 0 ? _definition$title : definition.name,
+    id: definition.id
+  };
 }
 
 /**

package/dist/useObjectFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"useObjectFetcher.js","names":["useContextOrThrow","createContext","isNameVariableDescriptor","value","type","name","isIdVariableDescriptor","id","isVariableDescriptor","ObjectFetcherContext","getVariableDescriptor","definition","title","_ref","_definition$title","Error","concat","useObjectFetcher"],"sources":["../src/useObjectFetcher.ts"],"sourcesContent":["import { VariableDescriptor, VariableDefinition } from '@deephaven/jsapi-types';\nimport { useContextOrThrow } from '@deephaven/react-hooks';\nimport { createContext } from 'react';\n\n/**\n * Descriptor for a variable by name. Used when needed to fetch an object.\n */\nexport type NameVariableDescriptor = {\n  /** Type of the variable */\n  type: string;\n  /** Name of the variable */\n  name: string;\n};\n\n/**\n * Descriptor for a variable by id. Used when needed to fetch an object.\n */\nexport type IdVariableDescriptor = {\n  /** Type of the variable */\n  type: string;\n  /** Id of the variable */\n  id: string;\n};\n\nexport function isNameVariableDescriptor(\n  value: unknown\n): value is NameVariableDescriptor {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    typeof (value as NameVariableDescriptor).type === 'string' &&\n    (value as NameVariableDescriptor).name != null\n  );\n}\n\nexport function isIdVariableDescriptor(\n  value: unknown\n): value is IdVariableDescriptor {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    typeof (value as IdVariableDescriptor).type === 'string' &&\n    (value as IdVariableDescriptor).id != null\n  );\n}\n\nexport function isVariableDescriptor(\n  value: unknown\n): value is VariableDescriptor {\n  return isNameVariableDescriptor(value) || isIdVariableDescriptor(value);\n}\n\n/**\n * Function to fetch an object based on a provided descriptor object\n */\nexport type ObjectFetcher<T = unknown> = (\n  descriptor: VariableDescriptor\n) => Promise<T>;\n\nexport const ObjectFetcherContext = createContext<ObjectFetcher | null>(null);\n\n/**\n * Get the serializable descriptor for a variable definition.\n * @param definition Variable definition to get the serialized descriptor for\n * @returns Descriptor object that is serializable\n */\nexport function getVariableDescriptor(\n  definition: Partial<VariableDefinition>\n): NameVariableDescriptor | IdVariableDescriptor {\n  // Can't use a spread operator because of how the GWT compiled code defines properties on the object: https://github.com/gwtproject/gwt/issues/9913\n  if (isIdVariableDescriptor(definition)) {\n    return {\n      id: definition.id,\n      type: definition.type,\n    };\n  }\n  if (\n    definition.type != null &&\n    (definition.title != null || definition.name != null)\n  ) {\n    return {\n      name: definition.title ?? definition.name ?? '',\n      type: definition.type,\n    };\n  }\n  throw new Error(`Can't get a descriptor for definition: ${definition}`);\n}\n\n/**\n * Use a function to fetch an object based on provided metadata\n * @returns Function to asynchronously fetch an object based on provided metadata\n */\nexport function useObjectFetcher<T = unknown>(): ObjectFetcher<T> {\n  return useContextOrThrow(\n    ObjectFetcherContext,\n    'No ObjectFetcher available in useObjectFetcher. Was code wrapped in ObjectFetcherContext.Provider?'\n  ) as ObjectFetcher<T>;\n}\n"],"mappings":"AACA,SAASA,iBAAiB,QAAQ,wBAAwB;AAC1D,SAASC,aAAa,QAAQ,OAAO;;AAErC;AACA;AACA;;AAQA;AACA;AACA;;AAQA,OAAO,SAASC,wBAAwBA,CACtCC,KAAc,EACmB;EACjC,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,IAAI,IAAI,IACb,OAAQA,KAAK,CAA4BC,IAAI,KAAK,QAAQ,IACzDD,KAAK,CAA4BE,IAAI,IAAI,IAAI;AAElD;AAEA,OAAO,SAASC,sBAAsBA,CACpCH,KAAc,EACiB;EAC/B,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,IAAI,IAAI,IACb,OAAQA,KAAK,CAA0BC,IAAI,KAAK,QAAQ,IACvDD,KAAK,CAA0BI,EAAE,IAAI,IAAI;AAE9C;AAEA,OAAO,SAASC,oBAAoBA,CAClCL,KAAc,EACe;EAC7B,OAAOD,wBAAwB,CAACC,KAAK,CAAC,IAAIG,sBAAsB,CAACH,KAAK,CAAC;AACzE;;AAEA;AACA;AACA;;AAKA,OAAO,IAAMM,oBAAoB,gBAAGR,aAAa,CAAuB,IAAI,CAAC;;AAE7E;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,qBAAqBA,CACnCC,UAAuC,EACQ;EAC/C;EACA,IAAIL,sBAAsB,CAACK,UAAU,CAAC,EAAE;IACtC,OAAO;MACLJ,EAAE,EAAEI,UAAU,CAACJ,EAAE;MACjBH,IAAI,EAAEO,UAAU,CAACP;IACnB,CAAC;EACH;EACA,IACEO,UAAU,CAACP,IAAI,IAAI,IAAI,KACtBO,UAAU,CAACC,KAAK,IAAI,IAAI,IAAID,UAAU,CAACN,IAAI,IAAI,IAAI,CAAC,EACrD;IAAA,IAAAQ,IAAA,EAAAC,iBAAA;IACA,OAAO;MACLT,IAAI,GAAAQ,IAAA,IAAAC,iBAAA,GAAEH,UAAU,CAACC,KAAK,cAAAE,iBAAA,cAAAA,iBAAA,GAAIH,UAAU,CAACN,IAAI,cAAAQ,IAAA,cAAAA,IAAA,GAAI,EAAE;MAC/CT,IAAI,EAAEO,UAAU,CAACP;IACnB,CAAC;EACH;EACA,MAAM,IAAIW,KAAK,2CAAAC,MAAA,CAA2CL,UAAU,CAAE,CAAC;AACzE;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASM,gBAAgBA,CAAA,EAAkC;EAChE,OAAOjB,iBAAiB,CACtBS,oBAAoB,EACpB,oGACF,CAAC;AACH"}
+{"version":3,"file":"useObjectFetcher.js","names":["useContextOrThrow","createContext","isNameVariableDescriptor","value","type","name","isIdVariableDescriptor","id","isVariableDescriptor","ObjectFetcherContext","sanitizeVariableDescriptor","descriptor","_descriptor$name","Error","concat","getVariableDescriptor","definition","_definition$type","_definition$title","title","useObjectFetcher"],"sources":["../src/useObjectFetcher.ts"],"sourcesContent":["import { VariableDescriptor, VariableDefinition } from '@deephaven/jsapi-types';\nimport { useContextOrThrow } from '@deephaven/react-hooks';\nimport { createContext } from 'react';\n\n/**\n * Descriptor for a variable by name. Used when needed to fetch an object.\n */\nexport type NameVariableDescriptor = {\n  /** Type of the variable */\n  type: string;\n  /** Name of the variable */\n  name: string;\n};\n\n/**\n * Descriptor for a variable by id. Used when needed to fetch an object.\n */\nexport type IdVariableDescriptor = {\n  /** Type of the variable */\n  type: string;\n  /** Id of the variable */\n  id: string;\n};\n\nexport function isNameVariableDescriptor(\n  value: unknown\n): value is NameVariableDescriptor {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    typeof (value as NameVariableDescriptor).type === 'string' &&\n    (value as NameVariableDescriptor).name != null\n  );\n}\n\nexport function isIdVariableDescriptor(\n  value: unknown\n): value is IdVariableDescriptor {\n  return (\n    typeof value === 'object' &&\n    value != null &&\n    typeof (value as IdVariableDescriptor).type === 'string' &&\n    (value as IdVariableDescriptor).id != null\n  );\n}\n\nexport function isVariableDescriptor(\n  value: unknown\n): value is VariableDescriptor {\n  return isNameVariableDescriptor(value) || isIdVariableDescriptor(value);\n}\n\n/**\n * Function to fetch an object based on a provided descriptor object\n */\nexport type ObjectFetcher<T = unknown> = (\n  descriptor: VariableDescriptor\n) => Promise<T>;\n\nexport const ObjectFetcherContext = createContext<ObjectFetcher | null>(null);\n\n/**\n * Gets a descriptor that only has the ID or name set, but not both.\n * API will throw an error if both are set when fetching from the connection.\n * @param descriptor Variable descriptor to sanitize\n * @returns Descriptor object that has either the ID or name set, but not both.\n */\nexport function sanitizeVariableDescriptor(\n  descriptor: Partial<VariableDescriptor>\n): NameVariableDescriptor | IdVariableDescriptor {\n  // Can't use a spread operator because of how the GWT compiled code defines properties on the object: https://github.com/gwtproject/gwt/issues/9913\n  if (isIdVariableDescriptor(descriptor)) {\n    return {\n      id: descriptor.id,\n      type: descriptor.type,\n    };\n  }\n  if (isNameVariableDescriptor(descriptor)) {\n    return {\n      name: descriptor.name ?? '',\n      type: descriptor.type,\n    };\n  }\n  throw new Error(`Invalid descriptor: ${descriptor}`);\n}\n\n/**\n * Get the variable descriptor for a definition.\n * @param definition Definition to get the variable descriptor from\n * @returns Serializable VariableDescriptor object\n */\nexport function getVariableDescriptor(\n  definition: Partial<VariableDefinition>\n): VariableDescriptor {\n  return {\n    type: definition.type ?? '',\n    name: definition.title ?? definition.name,\n    id: definition.id,\n  };\n}\n\n/**\n * Use a function to fetch an object based on provided metadata\n * @returns Function to asynchronously fetch an object based on provided metadata\n */\nexport function useObjectFetcher<T = unknown>(): ObjectFetcher<T> {\n  return useContextOrThrow(\n    ObjectFetcherContext,\n    'No ObjectFetcher available in useObjectFetcher. Was code wrapped in ObjectFetcherContext.Provider?'\n  ) as ObjectFetcher<T>;\n}\n"],"mappings":"AACA,SAASA,iBAAiB,QAAQ,wBAAwB;AAC1D,SAASC,aAAa,QAAQ,OAAO;;AAErC;AACA;AACA;;AAQA;AACA;AACA;;AAQA,OAAO,SAASC,wBAAwBA,CACtCC,KAAc,EACmB;EACjC,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,IAAI,IAAI,IACb,OAAQA,KAAK,CAA4BC,IAAI,KAAK,QAAQ,IACzDD,KAAK,CAA4BE,IAAI,IAAI,IAAI;AAElD;AAEA,OAAO,SAASC,sBAAsBA,CACpCH,KAAc,EACiB;EAC/B,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,IAAI,IAAI,IACb,OAAQA,KAAK,CAA0BC,IAAI,KAAK,QAAQ,IACvDD,KAAK,CAA0BI,EAAE,IAAI,IAAI;AAE9C;AAEA,OAAO,SAASC,oBAAoBA,CAClCL,KAAc,EACe;EAC7B,OAAOD,wBAAwB,CAACC,KAAK,CAAC,IAAIG,sBAAsB,CAACH,KAAK,CAAC;AACzE;;AAEA;AACA;AACA;;AAKA,OAAO,IAAMM,oBAAoB,gBAAGR,aAAa,CAAuB,IAAI,CAAC;;AAE7E;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,0BAA0BA,CACxCC,UAAuC,EACQ;EAC/C;EACA,IAAIL,sBAAsB,CAACK,UAAU,CAAC,EAAE;IACtC,OAAO;MACLJ,EAAE,EAAEI,UAAU,CAACJ,EAAE;MACjBH,IAAI,EAAEO,UAAU,CAACP;IACnB,CAAC;EACH;EACA,IAAIF,wBAAwB,CAACS,UAAU,CAAC,EAAE;IAAA,IAAAC,gBAAA;IACxC,OAAO;MACLP,IAAI,GAAAO,gBAAA,GAAED,UAAU,CAACN,IAAI,cAAAO,gBAAA,cAAAA,gBAAA,GAAI,EAAE;MAC3BR,IAAI,EAAEO,UAAU,CAACP;IACnB,CAAC;EACH;EACA,MAAM,IAAIS,KAAK,wBAAAC,MAAA,CAAwBH,UAAU,CAAE,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,qBAAqBA,CACnCC,UAAuC,EACnB;EAAA,IAAAC,gBAAA,EAAAC,iBAAA;EACpB,OAAO;IACLd,IAAI,GAAAa,gBAAA,GAAED,UAAU,CAACZ,IAAI,cAAAa,gBAAA,cAAAA,gBAAA,GAAI,EAAE;IAC3BZ,IAAI,GAAAa,iBAAA,GAAEF,UAAU,CAACG,KAAK,cAAAD,iBAAA,cAAAA,iBAAA,GAAIF,UAAU,CAACX,IAAI;IACzCE,EAAE,EAAES,UAAU,CAACT;EACjB,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASa,gBAAgBA,CAAA,EAAkC;EAChE,OAAOpB,iBAAiB,CACtBS,oBAAoB,EACpB,oGACF,CAAC;AACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/jsapi-bootstrap",
-  "version": "0.60.1-object-fetcher.6+6a7af1e6",
+  "version": "0.60.1-object-fetcher.7+443993f3",
   "description": "Deephaven JSAPI Bootstrap",
   "author": "Deephaven Data Labs LLC",
   "license": "Apache-2.0",
@@ -22,10 +22,10 @@
     "build:sass": "sass --embed-sources --load-path=../../node_modules ./src:./dist"
   },
   "dependencies": {
-    "@deephaven/components": "^0.60.1-object-fetcher.6+6a7af1e6",
-    "@deephaven/jsapi-types": "^0.60.1-object-fetcher.6+6a7af1e6",
-    "@deephaven/log": "^0.60.1-object-fetcher.6+6a7af1e6",
-    "@deephaven/react-hooks": "^0.60.1-object-fetcher.6+6a7af1e6"
+    "@deephaven/components": "^0.60.1-object-fetcher.7+443993f3",
+    "@deephaven/jsapi-types": "^0.60.1-object-fetcher.7+443993f3",
+    "@deephaven/log": "^0.60.1-object-fetcher.7+443993f3",
+    "@deephaven/react-hooks": "^0.60.1-object-fetcher.7+443993f3"
   },
   "devDependencies": {
     "react": "^17.x"
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6a7af1e6366a33dddcd7534fbc0d50d82509a137"
+  "gitHead": "443993f3fcc4a7501c154248468f65ff23f0ef23"
 }