@perses-dev/plugin-system 0.55.0-beta.10 → 0.55.0-beta.12

package/dist/runtime/profile-queries.js

@@ -46,7 +46,9 @@ export const PROFILE_QUERY_KEY = 'ProfileQuery';
                 queryFn: async ({ signal })=>{
                     const plugin = await getPlugin({
                         kind: PROFILE_QUERY_KEY,
-                        name: profileQueryKind
+                        name: profileQueryKind,
+                        version: definition.spec.plugin.metadata?.version,
+                        registry: definition.spec.plugin.metadata?.registry
                     });
                     const data = await plugin.getProfileData(definition.spec.plugin.spec, context, signal);
                     return data;

package/dist/runtime/profile-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/profile-queries.ts"],"sourcesContent":["// Copyright 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 type { QueryDefinition, UnknownSpec, ProfileData } from '@perses-dev/spec';\nimport type { UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nexport type ProfileQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'ProfileQuery', PluginSpec>;\nexport const PROFILE_QUERY_KEY = 'ProfileQuery';\n\n/**\n * Run a profile query using a ProfileQuery plugin and return the results\n * @param definitions: dashboard defintion for a profile query\n */\nexport function useProfileQueries(definitions: ProfileQueryDefinition[]): Array<UseQueryResult<ProfileData>> {\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 = ['query', PROFILE_QUERY_KEY, definition, absoluteTimeRange] as const; // `queryKey` watches and reruns `queryFn` if keys in the array change\n      const profileQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        queryKey: queryKey,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: Infinity,\n        queryFn: async ({ signal }: { signal?: AbortSignal }): Promise<ProfileData> => {\n          const plugin = await getPlugin({ kind: PROFILE_QUERY_KEY, name: profileQueryKind });\n          const data = await plugin.getProfileData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","PROFILE_QUERY_KEY","useProfileQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","context","queries","map","definition","queryKey","profileQueryKind","spec","plugin","kind","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","data","getProfileData","structuralSharing"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,SAASA,UAAU,QAAQ,wBAAwB;AAEnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,QAAQ,uBAAoB;AACtD,SAASC,YAAY,QAAQ,+BAAsB;AAEnD,OAAO,MAAMC,oBAAoB,eAAe;AAEhD;;;CAGC,GACD,OAAO,SAASC,kBAAkBC,WAAqC;IACrE,MAAM,EAAEC,SAAS,EAAE,GAAGL;IACtB,MAAMM,kBAAkBP;IACxB,MAAM,EAAEQ,iBAAiB,EAAE,GAAGN;IAE9B,MAAMO,UAAU;QACdF;QACAC;IACF;IAEA,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOT,WAAW;QAChBW,SAASL,YAAYM,GAAG,CAAC,CAACC;YACxB,MAAMC,WAAW;gBAAC;gBAASV;gBAAmBS;gBAAYJ;aAAkB,EAAW,sEAAsE;YAC7J,MAAMM,mBAAmBF,YAAYG,MAAMC,QAAQC;YACnD,OAAO;gBACLJ,UAAUA;gBACVK,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAWC;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMR,SAAS,MAAMV,UAAU;wBAAEW,MAAMd;wBAAmBsB,MAAMX;oBAAiB;oBACjF,MAAMY,OAAO,MAAMV,OAAOW,cAAc,CAACf,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASe;oBAC/E,OAAOE;gBACT;gBAEAE,mBAAmB;YACrB;QACF;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/profile-queries.ts"],"sourcesContent":["// Copyright 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 type { QueryDefinition, UnknownSpec, ProfileData } from '@perses-dev/spec';\nimport type { UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nexport type ProfileQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'ProfileQuery', PluginSpec>;\nexport const PROFILE_QUERY_KEY = 'ProfileQuery';\n\n/**\n * Run a profile query using a ProfileQuery plugin and return the results\n * @param definitions: dashboard defintion for a profile query\n */\nexport function useProfileQueries(definitions: ProfileQueryDefinition[]): Array<UseQueryResult<ProfileData>> {\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 = ['query', PROFILE_QUERY_KEY, definition, absoluteTimeRange] as const; // `queryKey` watches and reruns `queryFn` if keys in the array change\n      const profileQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        queryKey: queryKey,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: Infinity,\n        queryFn: async ({ signal }: { signal?: AbortSignal }): Promise<ProfileData> => {\n          const plugin = await getPlugin({\n            kind: PROFILE_QUERY_KEY,\n            name: profileQueryKind,\n            version: definition.spec.plugin.metadata?.version,\n            registry: definition.spec.plugin.metadata?.registry,\n          });\n          const data = await plugin.getProfileData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","PROFILE_QUERY_KEY","useProfileQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","context","queries","map","definition","queryKey","profileQueryKind","spec","plugin","kind","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","version","metadata","registry","data","getProfileData","structuralSharing"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,SAASA,UAAU,QAAQ,wBAAwB;AAEnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,QAAQ,uBAAoB;AACtD,SAASC,YAAY,QAAQ,+BAAsB;AAEnD,OAAO,MAAMC,oBAAoB,eAAe;AAEhD;;;CAGC,GACD,OAAO,SAASC,kBAAkBC,WAAqC;IACrE,MAAM,EAAEC,SAAS,EAAE,GAAGL;IACtB,MAAMM,kBAAkBP;IACxB,MAAM,EAAEQ,iBAAiB,EAAE,GAAGN;IAE9B,MAAMO,UAAU;QACdF;QACAC;IACF;IAEA,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOT,WAAW;QAChBW,SAASL,YAAYM,GAAG,CAAC,CAACC;YACxB,MAAMC,WAAW;gBAAC;gBAASV;gBAAmBS;gBAAYJ;aAAkB,EAAW,sEAAsE;YAC7J,MAAMM,mBAAmBF,YAAYG,MAAMC,QAAQC;YACnD,OAAO;gBACLJ,UAAUA;gBACVK,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAWC;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMR,SAAS,MAAMV,UAAU;wBAC7BW,MAAMd;wBACNsB,MAAMX;wBACNY,SAASd,WAAWG,IAAI,CAACC,MAAM,CAACW,QAAQ,EAAED;wBAC1CE,UAAUhB,WAAWG,IAAI,CAACC,MAAM,CAACW,QAAQ,EAAEC;oBAC7C;oBACA,MAAMC,OAAO,MAAMb,OAAOc,cAAc,CAAClB,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASe;oBAC/E,OAAOK;gBACT;gBAEAE,mBAAmB;YACrB;QACF;IACF;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"silences-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/silences-queries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAStE,MAAM,MAAM,uBAAuB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;AAC7G,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CA6B9G"}
+{"version":3,"file":"silences-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/silences-queries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAStE,MAAM,MAAM,uBAAuB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;AAC7G,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAsC9G"}

package/dist/runtime/silences-queries.js

@@ -24,7 +24,9 @@ export const SILENCES_QUERY_KEY = 'SilencesQuery';
     const { getPlugin } = usePluginRegistry();
     const context = useSilencesQueryContext();
     const pluginLoaderResponse = usePlugins('SilencesQuery', definitions.map((d)=>({
-            kind: d.spec.plugin.kind
+            kind: d.spec.plugin.kind,
+            version: d.spec.plugin.metadata?.version,
+            registry: d.spec.plugin.metadata?.registry
         })));
     return useQueries({
         queries: definitions.map((definition, idx)=>{
@@ -45,7 +47,9 @@ export const SILENCES_QUERY_KEY = 'SilencesQuery';
                 queryFn: async ({ signal })=>{
                     const plugin = await getPlugin({
                         kind: SILENCES_QUERY_KEY,
-                        name: silencesQueryKind
+                        name: silencesQueryKind,
+                        version: definition.spec.plugin.metadata?.version,
+                        registry: definition.spec.plugin.metadata?.registry
                     });
                     const data = await plugin.getSilencesData(definition.spec.plugin.spec, context, signal);
                     return data;

package/dist/runtime/silences-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/silences-queries.ts"],"sourcesContent":["// Copyright 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 type { SilencesData, QueryDefinition, UnknownSpec } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { SilencesQueryContext, SilencesQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport type SilencesQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'SilencesQuery', PluginSpec>;\nexport const SILENCES_QUERY_KEY = 'SilencesQuery';\n\n/**\n * Run a silences query using a SilencesQuery plugin and return the results.\n * Silences represent current state and are NOT time-range dependent.\n * @param definitions: dashboard definition for a silences query\n */\nexport function useSilencesQueries(definitions: SilencesQueryDefinition[]): Array<UseQueryResult<SilencesData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useSilencesQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'SilencesQuery',\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({ context, definition, plugin });\n      const silencesQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        enabled: queryEnabled,\n        queryKey: queryKey,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: 60_000,\n        queryFn: async ({ signal }: { signal?: AbortSignal }): Promise<SilencesData> => {\n          const plugin = await getPlugin({ kind: SILENCES_QUERY_KEY, name: silencesQueryKind });\n          const data = await plugin.getSilencesData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: SilencesQueryPlugin;\n  definition: SilencesQueryDefinition;\n  context: SilencesQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { variableState } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  // Note: no absoluteTimeRange in query key since silences are current state\n  const queryKey = ['query', SILENCES_QUERY_KEY, definition, variablesValueKey] as const;\n\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\nfunction useSilencesQueryContext(): SilencesQueryContext {\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n  };\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","usePlugins","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","SILENCES_QUERY_KEY","useSilencesQueries","definitions","getPlugin","context","useSilencesQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","silencesQueryKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","queryFn","signal","name","getSilencesData","variableState","dependencies","dependsOn","variableDependencies","variables","filteredVariabledState","variablesValueKey","waitToLoad","some","v","loading","undefined","datasourceStore"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,SAASA,UAAU,QAAQ,wBAAwB;AAGnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,uBAAoB;AAClE,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,aAAU;AACvE,SAASC,oBAAoB,QAAQ,iBAAc;AAGnD,OAAO,MAAMC,qBAAqB,gBAAgB;AAElD;;;;CAIC,GACD,OAAO,SAASC,mBAAmBC,WAAsC;IACvE,MAAM,EAAEC,SAAS,EAAE,GAAGR;IACtB,MAAMS,UAAUC;IAEhB,MAAMC,uBAAuBV,WAC3B,iBACAM,YAAYK,GAAG,CAAC,CAACC,IAAO,CAAA;YAAEC,MAAMD,EAAEE,IAAI,CAACC,MAAM,CAACF,IAAI;QAAC,CAAA;IAGrD,OAAOhB,WAAW;QAChBmB,SAASV,YAAYK,GAAG,CAAC,CAACM,YAAYC;YACpC,MAAMH,SAASL,oBAAoB,CAACQ,IAAI,EAAEC;YAC1C,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAE,GAAGC,gBAAgB;gBAAEd;gBAASS;gBAAYF;YAAO;YACjF,MAAMQ,oBAAoBN,YAAYH,MAAMC,QAAQF;YACpD,OAAO;gBACLW,SAASJ;gBACTC,UAAUA;gBACVI,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAW;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMf,SAAS,MAAMR,UAAU;wBAAEM,MAAMT;wBAAoB2B,MAAMR;oBAAkB;oBACnF,MAAMJ,OAAO,MAAMJ,OAAOiB,eAAe,CAACf,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASsB;oBAChF,OAAOX;gBACT;YACF;QACF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBP,MAAM,EACNE,UAAU,EACVT,OAAO,EAKR;IAIC,MAAM,EAAEyB,aAAa,EAAE,GAAGzB;IAE1B,MAAM0B,eAAenB,QAAQoB,YAAYpB,OAAOoB,SAAS,CAAClB,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,WAAW,CAAC;IACnG,MAAM4B,uBAAuBF,cAAcG;IAE3C,MAAMC,yBAAyBrC,uBAAuBgC,eAAeG;IACrE,MAAMG,oBAAoBrC,qBAAqBoC;IAC/C,2EAA2E;IAC3E,MAAMjB,WAAW;QAAC;QAASjB;QAAoBa;QAAYsB;KAAkB;IAE7E,IAAIC,aAAa;IACjB,IAAIJ,sBAAsB;QACxBI,aAAaJ,qBAAqBK,IAAI,CAAC,CAACC,IAAMT,aAAa,CAACS,EAAE,EAAEC;IAClE;IAEA,MAAMvB,eAAeL,WAAW6B,aAAa,CAACJ;IAC9C,OAAO;QACLnB;QACAD;IACF;AACF;AAEA,SAASX;IACP,MAAMwB,gBAAgB9B;IACtB,MAAM0C,kBAAkB/C;IAExB,OAAO;QACLmC;QACAY;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/silences-queries.ts"],"sourcesContent":["// Copyright 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 type { SilencesData, QueryDefinition, UnknownSpec } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { SilencesQueryContext, SilencesQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport type SilencesQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'SilencesQuery', PluginSpec>;\nexport const SILENCES_QUERY_KEY = 'SilencesQuery';\n\n/**\n * Run a silences query using a SilencesQuery plugin and return the results.\n * Silences represent current state and are NOT time-range dependent.\n * @param definitions: dashboard definition for a silences query\n */\nexport function useSilencesQueries(definitions: SilencesQueryDefinition[]): Array<UseQueryResult<SilencesData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useSilencesQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'SilencesQuery',\n    definitions.map((d) => ({\n      kind: d.spec.plugin.kind,\n      version: d.spec.plugin.metadata?.version,\n      registry: d.spec.plugin.metadata?.registry,\n    })),\n  );\n\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ context, definition, plugin });\n      const silencesQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        enabled: queryEnabled,\n        queryKey: queryKey,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: 60_000,\n        queryFn: async ({ signal }: { signal?: AbortSignal }): Promise<SilencesData> => {\n          const plugin = await getPlugin({\n            kind: SILENCES_QUERY_KEY,\n            name: silencesQueryKind,\n            version: definition.spec.plugin.metadata?.version,\n            registry: definition.spec.plugin.metadata?.registry,\n          });\n          const data = await plugin.getSilencesData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: SilencesQueryPlugin;\n  definition: SilencesQueryDefinition;\n  context: SilencesQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { variableState } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  // Note: no absoluteTimeRange in query key since silences are current state\n  const queryKey = ['query', SILENCES_QUERY_KEY, definition, variablesValueKey] as const;\n\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\nfunction useSilencesQueryContext(): SilencesQueryContext {\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n  };\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","usePlugins","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","SILENCES_QUERY_KEY","useSilencesQueries","definitions","getPlugin","context","useSilencesQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","version","metadata","registry","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","silencesQueryKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","queryFn","signal","name","getSilencesData","variableState","dependencies","dependsOn","variableDependencies","variables","filteredVariabledState","variablesValueKey","waitToLoad","some","v","loading","undefined","datasourceStore"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,SAASA,UAAU,QAAQ,wBAAwB;AAGnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,uBAAoB;AAClE,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,aAAU;AACvE,SAASC,oBAAoB,QAAQ,iBAAc;AAGnD,OAAO,MAAMC,qBAAqB,gBAAgB;AAElD;;;;CAIC,GACD,OAAO,SAASC,mBAAmBC,WAAsC;IACvE,MAAM,EAAEC,SAAS,EAAE,GAAGR;IACtB,MAAMS,UAAUC;IAEhB,MAAMC,uBAAuBV,WAC3B,iBACAM,YAAYK,GAAG,CAAC,CAACC,IAAO,CAAA;YACtBC,MAAMD,EAAEE,IAAI,CAACC,MAAM,CAACF,IAAI;YACxBG,SAASJ,EAAEE,IAAI,CAACC,MAAM,CAACE,QAAQ,EAAED;YACjCE,UAAUN,EAAEE,IAAI,CAACC,MAAM,CAACE,QAAQ,EAAEC;QACpC,CAAA;IAGF,OAAOrB,WAAW;QAChBsB,SAASb,YAAYK,GAAG,CAAC,CAACS,YAAYC;YACpC,MAAMN,SAASL,oBAAoB,CAACW,IAAI,EAAEC;YAC1C,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAE,GAAGC,gBAAgB;gBAAEjB;gBAASY;gBAAYL;YAAO;YACjF,MAAMW,oBAAoBN,YAAYN,MAAMC,QAAQF;YACpD,OAAO;gBACLc,SAASJ;gBACTC,UAAUA;gBACVI,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAW;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMlB,SAAS,MAAMR,UAAU;wBAC7BM,MAAMT;wBACN8B,MAAMR;wBACNV,SAASI,WAAWN,IAAI,CAACC,MAAM,CAACE,QAAQ,EAAED;wBAC1CE,UAAUE,WAAWN,IAAI,CAACC,MAAM,CAACE,QAAQ,EAAEC;oBAC7C;oBACA,MAAMI,OAAO,MAAMP,OAAOoB,eAAe,CAACf,WAAWN,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASyB;oBAChF,OAAOX;gBACT;YACF;QACF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBV,MAAM,EACNK,UAAU,EACVZ,OAAO,EAKR;IAIC,MAAM,EAAE4B,aAAa,EAAE,GAAG5B;IAE1B,MAAM6B,eAAetB,QAAQuB,YAAYvB,OAAOuB,SAAS,CAAClB,WAAWN,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,WAAW,CAAC;IACnG,MAAM+B,uBAAuBF,cAAcG;IAE3C,MAAMC,yBAAyBxC,uBAAuBmC,eAAeG;IACrE,MAAMG,oBAAoBxC,qBAAqBuC;IAC/C,2EAA2E;IAC3E,MAAMjB,WAAW;QAAC;QAASpB;QAAoBgB;QAAYsB;KAAkB;IAE7E,IAAIC,aAAa;IACjB,IAAIJ,sBAAsB;QACxBI,aAAaJ,qBAAqBK,IAAI,CAAC,CAACC,IAAMT,aAAa,CAACS,EAAE,EAAEC;IAClE;IAEA,MAAMvB,eAAeR,WAAWgC,aAAa,CAACJ;IAC9C,OAAO;QACLnB;QACAD;IACF;AACF;AAEA,SAASd;IACP,MAAM2B,gBAAgBjC;IACtB,MAAM6C,kBAAkBlD;IAExB,OAAO;QACLsC;QACAY;IACF;AACF"}

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,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAe,MAAM,kBAAkB,CAAC;AAC/F,OAAO,KAAK,EAAS,UAAU,EAAY,oBAAoB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG/G,OAAO,KAAK,EAAE,mBAAmB,EAA0B,mBAAmB,EAAyB,MAAM,UAAU,CAAC;AAOxH,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AA+CvD;;GAEG;AACH,eAAO,MAAM,kBAAkB,eACjB,yBAAyB,YAC3B,yBAAyB,iBACpB,oBAAoB,CAAC,cAAc,CAAC,KAClD,cAAc,CAAC,cAAc,CAiB/B,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,GACpD,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAgCvC;AAiBD;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,mBAAmB,EAAE,CAIlE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,UAAU,GAAG,mBAAmB,EAAE,CAWnF"}
+{"version":3,"file":"time-series-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/time-series-queries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAe,MAAM,kBAAkB,CAAC;AAC/F,OAAO,KAAK,EAAS,UAAU,EAAY,oBAAoB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG/G,OAAO,KAAK,EAAE,mBAAmB,EAA0B,mBAAmB,EAAyB,MAAM,UAAU,CAAC;AAOxH,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AA+CvD;;GAEG;AACH,eAAO,MAAM,kBAAkB,eACjB,yBAAyB,YAC3B,yBAAyB,iBACpB,oBAAoB,CAAC,cAAc,CAAC,KAClD,cAAc,CAAC,cAAc,CAoB/B,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,GACpD,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAyCvC;AAiBD;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,mBAAmB,EAAE,CAIlE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,UAAU,GAAG,mBAAmB,EAAE,CAWnF"}

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

@@ -47,7 +47,10 @@ function getQueryOptions({ plugin, definition, context }) {
 /**
  * Runs a time series query using a plugin and returns the results.
  */ export const useTimeSeriesQuery = (definition, options, queryOptions)=>{
-    const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);
+    const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind, {
+        version: definition.spec.plugin.metadata?.version,
+        registry: definition.spec.plugin.metadata?.registry
+    });
     const context = useTimeSeriesQueryContext();
     const { queryEnabled, queryKey } = getQueryOptions({
         plugin,
@@ -81,7 +84,9 @@ function getQueryOptions({ plugin, definition, context }) {
         suggestedStepMs: options?.suggestedStepMs
     };
     const pluginLoaderResponse = usePlugins(TIME_SERIES_QUERY_KEY, definitions.map((d)=>({
-            kind: d.spec.plugin.kind
+            kind: d.spec.plugin.kind,
+            version: d.spec.plugin.metadata?.version,
+            registry: d.spec.plugin.metadata?.registry
         })));
     return useQueries({
         queries: definitions.map((definition, idx)=>{
@@ -102,7 +107,9 @@ function getQueryOptions({ plugin, definition, context }) {
                 queryFn: async ({ signal })=>{
                     const plugin = await getPlugin({
                         kind: TIME_SERIES_QUERY_KEY,
-                        name: definition.spec.plugin.kind
+                        name: definition.spec.plugin.kind,
+                        version: definition.spec.plugin.metadata?.version,
+                        registry: definition.spec.plugin.metadata?.registry
                     });
                     const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, context, signal);
                     return data;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/time-series-queries.ts"],"sourcesContent":["// Copyright 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 type { TimeSeriesData, TimeSeriesQueryDefinition, UnknownSpec } from '@perses-dev/spec';\nimport type { Query, QueryCache, QueryKey, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries, useQuery, useQueryClient } from '@tanstack/react-query';\n\nimport type { TimeSeriesDataQuery, TimeSeriesQueryContext, TimeSeriesQueryMode, TimeSeriesQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport interface UseTimeSeriesQueryOptions {\n  suggestedStepMs?: number;\n  mode?: TimeSeriesQueryMode;\n}\n\nexport const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TimeSeriesQueryPlugin;\n  definition: TimeSeriesQueryDefinition;\n  context: TimeSeriesQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { timeRange, suggestedStepMs, mode, variableState } = 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\n  const queryKey = [\n    'query',\n    TIME_SERIES_QUERY_KEY,\n    definition,\n    timeRange,\n    variablesValueKey,\n    suggestedStepMs,\n    mode,\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): UseQueryResult<TimeSeriesData> => {\n  const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n  const context = useTimeSeriesQueryContext();\n  const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n  return useQuery({\n    enabled: (queryOptions?.enabled ?? true) || queryEnabled,\n    queryKey: queryKey,\n    queryFn: ({ signal }) => {\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, signal);\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): Array<UseQueryResult<TimeSeriesData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = {\n    ...useTimeSeriesQueryContext(),\n    mode: options?.mode,\n    suggestedStepMs: options?.suggestedStepMs,\n  };\n\n  const pluginLoaderResponse = usePlugins(\n    TIME_SERIES_QUERY_KEY,\n    definitions.map((d) => ({ kind: d.spec.plugin.kind })),\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        ...queryOptions,\n        enabled: (queryOptions?.enabled ?? true) && queryEnabled,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: Infinity,\n        queryKey: queryKey,\n        queryFn: async ({ signal }: { signal: AbortSignal }): Promise<TimeSeriesData> => {\n          const plugin = await getPlugin({ kind: TIME_SERIES_QUERY_KEY, name: definition.spec.plugin.kind });\n          const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      } as QueryObserverOptions;\n    }),\n  }) as Array<UseQueryResult<TimeSeriesData>>;\n}\n\n/**\n * Build the time series query context object from data available at runtime\n */\nfunction useTimeSeriesQueryContext(): TimeSeriesQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    timeRange: absoluteTimeRange,\n    variableState,\n    datasourceStore,\n  };\n}\n\n/**\n * Get active time series queries for query results summary\n */\nexport function useActiveTimeSeriesQueries(): TimeSeriesDataQuery[] {\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): TimeSeriesDataQuery[] {\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":["useQueries","useQuery","useQueryClient","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","useTimeRange","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","TIME_SERIES_QUERY_KEY","getQueryOptions","plugin","definition","context","timeRange","suggestedStepMs","mode","variableState","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariabledState","variablesValueKey","queryKey","waitToLoad","some","v","loading","queryEnabled","undefined","useTimeSeriesQuery","options","queryOptions","data","kind","useTimeSeriesQueryContext","enabled","queryFn","signal","Error","ctx","getTimeSeriesData","useTimeSeriesQueries","definitions","getPlugin","pluginLoaderResponse","map","d","queries","idx","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","name","absoluteTimeRange","datasourceStore","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 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 type { TimeSeriesData, TimeSeriesQueryDefinition, UnknownSpec } from '@perses-dev/spec';\nimport type { Query, QueryCache, QueryKey, QueryObserverOptions, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries, useQuery, useQueryClient } from '@tanstack/react-query';\n\nimport type { TimeSeriesDataQuery, TimeSeriesQueryContext, TimeSeriesQueryMode, TimeSeriesQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport interface UseTimeSeriesQueryOptions {\n  suggestedStepMs?: number;\n  mode?: TimeSeriesQueryMode;\n}\n\nexport const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TimeSeriesQueryPlugin;\n  definition: TimeSeriesQueryDefinition;\n  context: TimeSeriesQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { timeRange, suggestedStepMs, mode, variableState } = 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\n  const queryKey = [\n    'query',\n    TIME_SERIES_QUERY_KEY,\n    definition,\n    timeRange,\n    variablesValueKey,\n    suggestedStepMs,\n    mode,\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): UseQueryResult<TimeSeriesData> => {\n  const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind, {\n    version: definition.spec.plugin.metadata?.version,\n    registry: definition.spec.plugin.metadata?.registry,\n  });\n  const context = useTimeSeriesQueryContext();\n  const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n  return useQuery({\n    enabled: (queryOptions?.enabled ?? true) || queryEnabled,\n    queryKey: queryKey,\n    queryFn: ({ signal }) => {\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, signal);\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): Array<UseQueryResult<TimeSeriesData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = {\n    ...useTimeSeriesQueryContext(),\n    mode: options?.mode,\n    suggestedStepMs: options?.suggestedStepMs,\n  };\n\n  const pluginLoaderResponse = usePlugins(\n    TIME_SERIES_QUERY_KEY,\n    definitions.map((d) => ({\n      kind: d.spec.plugin.kind,\n      version: d.spec.plugin.metadata?.version,\n      registry: d.spec.plugin.metadata?.registry,\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        ...queryOptions,\n        enabled: (queryOptions?.enabled ?? true) && queryEnabled,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: Infinity,\n        queryKey: queryKey,\n        queryFn: async ({ signal }: { signal: AbortSignal }): Promise<TimeSeriesData> => {\n          const plugin = await getPlugin({\n            kind: TIME_SERIES_QUERY_KEY,\n            name: definition.spec.plugin.kind,\n            version: definition.spec.plugin.metadata?.version,\n            registry: definition.spec.plugin.metadata?.registry,\n          });\n          const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      } as QueryObserverOptions;\n    }),\n  }) as Array<UseQueryResult<TimeSeriesData>>;\n}\n\n/**\n * Build the time series query context object from data available at runtime\n */\nfunction useTimeSeriesQueryContext(): TimeSeriesQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    timeRange: absoluteTimeRange,\n    variableState,\n    datasourceStore,\n  };\n}\n\n/**\n * Get active time series queries for query results summary\n */\nexport function useActiveTimeSeriesQueries(): TimeSeriesDataQuery[] {\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): TimeSeriesDataQuery[] {\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":["useQueries","useQuery","useQueryClient","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","useTimeRange","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","TIME_SERIES_QUERY_KEY","getQueryOptions","plugin","definition","context","timeRange","suggestedStepMs","mode","variableState","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariabledState","variablesValueKey","queryKey","waitToLoad","some","v","loading","queryEnabled","undefined","useTimeSeriesQuery","options","queryOptions","data","kind","version","metadata","registry","useTimeSeriesQueryContext","enabled","queryFn","signal","Error","ctx","getTimeSeriesData","useTimeSeriesQueries","definitions","getPlugin","pluginLoaderResponse","map","d","queries","idx","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","name","absoluteTimeRange","datasourceStore","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.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAStE,MAAM,MAAM,oBAAoB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACvG,eAAO,MAAM,eAAe,eAAe,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CA+BrG"}
+{"version":3,"file":"trace-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/trace-queries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAStE,MAAM,MAAM,oBAAoB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACvG,eAAO,MAAM,eAAe,eAAe,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAwCrG"}

package/dist/runtime/trace-queries.js

@@ -25,7 +25,9 @@ export const TRACE_QUERY_KEY = 'TraceQuery';
     const { getPlugin } = usePluginRegistry();
     const context = useTraceQueryContext();
     const pluginLoaderResponse = usePlugins('TraceQuery', definitions.map((d)=>({
-            kind: d.spec.plugin.kind
+            kind: d.spec.plugin.kind,
+            version: d.spec.plugin.metadata?.version,
+            registry: d.spec.plugin.metadata?.registry
         })));
     // useQueries() handles data fetching from query plugins (e.g. traceQL queries, promQL queries)
     // https://tanstack.com/query/v4/docs/react/reference/useQuery
@@ -48,7 +50,9 @@ export const TRACE_QUERY_KEY = 'TraceQuery';
                 queryFn: async ({ signal })=>{
                     const plugin = await getPlugin({
                         kind: TRACE_QUERY_KEY,
-                        name: traceQueryKind
+                        name: traceQueryKind,
+                        version: definition.spec.plugin.metadata?.version,
+                        registry: definition.spec.plugin.metadata?.registry
                     });
                     const data = await plugin.getTraceData(definition.spec.plugin.spec, context, signal);
                     return data;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/trace-queries.ts"],"sourcesContent":["// Copyright 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 type { QueryDefinition, UnknownSpec, TraceData } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { TraceQueryContext, TraceQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\nexport type TraceQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'TraceQuery', PluginSpec>;\nexport const TRACE_QUERY_KEY = 'TraceQuery';\n\n/**\n * Run a trace query using a TraceQuery plugin and return the results\n * @param definitions: 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[]): Array<UseQueryResult<TraceData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useTraceQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'TraceQuery',\n    definitions.map((d) => ({ kind: d.spec.plugin.kind })),\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, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ context, definition, plugin });\n      const traceQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        enabled: queryEnabled,\n        queryKey: queryKey,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: Infinity,\n        queryFn: async ({ signal }: { signal?: AbortSignal }): Promise<TraceData> => {\n          const plugin = await getPlugin({ kind: TRACE_QUERY_KEY, name: traceQueryKind });\n          const data = await plugin.getTraceData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TraceQueryPlugin;\n  definition: TraceQueryDefinition;\n  context: TraceQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { variableState, absoluteTimeRange } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = ['query', TRACE_QUERY_KEY, definition, absoluteTimeRange, variablesValueKey] as const;\n\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\nfunction useTraceQueryContext(): TraceQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n    absoluteTimeRange,\n  };\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","usePlugins","useTimeRange","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","TRACE_QUERY_KEY","useTraceQueries","definitions","getPlugin","context","useTraceQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","traceQueryKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","getTraceData","variableState","absoluteTimeRange","dependencies","dependsOn","variableDependencies","variables","filteredVariabledState","variablesValueKey","waitToLoad","some","v","loading","undefined","datasourceStore"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,SAASA,UAAU,QAAQ,wBAAwB;AAGnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,uBAAoB;AAClE,SAASC,YAAY,QAAQ,+BAAsB;AACnD,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,aAAU;AACvE,SAASC,oBAAoB,QAAQ,iBAAc;AAEnD,OAAO,MAAMC,kBAAkB,aAAa;AAE5C;;;;CAIC,GACD,OAAO,SAASC,gBAAgBC,WAAmC;IACjE,MAAM,EAAEC,SAAS,EAAE,GAAGT;IACtB,MAAMU,UAAUC;IAEhB,MAAMC,uBAAuBX,WAC3B,cACAO,YAAYK,GAAG,CAAC,CAACC,IAAO,CAAA;YAAEC,MAAMD,EAAEE,IAAI,CAACC,MAAM,CAACF,IAAI;QAAC,CAAA;IAGrD,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOjB,WAAW;QAChBoB,SAASV,YAAYK,GAAG,CAAC,CAACM,YAAYC;YACpC,MAAMH,SAASL,oBAAoB,CAACQ,IAAI,EAAEC;YAC1C,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAE,GAAGC,gBAAgB;gBAAEd;gBAASS;gBAAYF;YAAO;YACjF,MAAMQ,iBAAiBN,YAAYH,MAAMC,QAAQF;YACjD,OAAO;gBACLW,SAASJ;gBACTC,UAAUA;gBACVI,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAWC;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMhB,SAAS,MAAMR,UAAU;wBAAEM,MAAMT;wBAAiB4B,MAAMT;oBAAe;oBAC7E,MAAMJ,OAAO,MAAMJ,OAAOkB,YAAY,CAAChB,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASuB;oBAC7E,OAAOZ;gBACT;YACF;QACF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBP,MAAM,EACNE,UAAU,EACVT,OAAO,EAKR;IAIC,MAAM,EAAE0B,aAAa,EAAEC,iBAAiB,EAAE,GAAG3B;IAE7C,MAAM4B,eAAerB,QAAQsB,YAAYtB,OAAOsB,SAAS,CAACpB,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,WAAW,CAAC;IACnG,MAAM8B,uBAAuBF,cAAcG;IAE3C,MAAMC,yBAAyBvC,uBAAuBiC,eAAeI;IACrE,MAAMG,oBAAoBvC,qBAAqBsC;IAC/C,MAAMnB,WAAW;QAAC;QAASjB;QAAiBa;QAAYkB;QAAmBM;KAAkB;IAE7F,IAAIC,aAAa;IACjB,IAAIJ,sBAAsB;QACxBI,aAAaJ,qBAAqBK,IAAI,CAAC,CAACC,IAAMV,aAAa,CAACU,EAAE,EAAEC;IAClE;IAEA,MAAMzB,eAAeL,WAAW+B,aAAa,CAACJ;IAC9C,OAAO;QACLrB;QACAD;IACF;AACF;AAEA,SAASX;IACP,MAAM,EAAE0B,iBAAiB,EAAE,GAAGnC;IAC9B,MAAMkC,gBAAgB/B;IACtB,MAAM4C,kBAAkBlD;IAExB,OAAO;QACLqC;QACAa;QACAZ;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/trace-queries.ts"],"sourcesContent":["// Copyright 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 type { QueryDefinition, UnknownSpec, TraceData } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { TraceQueryContext, TraceQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\nexport type TraceQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'TraceQuery', PluginSpec>;\nexport const TRACE_QUERY_KEY = 'TraceQuery';\n\n/**\n * Run a trace query using a TraceQuery plugin and return the results\n * @param definitions: 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[]): Array<UseQueryResult<TraceData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useTraceQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'TraceQuery',\n    definitions.map((d) => ({\n      kind: d.spec.plugin.kind,\n      version: d.spec.plugin.metadata?.version,\n      registry: d.spec.plugin.metadata?.registry,\n    })),\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, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ context, definition, plugin });\n      const traceQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        enabled: queryEnabled,\n        queryKey: queryKey,\n        refetchOnMount: false,\n        refetchOnWindowFocus: false,\n        refetchOnReconnect: false,\n        staleTime: Infinity,\n        queryFn: async ({ signal }: { signal?: AbortSignal }): Promise<TraceData> => {\n          const plugin = await getPlugin({\n            kind: TRACE_QUERY_KEY,\n            name: traceQueryKind,\n            version: definition.spec.plugin.metadata?.version,\n            registry: definition.spec.plugin.metadata?.registry,\n          });\n          const data = await plugin.getTraceData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TraceQueryPlugin;\n  definition: TraceQueryDefinition;\n  context: TraceQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { variableState, absoluteTimeRange } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = ['query', TRACE_QUERY_KEY, definition, absoluteTimeRange, variablesValueKey] as const;\n\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\nfunction useTraceQueryContext(): TraceQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n    absoluteTimeRange,\n  };\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","usePlugins","useTimeRange","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","TRACE_QUERY_KEY","useTraceQueries","definitions","getPlugin","context","useTraceQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","version","metadata","registry","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","traceQueryKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","getTraceData","variableState","absoluteTimeRange","dependencies","dependsOn","variableDependencies","variables","filteredVariabledState","variablesValueKey","waitToLoad","some","v","loading","undefined","datasourceStore"],"mappings":"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"}

package/dist/runtime/variables.d.ts

@@ -58,4 +58,10 @@ export declare function useVariableValues(names?: string[]): VariableStateMap;
 export declare function useAllVariableValues(names?: string[]): VariableStateMap;
 export declare function replaceVariablesInString(text: string, variableValues: VariableStateMap, extraVariables?: Record<string, string>): string;
 export declare function useReplaceVariablesInString(str: string | undefined): string | undefined;
+/**
+ * Convenience hook for replacing variables in a URL, including those nested
+ * inside percent-encoded query parameters (e.g. Explore `data=%24var`).
+ * Prefer this over {@link useReplaceVariablesInString} for link hrefs.
+ */
+export declare function useReplaceVariablesInUrl(url: string | undefined): string | undefined;
 //# sourceMappingURL=variables.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../src/runtime/variables.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAMlC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;AAEhE;;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,CAEpD;IAED;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAO1E;IAED;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAElC;IAED;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAerC;IAED,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,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,gBAAgB,EAChC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,MAAM,CAMR;AAGD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF"}
+{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../src/runtime/variables.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAMlC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;AAEhE;;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,CAEpD;IAED;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAO1E;IAED;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAElC;IAED;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAerC;IAED,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,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,gBAAgB,EAChC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,MAAM,CAMR;AAGD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAQpF"}

package/dist/runtime/variables.js

@@ -10,7 +10,7 @@
 // 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.
-import { parseVariables, replaceVariables } from "@perses-dev/components";
+import { parseVariables, replaceVariables, replaceVariablesInUrl } from "@perses-dev/components";
 import { immerable } from "immer";
 import { createContext, useContext, useMemo } from "react";
 import { useBuiltinVariableValues } from "./builtin-variables.js";
@@ -133,5 +133,21 @@ export function useReplaceVariablesInString(str) {
     if (!str) return undefined;
     return replaceVariables(str, variableValues);
 }
+/**
+ * Convenience hook for replacing variables in a URL, including those nested
+ * inside percent-encoded query parameters (e.g. Explore `data=%24var`).
+ * Prefer this over {@link useReplaceVariablesInString} for link hrefs.
+ */ export function useReplaceVariablesInUrl(url) {
+    const variableValues = useAllVariableValues();
+    return useMemo(()=>{
+        if (url === undefined || url === '') {
+            return url;
+        }
+        return replaceVariablesInUrl(url, variableValues);
+    }, [
+        url,
+        variableValues
+    ]);
+}
 
 //# sourceMappingURL=variables.js.map

package/dist/runtime/variables.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/variables.ts"],"sourcesContent":["// Copyright 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 type { VariableOption, VariableState, VariableStateMap } from '@perses-dev/components';\nimport { parseVariables, replaceVariables } from '@perses-dev/components';\nimport { immerable } from 'immer';\nimport { createContext, useContext, useMemo } from 'react';\n\nimport { useBuiltinVariableValues } from './builtin-variables';\n\n// Re-export types from @perses-dev/components for backwards compatibility\nexport type { VariableOption, VariableState, VariableStateMap };\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(): VariableSrv {\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// Simple wrapper around replaceVariables() with support for extra string variables.\nexport function replaceVariablesInString(\n  text: string,\n  variableValues: VariableStateMap,\n  extraVariables?: Record<string, string>,\n): string {\n  const vars = { ...variableValues }; // shallow clone to avoid modifying the original object\n  for (const [key, value] of Object.entries(extraVariables ?? {})) {\n    vars[key] = { value, loading: false };\n  }\n  return replaceVariables(text, vars);\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":["parseVariables","replaceVariables","immerable","createContext","useContext","useMemo","useBuiltinVariableValues","VariableStoreStateMap","DEFAULT_LOCAL_SOURCE_NAME","_state","get","key","_sourceStatesOrEmpty","source","name","set","value","sourceName","_sourceName","has","undefined","delete","result","sourceStates","Object","keys","length","VariableContext","useVariableContext","ctx","Error","useVariableValues","names","state","values","forEach","s","useAllVariableValues","variableValues","builtinVariableValues","replaceVariablesInString","text","extraVariables","vars","entries","loading","useReplaceVariablesInString","str","variablesInString"],"mappings":"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"}
+{"version":3,"sources":["../../src/runtime/variables.ts"],"sourcesContent":["// Copyright 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 type { VariableOption, VariableState, VariableStateMap } from '@perses-dev/components';\nimport { parseVariables, replaceVariables, replaceVariablesInUrl } from '@perses-dev/components';\nimport { immerable } from 'immer';\nimport { createContext, useContext, useMemo } from 'react';\n\nimport { useBuiltinVariableValues } from './builtin-variables';\n\n// Re-export types from @perses-dev/components for backwards compatibility\nexport type { VariableOption, VariableState, VariableStateMap };\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(): VariableSrv {\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// Simple wrapper around replaceVariables() with support for extra string variables.\nexport function replaceVariablesInString(\n  text: string,\n  variableValues: VariableStateMap,\n  extraVariables?: Record<string, string>,\n): string {\n  const vars = { ...variableValues }; // shallow clone to avoid modifying the original object\n  for (const [key, value] of Object.entries(extraVariables ?? {})) {\n    vars[key] = { value, loading: false };\n  }\n  return replaceVariables(text, vars);\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\n/**\n * Convenience hook for replacing variables in a URL, including those nested\n * inside percent-encoded query parameters (e.g. Explore `data=%24var`).\n * Prefer this over {@link useReplaceVariablesInString} for link hrefs.\n */\nexport function useReplaceVariablesInUrl(url: string | undefined): string | undefined {\n  const variableValues = useAllVariableValues();\n  return useMemo(() => {\n    if (url === undefined || url === '') {\n      return url;\n    }\n    return replaceVariablesInUrl(url, variableValues);\n  }, [url, variableValues]);\n}\n"],"names":["parseVariables","replaceVariables","replaceVariablesInUrl","immerable","createContext","useContext","useMemo","useBuiltinVariableValues","VariableStoreStateMap","DEFAULT_LOCAL_SOURCE_NAME","_state","get","key","_sourceStatesOrEmpty","source","name","set","value","sourceName","_sourceName","has","undefined","delete","result","sourceStates","Object","keys","length","VariableContext","useVariableContext","ctx","Error","useVariableValues","names","state","values","forEach","s","useAllVariableValues","variableValues","builtinVariableValues","replaceVariablesInString","text","extraVariables","vars","entries","loading","useReplaceVariablesInString","str","variablesInString","useReplaceVariablesInUrl","url"],"mappings":"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"}

package/dist/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './event';
+export * from './plugin-versions';
 export * from './variables';
 export * from './csv-export';
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAaA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAaA,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}

package/dist/utils/index.js

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 export * from "./event.js";
+export * from "./plugin-versions.js";
 export * from "./variables.js";
 export * from "./csv-export.js";
 

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/index.ts"],"sourcesContent":["// Copyright 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 './event';\nexport * from './variables';\nexport * from './csv-export';\n"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,cAAc,aAAU;AACxB,cAAc,iBAAc;AAC5B,cAAc,kBAAe"}
+{"version":3,"sources":["../../src/utils/index.ts"],"sourcesContent":["// Copyright 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 './event';\nexport * from './plugin-versions';\nexport * from './variables';\nexport * from './csv-export';\n"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,cAAc,aAAU;AACxB,cAAc,uBAAoB;AAClC,cAAc,iBAAc;AAC5B,cAAc,kBAAe"}

package/dist/utils/plugin-versions.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Sentinel version meaning "the latest version available in the Perses instance". It mirrors the backend
+ * `plugin.LatestVersion` constant. A plugin definition using it is not pinned to an exact version: the plugin registry
+ * resolves it dynamically at load time.
+ */
+export declare const LATEST_PLUGIN_VERSION = "latest";
+/**
+ * Compare two plugin version strings with semver semantics, the same way the Perses backend orders plugin versions.
+ * Returns a positive number when `a` is greater than `b`, a negative number when it is lower, and 0 when they are equal.
+ *
+ * Pre-releases order below their stable release (`1.0.0-beta` < `1.0.0`), as semver mandates. Versions that cannot be
+ * parsed at all always order below parseable ones, and are compared lexicographically between themselves, so an
+ * unexpected value can never be picked as "the latest version".
+ */
+export declare function comparePluginVersions(a: string, b: string): number;
+/** Return a new array of versions sorted from newest to oldest, using {@link comparePluginVersions}. */
+export declare function sortPluginVersionsDesc(versions: string[]): string[];
+//# sourceMappingURL=plugin-versions.d.ts.map

package/dist/utils/plugin-versions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-versions.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-versions.ts"],"names":[],"mappings":"AAgBA;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAU9C;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAalE;AAED,wGAAwG;AACxG,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAEnE"}

package/dist/utils/plugin-versions.js

@@ -0,0 +1,52 @@
+// Copyright 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.
+import { coerce, compare, parse } from "semver";
+/**
+ * Sentinel version meaning "the latest version available in the Perses instance". It mirrors the backend
+ * `plugin.LatestVersion` constant. A plugin definition using it is not pinned to an exact version: the plugin registry
+ * resolves it dynamically at load time.
+ */ export const LATEST_PLUGIN_VERSION = 'latest';
+/**
+ * Parse a plugin version with semver, tolerating the loose forms the backend also accepts (a leading `v`, a missing
+ * patch segment, ...). Returns `null` when the value cannot be understood as a version at all.
+ */ function parsePluginVersion(version) {
+    return parse(version, {
+        loose: true
+    }) ?? coerce(version);
+}
+/**
+ * Compare two plugin version strings with semver semantics, the same way the Perses backend orders plugin versions.
+ * Returns a positive number when `a` is greater than `b`, a negative number when it is lower, and 0 when they are equal.
+ *
+ * Pre-releases order below their stable release (`1.0.0-beta` < `1.0.0`), as semver mandates. Versions that cannot be
+ * parsed at all always order below parseable ones, and are compared lexicographically between themselves, so an
+ * unexpected value can never be picked as "the latest version".
+ */ export function comparePluginVersions(a, b) {
+    const parsedA = parsePluginVersion(a);
+    const parsedB = parsePluginVersion(b);
+    if (parsedA && parsedB) {
+        return compare(parsedA, parsedB);
+    }
+    if (parsedA) {
+        return 1;
+    }
+    if (parsedB) {
+        return -1;
+    }
+    return a.localeCompare(b);
+}
+/** Return a new array of versions sorted from newest to oldest, using {@link comparePluginVersions}. */ export function sortPluginVersionsDesc(versions) {
+    return versions.toSorted((a, b)=>comparePluginVersions(b, a));
+}
+
+//# sourceMappingURL=plugin-versions.js.map

package/dist/utils/plugin-versions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/plugin-versions.ts"],"sourcesContent":["// Copyright 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 type { SemVer } from 'semver';\nimport { coerce, compare, parse } from 'semver';\n\n/**\n * Sentinel version meaning \"the latest version available in the Perses instance\". It mirrors the backend\n * `plugin.LatestVersion` constant. A plugin definition using it is not pinned to an exact version: the plugin registry\n * resolves it dynamically at load time.\n */\nexport const LATEST_PLUGIN_VERSION = 'latest';\n\n/**\n * Parse a plugin version with semver, tolerating the loose forms the backend also accepts (a leading `v`, a missing\n * patch segment, ...). Returns `null` when the value cannot be understood as a version at all.\n */\nfunction parsePluginVersion(version: string): SemVer | null {\n  return parse(version, { loose: true }) ?? coerce(version);\n}\n\n/**\n * Compare two plugin version strings with semver semantics, the same way the Perses backend orders plugin versions.\n * Returns a positive number when `a` is greater than `b`, a negative number when it is lower, and 0 when they are equal.\n *\n * Pre-releases order below their stable release (`1.0.0-beta` < `1.0.0`), as semver mandates. Versions that cannot be\n * parsed at all always order below parseable ones, and are compared lexicographically between themselves, so an\n * unexpected value can never be picked as \"the latest version\".\n */\nexport function comparePluginVersions(a: string, b: string): number {\n  const parsedA = parsePluginVersion(a);\n  const parsedB = parsePluginVersion(b);\n  if (parsedA && parsedB) {\n    return compare(parsedA, parsedB);\n  }\n  if (parsedA) {\n    return 1;\n  }\n  if (parsedB) {\n    return -1;\n  }\n  return a.localeCompare(b);\n}\n\n/** Return a new array of versions sorted from newest to oldest, using {@link comparePluginVersions}. */\nexport function sortPluginVersionsDesc(versions: string[]): string[] {\n  return versions.toSorted((a, b) => comparePluginVersions(b, a));\n}\n"],"names":["coerce","compare","parse","LATEST_PLUGIN_VERSION","parsePluginVersion","version","loose","comparePluginVersions","a","b","parsedA","parsedB","localeCompare","sortPluginVersionsDesc","versions","toSorted"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAASA,MAAM,EAAEC,OAAO,EAAEC,KAAK,QAAQ,SAAS;AAEhD;;;;CAIC,GACD,OAAO,MAAMC,wBAAwB,SAAS;AAE9C;;;CAGC,GACD,SAASC,mBAAmBC,OAAe;IACzC,OAAOH,MAAMG,SAAS;QAAEC,OAAO;IAAK,MAAMN,OAAOK;AACnD;AAEA;;;;;;;CAOC,GACD,OAAO,SAASE,sBAAsBC,CAAS,EAAEC,CAAS;IACxD,MAAMC,UAAUN,mBAAmBI;IACnC,MAAMG,UAAUP,mBAAmBK;IACnC,IAAIC,WAAWC,SAAS;QACtB,OAAOV,QAAQS,SAASC;IAC1B;IACA,IAAID,SAAS;QACX,OAAO;IACT;IACA,IAAIC,SAAS;QACX,OAAO,CAAC;IACV;IACA,OAAOH,EAAEI,aAAa,CAACH;AACzB;AAEA,sGAAsG,GACtG,OAAO,SAASI,uBAAuBC,QAAkB;IACvD,OAAOA,SAASC,QAAQ,CAAC,CAACP,GAAGC,IAAMF,sBAAsBE,GAAGD;AAC9D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/plugin-system",
-  "version": "0.55.0-beta.10",
+  "version": "0.55.0-beta.12",
   "description": "The plugin feature in Pereses",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
@@ -29,12 +29,13 @@
     "lint:fix": "oxlint --fix src"
   },
   "dependencies": {
-    "@module-federation/enhanced": "^2.8.0",
-    "@perses-dev/client": "0.55.0-beta.10",
-    "@perses-dev/components": "0.55.0-beta.10",
+    "@module-federation/enhanced": "^2.9.0",
+    "@perses-dev/client": "0.55.0-beta.12",
+    "@perses-dev/components": "0.55.0-beta.12",
     "@perses-dev/spec": "0.3.0-beta.8",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
+    "fast-uri": "3.1.6",
     "immer": "^10.1.1",
     "react-hook-form": "^7.87.0",
     "semver": "^7.8.0",