@perses-dev/plugin-system 0.0.0-snapshot-scatterplot-fix-imports-95e1b59 → 0.0.0-snapshot-explorer-plugin-c4a7621

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

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// 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
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 _export_star(require("./TimeRangeProvider"), exports);
 _export_star(require("./TimeRangeProviderWithQueryParams"), exports);
+_export_star(require("./TimeRangeSettingsProvider"), exports);
 _export_star(require("./query-params"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/dist/cjs/runtime/TimeRangeProvider/query-params.js

@@ -54,15 +54,12 @@ const _usequeryparams = require("use-query-params");
 const _datefns = require("date-fns");
 const _core = require("@perses-dev/core");
 /* Interprets an encoded string and returns either the string or null/undefined if not available */ function getEncodedValue(input, allowEmptyString) {
-    if (input == null) {
-        return input;
-    }
     // '' or []
-    if (input.length === 0 && (!allowEmptyString || allowEmptyString && input !== '')) {
+    if (!input || input.length === 0 && (!allowEmptyString || allowEmptyString && input !== '')) {
         return null;
     }
     const str = input instanceof Array ? input[0] : input;
-    if (str == null) {
+    if (str === null || str === undefined) {
         return str;
     }
     if (!allowEmptyString && str === '') {
@@ -83,7 +80,7 @@ function encodeTimeRangeValue(timeOptionValue) {
 }
 function decodeTimeRangeValue(input) {
     const paramString = getEncodedValue(input);
-    if (paramString == null) return paramString;
+    if (!paramString) return null;
     return (0, _core.isDurationString)(paramString) ? paramString : new Date(Number(paramString));
 }
 const TimeRangeParam = {
@@ -91,7 +88,7 @@ const TimeRangeParam = {
     decode: decodeTimeRangeValue,
     equals: (valueA, valueB)=>{
         if (valueA === valueB) return true;
-        if (valueA == null || valueB == null) return valueA === valueB;
+        if (!valueA || !valueB) return valueA === valueB;
         return valueA.valueOf() === valueB.valueOf();
     }
 };

package/dist/cjs/runtime/UsageMetricsProvider.js

@@ -0,0 +1,99 @@
+// 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
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    UsageMetricsContext: function() {
+        return UsageMetricsContext;
+    },
+    UsageMetricsProvider: function() {
+        return UsageMetricsProvider;
+    },
+    useUsageMetrics: function() {
+        return useUsageMetrics;
+    },
+    useUsageMetricsContext: function() {
+        return useUsageMetricsContext;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _core = require("@perses-dev/core");
+const _react = require("react");
+const UsageMetricsContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
+const useUsageMetricsContext = ()=>{
+    return (0, _react.useContext)(UsageMetricsContext);
+};
+const useUsageMetrics = ()=>{
+    const ctx = useUsageMetricsContext();
+    return {
+        markQuery: (definition, newState)=>{
+            if (ctx === undefined) {
+                return;
+            }
+            const definitionKey = JSON.stringify(definition);
+            if (ctx.pendingQueries.has(definitionKey) && newState === 'pending') {
+                // Never allow transitions back to pending, to avoid re-sending stats on a re-render.
+                return;
+            }
+            if (ctx.pendingQueries.get(definitionKey) !== newState) {
+                ctx.pendingQueries.set(definitionKey, newState);
+                if (newState === 'error') {
+                    ctx.renderErrorCount += 1;
+                }
+                const allDone = [
+                    ...ctx.pendingQueries.values()
+                ].every((p)=>p !== 'pending');
+                if (ctx.renderDurationMs === 0 && allDone) {
+                    ctx.renderDurationMs = Date.now() - ctx.startRenderTime;
+                    submitMetrics(ctx);
+                }
+            }
+        }
+    };
+};
+const submitMetrics = async (stats)=>{
+    await (0, _core.fetch)('/api/v1/view', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+            project: stats.project,
+            dashboard: stats.dashboard,
+            render_time: stats.renderDurationMs / 1000,
+            render_errors: stats.renderErrorCount
+        })
+    });
+};
+const UsageMetricsProvider = ({ project, dashboard, children })=>{
+    const ctx = {
+        project: project,
+        dashboard: dashboard,
+        renderErrorCount: 0,
+        startRenderTime: Date.now(),
+        renderDurationMs: 0,
+        pendingQueries: new Map()
+    };
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(UsageMetricsContext.Provider, {
+        value: ctx,
+        children: children
+    });
+};

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

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// 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
@@ -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,25 +47,34 @@ function useDatasourceStore() {
     }
     return ctx;
 }
-function useListDatasourceSelectItems(datasourcePluginKind, project) {
+function useListDatasourceSelectItems(datasourcePluginName, project) {
     const { listDatasourceSelectItems } = useDatasourceStore();
-    return (0, _reactquery.useQuery)([
-        'listDatasourceSelectItems',
-        datasourcePluginKind,
-        project
-    ], ()=>listDatasourceSelectItems(datasourcePluginKind));
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'listDatasourceSelectItems',
+            datasourcePluginName,
+            project
+        ],
+        queryFn: ()=>listDatasourceSelectItems(datasourcePluginName)
+    });
 }
 function useDatasourceClient(selector) {
     const store = useDatasourceStore();
-    return (0, _reactquery.useQuery)([
-        'getDatasourceClient',
-        selector
-    ], ()=>store.getDatasourceClient(selector));
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'getDatasourceClient',
+            selector
+        ],
+        queryFn: ()=>store.getDatasourceClient(selector)
+    });
 }
 function useDatasource(selector) {
     const store = useDatasourceStore();
-    return (0, _reactquery.useQuery)([
-        'getDatasource',
-        selector
-    ], ()=>store.getDatasource(selector));
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'getDatasource',
+            selector
+        ],
+        queryFn: ()=>store.getDatasource(selector)
+    });
 }

package/dist/cjs/runtime/index.js

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// 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
@@ -17,11 +17,13 @@ Object.defineProperty(exports, "__esModule", {
 _export_star(require("./builtin-variables"), exports);
 _export_star(require("./datasources"), exports);
 _export_star(require("./plugin-registry"), exports);
-_export_star(require("./template-variables"), exports);
+_export_star(require("./variables"), exports);
 _export_star(require("./TimeRangeProvider"), exports);
 _export_star(require("./time-series-queries"), exports);
 _export_star(require("./trace-queries"), exports);
 _export_star(require("./DataQueriesProvider"), exports);
+_export_star(require("./QueryCountProvider"), exports);
+_export_star(require("./UsageMetricsProvider"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

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,18 +51,21 @@ 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) && kind !== ''
+        enabled: (options?.enabled ?? true) && pluginType !== undefined && kind !== ''
     };
     const { getPlugin } = usePluginRegistry();
-    return (0, _reactquery.useQuery)([
-        'getPlugin',
-        pluginType,
-        kind
-    ], ()=>getPlugin(pluginType, kind), options);
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'getPlugin',
+            pluginType,
+            kind
+        ],
+        queryFn: ()=>getPlugin(pluginType, kind),
+        ...options
+    });
 }
 function usePlugins(pluginType, plugins) {
     const { getPlugin } = usePluginRegistry();
@@ -79,27 +82,36 @@ function usePlugins(pluginType, plugins) {
         })
     });
 }
-function useListPluginMetadata(pluginType, options) {
+function useListPluginMetadata(pluginTypes, options) {
     const { listPluginMetadata } = usePluginRegistry();
-    return (0, _reactquery.useQuery)([
-        'listPluginMetadata',
-        pluginType
-    ], ()=>listPluginMetadata(pluginType), options);
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'listPluginMetadata',
+            pluginTypes
+        ],
+        queryFn: ()=>listPluginMetadata(pluginTypes),
+        ...options
+    });
 }
 function usePluginBuiltinVariableDefinitions() {
     const { getPlugin, listPluginMetadata } = usePluginRegistry();
-    return (0, _reactquery.useQuery)([
-        'usePluginBuiltinVariableDefinitions'
-    ], async ()=>{
-        const datasources = await listPluginMetadata('Datasource');
-        const datasourceKinds = new Set(datasources.map((datasource)=>datasource.kind));
-        const result = [];
-        for (const kind of datasourceKinds){
-            const plugin = await getPlugin('Datasource', kind);
-            if (plugin.getBuiltinVariableDefinitions) {
-                plugin.getBuiltinVariableDefinitions().forEach((definition)=>result.push(definition));
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'usePluginBuiltinVariableDefinitions'
+        ],
+        queryFn: async ()=>{
+            const datasources = await listPluginMetadata([
+                'Datasource'
+            ]);
+            const datasourceNames = new Set(datasources.map((datasource)=>datasource.spec.name));
+            const result = [];
+            for (const name of datasourceNames){
+                const plugin = await getPlugin('Datasource', name);
+                if (plugin.getBuiltinVariableDefinitions) {
+                    plugin.getBuiltinVariableDefinitions().forEach((definition)=>result.push(definition));
+                }
             }
+            return result;
         }
-        return result;
     });
 }

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

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// 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
@@ -38,7 +38,7 @@ _export(exports, {
     }
 });
 const _reactquery = require("@tanstack/react-query");
-const _templatevariables = require("./template-variables");
+const _variables = require("./variables");
 const _TimeRangeProvider = require("./TimeRangeProvider");
 const _datasources = require("./datasources");
 const _pluginregistry = require("./plugin-registry");
@@ -55,9 +55,9 @@ function filterVariableStateMap(v, names) {
     return Object.fromEntries(Object.entries(v).filter(([name])=>names.includes(name)));
 }
 function getQueryOptions({ plugin, definition, context }) {
-    const { timeRange, datasourceStore, suggestedStepMs, 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 { timeRange, datasourceStore, suggestedStepMs, mode, variableState, refreshKey } = context;
+    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);
@@ -66,16 +66,14 @@ function getQueryOptions({ plugin, definition, context }) {
         timeRange,
         datasourceStore,
         suggestedStepMs,
+        mode,
         variablesValueKey,
         refreshKey
     ];
     // 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 {
@@ -91,11 +89,9 @@ 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,
-        refetchInterval: context.refreshIntervalInMs > 0 ? context.refreshIntervalInMs : false,
         queryFn: ()=>{
             // The 'enabled' option should prevent this from happening, but make TypeScript happy by checking
             if (plugin === undefined) {
@@ -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);
         }
@@ -112,29 +108,30 @@ const useTimeSeriesQuery = (definition, options, queryOptions)=>{
 };
 function useTimeSeriesQueries(definitions, options, queryOptions) {
     const { getPlugin } = (0, _pluginregistry.usePluginRegistry)();
-    const context = useTimeSeriesQueryContext();
+    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?.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,
-                refetchInterval: context.refreshIntervalInMs > 0 ? context.refreshIntervalInMs : undefined,
                 queryFn: async ()=>{
-                    // 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
+                        // Keep suggested step changes out of the query key, so we don´t have to run again query when it changes
+                        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);
@@ -147,15 +144,14 @@ function useTimeSeriesQueries(definitions, options, queryOptions) {
 /**
  * Build the time series query context object from data available at runtime
  */ function useTimeSeriesQueryContext() {
-    const { absoluteTimeRange, refreshKey, refreshIntervalInMs } = (0, _TimeRangeProvider.useTimeRange)();
-    const variableState = (0, _templatevariables.useVariableValues)();
+    const { absoluteTimeRange, refreshKey } = (0, _TimeRangeProvider.useTimeRange)();
+    const variableState = (0, _variables.useAllVariableValues)();
     const datasourceStore = (0, _datasources.useDatasourceStore)();
     return {
         timeRange: absoluteTimeRange,
         variableState,
         datasourceStore,
-        refreshKey,
-        refreshIntervalInMs: refreshIntervalInMs
+        refreshKey
     };
 }
 function useActiveTimeSeriesQueries() {
@@ -168,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,20 +56,23 @@ 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 ()=>{
                     const plugin = await getPlugin(TRACE_QUERY_KEY, traceQueryKind);
                     const data = await plugin.getTraceData(definition.spec.plugin.spec, context);
                     return data;
-                }
+                },
+                // The data returned by getTraceData() contains circular dependencies (a span has a reference to the parent span, and the parent span has an array of child spans)
+                // Therefore structuralSharing must be turned off, otherwise the query is stuck in the 'fetching' state on re-fetch.
+                // Ref: https://github.com/TanStack/query/issues/6954#issuecomment-1962321426
+                structuralSharing: false
             };
         })
     });

package/dist/cjs/runtime/{template-variables.js → variables.js}

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// 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
@@ -21,18 +21,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    TemplateVariableContext: function() {
-        return TemplateVariableContext;
+    VariableContext: function() {
+        return VariableContext;
     },
     VariableStoreStateMap: function() {
         return VariableStoreStateMap;
     },
+    useAllVariableValues: function() {
+        return useAllVariableValues;
+    },
     useReplaceVariablesInString: function() {
         return useReplaceVariablesInString;
     },
-    useTemplateVariableValues: function() {
-        return useTemplateVariableValues;
-    },
     useVariableValues: function() {
         return useVariableValues;
     }
@@ -41,22 +41,14 @@ const _react = require("react");
 const _immer = require("immer");
 const _utils = require("../utils");
 const _builtinvariables = require("./builtin-variables");
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-let _immerable = _immer.immerable;
 class VariableStoreStateMap {
     /**
+   * "Immerable" is mandatory to be able to use this class in an immer context.
+   * Ref: https://docs.pmnd.rs/zustand/integrations/immer-middleware#gotchas
+   */ [_immer.immerable] = true;
+    DEFAULT_LOCAL_SOURCE_NAME = '';
+    _state = {};
+    /**
    * Get variable state by key.
    * @param key
    */ get(key) {
@@ -84,7 +76,6 @@ class VariableStoreStateMap {
    * Delete variable state by key.
    * @param key
    */ delete(key) {
-        var _Object_keys;
         const result = this.has(key);
         const sourceName = this._sourceName(key.source);
         const sourceStates = this._state[sourceName];
@@ -93,40 +84,31 @@ class VariableStoreStateMap {
             delete sourceStates[key.name];
         }
         // Delete source state from state if empty
-        if (((_Object_keys = Object.keys(sourceStates !== null && sourceStates !== void 0 ? sourceStates : {})) === null || _Object_keys === void 0 ? void 0 : _Object_keys.length) === 0) {
+        if (Object.keys(sourceStates ?? {})?.length === 0) {
             delete this._state[sourceName];
         }
         return result;
     }
     _sourceName(source) {
-        return source !== null && source !== void 0 ? source : this.DEFAULT_LOCAL_SOURCE_NAME;
+        return source ?? this.DEFAULT_LOCAL_SOURCE_NAME;
     }
     _sourceStatesOrEmpty(source) {
-        var _this__state_this__sourceName;
-        return (_this__state_this__sourceName = this._state[this._sourceName(source)]) !== null && _this__state_this__sourceName !== void 0 ? _this__state_this__sourceName : {};
-    }
-    constructor(){
-        /**
-   * "Immerable" is mandatory to be able to use this class in an immer context.
-   * Ref: https://docs.pmnd.rs/zustand/integrations/immer-middleware#gotchas
-   */ _define_property(this, _immerable, true);
-        _define_property(this, "DEFAULT_LOCAL_SOURCE_NAME", '');
-        _define_property(this, "_state", {});
+        return this._state[this._sourceName(source)] ?? {};
     }
 }
-const TemplateVariableContext = (0, _react.createContext)(undefined);
-function useTemplateVariableContext() {
-    const ctx = (0, _react.useContext)(TemplateVariableContext);
+const VariableContext = (0, _react.createContext)(undefined);
+function useVariableContext() {
+    const ctx = (0, _react.useContext)(VariableContext);
     if (ctx === undefined) {
-        throw new Error('No TemplateVariableContext found. Did you forget a Provider?');
+        throw new Error('No VariableContext found. Did you forget a Provider?');
     }
     return ctx;
 }
-function useTemplateVariableValues(names) {
-    const { state } = useTemplateVariableContext();
+function useVariableValues(names) {
+    const { state } = useVariableContext();
     const values = (0, _react.useMemo)(()=>{
         const values = {};
-        names === null || names === void 0 ? void 0 : names.forEach((name)=>{
+        names?.forEach((name)=>{
             const s = state[name];
             if (s) {
                 values[name] = s;
@@ -142,22 +124,22 @@ function useTemplateVariableValues(names) {
     }
     return values;
 }
-function useVariableValues(names) {
-    const templateVariableValues = useTemplateVariableValues(names);
+function useAllVariableValues(names) {
+    const variableValues = useVariableValues(names);
     const builtinVariableValues = (0, _builtinvariables.useBuiltinVariableValues)(names);
     return (0, _react.useMemo)(()=>{
         return {
-            ...templateVariableValues,
+            ...variableValues,
             ...builtinVariableValues
         };
     }, [
-        templateVariableValues,
+        variableValues,
         builtinVariableValues
     ]);
 }
 function useReplaceVariablesInString(str) {
-    const variablesInString = str ? (0, _utils.parseTemplateVariables)(str) : [];
-    const variableValues = useVariableValues(variablesInString);
+    const variablesInString = str ? (0, _utils.parseVariables)(str) : [];
+    const variableValues = useAllVariableValues(variablesInString);
     if (!str) return undefined;
-    return (0, _utils.replaceTemplateVariables)(str, variableValues);
+    return (0, _utils.replaceVariables)(str, variableValues);
 }

package/dist/cjs/stories/shared-utils/decorators/WithDataQueries.js

@@ -33,7 +33,7 @@ const WithDataQueries = (Story, context)=>{
             definitions: []
         }
     };
-    const props = parameter === null || parameter === void 0 ? void 0 : parameter.props;
+    const props = parameter?.props;
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(_pluginsystem.DataQueriesProvider, {
         ...props,
         children: /*#__PURE__*/ (0, _jsxruntime.jsx)(Story, {})