@deephaven/app-utils 0.46.2-beta.3 → 0.47.0

package/dist/components/AuthBootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthBootstrap.d.ts","sourceRoot":"","sources":["../../src/components/AuthBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAcxE,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AASF;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,kBAAkB,eA6D7D;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"AuthBootstrap.d.ts","sourceRoot":"","sources":["../../src/components/AuthBootstrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAcxE,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAeF;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,kBAAkB,eA6D7D;AAED,eAAe,aAAa,CAAC"}

package/dist/components/AuthBootstrap.js

@@ -12,7 +12,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 /** Core auth plugins that are always loaded */
-var CORE_AUTH_PLUGINS = new Map([['@deephaven/auth-plugins.AuthPluginParent', AuthPluginParent], ['@deephaven/auth-plugins.AuthPluginPsk', AuthPluginPsk], ['@deephaven/auth-plugins.AuthPluginAnonymous', AuthPluginAnonymous]]);
+var CORE_AUTH_PLUGINS = new Map([['@deephaven/auth-plugins.AuthPluginParent', {
+  AuthPlugin: AuthPluginParent
+}], ['@deephaven/auth-plugins.AuthPluginPsk', {
+  AuthPlugin: AuthPluginPsk
+}], ['@deephaven/auth-plugins.AuthPluginAnonymous', {
+  AuthPlugin: AuthPluginAnonymous
+}]]);
 
 /**
  * AuthBootstrap component. Handles displaying the auth plugin and authenticating.

package/dist/components/AuthBootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthBootstrap.js","names":["React","useContext","useEffect","useMemo","useState","AuthPluginAnonymous","AuthPluginParent","AuthPluginPsk","LoadingOverlay","useClient","getErrorMessage","PluginsContext","getAuthPluginComponent","LoginNotifier","CORE_AUTH_PLUGINS","Map","AuthBootstrap","children","client","plugins","authConfig","setAuthConfig","error","setError","initAuthConfigValues","isCanceled","loadAuthConfigValues","newAuthConfigValues","getAuthConfigValues","e","AuthComponent","undefined","isLoading"],"sources":["../../src/components/AuthBootstrap.tsx"],"sourcesContent":["import React, { useContext, useEffect, useMemo, useState } from 'react';\nimport {\n  AuthConfigMap,\n  AuthPluginAnonymous,\n  AuthPluginParent,\n  AuthPluginPsk,\n} from '@deephaven/auth-plugins';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { useClient } from '@deephaven/jsapi-bootstrap';\nimport { getErrorMessage } from '@deephaven/utils';\nimport { PluginsContext } from './PluginsBootstrap';\nimport { getAuthPluginComponent } from '../plugins';\nimport LoginNotifier from './LoginNotifier';\n\nexport type AuthBootstrapProps = {\n  /**\n   * The children to render after authentication is completed.\n   */\n  children: React.ReactNode;\n};\n\n/** Core auth plugins that are always loaded */\nconst CORE_AUTH_PLUGINS = new Map([\n  ['@deephaven/auth-plugins.AuthPluginParent', AuthPluginParent],\n  ['@deephaven/auth-plugins.AuthPluginPsk', AuthPluginPsk],\n  ['@deephaven/auth-plugins.AuthPluginAnonymous', AuthPluginAnonymous],\n]);\n\n/**\n * AuthBootstrap component. Handles displaying the auth plugin and authenticating.\n */\nexport function AuthBootstrap({ children }: AuthBootstrapProps) {\n  const client = useClient();\n  // `useContext` instead of `usePlugins` so that we don't have to wait for the plugins to load\n  // We want to load the auth config values in parallel with the plugins\n  const plugins = useContext(PluginsContext);\n  const [authConfig, setAuthConfig] = useState<AuthConfigMap>();\n  const [error, setError] = useState<unknown>();\n\n  useEffect(\n    function initAuthConfigValues() {\n      let isCanceled = false;\n      async function loadAuthConfigValues() {\n        try {\n          const newAuthConfigValues = await client.getAuthConfigValues();\n          if (!isCanceled) {\n            setAuthConfig(new Map(newAuthConfigValues));\n          }\n        } catch (e) {\n          if (!isCanceled) {\n            setError(e);\n          }\n        }\n      }\n      loadAuthConfigValues();\n      return () => {\n        isCanceled = true;\n      };\n    },\n    [client]\n  );\n\n  const AuthComponent = useMemo(() => {\n    if (plugins == null || authConfig == null) {\n      return undefined;\n    }\n\n    try {\n      return getAuthPluginComponent(plugins, authConfig, CORE_AUTH_PLUGINS);\n    } catch (e) {\n      setError(e);\n    }\n  }, [authConfig, plugins]);\n\n  const isLoading = AuthComponent == null || authConfig == null;\n\n  if (isLoading || error != null) {\n    return (\n      <LoadingOverlay\n        isLoading={isLoading && error == null}\n        errorMessage={getErrorMessage(error)}\n      />\n    );\n  }\n  return (\n    <AuthComponent authConfigValues={authConfig}>\n      <>\n        <LoginNotifier />\n        {children}\n      </>\n    </AuthComponent>\n  );\n}\n\nexport default AuthBootstrap;\n"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AACvE,SAEEC,mBAAmB,EACnBC,gBAAgB,EAChBC,aAAa,QACR,yBAAyB;AAChC,SAASC,cAAc,QAAQ,uBAAuB;AACtD,SAASC,SAAS,QAAQ,4BAA4B;AACtD,SAASC,eAAe,QAAQ,kBAAkB;AAAC,SAC1CC,cAAc;AAAA,SACdC,sBAAsB;AAAA,OACxBC,aAAa;AAAA;AAAA;AAAA;AASpB;AACA,IAAMC,iBAAiB,GAAG,IAAIC,GAAG,CAAC,CAChC,CAAC,0CAA0C,EAAET,gBAAgB,CAAC,EAC9D,CAAC,uCAAuC,EAAEC,aAAa,CAAC,EACxD,CAAC,6CAA6C,EAAEF,mBAAmB,CAAC,CACrE,CAAC;;AAEF;AACA;AACA;AACA,OAAO,SAASW,aAAa,OAAmC;EAAA,IAAlC;IAAEC;EAA6B,CAAC;EAC5D,IAAMC,MAAM,GAAGT,SAAS,EAAE;EAC1B;EACA;EACA,IAAMU,OAAO,GAAGlB,UAAU,CAACU,cAAc,CAAC;EAC1C,IAAM,CAACS,UAAU,EAAEC,aAAa,CAAC,GAAGjB,QAAQ,EAAiB;EAC7D,IAAM,CAACkB,KAAK,EAAEC,QAAQ,CAAC,GAAGnB,QAAQ,EAAW;EAE7CF,SAAS,CACP,SAASsB,oBAAoB,GAAG;IAC9B,IAAIC,UAAU,GAAG,KAAK;IAAC,SACRC,oBAAoB;MAAA;IAAA;IAAA;MAAA,0CAAnC,aAAsC;QACpC,IAAI;UACF,IAAMC,mBAAmB,SAAST,MAAM,CAACU,mBAAmB,EAAE;UAC9D,IAAI,CAACH,UAAU,EAAE;YACfJ,aAAa,CAAC,IAAIN,GAAG,CAACY,mBAAmB,CAAC,CAAC;UAC7C;QACF,CAAC,CAAC,OAAOE,CAAC,EAAE;UACV,IAAI,CAACJ,UAAU,EAAE;YACfF,QAAQ,CAACM,CAAC,CAAC;UACb;QACF;MACF,CAAC;MAAA;IAAA;IACDH,oBAAoB,EAAE;IACtB,OAAO,MAAM;MACXD,UAAU,GAAG,IAAI;IACnB,CAAC;EACH,CAAC,EACD,CAACP,MAAM,CAAC,CACT;EAED,IAAMY,aAAa,GAAG3B,OAAO,CAAC,MAAM;IAClC,IAAIgB,OAAO,IAAI,IAAI,IAAIC,UAAU,IAAI,IAAI,EAAE;MACzC,OAAOW,SAAS;IAClB;IAEA,IAAI;MACF,OAAOnB,sBAAsB,CAACO,OAAO,EAAEC,UAAU,EAAEN,iBAAiB,CAAC;IACvE,CAAC,CAAC,OAAOe,CAAC,EAAE;MACVN,QAAQ,CAACM,CAAC,CAAC;IACb;EACF,CAAC,EAAE,CAACT,UAAU,EAAED,OAAO,CAAC,CAAC;EAEzB,IAAMa,SAAS,GAAGF,aAAa,IAAI,IAAI,IAAIV,UAAU,IAAI,IAAI;EAE7D,IAAIY,SAAS,IAAIV,KAAK,IAAI,IAAI,EAAE;IAC9B,oBACE,KAAC,cAAc;MACb,SAAS,EAAEU,SAAS,IAAIV,KAAK,IAAI,IAAK;MACtC,YAAY,EAAEZ,eAAe,CAACY,KAAK;IAAE,EACrC;EAEN;EACA,oBACE,KAAC,aAAa;IAAC,gBAAgB,EAAEF,UAAW;IAAA,uBAC1C;MAAA,wBACE,KAAC,aAAa,KAAG,EAChBH,QAAQ;IAAA;EACR,EACW;AAEpB;AAEA,eAAeD,aAAa"}
+{"version":3,"file":"AuthBootstrap.js","names":["React","useContext","useEffect","useMemo","useState","AuthPluginAnonymous","AuthPluginParent","AuthPluginPsk","LoadingOverlay","useClient","getErrorMessage","PluginsContext","getAuthPluginComponent","LoginNotifier","CORE_AUTH_PLUGINS","Map","AuthPlugin","AuthBootstrap","children","client","plugins","authConfig","setAuthConfig","error","setError","initAuthConfigValues","isCanceled","loadAuthConfigValues","newAuthConfigValues","getAuthConfigValues","e","AuthComponent","undefined","isLoading"],"sources":["../../src/components/AuthBootstrap.tsx"],"sourcesContent":["import React, { useContext, useEffect, useMemo, useState } from 'react';\nimport {\n  AuthConfigMap,\n  AuthPluginAnonymous,\n  AuthPluginParent,\n  AuthPluginPsk,\n} from '@deephaven/auth-plugins';\nimport { LoadingOverlay } from '@deephaven/components';\nimport { useClient } from '@deephaven/jsapi-bootstrap';\nimport { getErrorMessage } from '@deephaven/utils';\nimport { PluginsContext } from './PluginsBootstrap';\nimport { getAuthPluginComponent } from '../plugins';\nimport LoginNotifier from './LoginNotifier';\n\nexport type AuthBootstrapProps = {\n  /**\n   * The children to render after authentication is completed.\n   */\n  children: React.ReactNode;\n};\n\n/** Core auth plugins that are always loaded */\nconst CORE_AUTH_PLUGINS = new Map([\n  [\n    '@deephaven/auth-plugins.AuthPluginParent',\n    { AuthPlugin: AuthPluginParent },\n  ],\n  ['@deephaven/auth-plugins.AuthPluginPsk', { AuthPlugin: AuthPluginPsk }],\n  [\n    '@deephaven/auth-plugins.AuthPluginAnonymous',\n    { AuthPlugin: AuthPluginAnonymous },\n  ],\n]);\n\n/**\n * AuthBootstrap component. Handles displaying the auth plugin and authenticating.\n */\nexport function AuthBootstrap({ children }: AuthBootstrapProps) {\n  const client = useClient();\n  // `useContext` instead of `usePlugins` so that we don't have to wait for the plugins to load\n  // We want to load the auth config values in parallel with the plugins\n  const plugins = useContext(PluginsContext);\n  const [authConfig, setAuthConfig] = useState<AuthConfigMap>();\n  const [error, setError] = useState<unknown>();\n\n  useEffect(\n    function initAuthConfigValues() {\n      let isCanceled = false;\n      async function loadAuthConfigValues() {\n        try {\n          const newAuthConfigValues = await client.getAuthConfigValues();\n          if (!isCanceled) {\n            setAuthConfig(new Map(newAuthConfigValues));\n          }\n        } catch (e) {\n          if (!isCanceled) {\n            setError(e);\n          }\n        }\n      }\n      loadAuthConfigValues();\n      return () => {\n        isCanceled = true;\n      };\n    },\n    [client]\n  );\n\n  const AuthComponent = useMemo(() => {\n    if (plugins == null || authConfig == null) {\n      return undefined;\n    }\n\n    try {\n      return getAuthPluginComponent(plugins, authConfig, CORE_AUTH_PLUGINS);\n    } catch (e) {\n      setError(e);\n    }\n  }, [authConfig, plugins]);\n\n  const isLoading = AuthComponent == null || authConfig == null;\n\n  if (isLoading || error != null) {\n    return (\n      <LoadingOverlay\n        isLoading={isLoading && error == null}\n        errorMessage={getErrorMessage(error)}\n      />\n    );\n  }\n  return (\n    <AuthComponent authConfigValues={authConfig}>\n      <>\n        <LoginNotifier />\n        {children}\n      </>\n    </AuthComponent>\n  );\n}\n\nexport default AuthBootstrap;\n"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AACvE,SAEEC,mBAAmB,EACnBC,gBAAgB,EAChBC,aAAa,QACR,yBAAyB;AAChC,SAASC,cAAc,QAAQ,uBAAuB;AACtD,SAASC,SAAS,QAAQ,4BAA4B;AACtD,SAASC,eAAe,QAAQ,kBAAkB;AAAC,SAC1CC,cAAc;AAAA,SACdC,sBAAsB;AAAA,OACxBC,aAAa;AAAA;AAAA;AAAA;AASpB;AACA,IAAMC,iBAAiB,GAAG,IAAIC,GAAG,CAAC,CAChC,CACE,0CAA0C,EAC1C;EAAEC,UAAU,EAAEV;AAAiB,CAAC,CACjC,EACD,CAAC,uCAAuC,EAAE;EAAEU,UAAU,EAAET;AAAc,CAAC,CAAC,EACxE,CACE,6CAA6C,EAC7C;EAAES,UAAU,EAAEX;AAAoB,CAAC,CACpC,CACF,CAAC;;AAEF;AACA;AACA;AACA,OAAO,SAASY,aAAa,OAAmC;EAAA,IAAlC;IAAEC;EAA6B,CAAC;EAC5D,IAAMC,MAAM,GAAGV,SAAS,EAAE;EAC1B;EACA;EACA,IAAMW,OAAO,GAAGnB,UAAU,CAACU,cAAc,CAAC;EAC1C,IAAM,CAACU,UAAU,EAAEC,aAAa,CAAC,GAAGlB,QAAQ,EAAiB;EAC7D,IAAM,CAACmB,KAAK,EAAEC,QAAQ,CAAC,GAAGpB,QAAQ,EAAW;EAE7CF,SAAS,CACP,SAASuB,oBAAoB,GAAG;IAC9B,IAAIC,UAAU,GAAG,KAAK;IAAC,SACRC,oBAAoB;MAAA;IAAA;IAAA;MAAA,0CAAnC,aAAsC;QACpC,IAAI;UACF,IAAMC,mBAAmB,SAAST,MAAM,CAACU,mBAAmB,EAAE;UAC9D,IAAI,CAACH,UAAU,EAAE;YACfJ,aAAa,CAAC,IAAIP,GAAG,CAACa,mBAAmB,CAAC,CAAC;UAC7C;QACF,CAAC,CAAC,OAAOE,CAAC,EAAE;UACV,IAAI,CAACJ,UAAU,EAAE;YACfF,QAAQ,CAACM,CAAC,CAAC;UACb;QACF;MACF,CAAC;MAAA;IAAA;IACDH,oBAAoB,EAAE;IACtB,OAAO,MAAM;MACXD,UAAU,GAAG,IAAI;IACnB,CAAC;EACH,CAAC,EACD,CAACP,MAAM,CAAC,CACT;EAED,IAAMY,aAAa,GAAG5B,OAAO,CAAC,MAAM;IAClC,IAAIiB,OAAO,IAAI,IAAI,IAAIC,UAAU,IAAI,IAAI,EAAE;MACzC,OAAOW,SAAS;IAClB;IAEA,IAAI;MACF,OAAOpB,sBAAsB,CAACQ,OAAO,EAAEC,UAAU,EAAEP,iBAAiB,CAAC;IACvE,CAAC,CAAC,OAAOgB,CAAC,EAAE;MACVN,QAAQ,CAACM,CAAC,CAAC;IACb;EACF,CAAC,EAAE,CAACT,UAAU,EAAED,OAAO,CAAC,CAAC;EAEzB,IAAMa,SAAS,GAAGF,aAAa,IAAI,IAAI,IAAIV,UAAU,IAAI,IAAI;EAE7D,IAAIY,SAAS,IAAIV,KAAK,IAAI,IAAI,EAAE;IAC9B,oBACE,KAAC,cAAc;MACb,SAAS,EAAEU,SAAS,IAAIV,KAAK,IAAI,IAAK;MACtC,YAAY,EAAEb,eAAe,CAACa,KAAK;IAAE,EACrC;EAEN;EACA,oBACE,KAAC,aAAa;IAAC,gBAAgB,EAAEF,UAAW;IAAA,uBAC1C;MAAA,wBACE,KAAC,aAAa,KAAG,EAChBH,QAAQ;IAAA;EACR,EACW;AAEpB;AAEA,eAAeD,aAAa"}

package/dist/plugins/PluginUtils.d.ts

@@ -1,7 +1,4 @@
-import React, { ForwardRefExoticComponent } from 'react';
-import { AuthPlugin, AuthPluginComponent } from '@deephaven/auth-plugins';
-export interface PluginModule {
-}
+import { type PluginModule, type AuthPlugin, type AuthPluginComponent, LegacyAuthPlugin, LegacyPlugin, Plugin } from '@deephaven/plugin';
 export type PluginModuleMap = Map<string, PluginModule>;
 export type PluginManifestPluginInfo = {
     name: string;
@@ -11,19 +8,14 @@ export type PluginManifestPluginInfo = {
 export type PluginManifest = {
     plugins: PluginManifestPluginInfo[];
 };
-/**
- * Load a component plugin from the server.
- * @param baseURL Base URL of the plugin server
- * @param pluginName Name of the component plugin to load
- * @returns A lazily loaded JSX.Element from the plugin
- */
-export declare function loadComponentPlugin(baseURL: URL, pluginName: string): ForwardRefExoticComponent<React.RefAttributes<unknown>>;
 /**
  * Imports a commonjs plugin module from the provided URL
  * @param pluginUrl The URL of the plugin to load
  * @returns The loaded module
  */
-export declare function loadModulePlugin(pluginUrl: string): Promise<PluginModule>;
+export declare function loadModulePlugin(pluginUrl: string): Promise<LegacyPlugin | {
+    default: Plugin;
+}>;
 /**
  * Loads a JSON file and returns the JSON object
  * @param jsonUrl The URL of the JSON file to load
@@ -31,7 +23,7 @@ export declare function loadModulePlugin(pluginUrl: string): Promise<PluginModul
  */
 export declare function loadJson(jsonUrl: string): Promise<PluginManifest>;
 /**
- * Load all plugin modules available.
+ * Load all plugin modules available based on the manifest file at the provided base URL
  * @param modulePluginsUrl The base URL of the module plugins to load
  * @returns A map from the name of the plugin to the plugin module that was loaded
  */
@@ -46,5 +38,5 @@ export declare function getAuthHandlers(authConfigValues: Map<string, string>):
  * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins
  * @returns The auth plugin component to render
  */
-export declare function getAuthPluginComponent(pluginMap: PluginModuleMap, authConfigValues: Map<string, string>, corePlugins?: Map<string, AuthPlugin>): AuthPluginComponent;
+export declare function getAuthPluginComponent(pluginMap: PluginModuleMap, authConfigValues: Map<string, string>, corePlugins?: Map<string, LegacyAuthPlugin | AuthPlugin>): AuthPluginComponent;
 //# sourceMappingURL=PluginUtils.d.ts.map

package/dist/plugins/PluginUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginUtils.d.ts","sourceRoot":"","sources":["../../src/plugins/PluginUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EACL,UAAU,EACV,mBAAmB,EAEpB,MAAM,yBAAyB,CAAC;AASjC,MAAM,WAAW,YAAY;CAAG;AAEhC,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAExD,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,OAAO,EAAE,wBAAwB,EAAE,CAAA;CAAE,CAAC;AAErE;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,EACZ,UAAU,EAAE,MAAM,GACjB,yBAAyB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAqBzD;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CAGvB;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAUvE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,eAAe,CAAC,CAmC1B;AAED,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,EAAE,CAEV;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,eAAe,EAC1B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GACpC,mBAAmB,CAsCrB"}
+{"version":3,"file":"PluginUtils.d.ts","sourceRoot":"","sources":["../../src/plugins/PluginUtils.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,mBAAmB,EAExB,gBAAgB,EAChB,YAAY,EACZ,MAAM,EAIP,MAAM,mBAAmB,CAAC;AAK3B,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAExD,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,OAAO,EAAE,wBAAwB,EAAE,CAAA;CAAE,CAAC;AAErE;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAG7C;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAUvE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,eAAe,CAAC,CAsC1B;AAED,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,EAAE,CAEV;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,eAAe,EAC1B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,WAAW,6CAAmD,GAC7D,mBAAmB,CAwCrB"}

package/dist/plugins/PluginUtils.js

@@ -1,58 +1,9 @@
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 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); }); }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React from 'react';
-import { isAuthPlugin } from '@deephaven/auth-plugins';
 import Log from '@deephaven/log';
-import RemoteComponent from "./RemoteComponent.js";
+import { isAuthPlugin, PluginType, isLegacyAuthPlugin, isLegacyPlugin } from '@deephaven/plugin';
 import loadRemoteModule from "./loadRemoteModule.js";
-import { jsx as _jsx } from "react/jsx-runtime";
 var log = Log.module('@deephaven/app-utils.PluginUtils');
-
-// A PluginModule. This interface should have new fields added to it from different levels of plugins.
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-
-/**
- * Load a component plugin from the server.
- * @param baseURL Base URL of the plugin server
- * @param pluginName Name of the component plugin to load
- * @returns A lazily loaded JSX.Element from the plugin
- */
-export function loadComponentPlugin(baseURL, pluginName) {
-  var pluginUrl = new URL("".concat(pluginName, ".js"), baseURL);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  var Plugin = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/_jsx(RemoteComponent, {
-    url: pluginUrl.href
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ,
-    render: _ref => {
-      var {
-        err,
-        Component
-      } = _ref;
-      if (err != null && err !== '') {
-        var errorMessage = "Error loading plugin ".concat(pluginName, " from ").concat(pluginUrl, " due to ").concat(err);
-        log.error(errorMessage);
-        return /*#__PURE__*/_jsx("div", {
-          className: "error-message",
-          children: "".concat(errorMessage)
-        });
-      }
-      // eslint-disable-next-line react/jsx-props-no-spreading
-      return /*#__PURE__*/_jsx(Component, _objectSpread({
-        ref: ref
-      }, props));
-    }
-  }));
-  Plugin.pluginName = pluginName;
-  Plugin.displayName = 'Plugin';
-  return Plugin;
-}
-
 /**
  * Imports a commonjs plugin module from the provided URL
  * @param pluginUrl The URL of the plugin to load
@@ -79,7 +30,7 @@ export function loadJson(_x2) {
 }
 
 /**
- * Load all plugin modules available.
+ * Load all plugin modules available based on the manifest file at the provided base URL
  * @param modulePluginsUrl The base URL of the module plugins to load
  * @returns A map from the name of the plugin to the plugin module that was loaded
  */
@@ -126,7 +77,7 @@ function _loadModulePlugins() {
           name: _name
         } = manifest.plugins[_i];
         if (module.status === 'fulfilled') {
-          pluginMap.set(_name, module.value);
+          pluginMap.set(_name, isLegacyPlugin(module.value) ? module.value : module.value.default);
         } else {
           log.error("Unable to load plugin ".concat(_name), module.reason);
         }
@@ -154,37 +105,48 @@ export function getAuthHandlers(authConfigValues) {
  * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins
  * @returns The auth plugin component to render
  */
-export function getAuthPluginComponent(pluginMap, authConfigValues, corePlugins) {
+export function getAuthPluginComponent(pluginMap, authConfigValues) {
+  var corePlugins = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Map();
   var authHandlers = getAuthHandlers(authConfigValues);
-  // Filter out all the plugins that are auth plugins, and then map them to [pluginName, AuthPlugin] pairs
-  // Uses some pretty disgusting casting, because TypeScript wants to treat it as an (string | AuthPlugin)[] array instead
-  var authPlugins = [...pluginMap.entries()].filter(_ref2 => {
-    var [, plugin] = _ref2;
-    return isAuthPlugin(plugin.AuthPlugin);
-  }).map(_ref3 => {
-    var [name, plugin] = _ref3;
-    return [name, plugin.AuthPlugin];
+  // User plugins take priority over core plugins
+  var authPlugins = [...pluginMap.entries(), ...corePlugins.entries()].filter(_ref => {
+    var [, plugin] = _ref;
+    return isAuthPlugin(plugin) || isLegacyAuthPlugin(plugin);
+  }).map(_ref2 => {
+    var [name, plugin] = _ref2;
+    if (isLegacyAuthPlugin(plugin)) {
+      return {
+        type: PluginType.AUTH_PLUGIN,
+        name,
+        component: plugin.AuthPlugin.Component,
+        isAvailable: plugin.AuthPlugin.isAvailable
+      };
+    }
+    return plugin;
   });
 
-  // Add all the core plugins in priority
-  authPlugins.push(...(corePlugins !== null && corePlugins !== void 0 ? corePlugins : []));
-
   // Filter the available auth plugins
-
-  var availableAuthPlugins = authPlugins.filter(_ref4 => {
-    var [name, authPlugin] = _ref4;
-    return authPlugin.isAvailable(authHandlers, authConfigValues);
+  var availableAuthPlugins = authPlugins.filter(_ref3 => {
+    var {
+      isAvailable
+    } = _ref3;
+    return isAvailable(authHandlers, authConfigValues);
   });
   if (availableAuthPlugins.length === 0) {
     throw new Error("No login plugins found, please register a login plugin for auth handlers: ".concat(authHandlers));
   } else if (availableAuthPlugins.length > 1) {
-    log.warn('More than one login plugin available, will use the first one: ', availableAuthPlugins.map(_ref5 => {
-      var [name] = _ref5;
+    log.warn('More than one login plugin available, will use the first one: ', availableAuthPlugins.map(_ref4 => {
+      var {
+        name
+      } = _ref4;
       return name;
     }).join(', '));
   }
-  var [loginPluginName, NewLoginPlugin] = availableAuthPlugins[0];
-  log.info('Using LoginPlugin', loginPluginName);
-  return NewLoginPlugin.Component;
+  var {
+    name,
+    component
+  } = availableAuthPlugins[0];
+  log.info('Using LoginPlugin', name);
+  return component;
 }
 //# sourceMappingURL=PluginUtils.js.map

package/dist/plugins/PluginUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"PluginUtils.js","names":["React","isAuthPlugin","Log","RemoteComponent","loadRemoteModule","log","module","loadComponentPlugin","baseURL","pluginName","pluginUrl","URL","Plugin","forwardRef","props","ref","href","err","Component","errorMessage","error","displayName","loadModulePlugin","myModule","loadJson","jsonUrl","res","fetch","ok","Error","statusText","json","loadModulePlugins","modulePluginsUrl","debug","manifest","Array","isArray","plugins","pluginPromises","i","length","name","main","pluginMainUrl","push","pluginModules","Promise","allSettled","pluginMap","Map","status","set","value","reason","info","e","getAuthHandlers","authConfigValues","get","split","getAuthPluginComponent","corePlugins","authHandlers","authPlugins","entries","filter","plugin","AuthPlugin","map","availableAuthPlugins","authPlugin","isAvailable","warn","join","loginPluginName","NewLoginPlugin"],"sources":["../../src/plugins/PluginUtils.tsx"],"sourcesContent":["import React, { ForwardRefExoticComponent } from 'react';\nimport {\n  AuthPlugin,\n  AuthPluginComponent,\n  isAuthPlugin,\n} from '@deephaven/auth-plugins';\nimport Log from '@deephaven/log';\nimport RemoteComponent from './RemoteComponent';\nimport loadRemoteModule from './loadRemoteModule';\n\nconst log = Log.module('@deephaven/app-utils.PluginUtils');\n\n// A PluginModule. This interface should have new fields added to it from different levels of plugins.\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface PluginModule {}\n\nexport type PluginModuleMap = Map<string, PluginModule>;\n\nexport type PluginManifestPluginInfo = {\n  name: string;\n  main: string;\n  version: string;\n};\n\nexport type PluginManifest = { plugins: PluginManifestPluginInfo[] };\n\n/**\n * Load a component plugin from the server.\n * @param baseURL Base URL of the plugin server\n * @param pluginName Name of the component plugin to load\n * @returns A lazily loaded JSX.Element from the plugin\n */\nexport function loadComponentPlugin(\n  baseURL: URL,\n  pluginName: string\n): ForwardRefExoticComponent<React.RefAttributes<unknown>> {\n  const pluginUrl = new URL(`${pluginName}.js`, baseURL);\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const Plugin: any = React.forwardRef((props, ref) => (\n    <RemoteComponent\n      url={pluginUrl.href}\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      render={({ err, Component }: { err: unknown; Component: any }) => {\n        if (err != null && err !== '') {\n          const errorMessage = `Error loading plugin ${pluginName} from ${pluginUrl} due to ${err}`;\n          log.error(errorMessage);\n          return <div className=\"error-message\">{`${errorMessage}`}</div>;\n        }\n        // eslint-disable-next-line react/jsx-props-no-spreading\n        return <Component ref={ref} {...props} />;\n      }}\n    />\n  ));\n  Plugin.pluginName = pluginName;\n  Plugin.displayName = 'Plugin';\n  return Plugin;\n}\n\n/**\n * Imports a commonjs plugin module from the provided URL\n * @param pluginUrl The URL of the plugin to load\n * @returns The loaded module\n */\nexport async function loadModulePlugin(\n  pluginUrl: string\n): Promise<PluginModule> {\n  const myModule = await loadRemoteModule(pluginUrl);\n  return myModule;\n}\n\n/**\n * Loads a JSON file and returns the JSON object\n * @param jsonUrl The URL of the JSON file to load\n * @returns The JSON object of the manifest file\n */\nexport async function loadJson(jsonUrl: string): Promise<PluginManifest> {\n  const res = await fetch(jsonUrl);\n  if (!res.ok) {\n    throw new Error(res.statusText);\n  }\n  try {\n    return await res.json();\n  } catch {\n    throw new Error('Could not be parsed as JSON');\n  }\n}\n\n/**\n * Load all plugin modules available.\n * @param modulePluginsUrl The base URL of the module plugins to load\n * @returns A map from the name of the plugin to the plugin module that was loaded\n */\nexport async function loadModulePlugins(\n  modulePluginsUrl: string\n): Promise<PluginModuleMap> {\n  log.debug('Loading plugins...');\n  try {\n    const manifest = await loadJson(`${modulePluginsUrl}/manifest.json`);\n\n    if (!Array.isArray(manifest.plugins)) {\n      throw new Error('Plugin manifest JSON does not contain plugins array');\n    }\n\n    log.debug('Plugin manifest loaded:', manifest);\n    const pluginPromises: Promise<PluginModule>[] = [];\n    for (let i = 0; i < manifest.plugins.length; i += 1) {\n      const { name, main } = manifest.plugins[i];\n      const pluginMainUrl = `${modulePluginsUrl}/${name}/${main}`;\n      pluginPromises.push(loadModulePlugin(pluginMainUrl));\n    }\n    const pluginModules = await Promise.allSettled(pluginPromises);\n\n    const pluginMap: PluginModuleMap = new Map();\n    for (let i = 0; i < pluginModules.length; i += 1) {\n      const module = pluginModules[i];\n      const { name } = manifest.plugins[i];\n      if (module.status === 'fulfilled') {\n        pluginMap.set(name, module.value);\n      } else {\n        log.error(`Unable to load plugin ${name}`, module.reason);\n      }\n    }\n    log.info('Plugins loaded:', pluginMap);\n\n    return pluginMap;\n  } catch (e) {\n    log.error('Unable to load plugins:', e);\n    return new Map();\n  }\n}\n\nexport function getAuthHandlers(\n  authConfigValues: Map<string, string>\n): string[] {\n  return authConfigValues.get('AuthHandlers')?.split(',') ?? [];\n}\n\n/**\n * Get the auth plugin component from the plugin map and current configuration\n * Throws if no auth plugin is available\n *\n * @param pluginMap Map of plugins loaded from the server\n * @param authConfigValues Auth config values from the server\n * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins\n * @returns The auth plugin component to render\n */\nexport function getAuthPluginComponent(\n  pluginMap: PluginModuleMap,\n  authConfigValues: Map<string, string>,\n  corePlugins?: Map<string, AuthPlugin>\n): AuthPluginComponent {\n  const authHandlers = getAuthHandlers(authConfigValues);\n  // Filter out all the plugins that are auth plugins, and then map them to [pluginName, AuthPlugin] pairs\n  // Uses some pretty disgusting casting, because TypeScript wants to treat it as an (string | AuthPlugin)[] array instead\n  const authPlugins = (\n    [...pluginMap.entries()].filter(\n      ([, plugin]: [string, { AuthPlugin?: AuthPlugin }]) =>\n        isAuthPlugin(plugin.AuthPlugin)\n    ) as [string, { AuthPlugin: AuthPlugin }][]\n  ).map(([name, plugin]) => [name, plugin.AuthPlugin]) as [\n    string,\n    AuthPlugin,\n  ][];\n\n  // Add all the core plugins in priority\n  authPlugins.push(...(corePlugins ?? []));\n\n  // Filter the available auth plugins\n\n  const availableAuthPlugins = authPlugins.filter(([name, authPlugin]) =>\n    authPlugin.isAvailable(authHandlers, authConfigValues)\n  );\n\n  if (availableAuthPlugins.length === 0) {\n    throw new Error(\n      `No login plugins found, please register a login plugin for auth handlers: ${authHandlers}`\n    );\n  } else if (availableAuthPlugins.length > 1) {\n    log.warn(\n      'More than one login plugin available, will use the first one: ',\n      availableAuthPlugins.map(([name]) => name).join(', ')\n    );\n  }\n\n  const [loginPluginName, NewLoginPlugin] = availableAuthPlugins[0];\n  log.info('Using LoginPlugin', loginPluginName);\n\n  return NewLoginPlugin.Component;\n}\n"],"mappings":";;;;;;;AAAA,OAAOA,KAAK,MAAqC,OAAO;AACxD,SAGEC,YAAY,QACP,yBAAyB;AAChC,OAAOC,GAAG,MAAM,gBAAgB;AAAC,OAC1BC,eAAe;AAAA,OACfC,gBAAgB;AAAA;AAEvB,IAAMC,GAAG,GAAGH,GAAG,CAACI,MAAM,CAAC,kCAAkC,CAAC;;AAE1D;AACA;;AAaA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,mBAAmB,CACjCC,OAAY,EACZC,UAAkB,EACuC;EACzD,IAAMC,SAAS,GAAG,IAAIC,GAAG,WAAIF,UAAU,UAAOD,OAAO,CAAC;EACtD;EACA,IAAMI,MAAW,gBAAGZ,KAAK,CAACa,UAAU,CAAC,CAACC,KAAK,EAAEC,GAAG,kBAC9C,KAAC,eAAe;IACd,GAAG,EAAEL,SAAS,CAACM;IACf;IAAA;IACA,MAAM,EAAE,QAA0D;MAAA,IAAzD;QAAEC,GAAG;QAAEC;MAA4C,CAAC;MAC3D,IAAID,GAAG,IAAI,IAAI,IAAIA,GAAG,KAAK,EAAE,EAAE;QAC7B,IAAME,YAAY,kCAA2BV,UAAU,mBAASC,SAAS,qBAAWO,GAAG,CAAE;QACzFZ,GAAG,CAACe,KAAK,CAACD,YAAY,CAAC;QACvB,oBAAO;UAAK,SAAS,EAAC,eAAe;UAAA,oBAAKA,YAAY;QAAA,EAAS;MACjE;MACA;MACA,oBAAO,KAAC,SAAS;QAAC,GAAG,EAAEJ;MAAI,GAAKD,KAAK,EAAI;IAC3C;EAAE,EAEL,CAAC;EACFF,MAAM,CAACH,UAAU,GAAGA,UAAU;EAC9BG,MAAM,CAACS,WAAW,GAAG,QAAQ;EAC7B,OAAOT,MAAM;AACf;;AAEA;AACA;AACA;AACA;AACA;AACA,gBAAsBU,gBAAgB;EAAA;AAAA;;AAOtC;AACA;AACA;AACA;AACA;AAJA;EAAA,sCAPO,WACLZ,SAAiB,EACM;IACvB,IAAMa,QAAQ,SAASnB,gBAAgB,CAACM,SAAS,CAAC;IAClD,OAAOa,QAAQ;EACjB,CAAC;EAAA;AAAA;AAOD,gBAAsBC,QAAQ;EAAA;AAAA;;AAY9B;AACA;AACA;AACA;AACA;AAJA;EAAA,8BAZO,WAAwBC,OAAe,EAA2B;IACvE,IAAMC,GAAG,SAASC,KAAK,CAACF,OAAO,CAAC;IAChC,IAAI,CAACC,GAAG,CAACE,EAAE,EAAE;MACX,MAAM,IAAIC,KAAK,CAACH,GAAG,CAACI,UAAU,CAAC;IACjC;IACA,IAAI;MACF,aAAaJ,GAAG,CAACK,IAAI,EAAE;IACzB,CAAC,CAAC,gBAAM;MACN,MAAM,IAAIF,KAAK,CAAC,6BAA6B,CAAC;IAChD;EACF,CAAC;EAAA;AAAA;AAOD,gBAAsBG,iBAAiB;EAAA;AAAA;AAqCtC;EAAA,uCArCM,WACLC,gBAAwB,EACE;IAC1B5B,GAAG,CAAC6B,KAAK,CAAC,oBAAoB,CAAC;IAC/B,IAAI;MACF,IAAMC,QAAQ,SAASX,QAAQ,WAAIS,gBAAgB,oBAAiB;MAEpE,IAAI,CAACG,KAAK,CAACC,OAAO,CAACF,QAAQ,CAACG,OAAO,CAAC,EAAE;QACpC,MAAM,IAAIT,KAAK,CAAC,qDAAqD,CAAC;MACxE;MAEAxB,GAAG,CAAC6B,KAAK,CAAC,yBAAyB,EAAEC,QAAQ,CAAC;MAC9C,IAAMI,cAAuC,GAAG,EAAE;MAClD,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGL,QAAQ,CAACG,OAAO,CAACG,MAAM,EAAED,CAAC,IAAI,CAAC,EAAE;QACnD,IAAM;UAAEE,IAAI;UAAEC;QAAK,CAAC,GAAGR,QAAQ,CAACG,OAAO,CAACE,CAAC,CAAC;QAC1C,IAAMI,aAAa,aAAMX,gBAAgB,cAAIS,IAAI,cAAIC,IAAI,CAAE;QAC3DJ,cAAc,CAACM,IAAI,CAACvB,gBAAgB,CAACsB,aAAa,CAAC,CAAC;MACtD;MACA,IAAME,aAAa,SAASC,OAAO,CAACC,UAAU,CAACT,cAAc,CAAC;MAE9D,IAAMU,SAA0B,GAAG,IAAIC,GAAG,EAAE;MAC5C,KAAK,IAAIV,EAAC,GAAG,CAAC,EAAEA,EAAC,GAAGM,aAAa,CAACL,MAAM,EAAED,EAAC,IAAI,CAAC,EAAE;QAChD,IAAMlC,MAAM,GAAGwC,aAAa,CAACN,EAAC,CAAC;QAC/B,IAAM;UAAEE,IAAI,EAAJA;QAAK,CAAC,GAAGP,QAAQ,CAACG,OAAO,CAACE,EAAC,CAAC;QACpC,IAAIlC,MAAM,CAAC6C,MAAM,KAAK,WAAW,EAAE;UACjCF,SAAS,CAACG,GAAG,CAACV,KAAI,EAAEpC,MAAM,CAAC+C,KAAK,CAAC;QACnC,CAAC,MAAM;UACLhD,GAAG,CAACe,KAAK,iCAA0BsB,KAAI,GAAIpC,MAAM,CAACgD,MAAM,CAAC;QAC3D;MACF;MACAjD,GAAG,CAACkD,IAAI,CAAC,iBAAiB,EAAEN,SAAS,CAAC;MAEtC,OAAOA,SAAS;IAClB,CAAC,CAAC,OAAOO,CAAC,EAAE;MACVnD,GAAG,CAACe,KAAK,CAAC,yBAAyB,EAAEoC,CAAC,CAAC;MACvC,OAAO,IAAIN,GAAG,EAAE;IAClB;EACF,CAAC;EAAA;AAAA;AAED,OAAO,SAASO,eAAe,CAC7BC,gBAAqC,EAC3B;EAAA;EACV,0DAAOA,gBAAgB,CAACC,GAAG,CAAC,cAAc,CAAC,2DAApC,uBAAsCC,KAAK,CAAC,GAAG,CAAC,yEAAI,EAAE;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsB,CACpCZ,SAA0B,EAC1BS,gBAAqC,EACrCI,WAAqC,EAChB;EACrB,IAAMC,YAAY,GAAGN,eAAe,CAACC,gBAAgB,CAAC;EACtD;EACA;EACA,IAAMM,WAAW,GACf,CAAC,GAAGf,SAAS,CAACgB,OAAO,EAAE,CAAC,CAACC,MAAM,CAC7B;IAAA,IAAC,GAAGC,MAAM,CAAwC;IAAA,OAChDlE,YAAY,CAACkE,MAAM,CAACC,UAAU,CAAC;EAAA,EAClC,CACDC,GAAG,CAAC;IAAA,IAAC,CAAC3B,IAAI,EAAEyB,MAAM,CAAC;IAAA,OAAK,CAACzB,IAAI,EAAEyB,MAAM,CAACC,UAAU,CAAC;EAAA,EAGhD;;EAEH;EACAJ,WAAW,CAACnB,IAAI,CAAC,IAAIiB,WAAW,aAAXA,WAAW,cAAXA,WAAW,GAAI,EAAE,CAAC,CAAC;;EAExC;;EAEA,IAAMQ,oBAAoB,GAAGN,WAAW,CAACE,MAAM,CAAC;IAAA,IAAC,CAACxB,IAAI,EAAE6B,UAAU,CAAC;IAAA,OACjEA,UAAU,CAACC,WAAW,CAACT,YAAY,EAAEL,gBAAgB,CAAC;EAAA,EACvD;EAED,IAAIY,oBAAoB,CAAC7B,MAAM,KAAK,CAAC,EAAE;IACrC,MAAM,IAAIZ,KAAK,qFACgEkC,YAAY,EAC1F;EACH,CAAC,MAAM,IAAIO,oBAAoB,CAAC7B,MAAM,GAAG,CAAC,EAAE;IAC1CpC,GAAG,CAACoE,IAAI,CACN,gEAAgE,EAChEH,oBAAoB,CAACD,GAAG,CAAC;MAAA,IAAC,CAAC3B,IAAI,CAAC;MAAA,OAAKA,IAAI;IAAA,EAAC,CAACgC,IAAI,CAAC,IAAI,CAAC,CACtD;EACH;EAEA,IAAM,CAACC,eAAe,EAAEC,cAAc,CAAC,GAAGN,oBAAoB,CAAC,CAAC,CAAC;EACjEjE,GAAG,CAACkD,IAAI,CAAC,mBAAmB,EAAEoB,eAAe,CAAC;EAE9C,OAAOC,cAAc,CAAC1D,SAAS;AACjC"}
+{"version":3,"file":"PluginUtils.js","names":["Log","isAuthPlugin","PluginType","isLegacyAuthPlugin","isLegacyPlugin","loadRemoteModule","log","module","loadModulePlugin","pluginUrl","myModule","loadJson","jsonUrl","res","fetch","ok","Error","statusText","json","loadModulePlugins","modulePluginsUrl","debug","manifest","Array","isArray","plugins","pluginPromises","i","length","name","main","pluginMainUrl","push","pluginModules","Promise","allSettled","pluginMap","Map","status","set","value","default","error","reason","info","e","getAuthHandlers","authConfigValues","get","split","getAuthPluginComponent","corePlugins","authHandlers","authPlugins","entries","filter","plugin","map","type","AUTH_PLUGIN","component","AuthPlugin","Component","isAvailable","availableAuthPlugins","warn","join"],"sources":["../../src/plugins/PluginUtils.tsx"],"sourcesContent":["import Log from '@deephaven/log';\nimport {\n  type PluginModule,\n  type AuthPlugin,\n  type AuthPluginComponent,\n  isAuthPlugin,\n  LegacyAuthPlugin,\n  LegacyPlugin,\n  Plugin,\n  PluginType,\n  isLegacyAuthPlugin,\n  isLegacyPlugin,\n} from '@deephaven/plugin';\nimport loadRemoteModule from './loadRemoteModule';\n\nconst log = Log.module('@deephaven/app-utils.PluginUtils');\n\nexport type PluginModuleMap = Map<string, PluginModule>;\n\nexport type PluginManifestPluginInfo = {\n  name: string;\n  main: string;\n  version: string;\n};\n\nexport type PluginManifest = { plugins: PluginManifestPluginInfo[] };\n\n/**\n * Imports a commonjs plugin module from the provided URL\n * @param pluginUrl The URL of the plugin to load\n * @returns The loaded module\n */\nexport async function loadModulePlugin(\n  pluginUrl: string\n): Promise<LegacyPlugin | { default: Plugin }> {\n  const myModule = await loadRemoteModule(pluginUrl);\n  return myModule;\n}\n\n/**\n * Loads a JSON file and returns the JSON object\n * @param jsonUrl The URL of the JSON file to load\n * @returns The JSON object of the manifest file\n */\nexport async function loadJson(jsonUrl: string): Promise<PluginManifest> {\n  const res = await fetch(jsonUrl);\n  if (!res.ok) {\n    throw new Error(res.statusText);\n  }\n  try {\n    return await res.json();\n  } catch {\n    throw new Error('Could not be parsed as JSON');\n  }\n}\n\n/**\n * Load all plugin modules available based on the manifest file at the provided base URL\n * @param modulePluginsUrl The base URL of the module plugins to load\n * @returns A map from the name of the plugin to the plugin module that was loaded\n */\nexport async function loadModulePlugins(\n  modulePluginsUrl: string\n): Promise<PluginModuleMap> {\n  log.debug('Loading plugins...');\n  try {\n    const manifest = await loadJson(`${modulePluginsUrl}/manifest.json`);\n\n    if (!Array.isArray(manifest.plugins)) {\n      throw new Error('Plugin manifest JSON does not contain plugins array');\n    }\n\n    log.debug('Plugin manifest loaded:', manifest);\n    const pluginPromises: Promise<LegacyPlugin | { default: Plugin }>[] = [];\n    for (let i = 0; i < manifest.plugins.length; i += 1) {\n      const { name, main } = manifest.plugins[i];\n      const pluginMainUrl = `${modulePluginsUrl}/${name}/${main}`;\n      pluginPromises.push(loadModulePlugin(pluginMainUrl));\n    }\n    const pluginModules = await Promise.allSettled(pluginPromises);\n\n    const pluginMap: PluginModuleMap = new Map();\n    for (let i = 0; i < pluginModules.length; i += 1) {\n      const module = pluginModules[i];\n      const { name } = manifest.plugins[i];\n      if (module.status === 'fulfilled') {\n        pluginMap.set(\n          name,\n          isLegacyPlugin(module.value) ? module.value : module.value.default\n        );\n      } else {\n        log.error(`Unable to load plugin ${name}`, module.reason);\n      }\n    }\n    log.info('Plugins loaded:', pluginMap);\n\n    return pluginMap;\n  } catch (e) {\n    log.error('Unable to load plugins:', e);\n    return new Map();\n  }\n}\n\nexport function getAuthHandlers(\n  authConfigValues: Map<string, string>\n): string[] {\n  return authConfigValues.get('AuthHandlers')?.split(',') ?? [];\n}\n\n/**\n * Get the auth plugin component from the plugin map and current configuration\n * Throws if no auth plugin is available\n *\n * @param pluginMap Map of plugins loaded from the server\n * @param authConfigValues Auth config values from the server\n * @param corePlugins Map of core auth plugins to include in the list. They are added after the loaded plugins\n * @returns The auth plugin component to render\n */\nexport function getAuthPluginComponent(\n  pluginMap: PluginModuleMap,\n  authConfigValues: Map<string, string>,\n  corePlugins = new Map<string, AuthPlugin | LegacyAuthPlugin>()\n): AuthPluginComponent {\n  const authHandlers = getAuthHandlers(authConfigValues);\n  // User plugins take priority over core plugins\n  const authPlugins = (\n    [...pluginMap.entries(), ...corePlugins.entries()].filter(\n      ([, plugin]) => isAuthPlugin(plugin) || isLegacyAuthPlugin(plugin)\n    ) as [string, AuthPlugin | LegacyAuthPlugin][]\n  ).map(([name, plugin]) => {\n    if (isLegacyAuthPlugin(plugin)) {\n      return {\n        type: PluginType.AUTH_PLUGIN,\n        name,\n        component: plugin.AuthPlugin.Component,\n        isAvailable: plugin.AuthPlugin.isAvailable,\n      };\n    }\n\n    return plugin;\n  });\n\n  // Filter the available auth plugins\n  const availableAuthPlugins = authPlugins.filter(({ isAvailable }) =>\n    isAvailable(authHandlers, authConfigValues)\n  );\n\n  if (availableAuthPlugins.length === 0) {\n    throw new Error(\n      `No login plugins found, please register a login plugin for auth handlers: ${authHandlers}`\n    );\n  } else if (availableAuthPlugins.length > 1) {\n    log.warn(\n      'More than one login plugin available, will use the first one: ',\n      availableAuthPlugins.map(({ name }) => name).join(', ')\n    );\n  }\n\n  const { name, component } = availableAuthPlugins[0];\n  log.info('Using LoginPlugin', name);\n\n  return component;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/app-utils",
-  "version": "0.46.2-beta.3+f626876e",
+  "version": "0.47.0",
   "description": "Deephaven App Utils",
   "author": "Deephaven Data Labs LLC",
   "license": "Apache-2.0",
@@ -28,15 +28,16 @@
     "redux": "^4.x"
   },
   "dependencies": {
-    "@deephaven/auth-plugins": "^0.46.2-beta.3+f626876e",
-    "@deephaven/components": "^0.46.2-beta.3+f626876e",
-    "@deephaven/jsapi-bootstrap": "^0.46.2-beta.3+f626876e",
-    "@deephaven/jsapi-components": "^0.46.2-beta.3+f626876e",
-    "@deephaven/jsapi-types": "^0.46.2-beta.3+f626876e",
-    "@deephaven/jsapi-utils": "^0.46.2-beta.3+f626876e",
-    "@deephaven/log": "^0.46.2-beta.3+f626876e",
-    "@deephaven/react-hooks": "^0.46.2-beta.3+f626876e",
-    "@deephaven/utils": "^0.46.2-beta.3+f626876e",
+    "@deephaven/auth-plugins": "^0.47.0",
+    "@deephaven/components": "^0.47.0",
+    "@deephaven/jsapi-bootstrap": "^0.47.0",
+    "@deephaven/jsapi-components": "^0.47.0",
+    "@deephaven/jsapi-types": "^0.47.0",
+    "@deephaven/jsapi-utils": "^0.47.0",
+    "@deephaven/log": "^0.47.0",
+    "@deephaven/plugin": "^0.47.0",
+    "@deephaven/react-hooks": "^0.47.0",
+    "@deephaven/utils": "^0.47.0",
     "@paciolan/remote-component": "2.13.0",
     "@paciolan/remote-module-loader": "^3.0.2",
     "fira": "mozilla/fira#4.202"
@@ -56,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f626876e5c91da43404f9ab2fc6c9c7cc2af830a"
+  "gitHead": "8d890b724d6c8bdb73eb03463f9c850ca57094bd"
 }