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

package/dist/DeferredApiBootstrap.d.ts

@@ -1,15 +1,15 @@
 import React from 'react';
-import { ObjectMetadata } from './useObjectFetcher';
+import { VariableDescriptor } from '@deephaven/jsapi-types';
 type DeferredApiBootstrapProps = React.PropsWithChildren<{
     onError?: (error: unknown) => void;
     /**
      * Options to use when fetching the deferred API.
      */
-    metadata: ObjectMetadata;
+    widget: VariableDescriptor;
 }>;
 /**
  * Does not render children until the deferred API is resolved.
  */
-export declare const DeferredApiBootstrap: React.MemoExoticComponent<({ children, onError, metadata, }: 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;AAG1B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,KAAK,yBAAyB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,oBAAoB,+DAK5B,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,
-    metadata
+    widget
   } = _ref;
-  var [api, apiError] = useDeferredApi(metadata);
+  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","metadata","api","apiError","Provider","value","displayName"],"sources":["../src/DeferredApiBootstrap.tsx"],"sourcesContent":["import React from 'react';\nimport useDeferredApi from './useDeferredApi';\nimport { ApiContext } from './ApiBootstrap';\nimport { ObjectMetadata } from './useObjectFetcher';\n\ntype DeferredApiBootstrapProps = React.PropsWithChildren<{\n  onError?: (error: unknown) => void;\n  /**\n   * Options to use when fetching the deferred API.\n   */\n  metadata: ObjectMetadata;\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    metadata,\n  }: DeferredApiBootstrapProps): JSX.Element | null => {\n    const [api, apiError] = useDeferredApi(metadata);\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,OACnBC,cAAc;AAAA,SACZC,UAAU;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAWnB;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,QAAQ,CAAC;EAChD,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

@@ -1,14 +1,18 @@
 /// <reference types="react" />
-import type { dh as DhType } from '@deephaven/jsapi-types';
-import { ObjectMetadata } from './useObjectFetcher';
-export type DeferredApiFetcher = (metadata?: ObjectMetadata) => Promise<DhType>;
+import type { dh as DhType, VariableDescriptor } from '@deephaven/jsapi-types';
+/**
+ * Function to fetch an API based on a provided descriptor object.
+ * Depending on the context there may be more properties on the descriptor,
+ * providing more information about the object, such as a session ID.
+ */
+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 object metadata 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 metadata The object metadata 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(metadata: ObjectMetadata): [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,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,kBAAkB,GAAG,CAAC,QAAQ,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEhF,eAAO,MAAM,kBAAkB,6DAExB,CAAC;AAER;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,cAAc,GACvB,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

@@ -2,15 +2,20 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { createContext, useContext, useEffect, useState } from 'react';
 import { ApiContext } from "./ApiBootstrap.js";
+/**
+ * Function to fetch an API based on a provided descriptor object.
+ * Depending on the context there may be more properties on the descriptor,
+ * providing more information about the object, such as a session ID.
+ */
 export var DeferredApiContext = /*#__PURE__*/createContext(null);
 
 /**
- * Retrieve the API for the current context, given the object metadata 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 metadata The object metadata 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(metadata) {
+export function useDeferredApi(widget) {
   var [api, setApi] = useState(null);
   var [error, setError] = useState(null);
   var deferredApi = useContext(DeferredApiContext);
@@ -34,7 +39,7 @@ export function useDeferredApi(metadata) {
       _loadApi = _asyncToGenerator(function* () {
         if (typeof deferredApi === 'function') {
           try {
-            var newApi = yield deferredApi(metadata);
+            var newApi = yield deferredApi(widget);
             if (!isCancelled) {
               setApi(newApi);
               setError(null);
@@ -55,7 +60,7 @@ export function useDeferredApi(metadata) {
     return () => {
       isCancelled = true;
     };
-  }, [contextApi, deferredApi, metadata]);
+  }, [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","metadata","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 } from '@deephaven/jsapi-types';\nimport { ApiContext } from './ApiBootstrap';\nimport { ObjectMetadata } from './useObjectFetcher';\n\nexport type DeferredApiFetcher = (metadata?: ObjectMetadata) => 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 object metadata provided.\n * The API may need to be loaded, and will return `null` until it is ready.\n * @param metadata The object metadata 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  metadata: ObjectMetadata\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(metadata);\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, metadata]);\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;AAKnB,OAAO,IAAMC,kBAAkB,gBAAGL,aAAa,CAE7C,IAAI,CAAC;;AAEP;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASM,cAAcA,CAC5BC,QAAwB,EACS;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,QAAQ,CAAC;YAC1C,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,QAAQ,CAAC,CAAC;EAEvC,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

@@ -1,17 +1,47 @@
 /// <reference types="react" />
-import { VariableDefinition } from '@deephaven/jsapi-types';
+import { VariableDescriptor, VariableDefinition } from '@deephaven/jsapi-types';
 /**
- * Metadata for an object. Used when needing to fetch an object.
+ * Descriptor for a variable by name. Used when needed to fetch an object.
  */
-export type ObjectMetadata = Record<string, unknown> & VariableDefinition;
-export type ObjectFetcher<T = unknown> = (metadata: ObjectMetadata) => Promise<T>;
+export type NameVariableDescriptor = {
+    /** Type of the variable */
+    type: string;
+    /** Name of the variable */
+    name: string;
+};
+/**
+ * Descriptor for a variable by id. Used when needed to fetch an object.
+ */
+export type IdVariableDescriptor = {
+    /** Type of the variable */
+    type: string;
+    /** Id of the variable */
+    id: string;
+};
+export declare function isNameVariableDescriptor(value: unknown): value is NameVariableDescriptor;
+export declare function isIdVariableDescriptor(value: unknown): value is IdVariableDescriptor;
+export declare function isVariableDescriptor(value: unknown): value is VariableDescriptor;
+/**
+ * Function to fetch an object based on a provided descriptor object
+ */
+export type ObjectFetcher<T = unknown> = (descriptor: VariableDescriptor) => Promise<T>;
 export declare const ObjectFetcherContext: import("react").Context<ObjectFetcher<unknown> | null>;
 /**
- * Get the metadata for an object definition that is serializable.
- * @param definition Object definition to get the metadata for
- * @returns Metadata 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 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
  */
-export declare function getObjectMetadata(definition: VariableDefinition): ObjectMetadata;
-export declare function getVariableDefinition(metadata: ObjectMetadata): VariableDefinition;
-export declare function useObjectFetcher(): ObjectFetcher;
+export declare function useObjectFetcher<T = unknown>(): ObjectFetcher<T>;
 //# sourceMappingURL=useObjectFetcher.d.ts.map

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,MAAM,wBAAwB,CAAC;AAI5D;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,kBAAkB,CAAC;AAE1E,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI,CACvC,QAAQ,EAAE,cAAc,KACrB,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhB,eAAO,MAAM,oBAAoB,wDAA4C,CAAC;AAE9E;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,kBAAkB,GAC7B,cAAc,CAQhB;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,cAAc,GACvB,kBAAkB,CAYpB;AAED,wBAAgB,gBAAgB,IAAI,aAAa,CAKhD"}
+{"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

@@ -2,39 +2,71 @@ import { useContextOrThrow } from '@deephaven/react-hooks';
 import { createContext } from 'react';
 
 /**
- * Metadata for an object. Used when needing to fetch an object.
+ * Descriptor for a variable by name. Used when needed to fetch an object.
+ */
+
+/**
+ * Descriptor for a variable by id. Used when needed to fetch an object.
+ */
+
+export function isNameVariableDescriptor(value) {
+  return typeof value === 'object' && value != null && typeof value.type === 'string' && value.name != null;
+}
+export function isIdVariableDescriptor(value) {
+  return typeof value === 'object' && value != null && typeof value.type === 'string' && value.id != null;
+}
+export function isVariableDescriptor(value) {
+  return isNameVariableDescriptor(value) || isIdVariableDescriptor(value);
+}
+
+/**
+ * Function to fetch an object based on a provided descriptor object
  */
 
 export var ObjectFetcherContext = /*#__PURE__*/createContext(null);
 
 /**
- * Get the metadata for an object definition that is serializable.
- * @param definition Object definition to get the metadata for
- * @returns Metadata 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 getObjectMetadata(definition) {
-  // Can't use a spread operator because the VariableDefinition JS API object uses property accessors
-  return {
-    id: definition.id,
-    name: definition.name,
-    type: definition.type,
-    title: definition.title
-  };
-}
-export function getVariableDefinition(metadata) {
-  var _metadata$title;
-  if (metadata.id != null) {
+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(descriptor)) {
+    return {
+      id: descriptor.id,
+      type: descriptor.type
+    };
+  }
+  if (isNameVariableDescriptor(descriptor)) {
+    var _descriptor$name;
     return {
-      type: metadata.type,
-      id: metadata.id
+      name: (_descriptor$name = descriptor.name) !== null && _descriptor$name !== void 0 ? _descriptor$name : '',
+      type: descriptor.type
     };
   }
+  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: metadata.type,
-    name: metadata.name,
-    title: (_metadata$title = metadata.title) !== null && _metadata$title !== void 0 ? _metadata$title : metadata.name
+    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
   };
 }
+
+/**
+ * Use a function to fetch an object based on provided metadata
+ * @returns Function to asynchronously fetch an object based on provided metadata
+ */
 export function useObjectFetcher() {
   return useContextOrThrow(ObjectFetcherContext, 'No ObjectFetcher available in useObjectFetcher. Was code wrapped in ObjectFetcherContext.Provider?');
 }

package/dist/useObjectFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"useObjectFetcher.js","names":["useContextOrThrow","createContext","ObjectFetcherContext","getObjectMetadata","definition","id","name","type","title","getVariableDefinition","metadata","_metadata$title","useObjectFetcher"],"sources":["../src/useObjectFetcher.ts"],"sourcesContent":["import { VariableDefinition } from '@deephaven/jsapi-types';\nimport { useContextOrThrow } from '@deephaven/react-hooks';\nimport { createContext } from 'react';\n\n/**\n * Metadata for an object. Used when needing to fetch an object.\n */\nexport type ObjectMetadata = Record<string, unknown> & VariableDefinition;\n\nexport type ObjectFetcher<T = unknown> = (\n  metadata: ObjectMetadata\n) => Promise<T>;\n\nexport const ObjectFetcherContext = createContext<ObjectFetcher | null>(null);\n\n/**\n * Get the metadata for an object definition that is serializable.\n * @param definition Object definition to get the metadata for\n * @returns Metadata object that is serializable\n */\nexport function getObjectMetadata(\n  definition: VariableDefinition\n): ObjectMetadata {\n  // Can't use a spread operator because the VariableDefinition JS API object uses property accessors\n  return {\n    id: definition.id,\n    name: definition.name,\n    type: definition.type,\n    title: definition.title,\n  };\n}\n\nexport function getVariableDefinition(\n  metadata: ObjectMetadata\n): VariableDefinition {\n  if (metadata.id != null) {\n    return {\n      type: metadata.type,\n      id: metadata.id,\n    };\n  }\n  return {\n    type: metadata.type,\n    name: metadata.name,\n    title: metadata.title ?? metadata.name,\n  };\n}\n\nexport function useObjectFetcher(): ObjectFetcher {\n  return useContextOrThrow(\n    ObjectFetcherContext,\n    'No ObjectFetcher available in useObjectFetcher. Was code wrapped in ObjectFetcherContext.Provider?'\n  );\n}\n"],"mappings":"AACA,SAASA,iBAAiB,QAAQ,wBAAwB;AAC1D,SAASC,aAAa,QAAQ,OAAO;;AAErC;AACA;AACA;;AAOA,OAAO,IAAMC,oBAAoB,gBAAGD,aAAa,CAAuB,IAAI,CAAC;;AAE7E;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,iBAAiBA,CAC/BC,UAA8B,EACd;EAChB;EACA,OAAO;IACLC,EAAE,EAAED,UAAU,CAACC,EAAE;IACjBC,IAAI,EAAEF,UAAU,CAACE,IAAI;IACrBC,IAAI,EAAEH,UAAU,CAACG,IAAI;IACrBC,KAAK,EAAEJ,UAAU,CAACI;EACpB,CAAC;AACH;AAEA,OAAO,SAASC,qBAAqBA,CACnCC,QAAwB,EACJ;EAAA,IAAAC,eAAA;EACpB,IAAID,QAAQ,CAACL,EAAE,IAAI,IAAI,EAAE;IACvB,OAAO;MACLE,IAAI,EAAEG,QAAQ,CAACH,IAAI;MACnBF,EAAE,EAAEK,QAAQ,CAACL;IACf,CAAC;EACH;EACA,OAAO;IACLE,IAAI,EAAEG,QAAQ,CAACH,IAAI;IACnBD,IAAI,EAAEI,QAAQ,CAACJ,IAAI;IACnBE,KAAK,GAAAG,eAAA,GAAED,QAAQ,CAACF,KAAK,cAAAG,eAAA,cAAAA,eAAA,GAAID,QAAQ,CAACJ;EACpC,CAAC;AACH;AAEA,OAAO,SAASM,gBAAgBA,CAAA,EAAkB;EAChD,OAAOZ,iBAAiB,CACtBE,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.0+7fe24cdd",
+  "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.0+7fe24cdd",
-    "@deephaven/jsapi-types": "^0.60.1-object-fetcher.0+7fe24cdd",
-    "@deephaven/log": "^0.60.1-object-fetcher.0+7fe24cdd",
-    "@deephaven/react-hooks": "^0.60.1-object-fetcher.0+7fe24cdd"
+    "@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": "7fe24cddd638b5b922b609693756ecbf5a989094"
+  "gitHead": "443993f3fcc4a7501c154248468f65ff23f0ef23"
 }