@perses-dev/plugin-system 0.50.1 → 0.51.0-beta.0

package/dist/cjs/remote/PluginRuntime.js

@@ -0,0 +1,267 @@
+/* eslint-disable @typescript-eslint/no-require-imports */ // Copyright 2024 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    loadPlugin: function() {
+        return loadPlugin;
+    },
+    pluginRuntime: function() {
+        return pluginRuntime;
+    },
+    usePluginRuntime: function() {
+        return usePluginRuntime;
+    }
+});
+const _runtime = require("@module-federation/enhanced/runtime");
+const _reactquery = /*#__PURE__*/ _interop_require_wildcard(require("@tanstack/react-query"));
+const _react = /*#__PURE__*/ _interop_require_default(require("react"));
+const _reactdom = /*#__PURE__*/ _interop_require_default(require("react-dom"));
+const _reactrouterdom = /*#__PURE__*/ _interop_require_wildcard(require("react-router-dom"));
+const _reacthookform = /*#__PURE__*/ _interop_require_wildcard(require("react-hook-form"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+const pluginRuntime = (0, _runtime.init)({
+    name: '@perses/perses-ui-host',
+    remotes: [],
+    shared: {
+        react: {
+            version: _react.default.version,
+            lib: ()=>_react.default,
+            shareConfig: {
+                singleton: true,
+                requiredVersion: `^${_react.default.version}`
+            }
+        },
+        'react-dom': {
+            version: '18.3.1',
+            lib: ()=>_reactdom.default,
+            shareConfig: {
+                singleton: true,
+                requiredVersion: `^18.3.1`
+            }
+        },
+        'react-router-dom': {
+            version: '6.26.0',
+            lib: ()=>_reactrouterdom,
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^6.26.0'
+            }
+        },
+        '@tanstack/react-query': {
+            version: '4.36.1',
+            lib: ()=>_reactquery,
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^4.36.1'
+            }
+        },
+        'react-hook-form': {
+            version: '7.52.2',
+            lib: ()=>_reacthookform,
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^7.52.2'
+            }
+        },
+        echarts: {
+            version: '5.5.0',
+            lib: ()=>require('echarts'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^5.5.0'
+            }
+        },
+        '@perses-dev/components': {
+            version: '0.50.0',
+            lib: ()=>require('@perses-dev/components'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^0.50.0'
+            }
+        },
+        '@perses-dev/plugin-system': {
+            version: '0.50.0',
+            lib: ()=>require('@perses-dev/plugin-system'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^0.50.0'
+            }
+        },
+        '@perses-dev/explore': {
+            version: '0.50.0',
+            lib: ()=>require('@perses-dev/explore'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^0.50.0'
+            }
+        },
+        '@perses-dev/dashboards': {
+            version: '0.50.0',
+            lib: ()=>require('@perses-dev/dashboards'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^0.50.0'
+            }
+        },
+        // Below are the shared modules that are used by the plugins, this can be part of the SDK
+        'date-fns': {
+            version: '2.29.3',
+            lib: ()=>require('date-fns'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^2.29.3'
+            }
+        },
+        'date-fns-tz': {
+            version: '1.3.8',
+            lib: ()=>require('date-fns-tz'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^1.3.8'
+            }
+        },
+        lodash: {
+            version: '4.17.21',
+            lib: ()=>require('lodash'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^4.17.21'
+            }
+        },
+        '@emotion/react': {
+            version: '11.11.3',
+            lib: ()=>require('@emotion/react'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^11.11.3'
+            }
+        },
+        '@emotion/styled': {
+            version: '11.11.0',
+            lib: ()=>require('@emotion/styled'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^11.11.0'
+            }
+        },
+        '@hookform/resolvers/zod': {
+            version: '3.3.4',
+            lib: ()=>require('@hookform/resolvers/zod'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^3.3.4'
+            }
+        },
+        'use-resize-observer': {
+            version: '9.1.0',
+            lib: ()=>require('use-resize-observer'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^9.1.0'
+            }
+        },
+        'mdi-material-ui': {
+            version: '7.4.0',
+            lib: ()=>require('mdi-material-ui'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^7.4.0'
+            }
+        },
+        immer: {
+            version: '9.0.15',
+            lib: ()=>require('immer'),
+            shareConfig: {
+                singleton: true,
+                requiredVersion: '^9.0.15'
+            }
+        }
+    }
+});
+const registerRemote = (name, baseURL)=>{
+    const existingRemote = pluginRuntime.options.remotes.find((remote)=>remote.name === name);
+    if (!existingRemote) {
+        const remoteEntryURL = baseURL ? `${baseURL}/${name}/mf-manifest.json` : `/plugins/${name}/mf-manifest.json`;
+        pluginRuntime.registerRemotes([
+            {
+                name,
+                entry: remoteEntryURL,
+                alias: name
+            }
+        ]);
+    }
+};
+const loadPlugin = async (moduleName, pluginName, baseURL)=>{
+    registerRemote(moduleName, baseURL);
+    return (0, _runtime.loadRemote)(`${moduleName}/${pluginName}`);
+};
+function usePluginRuntime({ plugin }) {
+    return {
+        pluginRuntime,
+        loadPlugin: ()=>loadPlugin(plugin.moduleName, plugin.name, plugin.baseURL)
+    };
+}

package/dist/cjs/remote/index.js

@@ -0,0 +1,31 @@
+// Copyright 2023 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+_export_star(require("./PluginLoaderComponent"), exports);
+_export_star(require("./remotePluginLoader"), exports);
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}

package/dist/cjs/remote/remotePluginLoader.js

@@ -0,0 +1,61 @@
+// Copyright 2024 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "remotePluginLoader", {
+    enumerable: true,
+    get: function() {
+        return remotePluginLoader;
+    }
+});
+const _PluginRuntime = require("./PluginRuntime");
+const isPluginMetadata = (plugin)=>{
+    return typeof plugin === 'object' && plugin !== null && 'kind' in plugin && 'spec' in plugin && typeof plugin.spec === 'object' && plugin.spec !== null && 'name' in plugin.spec;
+};
+const isPluginModuleResource = (pluginModule)=>{
+    return typeof pluginModule === 'object' && pluginModule !== null && 'metadata' in pluginModule && 'spec' in pluginModule && typeof pluginModule.spec === 'object' && pluginModule.spec !== null && 'plugins' in pluginModule.spec && Array.isArray(pluginModule.spec.plugins) && pluginModule.spec.plugins.every(isPluginMetadata);
+};
+const remotePluginLoader = (baseURL)=>{
+    return {
+        getInstalledPlugins: async ()=>{
+            const pluginsResponse = await fetch(`${baseURL ? baseURL : ''}/api/v1/plugins`);
+            const plugins = await pluginsResponse.json();
+            let pluginModules = [];
+            if (Array.isArray(plugins)) {
+                pluginModules = plugins.filter(isPluginModuleResource);
+            } else {
+                console.error('RemotePluginLoader: Error loading plugins, response is not an array');
+            }
+            if (!pluginModules.length) {
+                console.error('RemotePluginLoader: No valid plugins found');
+            }
+            return pluginModules;
+        },
+        importPluginModule: async (resource)=>{
+            const pluginModuleName = resource.metadata.name;
+            const pluginModule = {};
+            for (const plugin of resource.spec.plugins){
+                const remotePluginModule = await (0, _PluginRuntime.loadPlugin)(pluginModuleName, plugin.spec.name);
+                const remotePlugin = remotePluginModule?.[plugin.spec.name];
+                if (remotePlugin) {
+                    pluginModule[plugin.spec.name] = remotePlugin;
+                } else {
+                    console.error(`RemotePluginLoader: Error loading plugin ${plugin.spec.name}`);
+                }
+            }
+            return pluginModule;
+        }
+    };
+};

package/dist/cjs/runtime/DataQueriesProvider/DataQueriesProvider.js

@@ -51,15 +51,9 @@ function useDataQueriesContext() {
 function useDataQueries(queryType) {
     const ctx = useDataQueriesContext();
     // Filter the query results based on the specified query type
-    const filteredQueryResults = ctx.queryResults.filter((queryResult)=>{
-        var _queryResult_definition;
-        return (queryResult === null || queryResult === void 0 ? void 0 : (_queryResult_definition = queryResult.definition) === null || _queryResult_definition === void 0 ? void 0 : _queryResult_definition.kind) === queryType;
-    });
+    const filteredQueryResults = ctx.queryResults.filter((queryResult)=>queryResult?.definition?.kind === queryType);
     // Filter the errors based on the specified query type
-    const filteredErrors = ctx.errors.filter((errors, index)=>{
-        var _ctx_queryResults_index_definition, _ctx_queryResults_index;
-        return ((_ctx_queryResults_index = ctx.queryResults[index]) === null || _ctx_queryResults_index === void 0 ? void 0 : (_ctx_queryResults_index_definition = _ctx_queryResults_index.definition) === null || _ctx_queryResults_index_definition === void 0 ? void 0 : _ctx_queryResults_index_definition.kind) === queryType;
-    });
+    const filteredErrors = ctx.errors.filter((errors, index)=>ctx.queryResults[index]?.definition?.kind === queryType);
     // Create a new context object with the filtered results and errors
     const filteredCtx = {
         queryResults: filteredQueryResults,
@@ -101,7 +95,7 @@ function DataQueriesProvider(props) {
             ...(0, _model.transformQueryResults)(timeSeriesResults, timeSeriesQueries),
             ...(0, _model.transformQueryResults)(traceResults, traceQueries)
         ];
-        if (queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.enabled) {
+        if (queryOptions?.enabled) {
             for (const result of mergedQueryResults){
                 if (!result.isLoading && !result.isFetching && !result.error) {
                     usageMetrics.markQuery(result.definition, 'success');
@@ -125,7 +119,7 @@ function DataQueriesProvider(props) {
         traceQueries,
         traceResults,
         refetchAll,
-        queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.enabled,
+        queryOptions?.enabled,
         usageMetrics
     ]);
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(DataQueriesContext.Provider, {

package/dist/cjs/runtime/DataQueriesProvider/model.js

@@ -57,14 +57,12 @@ function useQueryType() {
         };
         if (timeSeriesQueryPlugins) {
             timeSeriesQueryPlugins.forEach((plugin)=>{
-                var _map_plugin_pluginType;
-                (_map_plugin_pluginType = map[plugin.pluginType]) === null || _map_plugin_pluginType === void 0 ? void 0 : _map_plugin_pluginType.push(plugin.kind);
+                map[plugin.kind]?.push(plugin.spec.name);
             });
         }
         if (traceQueryPlugins) {
             traceQueryPlugins.forEach((plugin)=>{
-                var _map_plugin_pluginType;
-                (_map_plugin_pluginType = map[plugin.pluginType]) === null || _map_plugin_pluginType === void 0 ? void 0 : _map_plugin_pluginType.push(plugin.kind);
+                map[plugin.kind]?.push(plugin.spec.name);
             });
         }
         return map;
@@ -80,14 +78,13 @@ function useQueryType() {
                 case 'TempoTraceQuery':
                     return isTraceQueryPluginLoading;
             }
-            throw new Error(`Unable to determine the query type: ${pluginKind}`);
+            return isTraceQueryPluginLoading || isTimeSeriesQueryLoading;
         };
         if (isLoading(pluginKind)) {
             return undefined;
         }
         for(const queryType in queryTypeMap){
-            var _queryTypeMap_queryType;
-            if ((_queryTypeMap_queryType = queryTypeMap[queryType]) === null || _queryTypeMap_queryType === void 0 ? void 0 : _queryTypeMap_queryType.includes(pluginKind)) {
+            if (queryTypeMap[queryType]?.includes(pluginKind)) {
                 return queryType;
             }
         }

package/dist/cjs/runtime/TimeRangeProvider/TimeRangeProvider.js

@@ -135,13 +135,13 @@ function TimeRangeProvider(props) {
         const absoluteTimeRange = (0, _core.isRelativeTimeRange)(localTimeRange) ? (0, _core.toAbsoluteTimeRange)(localTimeRange) : localTimeRange;
         return {
             timeRange: localTimeRange,
-            setTimeRange: setTimeRange !== null && setTimeRange !== void 0 ? setTimeRange : setLocalTimeRange,
+            setTimeRange: setTimeRange ?? setLocalTimeRange,
             absoluteTimeRange,
             refresh,
             refreshKey: `${absoluteTimeRange.start}:${absoluteTimeRange.end}:${localRefreshInterval}:${refreshCounter}`,
             refreshInterval: localRefreshInterval,
             refreshIntervalInMs: refreshIntervalInMs,
-            setRefreshInterval: setRefreshInterval !== null && setRefreshInterval !== void 0 ? setRefreshInterval : setLocalRefreshInterval
+            setRefreshInterval: setRefreshInterval ?? setLocalRefreshInterval
         };
     }, [
         localTimeRange,

package/dist/cjs/runtime/builtin-variables.js

@@ -59,7 +59,7 @@ function useBuiltinVariableValues(names) {
     ]);
     const values = (0, _react.useMemo)(()=>{
         const values = {};
-        names === null || names === void 0 ? void 0 : names.forEach((name)=>{
+        names?.forEach((name)=>{
             const s = states[name];
             if (s) {
                 values[name] = s;

package/dist/cjs/runtime/datasources.js

@@ -47,15 +47,15 @@ function useDatasourceStore() {
     }
     return ctx;
 }
-function useListDatasourceSelectItems(datasourcePluginKind, project) {
+function useListDatasourceSelectItems(datasourcePluginName, project) {
     const { listDatasourceSelectItems } = useDatasourceStore();
     return (0, _reactquery.useQuery)({
         queryKey: [
             'listDatasourceSelectItems',
-            datasourcePluginKind,
+            datasourcePluginName,
             project
         ],
-        queryFn: ()=>listDatasourceSelectItems(datasourcePluginKind)
+        queryFn: ()=>listDatasourceSelectItems(datasourcePluginName)
     });
 }
 function useDatasourceClient(selector) {

package/dist/cjs/runtime/plugin-registry.js

@@ -40,8 +40,8 @@ _export(exports, {
         return usePlugins;
     }
 });
-const _react = require("react");
 const _reactquery = require("@tanstack/react-query");
+const _react = require("react");
 const PluginRegistryContext = (0, _react.createContext)(undefined);
 function usePluginRegistry() {
     const ctx = (0, _react.useContext)(PluginRegistryContext);
@@ -51,11 +51,10 @@ function usePluginRegistry() {
     return ctx;
 }
 function usePlugin(pluginType, kind, options) {
-    var _options_enabled;
     // We never want to ask for a plugin when the kind isn't set yet, so disable those queries automatically
     options = {
         ...options,
-        enabled: ((_options_enabled = options === null || options === void 0 ? void 0 : options.enabled) !== null && _options_enabled !== void 0 ? _options_enabled : true) && pluginType !== undefined && kind !== ''
+        enabled: (options?.enabled ?? true) && pluginType !== undefined && kind !== ''
     };
     const { getPlugin } = usePluginRegistry();
     return (0, _reactquery.useQuery)({
@@ -104,10 +103,10 @@ function usePluginBuiltinVariableDefinitions() {
             const datasources = await listPluginMetadata([
                 'Datasource'
             ]);
-            const datasourceKinds = new Set(datasources.map((datasource)=>datasource.kind));
+            const datasourceNames = new Set(datasources.map((datasource)=>datasource.spec.name));
             const result = [];
-            for (const kind of datasourceKinds){
-                const plugin = await getPlugin('Datasource', kind);
+            for (const name of datasourceNames){
+                const plugin = await getPlugin('Datasource', name);
                 if (plugin.getBuiltinVariableDefinitions) {
                     plugin.getBuiltinVariableDefinitions().forEach((definition)=>result.push(definition));
                 }

package/dist/cjs/runtime/time-series-queries.js

@@ -56,8 +56,8 @@ function filterVariableStateMap(v, names) {
 }
 function getQueryOptions({ plugin, definition, context }) {
     const { timeRange, datasourceStore, suggestedStepMs, mode, variableState, refreshKey } = context;
-    const dependencies = (plugin === null || plugin === void 0 ? void 0 : plugin.dependsOn) ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};
-    const variableDependencies = dependencies === null || dependencies === void 0 ? void 0 : dependencies.variables;
+    const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};
+    const variableDependencies = dependencies?.variables;
     // Determine queryKey
     const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);
     const variablesValueKey = getVariableValuesKey(filteredVariabledState);
@@ -73,10 +73,7 @@ function getQueryOptions({ plugin, definition, context }) {
     // Determine queryEnabled
     let waitToLoad = false;
     if (variableDependencies) {
-        waitToLoad = variableDependencies.some((v)=>{
-            var _variableState_v;
-            return (_variableState_v = variableState[v]) === null || _variableState_v === void 0 ? void 0 : _variableState_v.loading;
-        });
+        waitToLoad = variableDependencies.some((v)=>variableState[v]?.loading);
     }
     const queryEnabled = plugin !== undefined && !waitToLoad;
     return {
@@ -92,9 +89,8 @@ const useTimeSeriesQuery = (definition, options, queryOptions)=>{
         definition,
         context
     });
-    var _queryOptions_enabled;
     return (0, _reactquery.useQuery)({
-        enabled: ((_queryOptions_enabled = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.enabled) !== null && _queryOptions_enabled !== void 0 ? _queryOptions_enabled : true) || queryEnabled,
+        enabled: (queryOptions?.enabled ?? true) || queryEnabled,
         queryKey: queryKey,
         queryFn: ()=>{
             // The 'enabled' option should prevent this from happening, but make TypeScript happy by checking
@@ -104,7 +100,7 @@ const useTimeSeriesQuery = (definition, options, queryOptions)=>{
             // Keep options out of query key so we don't re-run queries because suggested step changes
             const ctx = {
                 ...context,
-                suggestedStepMs: options === null || options === void 0 ? void 0 : options.suggestedStepMs
+                suggestedStepMs: options?.suggestedStepMs
             };
             return plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx);
         }
@@ -115,29 +111,27 @@ function useTimeSeriesQueries(definitions, options, queryOptions) {
     const context = {
         ...useTimeSeriesQueryContext(),
         // We need mode to be part query key because this drives the type of query done (instant VS range query)
-        mode: options === null || options === void 0 ? void 0 : options.mode
+        mode: options?.mode
     };
     const pluginLoaderResponse = (0, _pluginregistry.usePlugins)(TIME_SERIES_QUERY_KEY, definitions.map((d)=>({
             kind: d.spec.plugin.kind
         })));
     return (0, _reactquery.useQueries)({
         queries: definitions.map((definition, idx)=>{
-            var _pluginLoaderResponse_idx;
-            const plugin = (_pluginLoaderResponse_idx = pluginLoaderResponse[idx]) === null || _pluginLoaderResponse_idx === void 0 ? void 0 : _pluginLoaderResponse_idx.data;
+            const plugin = pluginLoaderResponse[idx]?.data;
             const { queryEnabled, queryKey } = getQueryOptions({
                 plugin,
                 definition,
                 context
             });
-            var _queryOptions_enabled;
             return {
-                enabled: ((_queryOptions_enabled = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.enabled) !== null && _queryOptions_enabled !== void 0 ? _queryOptions_enabled : true) && queryEnabled,
+                enabled: (queryOptions?.enabled ?? true) && queryEnabled,
                 queryKey: queryKey,
                 queryFn: async ()=>{
                     const ctx = {
                         ...context,
                         // Keep suggested step changes out of the query key, so we don´t have to run again query when it changes
-                        suggestedStepMs: options === null || options === void 0 ? void 0 : options.suggestedStepMs
+                        suggestedStepMs: options?.suggestedStepMs
                     };
                     const plugin = await getPlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);
                     const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx);
@@ -170,9 +164,8 @@ function getActiveTimeSeriesQueries(cache) {
     for (const query of cache.findAll({
         type: 'active'
     })){
-        var _query_queryKey;
-        const firstPart = (_query_queryKey = query.queryKey) === null || _query_queryKey === void 0 ? void 0 : _query_queryKey[0];
-        if ((firstPart === null || firstPart === void 0 ? void 0 : firstPart.kind) && firstPart.kind.startsWith(TIME_SERIES_QUERY_KEY)) {
+        const firstPart = query.queryKey?.[0];
+        if (firstPart?.kind && firstPart.kind.startsWith(TIME_SERIES_QUERY_KEY)) {
             queries.push(query);
         }
     }

package/dist/cjs/runtime/trace-queries.js

@@ -56,13 +56,12 @@ function useTraceQueries(definitions) {
     // https://tanstack.com/query/v4/docs/react/reference/useQuery
     return (0, _reactquery.useQueries)({
         queries: definitions.map((definition)=>{
-            var _definition_spec_plugin, _definition_spec;
             const queryKey = [
                 definition,
                 datasourceStore,
                 absoluteTimeRange
             ]; // `queryKey` watches and reruns `queryFn` if keys in the array change
-            const traceQueryKind = definition === null || definition === void 0 ? void 0 : (_definition_spec = definition.spec) === null || _definition_spec === void 0 ? void 0 : (_definition_spec_plugin = _definition_spec.plugin) === null || _definition_spec_plugin === void 0 ? void 0 : _definition_spec_plugin.kind;
+            const traceQueryKind = definition?.spec?.plugin?.kind;
             return {
                 queryKey: queryKey,
                 queryFn: async ()=>{