@perses-dev/plugin-system 0.46.0 → 0.47.0

package/dist/cjs/components/Variables/VariableEditorForm/VariablePreview.js

@@ -155,10 +155,10 @@ function VariablePreview(props) {
                             },
                             children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.CircularProgress, {})
                         }),
-                        values === null || values === void 0 ? void 0 : values.slice(0, maxValues).map((val)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Chip, {
+                        values === null || values === void 0 ? void 0 : values.slice(0, maxValues).map((val, index)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Chip, {
                                 size: "small",
                                 label: val
-                            }, val)),
+                            }, index)),
                         notShown > 0 && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Chip, {
                             onClick: showAll,
                             variant: "outlined",

package/dist/cjs/components/Variables/variable-model.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
@@ -64,7 +64,7 @@ function filterVariableList(data, capturedRegexp) {
 function useListVariablePluginValues(definition) {
     const { data: variablePlugin } = (0, _runtime.usePlugin)('Variable', definition.spec.plugin.kind);
     const datasourceStore = (0, _runtime.useDatasourceStore)();
-    const allVariables = (0, _runtime.useVariableValues)();
+    const allVariables = (0, _runtime.useAllVariableValues)();
     const { absoluteTimeRange: timeRange, refreshKey } = (0, _runtime.useTimeRange)();
     const variablePluginCtx = {
         timeRange,
@@ -78,7 +78,7 @@ function useListVariablePluginValues(definition) {
         const dependencies = variablePlugin.dependsOn(spec, variablePluginCtx);
         dependsOnVariables = dependencies.variables;
     }
-    const variables = (0, _runtime.useVariableValues)(dependsOnVariables);
+    const variables = (0, _runtime.useAllVariableValues)(dependsOnVariables);
     let waitToLoad = false;
     if (dependsOnVariables) {
         waitToLoad = dependsOnVariables.some((v)=>{
@@ -87,25 +87,27 @@ function useListVariablePluginValues(definition) {
         });
     }
     const variablesValueKey = getVariableValuesKey(variables);
-    return (0, _reactquery.useQuery)([
-        definition,
-        variablesValueKey,
-        timeRange,
-        refreshKey
-    ], async ()=>{
-        const resp = await (variablePlugin === null || variablePlugin === void 0 ? void 0 : variablePlugin.getVariableOptions(spec, {
-            datasourceStore,
-            variables,
-            timeRange
-        }));
-        if (resp === undefined) {
-            return [];
-        }
-        if (!capturingRegexp) {
-            return resp.data;
-        }
-        return filterVariableList(resp.data, capturingRegexp);
-    }, {
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            definition,
+            variablesValueKey,
+            timeRange,
+            refreshKey
+        ],
+        queryFn: async ()=>{
+            const resp = await (variablePlugin === null || variablePlugin === void 0 ? void 0 : variablePlugin.getVariableOptions(spec, {
+                datasourceStore,
+                variables,
+                timeRange
+            }));
+            if (resp === undefined) {
+                return [];
+            }
+            if (!capturingRegexp) {
+                return resp.data;
+            }
+            return filterVariableList(resp.data, capturingRegexp);
+        },
         enabled: !!variablePlugin || waitToLoad
     });
 }

package/dist/cjs/context/ProjectStoreProvider.js

@@ -41,10 +41,13 @@ const _core = require("@perses-dev/core");
 const _queryparams = require("./query-params");
 const ProjectStoreContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
 function useProjectList() {
-    return (0, _reactquery.useQuery)([
-        'projects'
-    ], ()=>{
-        return (0, _core.fetchJson)('/api/v1/projects');
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'projects'
+        ],
+        queryFn: ()=>{
+            return (0, _core.fetchJson)('/api/v1/projects');
+        }
     });
 }
 function useProjectStore() {

package/dist/cjs/context/ValidationProvider.js

@@ -0,0 +1,69 @@
+// 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, {
+    ValidationProvider: function() {
+        return ValidationProvider;
+    },
+    ValidationSchemasContext: function() {
+        return ValidationSchemasContext;
+    },
+    useValidationSchemas: function() {
+        return useValidationSchemas;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _react = require("react");
+const _core = require("@perses-dev/core");
+const ValidationSchemasContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
+function useValidationSchemas() {
+    const ctx = (0, _react.useContext)(ValidationSchemasContext);
+    if (ctx === undefined) {
+        throw new Error('No ValidationSchemasContext found. Did you forget a Provider?');
+    }
+    return ctx;
+}
+function ValidationProvider({ children }) {
+    const [datasourceEditorSchema, setDatasourceEditorSchema] = (0, _react.useState)(_core.datasourceDefinitionSchema);
+    const [panelEditorSchema, setPanelEditorSchema] = (0, _react.useState)(_core.panelEditorSchema);
+    const [variableEditorSchema, setVariableEditorSchema] = (0, _react.useState)(_core.variableDefinitionSchema);
+    function setDatasourceEditorSchemaPlugin(pluginSchema) {
+        setDatasourceEditorSchema((0, _core.buildDatasourceDefinitionSchema)(pluginSchema));
+    }
+    function setPanelEditorSchemaPlugin(pluginSchema) {
+        setPanelEditorSchema((0, _core.buildPanelEditorSchema)(pluginSchema));
+    }
+    function setVariableEditorSchemaPlugin(pluginSchema) {
+        setVariableEditorSchema((0, _core.buildVariableDefinitionSchema)(pluginSchema));
+    }
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(ValidationSchemasContext.Provider, {
+        value: {
+            datasourceEditorSchema,
+            panelEditorSchema,
+            variableEditorSchema,
+            setDatasourceEditorSchemaPlugin,
+            setPanelEditorSchemaPlugin,
+            setVariableEditorSchemaPlugin
+        },
+        children: children
+    });
+}

package/dist/cjs/context/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./ProjectStoreProvider"), exports);
+_export_star(require("./ValidationProvider"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/dist/cjs/index.js

@@ -20,7 +20,6 @@ _export_star(require("./model"), exports);
 _export_star(require("./runtime"), exports);
 _export_star(require("./test-utils"), exports);
 _export_star(require("./utils"), exports);
-_export_star(require("./validation"), exports);
 _export_star(require("./context"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/dist/cjs/runtime/QueryCountProvider.js

@@ -0,0 +1,83 @@
+// 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, {
+    QueryCountProvider: function() {
+        return QueryCountProvider;
+    },
+    useQueryCountContext: function() {
+        return useQueryCountContext;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+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 QueryCountContext = /*#__PURE__*/ (0, _react.createContext)(0);
+const QueryCountProvider = ({ queryCount, children })=>{
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(QueryCountContext.Provider, {
+        value: queryCount,
+        children: children
+    });
+};
+const useQueryCountContext = ()=>{
+    return (0, _react.useContext)(QueryCountContext);
+};

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

@@ -0,0 +1,100 @@
+// 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, {
+    TimeRangeSettingsContext: function() {
+        return TimeRangeSettingsContext;
+    },
+    TimeRangeSettingsProvider: function() {
+        return TimeRangeSettingsProvider;
+    },
+    useShowCustomTimeRangeSetting: function() {
+        return useShowCustomTimeRangeSetting;
+    },
+    useTimeRangeOptionsSetting: function() {
+        return useTimeRangeOptionsSetting;
+    },
+    useTimeRangeSettings: function() {
+        return useTimeRangeSettings;
+    },
+    useTimeRangeSettingsContext: function() {
+        return useTimeRangeSettingsContext;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _react = require("react");
+const _components = require("@perses-dev/components");
+const DEFAULT_OPTIONS = [
+    '5m',
+    '15m',
+    '30m',
+    '1h',
+    '6h',
+    '12h',
+    '24h',
+    '7d',
+    '14d'
+];
+const defaultTimeRangeSettings = {
+    showCustom: true,
+    options: DEFAULT_OPTIONS.map((duration)=>(0, _components.buildRelativeTimeOption)(duration))
+};
+const TimeRangeSettingsContext = /*#__PURE__*/ (0, _react.createContext)(defaultTimeRangeSettings);
+function useTimeRangeSettingsContext() {
+    const ctx = (0, _react.useContext)(TimeRangeSettingsContext);
+    if (ctx === undefined) {
+        throw new Error('No TimeRangeContext found. Did you forget a Provider?');
+    }
+    return ctx;
+}
+function useTimeRangeSettings() {
+    return useTimeRangeSettingsContext();
+}
+function useShowCustomTimeRangeSetting(override) {
+    const showCustomTimeRange = useTimeRangeSettings().showCustom;
+    if (override !== undefined) {
+        return override;
+    }
+    return showCustomTimeRange;
+}
+function useTimeRangeOptionsSetting(override) {
+    const showCustomTimeRange = useTimeRangeSettings().options;
+    if (override !== undefined) {
+        return override;
+    }
+    return showCustomTimeRange;
+}
+function TimeRangeSettingsProvider(props) {
+    const ctx = (0, _react.useMemo)(()=>{
+        return {
+            showCustom: props.showCustom === undefined ? defaultTimeRangeSettings.showCustom : props.showCustom,
+            options: props.options === undefined ? defaultTimeRangeSettings.options : props.options
+        };
+    }, [
+        props.showCustom,
+        props.options
+    ]);
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(TimeRangeSettingsContext.Provider, {
+        value: ctx,
+        children: props.children
+    });
+}

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/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

package/dist/cjs/runtime/datasources.js

@@ -49,23 +49,32 @@ function useDatasourceStore() {
 }
 function useListDatasourceSelectItems(datasourcePluginKind, project) {
     const { listDatasourceSelectItems } = useDatasourceStore();
-    return (0, _reactquery.useQuery)([
-        'listDatasourceSelectItems',
-        datasourcePluginKind,
-        project
-    ], ()=>listDatasourceSelectItems(datasourcePluginKind));
+    return (0, _reactquery.useQuery)({
+        queryKey: [
+            'listDatasourceSelectItems',
+            datasourcePluginKind,
+            project
+        ],
+        queryFn: ()=>listDatasourceSelectItems(datasourcePluginKind)
+    });
 }
 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,12 @@ 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);
 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

@@ -58,11 +58,15 @@ function usePlugin(pluginType, kind, options) {
         enabled: ((_options_enabled = options === null || options === void 0 ? void 0 : options.enabled) !== null && _options_enabled !== void 0 ? _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();
@@ -81,27 +85,34 @@ function usePlugins(pluginType, plugins) {
 }
 function useListPluginMetadata(pluginTypes, options) {
     const { listPluginMetadata } = usePluginRegistry();
-    return (0, _reactquery.useQuery)([
-        'listPluginMetadata',
-        pluginTypes
-    ], ()=>listPluginMetadata(pluginTypes), 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 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 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");
@@ -151,7 +151,7 @@ function useTimeSeriesQueries(definitions, options, queryOptions) {
  * Build the time series query context object from data available at runtime
  */ function useTimeSeriesQueryContext() {
     const { absoluteTimeRange, refreshKey } = (0, _TimeRangeProvider.useTimeRange)();
-    const variableState = (0, _templatevariables.useVariableValues)();
+    const variableState = (0, _variables.useAllVariableValues)();
     const datasourceStore = (0, _datasources.useDatasourceStore)();
     return {
         timeRange: absoluteTimeRange,

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

@@ -69,7 +69,11 @@ function useTraceQueries(definitions) {
                     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;
     }
@@ -114,16 +114,16 @@ class VariableStoreStateMap {
         _define_property(this, "_state", {});
     }
 }
-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)=>{
@@ -142,22 +142,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);
 }