@perses-dev/plugin-system 0.46.0 → 0.47.0

package/dist/runtime/time-series-queries.d.ts

@@ -9,11 +9,11 @@ export declare const TIME_SERIES_QUERY_KEY = "TimeSeriesQuery";
 /**
  * Runs a time series query using a plugin and returns the results.
  */
-export declare const useTimeSeriesQuery: (definition: TimeSeriesQueryDefinition, options?: UseTimeSeriesQueryOptions, queryOptions?: QueryObserverOptions) => import("@tanstack/react-query").UseQueryResult<TimeSeriesData, unknown>;
+export declare const useTimeSeriesQuery: (definition: TimeSeriesQueryDefinition, options?: UseTimeSeriesQueryOptions, queryOptions?: QueryObserverOptions<TimeSeriesData>) => import("@tanstack/react-query").UseQueryResult<TimeSeriesData, unknown>;
 /**
  * Runs multiple time series queries using plugins and returns the results.
  */
-export declare function useTimeSeriesQueries(definitions: TimeSeriesQueryDefinition[], options?: UseTimeSeriesQueryOptions, queryOptions?: QueryObserverOptions): import("@tanstack/react-query").UseQueryResult<TimeSeriesData, unknown>[];
+export declare function useTimeSeriesQueries(definitions: TimeSeriesQueryDefinition[], options?: UseTimeSeriesQueryOptions, queryOptions?: Omit<QueryObserverOptions, 'queryKey'>): import("@tanstack/react-query").UseQueryResult<TimeSeriesData, unknown>[];
 /**
  * Get active time series queries for query results summary
  */

package/dist/runtime/time-series-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-series-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/time-series-queries.ts"],"names":[],"mappings":"AAaA,OAAO,EAKL,UAAU,EAEV,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,yBAAyB,EAAe,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAA0B,mBAAmB,EAAyB,MAAM,UAAU,CAAC;AAMnH,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AA2DvD;;GAEG;AACH,eAAO,MAAM,kBAAkB,eACjB,yBAAyB,YAC3B,yBAAyB,iBACpB,oBAAoB,4EAmBpC,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,yBAAyB,EAAE,EACxC,OAAO,CAAC,EAAE,yBAAyB,EACnC,YAAY,CAAC,EAAE,oBAAoB,6EAkCpC;AAkBD;;GAEG;AACH,wBAAgB,0BAA0B,0BAIzC;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,UAAU,yBAW3D"}
+{"version":3,"file":"time-series-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/time-series-queries.ts"],"names":[],"mappings":"AAaA,OAAO,EAKL,UAAU,EAEV,oBAAoB,EACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,yBAAyB,EAAe,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAA0B,mBAAmB,EAAyB,MAAM,UAAU,CAAC;AAMnH,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AA2DvD;;GAEG;AACH,eAAO,MAAM,kBAAkB,eACjB,yBAAyB,YAC3B,yBAAyB,iBACpB,qBAAqB,cAAc,CAAC,4EAmBpD,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,yBAAyB,EAAE,EACxC,OAAO,CAAC,EAAE,yBAAyB,EACnC,YAAY,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,6EAkCtD;AAkBD;;GAEG;AACH,wBAAgB,0BAA0B,0BAIzC;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,UAAU,yBAW3D"}

package/dist/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
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { useQuery, useQueries, useQueryClient } from '@tanstack/react-query';
-import { useVariableValues } from './template-variables';
+import { useAllVariableValues } from './variables';
 import { useTimeRange } from './TimeRangeProvider';
 import { useDatasourceStore } from './datasources';
 import { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';
@@ -128,7 +128,7 @@ function getQueryOptions({ plugin, definition, context }) {
  * Build the time series query context object from data available at runtime
  */ function useTimeSeriesQueryContext() {
     const { absoluteTimeRange, refreshKey } = useTimeRange();
-    const variableState = useVariableValues();
+    const variableState = useAllVariableValues();
     const datasourceStore = useDatasourceStore();
     return {
         timeRange: absoluteTimeRange,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/time-series-queries.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport {\n  useQuery,\n  useQueries,\n  useQueryClient,\n  Query,\n  QueryCache,\n  QueryKey,\n  QueryObserverOptions,\n} from '@tanstack/react-query';\nimport { TimeSeriesQueryDefinition, UnknownSpec, TimeSeriesData } from '@perses-dev/core';\nimport { TimeSeriesDataQuery, TimeSeriesQueryContext, TimeSeriesQueryMode, TimeSeriesQueryPlugin } from '../model';\nimport { VariableStateMap, useVariableValues } from './template-variables';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';\n\nexport interface UseTimeSeriesQueryOptions {\n  suggestedStepMs?: number;\n  mode?: TimeSeriesQueryMode;\n}\n\nexport const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';\n\n/**\n * Returns a serialized string of the current state of variable values.\n */\nfunction getVariableValuesKey(v: VariableStateMap) {\n  return Object.values(v)\n    .map((v) => JSON.stringify(v.value))\n    .join(',');\n}\n\nfunction filterVariableStateMap(v: VariableStateMap, names?: string[]) {\n  if (!names) {\n    return v;\n  }\n  return Object.fromEntries(Object.entries(v).filter(([name]) => names.includes(name)));\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TimeSeriesQueryPlugin;\n  definition: TimeSeriesQueryDefinition;\n  context: TimeSeriesQueryContext;\n}) {\n  const { timeRange, datasourceStore, suggestedStepMs, mode, variableState, refreshKey } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  // Determine queryKey\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = [\n    definition,\n    timeRange,\n    datasourceStore,\n    suggestedStepMs,\n    mode,\n    variablesValueKey,\n    refreshKey,\n  ] as const;\n\n  // Determine queryEnabled\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\n/**\n * Runs a time series query using a plugin and returns the results.\n */\nexport const useTimeSeriesQuery = (\n  definition: TimeSeriesQueryDefinition,\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: QueryObserverOptions\n) => {\n  const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n  const context = useTimeSeriesQueryContext();\n\n  const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n  return useQuery({\n    enabled: (queryOptions?.enabled ?? true) || queryEnabled,\n    queryKey: queryKey,\n    queryFn: () => {\n      // The 'enabled' option should prevent this from happening, but make TypeScript happy by checking\n      if (plugin === undefined) {\n        throw new Error('Expected plugin to be loaded');\n      }\n      // Keep options out of query key so we don't re-run queries because suggested step changes\n      const ctx: TimeSeriesQueryContext = { ...context, suggestedStepMs: options?.suggestedStepMs };\n      return plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx);\n    },\n  });\n};\n\n/**\n * Runs multiple time series queries using plugins and returns the results.\n */\nexport function useTimeSeriesQueries(\n  definitions: TimeSeriesQueryDefinition[],\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: QueryObserverOptions\n) {\n  const { getPlugin } = usePluginRegistry();\n  const context = {\n    ...useTimeSeriesQueryContext(),\n    // We need mode to be part query key because this drives the type of query done (instant VS range query)\n    mode: options?.mode,\n  };\n\n  const pluginLoaderResponse = usePlugins(\n    TIME_SERIES_QUERY_KEY,\n    definitions.map((d) => ({ kind: d.spec.plugin.kind }))\n  );\n\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n      return {\n        enabled: (queryOptions?.enabled ?? true) && queryEnabled,\n        queryKey: queryKey,\n        queryFn: async () => {\n          const ctx: TimeSeriesQueryContext = {\n            ...context,\n            // Keep suggested step changes out of the query key, so we don´t have to run again query when it changes\n            suggestedStepMs: options?.suggestedStepMs,\n          };\n          const plugin = await getPlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n          const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\n/**\n * Build the time series query context object from data available at runtime\n */\nfunction useTimeSeriesQueryContext(): TimeSeriesQueryContext {\n  const { absoluteTimeRange, refreshKey } = useTimeRange();\n  const variableState = useVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    timeRange: absoluteTimeRange,\n    variableState,\n    datasourceStore,\n    refreshKey,\n  };\n}\n\n/**\n * Get active time series queries for query results summary\n */\nexport function useActiveTimeSeriesQueries() {\n  const queryClient = useQueryClient();\n  const queryCache = queryClient.getQueryCache();\n  return getActiveTimeSeriesQueries(queryCache);\n}\n\n/**\n * Filter all cached queries down to only active time series queries\n */\nexport function getActiveTimeSeriesQueries(cache: QueryCache) {\n  const queries: TimeSeriesDataQuery[] = [];\n\n  for (const query of cache.findAll({ type: 'active' })) {\n    const firstPart = query.queryKey?.[0] as UnknownSpec;\n    if (firstPart?.kind && (firstPart.kind as string).startsWith(TIME_SERIES_QUERY_KEY)) {\n      queries.push(query as Query<TimeSeriesData, unknown, TimeSeriesData, QueryKey>);\n    }\n  }\n\n  return queries;\n}\n"],"names":["useQuery","useQueries","useQueryClient","useVariableValues","useTimeRange","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","TIME_SERIES_QUERY_KEY","getVariableValuesKey","v","Object","values","map","JSON","stringify","value","join","filterVariableStateMap","names","fromEntries","entries","filter","name","includes","getQueryOptions","plugin","definition","context","timeRange","datasourceStore","suggestedStepMs","mode","variableState","refreshKey","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariabledState","variablesValueKey","queryKey","waitToLoad","some","loading","queryEnabled","undefined","useTimeSeriesQuery","options","queryOptions","data","kind","useTimeSeriesQueryContext","enabled","queryFn","Error","ctx","getTimeSeriesData","useTimeSeriesQueries","definitions","getPlugin","pluginLoaderResponse","d","queries","idx","absoluteTimeRange","useActiveTimeSeriesQueries","queryClient","queryCache","getQueryCache","getActiveTimeSeriesQueries","cache","query","findAll","type","firstPart","startsWith","push"],"mappings":"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"}
+{"version":3,"sources":["../../src/runtime/time-series-queries.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport {\n  useQuery,\n  useQueries,\n  useQueryClient,\n  Query,\n  QueryCache,\n  QueryKey,\n  QueryObserverOptions,\n} from '@tanstack/react-query';\nimport { TimeSeriesQueryDefinition, UnknownSpec, TimeSeriesData } from '@perses-dev/core';\nimport { TimeSeriesDataQuery, TimeSeriesQueryContext, TimeSeriesQueryMode, TimeSeriesQueryPlugin } from '../model';\nimport { VariableStateMap, useAllVariableValues } from './variables';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';\n\nexport interface UseTimeSeriesQueryOptions {\n  suggestedStepMs?: number;\n  mode?: TimeSeriesQueryMode;\n}\n\nexport const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';\n\n/**\n * Returns a serialized string of the current state of variable values.\n */\nfunction getVariableValuesKey(v: VariableStateMap) {\n  return Object.values(v)\n    .map((v) => JSON.stringify(v.value))\n    .join(',');\n}\n\nfunction filterVariableStateMap(v: VariableStateMap, names?: string[]) {\n  if (!names) {\n    return v;\n  }\n  return Object.fromEntries(Object.entries(v).filter(([name]) => names.includes(name)));\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TimeSeriesQueryPlugin;\n  definition: TimeSeriesQueryDefinition;\n  context: TimeSeriesQueryContext;\n}) {\n  const { timeRange, datasourceStore, suggestedStepMs, mode, variableState, refreshKey } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  // Determine queryKey\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = [\n    definition,\n    timeRange,\n    datasourceStore,\n    suggestedStepMs,\n    mode,\n    variablesValueKey,\n    refreshKey,\n  ] as const;\n\n  // Determine queryEnabled\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\n/**\n * Runs a time series query using a plugin and returns the results.\n */\nexport const useTimeSeriesQuery = (\n  definition: TimeSeriesQueryDefinition,\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: QueryObserverOptions<TimeSeriesData>\n) => {\n  const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n  const context = useTimeSeriesQueryContext();\n\n  const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n  return useQuery({\n    enabled: (queryOptions?.enabled ?? true) || queryEnabled,\n    queryKey: queryKey,\n    queryFn: () => {\n      // The 'enabled' option should prevent this from happening, but make TypeScript happy by checking\n      if (plugin === undefined) {\n        throw new Error('Expected plugin to be loaded');\n      }\n      // Keep options out of query key so we don't re-run queries because suggested step changes\n      const ctx: TimeSeriesQueryContext = { ...context, suggestedStepMs: options?.suggestedStepMs };\n      return plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx);\n    },\n  });\n};\n\n/**\n * Runs multiple time series queries using plugins and returns the results.\n */\nexport function useTimeSeriesQueries(\n  definitions: TimeSeriesQueryDefinition[],\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: Omit<QueryObserverOptions, 'queryKey'>\n) {\n  const { getPlugin } = usePluginRegistry();\n  const context = {\n    ...useTimeSeriesQueryContext(),\n    // We need mode to be part query key because this drives the type of query done (instant VS range query)\n    mode: options?.mode,\n  };\n\n  const pluginLoaderResponse = usePlugins(\n    TIME_SERIES_QUERY_KEY,\n    definitions.map((d) => ({ kind: d.spec.plugin.kind }))\n  );\n\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n      return {\n        enabled: (queryOptions?.enabled ?? true) && queryEnabled,\n        queryKey: queryKey,\n        queryFn: async () => {\n          const ctx: TimeSeriesQueryContext = {\n            ...context,\n            // Keep suggested step changes out of the query key, so we don´t have to run again query when it changes\n            suggestedStepMs: options?.suggestedStepMs,\n          };\n          const plugin = await getPlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n          const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\n/**\n * Build the time series query context object from data available at runtime\n */\nfunction useTimeSeriesQueryContext(): TimeSeriesQueryContext {\n  const { absoluteTimeRange, refreshKey } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    timeRange: absoluteTimeRange,\n    variableState,\n    datasourceStore,\n    refreshKey,\n  };\n}\n\n/**\n * Get active time series queries for query results summary\n */\nexport function useActiveTimeSeriesQueries() {\n  const queryClient = useQueryClient();\n  const queryCache = queryClient.getQueryCache();\n  return getActiveTimeSeriesQueries(queryCache);\n}\n\n/**\n * Filter all cached queries down to only active time series queries\n */\nexport function getActiveTimeSeriesQueries(cache: QueryCache) {\n  const queries: TimeSeriesDataQuery[] = [];\n\n  for (const query of cache.findAll({ type: 'active' })) {\n    const firstPart = query.queryKey?.[0] as UnknownSpec;\n    if (firstPart?.kind && (firstPart.kind as string).startsWith(TIME_SERIES_QUERY_KEY)) {\n      queries.push(query as Query<TimeSeriesData, unknown, TimeSeriesData, QueryKey>);\n    }\n  }\n\n  return queries;\n}\n"],"names":["useQuery","useQueries","useQueryClient","useAllVariableValues","useTimeRange","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","TIME_SERIES_QUERY_KEY","getVariableValuesKey","v","Object","values","map","JSON","stringify","value","join","filterVariableStateMap","names","fromEntries","entries","filter","name","includes","getQueryOptions","plugin","definition","context","timeRange","datasourceStore","suggestedStepMs","mode","variableState","refreshKey","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariabledState","variablesValueKey","queryKey","waitToLoad","some","loading","queryEnabled","undefined","useTimeSeriesQuery","options","queryOptions","data","kind","useTimeSeriesQueryContext","enabled","queryFn","Error","ctx","getTimeSeriesData","useTimeSeriesQueries","definitions","getPlugin","pluginLoaderResponse","d","queries","idx","absoluteTimeRange","useActiveTimeSeriesQueries","queryClient","queryCache","getQueryCache","getActiveTimeSeriesQueries","cache","query","findAll","type","firstPart","startsWith","push"],"mappings":"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"}

package/dist/runtime/trace-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/trace-queries.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKnF,MAAM,MAAM,oBAAoB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACvG,eAAO,MAAM,eAAe,eAAe,CAAC;AAE5C,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,iBAAiB;;;EAM5D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,oBAAoB,EAAE,mGA0BlE"}
+{"version":3,"file":"trace-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/trace-queries.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKnF,MAAM,MAAM,oBAAoB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACvG,eAAO,MAAM,eAAe,eAAe,CAAC;AAE5C,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,iBAAiB;;;EAM5D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,oBAAoB,EAAE,mGA+BlE"}

package/dist/runtime/trace-queries.js

@@ -52,7 +52,11 @@ export function getUnixTimeRange(timeRange) {
                     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/runtime/trace-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/trace-queries.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { getUnixTime } from 'date-fns';\nimport { QueryDefinition, UnknownSpec, AbsoluteTimeRange } from '@perses-dev/core';\nimport { useQueries } from '@tanstack/react-query';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nexport type TraceQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'TraceQuery', PluginSpec>;\nexport const TRACE_QUERY_KEY = 'TraceQuery';\n\nexport function getUnixTimeRange(timeRange: AbsoluteTimeRange) {\n  const { start, end } = timeRange;\n  return {\n    start: Math.ceil(getUnixTime(start)),\n    end: Math.ceil(getUnixTime(end)),\n  };\n}\n\n/**\n * Run a trace query using a TraceQuery plugin and return the results\n * @param definition: dashboard defintion for a trace query, written in Trace Query Language (TraceQL)\n * Documentation for TraceQL: https://grafana.com/docs/tempo/latest/traceql/\n */\nexport function useTraceQueries(definitions: TraceQueryDefinition[]) {\n  const { getPlugin } = usePluginRegistry();\n  const datasourceStore = useDatasourceStore();\n  const { absoluteTimeRange } = useTimeRange();\n\n  const context = {\n    datasourceStore,\n    absoluteTimeRange,\n  };\n\n  // useQueries() handles data fetching from query plugins (e.g. traceQL queries, promQL queries)\n  // https://tanstack.com/query/v4/docs/react/reference/useQuery\n  return useQueries({\n    queries: definitions.map((definition) => {\n      const queryKey = [definition, datasourceStore, absoluteTimeRange] as const; // `queryKey` watches and reruns `queryFn` if keys in the array change\n      const traceQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        queryKey: queryKey,\n        queryFn: async () => {\n          const plugin = await getPlugin(TRACE_QUERY_KEY, traceQueryKind);\n          const data = await plugin.getTraceData(definition.spec.plugin.spec, context);\n          return data;\n        },\n      };\n    }),\n  });\n}\n"],"names":["getUnixTime","useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","TRACE_QUERY_KEY","getUnixTimeRange","timeRange","start","end","Math","ceil","useTraceQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","context","queries","map","definition","queryKey","traceQueryKind","spec","plugin","kind","queryFn","data","getTraceData"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,WAAW,QAAQ,WAAW;AAEvC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,SAASC,YAAY,QAAQ,sBAAsB;AAEnD,OAAO,MAAMC,kBAAkB,aAAa;AAE5C,OAAO,SAASC,iBAAiBC,SAA4B;IAC3D,MAAM,EAAEC,KAAK,EAAEC,GAAG,EAAE,GAAGF;IACvB,OAAO;QACLC,OAAOE,KAAKC,IAAI,CAACX,YAAYQ;QAC7BC,KAAKC,KAAKC,IAAI,CAACX,YAAYS;IAC7B;AACF;AAEA;;;;CAIC,GACD,OAAO,SAASG,gBAAgBC,WAAmC;IACjE,MAAM,EAAEC,SAAS,EAAE,GAAGX;IACtB,MAAMY,kBAAkBb;IACxB,MAAM,EAAEc,iBAAiB,EAAE,GAAGZ;IAE9B,MAAMa,UAAU;QACdF;QACAC;IACF;IAEA,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOf,WAAW;QAChBiB,SAASL,YAAYM,GAAG,CAAC,CAACC;gBAEDA,yBAAAA;YADvB,MAAMC,WAAW;gBAACD;gBAAYL;gBAAiBC;aAAkB,EAAW,sEAAsE;YAClJ,MAAMM,iBAAiBF,uBAAAA,kCAAAA,mBAAAA,WAAYG,IAAI,cAAhBH,wCAAAA,0BAAAA,iBAAkBI,MAAM,cAAxBJ,8CAAAA,wBAA0BK,IAAI;YACrD,OAAO;gBACLJ,UAAUA;gBACVK,SAAS;oBACP,MAAMF,SAAS,MAAMV,UAAUT,iBAAiBiB;oBAChD,MAAMK,OAAO,MAAMH,OAAOI,YAAY,CAACR,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN;oBACpE,OAAOU;gBACT;YACF;QACF;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/trace-queries.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { getUnixTime } from 'date-fns';\nimport { QueryDefinition, UnknownSpec, AbsoluteTimeRange } from '@perses-dev/core';\nimport { useQueries } from '@tanstack/react-query';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nexport type TraceQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'TraceQuery', PluginSpec>;\nexport const TRACE_QUERY_KEY = 'TraceQuery';\n\nexport function getUnixTimeRange(timeRange: AbsoluteTimeRange) {\n  const { start, end } = timeRange;\n  return {\n    start: Math.ceil(getUnixTime(start)),\n    end: Math.ceil(getUnixTime(end)),\n  };\n}\n\n/**\n * Run a trace query using a TraceQuery plugin and return the results\n * @param definition: dashboard defintion for a trace query, written in Trace Query Language (TraceQL)\n * Documentation for TraceQL: https://grafana.com/docs/tempo/latest/traceql/\n */\nexport function useTraceQueries(definitions: TraceQueryDefinition[]) {\n  const { getPlugin } = usePluginRegistry();\n  const datasourceStore = useDatasourceStore();\n  const { absoluteTimeRange } = useTimeRange();\n\n  const context = {\n    datasourceStore,\n    absoluteTimeRange,\n  };\n\n  // useQueries() handles data fetching from query plugins (e.g. traceQL queries, promQL queries)\n  // https://tanstack.com/query/v4/docs/react/reference/useQuery\n  return useQueries({\n    queries: definitions.map((definition) => {\n      const queryKey = [definition, datasourceStore, absoluteTimeRange] as const; // `queryKey` watches and reruns `queryFn` if keys in the array change\n      const traceQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        queryKey: queryKey,\n        queryFn: async () => {\n          const plugin = await getPlugin(TRACE_QUERY_KEY, traceQueryKind);\n          const data = await plugin.getTraceData(definition.spec.plugin.spec, context);\n          return data;\n        },\n\n        // 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)\n        // Therefore structuralSharing must be turned off, otherwise the query is stuck in the 'fetching' state on re-fetch.\n        // Ref: https://github.com/TanStack/query/issues/6954#issuecomment-1962321426\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["getUnixTime","useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","TRACE_QUERY_KEY","getUnixTimeRange","timeRange","start","end","Math","ceil","useTraceQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","context","queries","map","definition","queryKey","traceQueryKind","spec","plugin","kind","queryFn","data","getTraceData","structuralSharing"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,WAAW,QAAQ,WAAW;AAEvC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,SAASC,YAAY,QAAQ,sBAAsB;AAEnD,OAAO,MAAMC,kBAAkB,aAAa;AAE5C,OAAO,SAASC,iBAAiBC,SAA4B;IAC3D,MAAM,EAAEC,KAAK,EAAEC,GAAG,EAAE,GAAGF;IACvB,OAAO;QACLC,OAAOE,KAAKC,IAAI,CAACX,YAAYQ;QAC7BC,KAAKC,KAAKC,IAAI,CAACX,YAAYS;IAC7B;AACF;AAEA;;;;CAIC,GACD,OAAO,SAASG,gBAAgBC,WAAmC;IACjE,MAAM,EAAEC,SAAS,EAAE,GAAGX;IACtB,MAAMY,kBAAkBb;IACxB,MAAM,EAAEc,iBAAiB,EAAE,GAAGZ;IAE9B,MAAMa,UAAU;QACdF;QACAC;IACF;IAEA,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOf,WAAW;QAChBiB,SAASL,YAAYM,GAAG,CAAC,CAACC;gBAEDA,yBAAAA;YADvB,MAAMC,WAAW;gBAACD;gBAAYL;gBAAiBC;aAAkB,EAAW,sEAAsE;YAClJ,MAAMM,iBAAiBF,uBAAAA,kCAAAA,mBAAAA,WAAYG,IAAI,cAAhBH,wCAAAA,0BAAAA,iBAAkBI,MAAM,cAAxBJ,8CAAAA,wBAA0BK,IAAI;YACrD,OAAO;gBACLJ,UAAUA;gBACVK,SAAS;oBACP,MAAMF,SAAS,MAAMV,UAAUT,iBAAiBiB;oBAChD,MAAMK,OAAO,MAAMH,OAAOI,YAAY,CAACR,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN;oBACpE,OAAOU;gBACT;gBAEA,kKAAkK;gBAClK,oHAAoH;gBACpH,6EAA6E;gBAC7EE,mBAAmB;YACrB;QACF;IACF;AACF"}

package/dist/runtime/{template-variables.d.ts → variables.d.ts}

@@ -67,11 +67,11 @@ export declare class VariableStoreStateMap {
     private _sourceName;
     private _sourceStatesOrEmpty;
 }
-export type TemplateVariableSrv = {
+export type VariableSrv = {
     state: VariableStateMap;
 };
-export declare const TemplateVariableContext: import("react").Context<TemplateVariableSrv | undefined>;
-export declare function useTemplateVariableValues(names?: string[]): VariableStateMap;
+export declare const VariableContext: import("react").Context<VariableSrv | undefined>;
 export declare function useVariableValues(names?: string[]): VariableStateMap;
+export declare function useAllVariableValues(names?: string[]): VariableStateMap;
 export declare function useReplaceVariablesInString(str: string | undefined): string | undefined;
-//# sourceMappingURL=template-variables.d.ts.map
+//# sourceMappingURL=variables.d.ts.map

package/dist/runtime/variables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../src/runtime/variables.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI1C,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,qBAAa,qBAAqB;IAChC;;;OAGG;IACH,CAAC,SAAS,CAAC,UAAQ;IAEnB,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAM;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqD;IAE5E;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,GAAG,SAAS;IAIrD;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS;IAS3E;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO;IAInC;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO;IAiBtC,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,oBAAoB;CAG7B;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,eAAe,kDAAoD,CAAC;AAUjF,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAmBpE;AAGD,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAOvE;AAGD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF"}

package/dist/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
@@ -25,7 +25,7 @@ function _define_property(obj, key, value) {
 }
 import { createContext, useContext, useMemo } from 'react';
 import { immerable } from 'immer';
-import { parseTemplateVariables, replaceTemplateVariables } from '../utils';
+import { parseVariables, replaceVariables } from '../utils';
 import { useBuiltinVariableValues } from './builtin-variables';
 let _immerable = immerable;
 /**
@@ -89,16 +89,16 @@ let _immerable = immerable;
         _define_property(this, "_state", {});
     }
 }
-export const TemplateVariableContext = createContext(undefined);
-function useTemplateVariableContext() {
-    const ctx = useContext(TemplateVariableContext);
+export const VariableContext = createContext(undefined);
+function useVariableContext() {
+    const ctx = 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;
 }
-export function useTemplateVariableValues(names) {
-    const { state } = useTemplateVariableContext();
+export function useVariableValues(names) {
+    const { state } = useVariableContext();
     const values = useMemo(()=>{
         const values = {};
         names === null || names === void 0 ? void 0 : names.forEach((name)=>{
@@ -117,25 +117,26 @@ export function useTemplateVariableValues(names) {
     }
     return values;
 }
-export function useVariableValues(names) {
-    const templateVariableValues = useTemplateVariableValues(names);
+// useAllVariableValues wraps user-defined variables with built-in variables
+export function useAllVariableValues(names) {
+    const variableValues = useVariableValues(names);
     const builtinVariableValues = useBuiltinVariableValues(names);
     return useMemo(()=>{
         return {
-            ...templateVariableValues,
+            ...variableValues,
             ...builtinVariableValues
         };
     }, [
-        templateVariableValues,
+        variableValues,
         builtinVariableValues
     ]);
 }
-// Convenience hook for replacing template variables in a string
+// Convenience hook for replacing variables in a string
 export function useReplaceVariablesInString(str) {
-    const variablesInString = str ? parseTemplateVariables(str) : [];
-    const variableValues = useVariableValues(variablesInString);
+    const variablesInString = str ? parseVariables(str) : [];
+    const variableValues = useAllVariableValues(variablesInString);
     if (!str) return undefined;
-    return replaceTemplateVariables(str, variableValues);
+    return replaceVariables(str, variableValues);
 }
 
-//# sourceMappingURL=template-variables.js.map
+//# sourceMappingURL=variables.js.map

package/dist/runtime/variables.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/runtime/variables.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { createContext, useContext, useMemo } from 'react';\nimport { VariableValue } from '@perses-dev/core';\nimport { immerable } from 'immer';\nimport { VariableOption } from '../model';\nimport { parseVariables, replaceVariables } from '../utils';\nimport { useBuiltinVariableValues } from './builtin-variables';\n\nexport type VariableState = {\n  value: VariableValue;\n  options?: VariableOption[];\n  loading: boolean;\n  error?: Error;\n  /**\n   * If a local variable is overriding an external variable, local var will have the flag ``overriding=true``.\n   */\n  overriding?: boolean;\n  /**\n   * If a local variable is overriding an external variable, external var will have the flag ``overridden=true``.\n   */\n  overridden?: boolean;\n  defaultValue?: VariableValue;\n};\n\nexport type VariableStateMap = Record<string, VariableState>;\n\n/**\n * Structure used as key in the {@link VariableStoreStateMap}.\n */\nexport type VariableStateKey = {\n  /**\n   * name of the variable we want to access in the state.\n   */\n  name: string;\n  /**\n   * source of the variable we want to access in the state.\n   * Defined only for external variables.\n   */\n  source?: string;\n};\n\n/**\n * A state map with two entry keys, materialized by {@link VariableStateKey} structure.\n */\nexport class VariableStoreStateMap {\n  /**\n   * \"Immerable\" is mandatory to be able to use this class in an immer context.\n   * Ref: https://docs.pmnd.rs/zustand/integrations/immer-middleware#gotchas\n   */\n  [immerable] = true;\n\n  private readonly DEFAULT_LOCAL_SOURCE_NAME = '';\n  private readonly _state: Record<string, Record<string, VariableState>> = {};\n\n  /**\n   * Get variable state by key.\n   * @param key\n   */\n  get(key: VariableStateKey): VariableState | undefined {\n    return this._sourceStatesOrEmpty(key.source)[key.name];\n  }\n\n  /**\n   * Set variable state by key.\n   * @param key\n   * @param value\n   */\n  set(key: VariableStateKey, value: VariableState): VariableState | undefined {\n    const sourceName = this._sourceName(key.source);\n    if (!this._state[sourceName]) {\n      this._state[sourceName] = {};\n    }\n    this._sourceStatesOrEmpty(key.source)[key.name] = value;\n    return value;\n  }\n\n  /**\n   * Check presence of variable state by key.\n   * @param key\n   */\n  has(key: VariableStateKey): boolean {\n    return this._sourceStatesOrEmpty(key.source)[key.name] !== undefined;\n  }\n\n  /**\n   * Delete variable state by key.\n   * @param key\n   */\n  delete(key: VariableStateKey): boolean {\n    const result = this.has(key);\n    const sourceName = this._sourceName(key.source);\n    const sourceStates = this._state[sourceName];\n\n    // Delete var from source state\n    if (sourceStates) {\n      delete sourceStates[key.name];\n    }\n\n    // Delete source state from state if empty\n    if (Object.keys(sourceStates ?? {})?.length === 0) {\n      delete this._state[sourceName];\n    }\n    return result;\n  }\n\n  private _sourceName(source: string | undefined): string {\n    return source ?? this.DEFAULT_LOCAL_SOURCE_NAME;\n  }\n\n  private _sourceStatesOrEmpty(source: string | undefined): Record<string, VariableState> {\n    return this._state[this._sourceName(source)] ?? {};\n  }\n}\n\nexport type VariableSrv = {\n  state: VariableStateMap;\n};\n\nexport const VariableContext = createContext<VariableSrv | undefined>(undefined);\n\nfunction useVariableContext() {\n  const ctx = useContext(VariableContext);\n  if (ctx === undefined) {\n    throw new Error('No VariableContext found. Did you forget a Provider?');\n  }\n  return ctx;\n}\n\nexport function useVariableValues(names?: string[]): VariableStateMap {\n  const { state } = useVariableContext();\n\n  const values = useMemo(() => {\n    const values: VariableStateMap = {};\n    names?.forEach((name) => {\n      const s = state[name];\n      if (s) {\n        values[name] = s;\n      }\n    });\n    return values;\n  }, [state, names]);\n\n  if (names === undefined) {\n    return state;\n  }\n\n  return values;\n}\n\n// useAllVariableValues wraps user-defined variables with built-in variables\nexport function useAllVariableValues(names?: string[]): VariableStateMap {\n  const variableValues = useVariableValues(names);\n  const builtinVariableValues = useBuiltinVariableValues(names);\n\n  return useMemo(() => {\n    return { ...variableValues, ...builtinVariableValues } as VariableStateMap;\n  }, [variableValues, builtinVariableValues]);\n}\n\n// Convenience hook for replacing variables in a string\nexport function useReplaceVariablesInString(str: string | undefined): string | undefined {\n  const variablesInString = str ? parseVariables(str) : [];\n  const variableValues = useAllVariableValues(variablesInString);\n  if (!str) return undefined;\n  return replaceVariables(str, variableValues);\n}\n"],"names":["createContext","useContext","useMemo","immerable","parseVariables","replaceVariables","useBuiltinVariableValues","VariableStoreStateMap","get","key","_sourceStatesOrEmpty","source","name","set","value","sourceName","_sourceName","_state","has","undefined","delete","Object","result","sourceStates","keys","length","DEFAULT_LOCAL_SOURCE_NAME","VariableContext","useVariableContext","ctx","Error","useVariableValues","names","state","values","forEach","s","useAllVariableValues","variableValues","builtinVariableValues","useReplaceVariablesInString","str","variablesInString"],"mappings":"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"}

package/dist/stories/shared-utils/decorators/WithPluginSystemVariables.d.ts

@@ -0,0 +1,12 @@
+import { StoryFn, StoryContext } from '@storybook/react';
+import { VariableSrv } from '../../../runtime';
+declare module '@storybook/react' {
+    interface Parameters {
+        withPluginSystemVariables?: WithPluginSystemVariableParameter;
+    }
+}
+export type WithPluginSystemVariableParameter = {
+    props: VariableSrv;
+};
+export declare const WithPluginSystemVariables: (Story: StoryFn, context: StoryContext<unknown>) => import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=WithPluginSystemVariables.d.ts.map

package/dist/stories/shared-utils/decorators/WithPluginSystemVariables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WithPluginSystemVariables.d.ts","sourceRoot":"","sources":["../../../../src/stories/shared-utils/decorators/WithPluginSystemVariables.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAmB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,QAAQ,kBAAkB,CAAC;IAChC,UAAU,UAAU;QAClB,yBAAyB,CAAC,EAAE,iCAAiC,CAAC;KAC/D;CACF;AAED,MAAM,MAAM,iCAAiC,GAAG;IAC9C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAcF,eAAO,MAAM,yBAAyB,UAAW,OAAO,WAAW,aAAa,OAAO,CAAC,4CAcvF,CAAC"}

package/dist/stories/shared-utils/decorators/{WithPluginSystemTemplateVariables.js → WithPluginSystemVariables.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
@@ -11,29 +11,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { jsx as _jsx } from "react/jsx-runtime";
-import { TemplateVariableContext } from '../../../runtime';
+import { VariableContext } from '../../../runtime';
 // Type guard because storybook types parameters as `any`
-function isWithTemplateVariableParameter(parameter) {
+function isWithVariableParameter(parameter) {
     return !!parameter && typeof parameter === 'object' && 'props' in parameter;
 }
-// This decorator is used for non-dashboards package template variable needs.
+// This decorator is used for non-dashboards package variable needs.
 // Use the more specific decorator in the dashboards package when working with
 // dashboards.
 // This decorator includes "PluginSystem" in the name to differentiate it from
 // the datasource store decorator in the `dashboards` package.
-export const WithPluginSystemTemplateVariables = (Story, context)=>{
-    const initParameter = context.parameters.withPluginSystemTemplateVariables;
+export const WithPluginSystemVariables = (Story, context)=>{
+    const initParameter = context.parameters.withPluginSystemVariables;
     const defaultValue = {
         state: {}
     };
-    const parameter = isWithTemplateVariableParameter(initParameter) ? initParameter : {
+    const parameter = isWithVariableParameter(initParameter) ? initParameter : {
         props: defaultValue
     };
     const props = parameter === null || parameter === void 0 ? void 0 : parameter.props;
-    return /*#__PURE__*/ _jsx(TemplateVariableContext.Provider, {
+    return /*#__PURE__*/ _jsx(VariableContext.Provider, {
         value: props,
         children: /*#__PURE__*/ _jsx(Story, {})
     });
 };
 
-//# sourceMappingURL=WithPluginSystemTemplateVariables.js.map
+//# sourceMappingURL=WithPluginSystemVariables.js.map

package/dist/stories/shared-utils/decorators/WithPluginSystemVariables.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/stories/shared-utils/decorators/WithPluginSystemVariables.tsx"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { StoryFn, StoryContext } from '@storybook/react';\nimport { VariableContext, VariableSrv } from '../../../runtime';\n\ndeclare module '@storybook/react' {\n  interface Parameters {\n    withPluginSystemVariables?: WithPluginSystemVariableParameter;\n  }\n}\n\nexport type WithPluginSystemVariableParameter = {\n  props: VariableSrv;\n};\n\n// Type guard because storybook types parameters as `any`\nfunction isWithVariableParameter(\n  parameter: unknown | WithPluginSystemVariableParameter\n): parameter is WithPluginSystemVariableParameter {\n  return !!parameter && typeof parameter === 'object' && 'props' in parameter;\n}\n\n// This decorator is used for non-dashboards package variable needs.\n// Use the more specific decorator in the dashboards package when working with\n// dashboards.\n// This decorator includes \"PluginSystem\" in the name to differentiate it from\n// the datasource store decorator in the `dashboards` package.\nexport const WithPluginSystemVariables = (Story: StoryFn, context: StoryContext<unknown>) => {\n  const initParameter = context.parameters.withPluginSystemVariables;\n  const defaultValue: VariableSrv = {\n    state: {},\n  };\n  const parameter = isWithVariableParameter(initParameter) ? initParameter : { props: defaultValue };\n\n  const props = parameter?.props;\n\n  return (\n    <VariableContext.Provider value={props}>\n      <Story />\n    </VariableContext.Provider>\n  );\n};\n"],"names":["VariableContext","isWithVariableParameter","parameter","WithPluginSystemVariables","Story","context","initParameter","parameters","withPluginSystemVariables","defaultValue","state","props","Provider","value"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAGjC,SAASA,eAAe,QAAqB,mBAAmB;AAYhE,yDAAyD;AACzD,SAASC,wBACPC,SAAsD;IAEtD,OAAO,CAAC,CAACA,aAAa,OAAOA,cAAc,YAAY,WAAWA;AACpE;AAEA,oEAAoE;AACpE,8EAA8E;AAC9E,cAAc;AACd,8EAA8E;AAC9E,8DAA8D;AAC9D,OAAO,MAAMC,4BAA4B,CAACC,OAAgBC;IACxD,MAAMC,gBAAgBD,QAAQE,UAAU,CAACC,yBAAyB;IAClE,MAAMC,eAA4B;QAChCC,OAAO,CAAC;IACV;IACA,MAAMR,YAAYD,wBAAwBK,iBAAiBA,gBAAgB;QAAEK,OAAOF;IAAa;IAEjG,MAAME,QAAQT,sBAAAA,gCAAAA,UAAWS,KAAK;IAE9B,qBACE,KAACX,gBAAgBY,QAAQ;QAACC,OAAOF;kBAC/B,cAAA,KAACP;;AAGP,EAAE"}

package/dist/stories/shared-utils/decorators/index.d.ts

@@ -2,6 +2,6 @@ export * from './WithDataQueries';
 export * from './WithPluginRegistry';
 export * from './WithPluginSystemBuiltinVariables';
 export * from './WithPluginSystemDatasourceStore';
-export * from './WithPluginSystemTemplateVariables';
+export * from './WithPluginSystemVariables';
 export * from './WithTimeRange';
 //# sourceMappingURL=index.d.ts.map

package/dist/stories/shared-utils/decorators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/stories/shared-utils/decorators/index.ts"],"names":[],"mappings":"AAaA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oCAAoC,CAAC;AACnD,cAAc,mCAAmC,CAAC;AAClD,cAAc,qCAAqC,CAAC;AACpD,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/stories/shared-utils/decorators/index.ts"],"names":[],"mappings":"AAaA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oCAAoC,CAAC;AACnD,cAAc,mCAAmC,CAAC;AAClD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC"}

package/dist/stories/shared-utils/decorators/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
@@ -14,7 +14,7 @@ export * from './WithDataQueries';
 export * from './WithPluginRegistry';
 export * from './WithPluginSystemBuiltinVariables';
 export * from './WithPluginSystemDatasourceStore';
-export * from './WithPluginSystemTemplateVariables';
+export * from './WithPluginSystemVariables';
 export * from './WithTimeRange';
 
 //# sourceMappingURL=index.js.map

package/dist/stories/shared-utils/decorators/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/stories/shared-utils/decorators/index.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nexport * from './WithDataQueries';\nexport * from './WithPluginRegistry';\nexport * from './WithPluginSystemBuiltinVariables';\nexport * from './WithPluginSystemDatasourceStore';\nexport * from './WithPluginSystemTemplateVariables';\nexport * from './WithTimeRange';\n"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,cAAc,oBAAoB;AAClC,cAAc,uBAAuB;AACrC,cAAc,qCAAqC;AACnD,cAAc,oCAAoC;AAClD,cAAc,sCAAsC;AACpD,cAAc,kBAAkB"}
+{"version":3,"sources":["../../../../src/stories/shared-utils/decorators/index.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nexport * from './WithDataQueries';\nexport * from './WithPluginRegistry';\nexport * from './WithPluginSystemBuiltinVariables';\nexport * from './WithPluginSystemDatasourceStore';\nexport * from './WithPluginSystemVariables';\nexport * from './WithTimeRange';\n"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,cAAc,oBAAoB;AAClC,cAAc,uBAAuB;AACrC,cAAc,qCAAqC;AACnD,cAAc,oCAAoC;AAClD,cAAc,8BAA8B;AAC5C,cAAc,kBAAkB"}

package/dist/test/mock-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-data.d.ts","sourceRoot":"","sources":["../../src/test/mock-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,EAAE,cAsBnC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAc7B,CAAC"}
+{"version":3,"file":"mock-data.d.ts","sourceRoot":"","sources":["../../src/test/mock-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,EAAE,cAsBnC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAmC7B,CAAC"}

package/dist/test/mock-data.js

@@ -46,14 +46,35 @@ export const MOCK_TIME_SERIES_DATA = {
     ]
 };
 export const MOCK_TRACE_DATA = {
-    traces: [
+    searchResult: [
         {
             durationMs: 1120,
-            errorCount: 0,
-            spanCount: 10,
+            serviceStats: {
+                'shop-backend': {
+                    spanCount: 4,
+                    errorCount: 0
+                },
+                'cart-service': {
+                    spanCount: 2,
+                    errorCount: 0
+                },
+                'article-service': {
+                    spanCount: 2,
+                    errorCount: 0
+                },
+                'auth-service': {
+                    spanCount: 1,
+                    errorCount: 0
+                },
+                postgres: {
+                    spanCount: 1,
+                    errorCount: 0
+                }
+            },
             startTimeUnixMs: 1699916103945861,
             traceId: '95ba9202315c29c801b5aa41452aa775',
-            name: 'rootServiceName="shop-backend", rootTraceName="shop-backend"'
+            rootServiceName: 'shop-backend',
+            rootTraceName: 'article-to-cart'
         }
     ],
     metadata: {

package/dist/test/mock-data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/test/mock-data.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesData, TraceData } from '@perses-dev/core';\n\nexport const MOCK_TIME_SERIES_DATA: TimeSeriesData = {\n  timeRange: {\n    start: new Date(1666625490000),\n    end: new Date(1666625535000),\n  },\n  stepMs: 24379,\n  series: [\n    {\n      name: 'device=\"/dev/vda1\", env=\"demo\", fstype=\"ext4\", instance=\"demo.do.prometheus.io:9100\", job=\"node\", mountpoint=\"/\"',\n      values: [\n        [1666479357903, 0.27700745551584494],\n        [1666479382282, 0.27701284657366565],\n      ],\n    },\n    {\n      name: 'device=\"/dev/vda15\", env=\"demo\", fstype=\"vfat\", instance=\"demo.do.prometheus.io:9100\", job=\"node\", mountpoint=\"/boot/efi\"',\n      values: [\n        [1666479357903, 0.08486496097624885],\n        [1666479382282, 0.08486496097624885],\n      ],\n    },\n  ],\n};\n\nexport const MOCK_TRACE_DATA: TraceData = {\n  traces: [\n    {\n      durationMs: 1120,\n      errorCount: 0,\n      spanCount: 10,\n      startTimeUnixMs: 1699916103945861,\n      traceId: '95ba9202315c29c801b5aa41452aa775',\n      name: 'rootServiceName=\"shop-backend\", rootTraceName=\"shop-backend\"',\n    },\n  ],\n  metadata: {\n    executedQueryString: '{ duration > 1000ms }',\n  },\n};\n"],"names":["MOCK_TIME_SERIES_DATA","timeRange","start","Date","end","stepMs","series","name","values","MOCK_TRACE_DATA","traces","durationMs","errorCount","spanCount","startTimeUnixMs","traceId","metadata","executedQueryString"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,OAAO,MAAMA,wBAAwC;IACnDC,WAAW;QACTC,OAAO,IAAIC,KAAK;QAChBC,KAAK,IAAID,KAAK;IAChB;IACAE,QAAQ;IACRC,QAAQ;QACN;YACEC,MAAM;YACNC,QAAQ;gBACN;oBAAC;oBAAe;iBAAoB;gBACpC;oBAAC;oBAAe;iBAAoB;aACrC;QACH;QACA;YACED,MAAM;YACNC,QAAQ;gBACN;oBAAC;oBAAe;iBAAoB;gBACpC;oBAAC;oBAAe;iBAAoB;aACrC;QACH;KACD;AACH,EAAE;AAEF,OAAO,MAAMC,kBAA6B;IACxCC,QAAQ;QACN;YACEC,YAAY;YACZC,YAAY;YACZC,WAAW;YACXC,iBAAiB;YACjBC,SAAS;YACTR,MAAM;QACR;KACD;IACDS,UAAU;QACRC,qBAAqB;IACvB;AACF,EAAE"}
+{"version":3,"sources":["../../src/test/mock-data.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesData, TraceData } from '@perses-dev/core';\n\nexport const MOCK_TIME_SERIES_DATA: TimeSeriesData = {\n  timeRange: {\n    start: new Date(1666625490000),\n    end: new Date(1666625535000),\n  },\n  stepMs: 24379,\n  series: [\n    {\n      name: 'device=\"/dev/vda1\", env=\"demo\", fstype=\"ext4\", instance=\"demo.do.prometheus.io:9100\", job=\"node\", mountpoint=\"/\"',\n      values: [\n        [1666479357903, 0.27700745551584494],\n        [1666479382282, 0.27701284657366565],\n      ],\n    },\n    {\n      name: 'device=\"/dev/vda15\", env=\"demo\", fstype=\"vfat\", instance=\"demo.do.prometheus.io:9100\", job=\"node\", mountpoint=\"/boot/efi\"',\n      values: [\n        [1666479357903, 0.08486496097624885],\n        [1666479382282, 0.08486496097624885],\n      ],\n    },\n  ],\n};\n\nexport const MOCK_TRACE_DATA: TraceData = {\n  searchResult: [\n    {\n      durationMs: 1120,\n      serviceStats: {\n        'shop-backend': {\n          spanCount: 4,\n          errorCount: 0,\n        },\n        'cart-service': {\n          spanCount: 2,\n          errorCount: 0,\n        },\n        'article-service': {\n          spanCount: 2,\n          errorCount: 0,\n        },\n        'auth-service': {\n          spanCount: 1,\n          errorCount: 0,\n        },\n        postgres: {\n          spanCount: 1,\n          errorCount: 0,\n        },\n      },\n      startTimeUnixMs: 1699916103945861,\n      traceId: '95ba9202315c29c801b5aa41452aa775',\n      rootServiceName: 'shop-backend',\n      rootTraceName: 'article-to-cart',\n    },\n  ],\n  metadata: {\n    executedQueryString: '{ duration > 1000ms }',\n  },\n};\n"],"names":["MOCK_TIME_SERIES_DATA","timeRange","start","Date","end","stepMs","series","name","values","MOCK_TRACE_DATA","searchResult","durationMs","serviceStats","spanCount","errorCount","postgres","startTimeUnixMs","traceId","rootServiceName","rootTraceName","metadata","executedQueryString"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,OAAO,MAAMA,wBAAwC;IACnDC,WAAW;QACTC,OAAO,IAAIC,KAAK;QAChBC,KAAK,IAAID,KAAK;IAChB;IACAE,QAAQ;IACRC,QAAQ;QACN;YACEC,MAAM;YACNC,QAAQ;gBACN;oBAAC;oBAAe;iBAAoB;gBACpC;oBAAC;oBAAe;iBAAoB;aACrC;QACH;QACA;YACED,MAAM;YACNC,QAAQ;gBACN;oBAAC;oBAAe;iBAAoB;gBACpC;oBAAC;oBAAe;iBAAoB;aACrC;QACH;KACD;AACH,EAAE;AAEF,OAAO,MAAMC,kBAA6B;IACxCC,cAAc;QACZ;YACEC,YAAY;YACZC,cAAc;gBACZ,gBAAgB;oBACdC,WAAW;oBACXC,YAAY;gBACd;gBACA,gBAAgB;oBACdD,WAAW;oBACXC,YAAY;gBACd;gBACA,mBAAmB;oBACjBD,WAAW;oBACXC,YAAY;gBACd;gBACA,gBAAgB;oBACdD,WAAW;oBACXC,YAAY;gBACd;gBACAC,UAAU;oBACRF,WAAW;oBACXC,YAAY;gBACd;YACF;YACAE,iBAAiB;YACjBC,SAAS;YACTC,iBAAiB;YACjBC,eAAe;QACjB;KACD;IACDC,UAAU;QACRC,qBAAqB;IACvB;AACF,EAAE"}

package/dist/test/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/test/render.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAU,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAW9C,KAAK,cAAc,GAAG;IACpB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,KAAK,CAAC,SAAS,EACnB,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAC9C,cAAc,CAAC,EAAE,cAAc,gIAsBhC"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/test/render.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAU,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,KAAK,cAAc,GAAG;IACpB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,KAAK,CAAC,SAAS,EACnB,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,EAC9C,cAAc,CAAC,EAAE,cAAc,gIAqBhC"}

package/dist/test/render.js

@@ -15,13 +15,6 @@ import { render } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { PluginRegistry } from '../components/PluginRegistry';
 import { testPluginLoader } from './test-plugins';
-const testLogger = {
-    log: console.log,
-    warn: console.warn,
-    error: ()=>{
-    // Don't log network errors in tests to the console
-    }
-};
 /**
  * Test helper to render a React component with some common app-level providers, as well as the PluginRegistry
  * wrapped around it.
@@ -33,8 +26,7 @@ const testLogger = {
                 refetchOnWindowFocus: false,
                 retry: false
             }
-        },
-        logger: testLogger
+        }
     });
     var _contextOptions_defaultPluginKinds;
     return render(/*#__PURE__*/ _jsx(QueryClientProvider, {

package/dist/test/render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/test/render.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { render, RenderOptions } from '@testing-library/react';\nimport { QueryClient, QueryClientProvider } from '@tanstack/react-query';\nimport { PluginRegistry } from '../components/PluginRegistry';\nimport { DefaultPluginKinds } from '../model';\nimport { testPluginLoader } from './test-plugins';\n\nconst testLogger = {\n  log: console.log,\n  warn: console.warn,\n  error: () => {\n    // Don't log network errors in tests to the console\n  },\n};\n\ntype ContextOptions = {\n  defaultPluginKinds?: DefaultPluginKinds;\n};\n\n/**\n * Test helper to render a React component with some common app-level providers, as well as the PluginRegistry\n * wrapped around it.\n */\nexport function renderWithContext(\n  ui: React.ReactNode,\n  renderOptions?: Omit<RenderOptions, 'queries'>,\n  contextOptions?: ContextOptions\n) {\n  // Create a new QueryClient for each test to avoid caching issues\n  const queryClient = new QueryClient({\n    defaultOptions: { queries: { refetchOnWindowFocus: false, retry: false } },\n    logger: testLogger,\n  });\n  return render(\n    <QueryClientProvider client={queryClient}>\n      <PluginRegistry\n        pluginLoader={testPluginLoader}\n        defaultPluginKinds={\n          contextOptions?.defaultPluginKinds ?? {\n            TimeSeriesQuery: 'PrometheusTimeSeriesQuery',\n          }\n        }\n      >\n        {ui}\n      </PluginRegistry>\n    </QueryClientProvider>,\n    renderOptions\n  );\n}\n"],"names":["render","QueryClient","QueryClientProvider","PluginRegistry","testPluginLoader","testLogger","log","console","warn","error","renderWithContext","ui","renderOptions","contextOptions","queryClient","defaultOptions","queries","refetchOnWindowFocus","retry","logger","client","pluginLoader","defaultPluginKinds","TimeSeriesQuery"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAEjC,SAASA,MAAM,QAAuB,yBAAyB;AAC/D,SAASC,WAAW,EAAEC,mBAAmB,QAAQ,wBAAwB;AACzE,SAASC,cAAc,QAAQ,+BAA+B;AAE9D,SAASC,gBAAgB,QAAQ,iBAAiB;AAElD,MAAMC,aAAa;IACjBC,KAAKC,QAAQD,GAAG;IAChBE,MAAMD,QAAQC,IAAI;IAClBC,OAAO;IACL,mDAAmD;IACrD;AACF;AAMA;;;CAGC,GACD,OAAO,SAASC,kBACdC,EAAmB,EACnBC,aAA8C,EAC9CC,cAA+B;IAE/B,iEAAiE;IACjE,MAAMC,cAAc,IAAIb,YAAY;QAClCc,gBAAgB;YAAEC,SAAS;gBAAEC,sBAAsB;gBAAOC,OAAO;YAAM;QAAE;QACzEC,QAAQd;IACV;QAMQQ;IALR,OAAOb,qBACL,KAACE;QAAoBkB,QAAQN;kBAC3B,cAAA,KAACX;YACCkB,cAAcjB;YACdkB,oBACET,CAAAA,qCAAAA,2BAAAA,qCAAAA,eAAgBS,kBAAkB,cAAlCT,gDAAAA,qCAAsC;gBACpCU,iBAAiB;YACnB;sBAGDZ;;QAGLC;AAEJ"}
+{"version":3,"sources":["../../src/test/render.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { render, RenderOptions } from '@testing-library/react';\nimport { QueryClient, QueryClientProvider } from '@tanstack/react-query';\nimport { PluginRegistry } from '../components/PluginRegistry';\nimport { DefaultPluginKinds } from '../model';\nimport { testPluginLoader } from './test-plugins';\n\ntype ContextOptions = {\n  defaultPluginKinds?: DefaultPluginKinds;\n};\n\n/**\n * Test helper to render a React component with some common app-level providers, as well as the PluginRegistry\n * wrapped around it.\n */\nexport function renderWithContext(\n  ui: React.ReactNode,\n  renderOptions?: Omit<RenderOptions, 'queries'>,\n  contextOptions?: ContextOptions\n) {\n  // Create a new QueryClient for each test to avoid caching issues\n  const queryClient = new QueryClient({\n    defaultOptions: { queries: { refetchOnWindowFocus: false, retry: false } },\n  });\n  return render(\n    <QueryClientProvider client={queryClient}>\n      <PluginRegistry\n        pluginLoader={testPluginLoader}\n        defaultPluginKinds={\n          contextOptions?.defaultPluginKinds ?? {\n            TimeSeriesQuery: 'PrometheusTimeSeriesQuery',\n          }\n        }\n      >\n        {ui}\n      </PluginRegistry>\n    </QueryClientProvider>,\n    renderOptions\n  );\n}\n"],"names":["render","QueryClient","QueryClientProvider","PluginRegistry","testPluginLoader","renderWithContext","ui","renderOptions","contextOptions","queryClient","defaultOptions","queries","refetchOnWindowFocus","retry","client","pluginLoader","defaultPluginKinds","TimeSeriesQuery"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAEjC,SAASA,MAAM,QAAuB,yBAAyB;AAC/D,SAASC,WAAW,EAAEC,mBAAmB,QAAQ,wBAAwB;AACzE,SAASC,cAAc,QAAQ,+BAA+B;AAE9D,SAASC,gBAAgB,QAAQ,iBAAiB;AAMlD;;;CAGC,GACD,OAAO,SAASC,kBACdC,EAAmB,EACnBC,aAA8C,EAC9CC,cAA+B;IAE/B,iEAAiE;IACjE,MAAMC,cAAc,IAAIR,YAAY;QAClCS,gBAAgB;YAAEC,SAAS;gBAAEC,sBAAsB;gBAAOC,OAAO;YAAM;QAAE;IAC3E;QAMQL;IALR,OAAOR,qBACL,KAACE;QAAoBY,QAAQL;kBAC3B,cAAA,KAACN;YACCY,cAAcX;YACdY,oBACER,CAAAA,qCAAAA,2BAAAA,qCAAAA,eAAgBQ,kBAAkB,cAAlCR,gDAAAA,qCAAsC;gBACpCS,iBAAiB;YACnB;sBAGDX;;QAGLC;AAEJ"}

package/dist/test/test-plugins/bert/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/test/test-plugins/bert/index.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAiBjE,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CASvD,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CA4BvD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/test/test-plugins/bert/index.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAiBjE,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CASvD,CAAC;AAgBF,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAgBvD,CAAC"}

package/dist/test/test-plugins/bert/index.js

@@ -43,30 +43,31 @@ export const BertPanel1 = {
             option1: ''
         })
 };
+function BertPanel2Editor({ value, onChange }) {
+    return /*#__PURE__*/ _jsxs("div", {
+        children: [
+            /*#__PURE__*/ _jsx("label", {
+                htmlFor: "editor-input",
+                children: "BertPanel2 editor"
+            }),
+            /*#__PURE__*/ _jsx("input", {
+                type: "text",
+                id: "editor-input",
+                value: value.option2,
+                onChange: (e)=>onChange({
+                        ...value,
+                        option2: e.target.value
+                    })
+            })
+        ]
+    });
+}
 export const BertPanel2 = {
     PanelComponent: ()=>null,
     panelOptionsEditorComponents: [
         {
             label: 'Settings',
-            content: function BertPanel2Editor({ value, onChange }) {
-                return /*#__PURE__*/ _jsxs("div", {
-                    children: [
-                        /*#__PURE__*/ _jsx("label", {
-                            htmlFor: "editor-input",
-                            children: "BertPanel2 editor"
-                        }),
-                        /*#__PURE__*/ _jsx("input", {
-                            type: "text",
-                            id: "editor-input",
-                            value: value.option2,
-                            onChange: (e)=>onChange({
-                                    ...value,
-                                    option2: e.target.value
-                                })
-                        })
-                    ]
-                });
-            }
+            content: BertPanel2Editor
         },
         {
             label: 'Custom Tab',

package/dist/test/test-plugins/bert/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/test/test-plugins/bert/index.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { OptionsEditorProps, PanelPlugin } from '../../../model';\n\nfunction BertPanel1Editor({ value, onChange }: OptionsEditorProps<{ option1: string }>) {\n  return (\n    <div>\n      <label htmlFor=\"editor-input\">BertPanel1 editor</label>\n      <input\n        type=\"text\"\n        id=\"editor-input\"\n        value={value.option1}\n        onChange={(e) => onChange({ ...value, option1: e.target.value })}\n      />\n    </div>\n  );\n}\n\n// Dummy plugins to test loading\nexport const BertPanel1: PanelPlugin<{ option1: string }> = {\n  PanelComponent: () => null,\n  panelOptionsEditorComponents: [\n    {\n      label: 'Editor',\n      content: BertPanel1Editor,\n    },\n  ],\n  createInitialOptions: () => ({ option1: '' }),\n};\n\nexport const BertPanel2: PanelPlugin<{ option2: string }> = {\n  PanelComponent: () => null,\n  panelOptionsEditorComponents: [\n    {\n      label: 'Settings',\n      content: function BertPanel2Editor({ value, onChange }) {\n        return (\n          <div>\n            <label htmlFor=\"editor-input\">BertPanel2 editor</label>\n            <input\n              type=\"text\"\n              id=\"editor-input\"\n              value={value.option2}\n              onChange={(e) => onChange({ ...value, option2: e.target.value })}\n            />\n          </div>\n        );\n      },\n    },\n    {\n      label: 'Custom Tab',\n      content: function Editor() {\n        return <div>custom content</div>;\n      },\n    },\n  ],\n  createInitialOptions: () => ({ option2: '' }),\n  hideQueryEditor: true,\n};\n"],"names":["BertPanel1Editor","value","onChange","div","label","htmlFor","input","type","id","option1","e","target","BertPanel1","PanelComponent","panelOptionsEditorComponents","content","createInitialOptions","BertPanel2","BertPanel2Editor","option2","Editor","hideQueryEditor"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAIjC,SAASA,iBAAiB,EAAEC,KAAK,EAAEC,QAAQ,EAA2C;IACpF,qBACE,MAACC;;0BACC,KAACC;gBAAMC,SAAQ;0BAAe;;0BAC9B,KAACC;gBACCC,MAAK;gBACLC,IAAG;gBACHP,OAAOA,MAAMQ,OAAO;gBACpBP,UAAU,CAACQ,IAAMR,SAAS;wBAAE,GAAGD,KAAK;wBAAEQ,SAASC,EAAEC,MAAM,CAACV,KAAK;oBAAC;;;;AAItE;AAEA,gCAAgC;AAChC,OAAO,MAAMW,aAA+C;IAC1DC,gBAAgB,IAAM;IACtBC,8BAA8B;QAC5B;YACEV,OAAO;YACPW,SAASf;QACX;KACD;IACDgB,sBAAsB,IAAO,CAAA;YAAEP,SAAS;QAAG,CAAA;AAC7C,EAAE;AAEF,OAAO,MAAMQ,aAA+C;IAC1DJ,gBAAgB,IAAM;IACtBC,8BAA8B;QAC5B;YACEV,OAAO;YACPW,SAAS,SAASG,iBAAiB,EAAEjB,KAAK,EAAEC,QAAQ,EAAE;gBACpD,qBACE,MAACC;;sCACC,KAACC;4BAAMC,SAAQ;sCAAe;;sCAC9B,KAACC;4BACCC,MAAK;4BACLC,IAAG;4BACHP,OAAOA,MAAMkB,OAAO;4BACpBjB,UAAU,CAACQ,IAAMR,SAAS;oCAAE,GAAGD,KAAK;oCAAEkB,SAAST,EAAEC,MAAM,CAACV,KAAK;gCAAC;;;;YAItE;QACF;QACA;YACEG,OAAO;YACPW,SAAS,SAASK;gBAChB,qBAAO,KAACjB;8BAAI;;YACd;QACF;KACD;IACDa,sBAAsB,IAAO,CAAA;YAAEG,SAAS;QAAG,CAAA;IAC3CE,iBAAiB;AACnB,EAAE"}
+{"version":3,"sources":["../../../../src/test/test-plugins/bert/index.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { OptionsEditorProps, PanelPlugin } from '../../../model';\n\nfunction BertPanel1Editor({ value, onChange }: OptionsEditorProps<{ option1: string }>) {\n  return (\n    <div>\n      <label htmlFor=\"editor-input\">BertPanel1 editor</label>\n      <input\n        type=\"text\"\n        id=\"editor-input\"\n        value={value.option1}\n        onChange={(e) => onChange({ ...value, option1: e.target.value })}\n      />\n    </div>\n  );\n}\n\n// Dummy plugins to test loading\nexport const BertPanel1: PanelPlugin<{ option1: string }> = {\n  PanelComponent: () => null,\n  panelOptionsEditorComponents: [\n    {\n      label: 'Editor',\n      content: BertPanel1Editor,\n    },\n  ],\n  createInitialOptions: () => ({ option1: '' }),\n};\n\nfunction BertPanel2Editor({ value, onChange }: OptionsEditorProps<{ option2: string }>) {\n  return (\n    <div>\n      <label htmlFor=\"editor-input\">BertPanel2 editor</label>\n      <input\n        type=\"text\"\n        id=\"editor-input\"\n        value={value.option2}\n        onChange={(e) => onChange({ ...value, option2: e.target.value })}\n      />\n    </div>\n  );\n}\n\nexport const BertPanel2: PanelPlugin<{ option2: string }> = {\n  PanelComponent: () => null,\n  panelOptionsEditorComponents: [\n    {\n      label: 'Settings',\n      content: BertPanel2Editor,\n    },\n    {\n      label: 'Custom Tab',\n      content: function Editor() {\n        return <div>custom content</div>;\n      },\n    },\n  ],\n  createInitialOptions: () => ({ option2: '' }),\n  hideQueryEditor: true,\n};\n"],"names":["BertPanel1Editor","value","onChange","div","label","htmlFor","input","type","id","option1","e","target","BertPanel1","PanelComponent","panelOptionsEditorComponents","content","createInitialOptions","BertPanel2Editor","option2","BertPanel2","Editor","hideQueryEditor"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAIjC,SAASA,iBAAiB,EAAEC,KAAK,EAAEC,QAAQ,EAA2C;IACpF,qBACE,MAACC;;0BACC,KAACC;gBAAMC,SAAQ;0BAAe;;0BAC9B,KAACC;gBACCC,MAAK;gBACLC,IAAG;gBACHP,OAAOA,MAAMQ,OAAO;gBACpBP,UAAU,CAACQ,IAAMR,SAAS;wBAAE,GAAGD,KAAK;wBAAEQ,SAASC,EAAEC,MAAM,CAACV,KAAK;oBAAC;;;;AAItE;AAEA,gCAAgC;AAChC,OAAO,MAAMW,aAA+C;IAC1DC,gBAAgB,IAAM;IACtBC,8BAA8B;QAC5B;YACEV,OAAO;YACPW,SAASf;QACX;KACD;IACDgB,sBAAsB,IAAO,CAAA;YAAEP,SAAS;QAAG,CAAA;AAC7C,EAAE;AAEF,SAASQ,iBAAiB,EAAEhB,KAAK,EAAEC,QAAQ,EAA2C;IACpF,qBACE,MAACC;;0BACC,KAACC;gBAAMC,SAAQ;0BAAe;;0BAC9B,KAACC;gBACCC,MAAK;gBACLC,IAAG;gBACHP,OAAOA,MAAMiB,OAAO;gBACpBhB,UAAU,CAACQ,IAAMR,SAAS;wBAAE,GAAGD,KAAK;wBAAEiB,SAASR,EAAEC,MAAM,CAACV,KAAK;oBAAC;;;;AAItE;AAEA,OAAO,MAAMkB,aAA+C;IAC1DN,gBAAgB,IAAM;IACtBC,8BAA8B;QAC5B;YACEV,OAAO;YACPW,SAASE;QACX;QACA;YACEb,OAAO;YACPW,SAAS,SAASK;gBAChB,qBAAO,KAACjB;8BAAI;;YACd;QACF;KACD;IACDa,sBAAsB,IAAO,CAAA;YAAEE,SAAS;QAAG,CAAA;IAC3CG,iBAAiB;AACnB,EAAE"}

package/dist/utils/variables.d.ts

@@ -1,9 +1,9 @@
 import { VariableValue } from '@perses-dev/core';
 import { VariableStateMap } from '@perses-dev/plugin-system';
-export declare function replaceTemplateVariables(text: string, variableState: VariableStateMap): string;
-export declare function replaceTemplateVariable(text: string, varName: string, templateVariableValue: VariableValue): string;
+export declare function replaceVariables(text: string, variableState: VariableStateMap): string;
+export declare function replaceVariable(text: string, varName: string, variableValue: VariableValue): string;
 /**
- * Returns a list of template variables
+ * Returns a list of variables
  */
-export declare const parseTemplateVariables: (text: string) => string[];
+export declare const parseVariables: (text: string) => string[];
 //# sourceMappingURL=variables.d.ts.map