@deephaven/app-utils 0.77.1-beta.5 → 0.78.1-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,8 @@
1
+ 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; }
2
+ 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; }
3
+ 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; }
4
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
5
+ 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); }
1
6
  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); } }
2
7
  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); }); }; }
3
8
  import Log from '@deephaven/log';
@@ -93,14 +98,17 @@ function _loadModulePlugins() {
93
98
  for (var _i = 0; _i < pluginModules.length; _i += 1) {
94
99
  var module = pluginModules[_i];
95
100
  var {
96
- name: _name
101
+ name: _name,
102
+ version
97
103
  } = manifest.plugins[_i];
98
104
  if (module.status === 'fulfilled') {
99
105
  var moduleValue = getPluginModuleValue(module.value);
100
106
  if (moduleValue == null) {
101
107
  log.error("Plugin '".concat(_name, "' is missing an exported value."));
102
108
  } else {
103
- pluginMap.set(_name, moduleValue);
109
+ pluginMap.set(_name, _objectSpread(_objectSpread({}, moduleValue), {}, {
110
+ version
111
+ }));
104
112
  }
105
113
  } else {
106
114
  log.error("Unable to load plugin '".concat(_name, "'"), module.reason);
@@ -1 +1 @@
1
- {"version":3,"file":"PluginUtils.js","names":["Log","isAuthPlugin","PluginType","isLegacyAuthPlugin","isLegacyPlugin","isPlugin","loadRemoteModule","log","module","loadModulePlugin","_x","_loadModulePlugin","apply","arguments","_asyncToGenerator","pluginUrl","myModule","loadJson","_x2","_loadJson","jsonUrl","res","fetch","ok","Error","statusText","json","_unused","hasDefaultExport","value","default","getPluginModuleValue","loadModulePlugins","_x3","_loadModulePlugins","modulePluginsUrl","debug","manifest","concat","Array","isArray","plugins","pluginPromises","i","length","name","main","pluginMainUrl","push","pluginModules","Promise","allSettled","pluginMap","Map","status","moduleValue","error","set","reason","info","e","getAuthHandlers","authConfigValues","_authConfigValues$get","_authConfigValues$get2","get","split","getAuthPluginComponent","corePlugins","undefined","authHandlers","authPlugins","entries","filter","_ref","plugin","map","_ref2","type","AUTH_PLUGIN","component","AuthPlugin","Component","isAvailable","availableAuthPlugins","_ref3","warn","_ref4","join"],"sources":["../../src/plugins/PluginUtils.tsx"],"sourcesContent":["import Log from '@deephaven/log';\nimport {\n type PluginModuleMap,\n type AuthPlugin,\n type AuthPluginComponent,\n isAuthPlugin,\n LegacyAuthPlugin,\n LegacyPlugin,\n Plugin,\n PluginType,\n isLegacyAuthPlugin,\n isLegacyPlugin,\n PluginModule,\n isPlugin,\n} from '@deephaven/plugin';\nimport loadRemoteModule from './loadRemoteModule';\n\nconst log = Log.module('@deephaven/app-utils.PluginUtils');\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\nfunction hasDefaultExport(value: unknown): value is { default: Plugin } {\n return (\n typeof value === 'object' &&\n value != null &&\n typeof (value as { default?: unknown }).default === 'object'\n );\n}\n\nexport function getPluginModuleValue(\n value: LegacyPlugin | Plugin | { default: Plugin }\n): PluginModule | null {\n // TypeScript builds CJS default exports differently depending on\n // whether there are also named exports. If the default is the only\n // export, it will be the value. If there are also named exports,\n // it will be assigned to the `default` property on the value.\n if (isPlugin(value)) {\n return value;\n }\n if (hasDefaultExport(value) && isPlugin(value.default)) {\n return value.default;\n }\n if (isLegacyPlugin(value)) {\n return value;\n }\n return null;\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\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 const moduleValue = getPluginModuleValue(module.value);\n if (moduleValue == null) {\n log.error(`Plugin '${name}' is missing an exported value.`);\n } else {\n pluginMap.set(name, moduleValue);\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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"}
1
+ {"version":3,"file":"PluginUtils.js","names":["Log","isAuthPlugin","PluginType","isLegacyAuthPlugin","isLegacyPlugin","isPlugin","loadRemoteModule","log","module","loadModulePlugin","_x","_loadModulePlugin","apply","arguments","_asyncToGenerator","pluginUrl","myModule","loadJson","_x2","_loadJson","jsonUrl","res","fetch","ok","Error","statusText","json","_unused","hasDefaultExport","value","default","getPluginModuleValue","loadModulePlugins","_x3","_loadModulePlugins","modulePluginsUrl","debug","manifest","concat","Array","isArray","plugins","pluginPromises","i","length","name","main","pluginMainUrl","push","pluginModules","Promise","allSettled","pluginMap","Map","version","status","moduleValue","error","set","_objectSpread","reason","info","e","getAuthHandlers","authConfigValues","_authConfigValues$get","_authConfigValues$get2","get","split","getAuthPluginComponent","corePlugins","undefined","authHandlers","authPlugins","entries","filter","_ref","plugin","map","_ref2","type","AUTH_PLUGIN","component","AuthPlugin","Component","isAvailable","availableAuthPlugins","_ref3","warn","_ref4","join"],"sources":["../../src/plugins/PluginUtils.tsx"],"sourcesContent":["import Log from '@deephaven/log';\nimport {\n type PluginModuleMap,\n type AuthPlugin,\n type AuthPluginComponent,\n isAuthPlugin,\n LegacyAuthPlugin,\n LegacyPlugin,\n Plugin,\n PluginType,\n isLegacyAuthPlugin,\n isLegacyPlugin,\n PluginModule,\n isPlugin,\n} from '@deephaven/plugin';\nimport loadRemoteModule from './loadRemoteModule';\n\nconst log = Log.module('@deephaven/app-utils.PluginUtils');\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\nfunction hasDefaultExport(value: unknown): value is { default: Plugin } {\n return (\n typeof value === 'object' &&\n value != null &&\n typeof (value as { default?: unknown }).default === 'object'\n );\n}\n\nexport function getPluginModuleValue(\n value: LegacyPlugin | Plugin | { default: Plugin }\n): PluginModule | null {\n // TypeScript builds CJS default exports differently depending on\n // whether there are also named exports. If the default is the only\n // export, it will be the value. If there are also named exports,\n // it will be assigned to the `default` property on the value.\n if (isPlugin(value)) {\n return value;\n }\n if (hasDefaultExport(value) && isPlugin(value.default)) {\n return value.default;\n }\n if (isLegacyPlugin(value)) {\n return value;\n }\n return null;\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\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, version } = manifest.plugins[i];\n if (module.status === 'fulfilled') {\n const moduleValue = getPluginModuleValue(module.value);\n if (moduleValue == null) {\n log.error(`Plugin '${name}' is missing an exported value.`);\n } else {\n pluginMap.set(name, { ...moduleValue, version });\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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@deephaven/app-utils",
3
- "version": "0.77.1-beta.5+2246a4a1",
3
+ "version": "0.78.1-beta.0+11005198",
4
4
  "description": "Deephaven App Utils",
5
5
  "author": "Deephaven Data Labs LLC",
6
6
  "license": "Apache-2.0",
@@ -29,24 +29,24 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "@adobe/react-spectrum": "3.33.1",
32
- "@deephaven/auth-plugins": "^0.77.1-beta.5+2246a4a1",
33
- "@deephaven/chart": "^0.77.1-beta.5+2246a4a1",
34
- "@deephaven/components": "^0.77.1-beta.5+2246a4a1",
35
- "@deephaven/console": "^0.77.1-beta.5+2246a4a1",
36
- "@deephaven/dashboard": "^0.77.1-beta.5+2246a4a1",
37
- "@deephaven/dashboard-core-plugins": "^0.77.1-beta.5+2246a4a1",
38
- "@deephaven/golden-layout": "^0.77.1-beta.5+2246a4a1",
39
- "@deephaven/icons": "^0.77.1-beta.5+2246a4a1",
40
- "@deephaven/iris-grid": "^0.77.1-beta.5+2246a4a1",
41
- "@deephaven/jsapi-bootstrap": "^0.77.1-beta.5+2246a4a1",
42
- "@deephaven/jsapi-components": "^0.77.1-beta.5+2246a4a1",
32
+ "@deephaven/auth-plugins": "^0.78.1-beta.0+11005198",
33
+ "@deephaven/chart": "^0.78.1-beta.0+11005198",
34
+ "@deephaven/components": "^0.78.1-beta.0+11005198",
35
+ "@deephaven/console": "^0.78.1-beta.0+11005198",
36
+ "@deephaven/dashboard": "^0.78.1-beta.0+11005198",
37
+ "@deephaven/dashboard-core-plugins": "^0.78.1-beta.0+11005198",
38
+ "@deephaven/golden-layout": "^0.78.1-beta.0+11005198",
39
+ "@deephaven/icons": "^0.78.1-beta.0+11005198",
40
+ "@deephaven/iris-grid": "^0.78.1-beta.0+11005198",
41
+ "@deephaven/jsapi-bootstrap": "^0.78.1-beta.0+11005198",
42
+ "@deephaven/jsapi-components": "^0.78.1-beta.0+11005198",
43
43
  "@deephaven/jsapi-types": "1.0.0-dev0.34.0",
44
- "@deephaven/jsapi-utils": "^0.77.1-beta.5+2246a4a1",
45
- "@deephaven/log": "^0.77.1-beta.5+2246a4a1",
46
- "@deephaven/plugin": "^0.77.1-beta.5+2246a4a1",
47
- "@deephaven/react-hooks": "^0.77.1-beta.5+2246a4a1",
48
- "@deephaven/redux": "^0.77.1-beta.5+2246a4a1",
49
- "@deephaven/utils": "^0.77.1-beta.5+2246a4a1",
44
+ "@deephaven/jsapi-utils": "^0.78.1-beta.0+11005198",
45
+ "@deephaven/log": "^0.78.1-beta.0+11005198",
46
+ "@deephaven/plugin": "^0.78.1-beta.0+11005198",
47
+ "@deephaven/react-hooks": "^0.78.1-beta.0+11005198",
48
+ "@deephaven/redux": "^0.78.1-beta.0+11005198",
49
+ "@deephaven/utils": "^0.78.1-beta.0+11005198",
50
50
  "@fontsource/fira-mono": "5.0.13",
51
51
  "@fontsource/fira-sans": "5.0.20",
52
52
  "@paciolan/remote-component": "2.13.0",
@@ -68,5 +68,5 @@
68
68
  "publishConfig": {
69
69
  "access": "public"
70
70
  },
71
- "gitHead": "2246a4a1ef087db060f2130c5a2d7c1e037746b4"
71
+ "gitHead": "11005198cdd5608ad4c88eb296fd10f51528ff09"
72
72
  }