@perses-dev/plugin-system 0.55.0-beta.9 → 0.55.0-rc.1

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/alerts-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 { AlertsData, QueryDefinition, UnknownSpec } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { AlertsQueryContext, AlertsQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport type AlertsQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'AlertsQuery', PluginSpec>;\nexport const ALERTS_QUERY_KEY = 'AlertsQuery';\n\n/**\n * Run an alerts query using an AlertsQuery plugin and return the results.\n * Alerts represent current state and are NOT time-range dependent.\n * @param definitions: dashboard definition for an alerts query\n */\nexport function useAlertsQueries(definitions: AlertsQueryDefinition[]): Array<UseQueryResult<AlertsData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useAlertsQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'AlertsQuery',\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 alertsQueryKind = 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<AlertsData> => {\n          const plugin = await getPlugin({ kind: ALERTS_QUERY_KEY, name: alertsQueryKind });\n          const data = await plugin.getAlertsData(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?: AlertsQueryPlugin;\n  definition: AlertsQueryDefinition;\n  context: AlertsQueryContext;\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 alerts are current state\n  const queryKey = ['query', ALERTS_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 useAlertsQueryContext(): AlertsQueryContext {\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","ALERTS_QUERY_KEY","useAlertsQueries","definitions","getPlugin","context","useAlertsQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","alertsQueryKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","queryFn","signal","name","getAlertsData","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,mBAAmB,cAAc;AAE9C;;;;CAIC,GACD,OAAO,SAASC,iBAAiBC,WAAoC;IACnE,MAAM,EAAEC,SAAS,EAAE,GAAGR;IACtB,MAAMS,UAAUC;IAEhB,MAAMC,uBAAuBV,WAC3B,eACAM,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,kBAAkBN,YAAYH,MAAMC,QAAQF;YAClD,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;wBAAkB2B,MAAMR;oBAAgB;oBAC/E,MAAMJ,OAAO,MAAMJ,OAAOiB,aAAa,CAACf,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASsB;oBAC9E,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,yEAAyE;IACzE,MAAMjB,WAAW;QAAC;QAASjB;QAAkBa;QAAYsB;KAAkB;IAE3E,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/alerts-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 { AlertsData, QueryDefinition, UnknownSpec } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { AlertsQueryContext, AlertsQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport type AlertsQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'AlertsQuery', PluginSpec>;\nexport const ALERTS_QUERY_KEY = 'AlertsQuery';\n\n/**\n * Run an alerts query using an AlertsQuery plugin and return the results.\n * Alerts represent current state and are NOT time-range dependent.\n * @param definitions: dashboard definition for an alerts query\n */\nexport function useAlertsQueries(definitions: AlertsQueryDefinition[]): Array<UseQueryResult<AlertsData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useAlertsQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'AlertsQuery',\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 alertsQueryKind = 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<AlertsData> => {\n          const plugin = await getPlugin({\n            kind: ALERTS_QUERY_KEY,\n            name: alertsQueryKind,\n            version: definition.spec.plugin.metadata?.version,\n            registry: definition.spec.plugin.metadata?.registry,\n          });\n          const data = await plugin.getAlertsData(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?: AlertsQueryPlugin;\n  definition: AlertsQueryDefinition;\n  context: AlertsQueryContext;\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 alerts are current state\n  const queryKey = ['query', ALERTS_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 useAlertsQueryContext(): AlertsQueryContext {\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","ALERTS_QUERY_KEY","useAlertsQueries","definitions","getPlugin","context","useAlertsQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","version","metadata","registry","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","alertsQueryKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","queryFn","signal","name","getAlertsData","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,mBAAmB,cAAc;AAE9C;;;;CAIC,GACD,OAAO,SAASC,iBAAiBC,WAAoC;IACnE,MAAM,EAAEC,SAAS,EAAE,GAAGR;IACtB,MAAMS,UAAUC;IAEhB,MAAMC,uBAAuBV,WAC3B,eACAM,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,kBAAkBN,YAAYN,MAAMC,QAAQF;YAClD,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,aAAa,CAACf,WAAWN,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,SAASyB;oBAC9E,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,yEAAyE;IACzE,MAAMjB,WAAW;QAAC;QAASpB;QAAkBgB;QAAYsB;KAAkB;IAE3E,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/annotations.d.ts

@@ -1,6 +1,14 @@
 import type { AnnotationData, AnnotationSpec } from '@perses-dev/spec';
 import type { UseQueryResult } from '@tanstack/react-query';
 export declare const ANNOTATION_KEY = "Annotation";
+/**
+ * Resolves annotation specs through the shared query cache. Panels requesting the same spec,
+ * absolute time range, and variable values share both in-flight requests and cached data with previews.
+ */
 export declare function useAnnotations(definitions: AnnotationSpec[]): Array<UseQueryResult<AnnotationData[]>>;
+/**
+ * Resolves one annotation spec using the same cache and fetch policy as {@link useAnnotations}.
+ * Used by annotation previews; also exposes loading, error, and refetch state to individual consumers.
+ */
 export declare function useAnnotationData(spec: AnnotationSpec): UseQueryResult<AnnotationData[]>;
 //# sourceMappingURL=annotations.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/runtime/annotations.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAUtE,eAAO,MAAM,cAAc,eAAe,CAAC;AA+C3C,wBAAgB,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,CA8BrG;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAAC,cAAc,EAAE,CAAC,CAsCxF"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/runtime/annotations.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,EAAmB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAU7E,eAAO,MAAM,cAAc,eAAe,CAAC;AAgD3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,CAiBrG;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAAC,cAAc,EAAE,CAAC,CAQxF"}

package/dist/runtime/annotations.js

@@ -12,7 +12,7 @@
 // limitations under the License.
 import { useQueries, useQuery } from "@tanstack/react-query";
 import { useDatasourceStore } from "./datasources.js";
-import { usePlugin, usePluginRegistry, usePlugins } from "./plugin-registry.js";
+import { usePlugin, usePlugins } from "./plugin-registry.js";
 import { useTimeRange } from "./TimeRangeProvider/index.js";
 import { filterVariableStateMap, getVariableValuesKey } from "./utils.js";
 import { useAllVariableValues } from "./variables.js";
@@ -29,101 +29,65 @@ function useAnnotationContext() {
 }
 function getQueryOptions({ plugin, definition, context }) {
     const { variableState, absoluteTimeRange } = context;
-    const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.plugin.spec, context) : {};
-    const variableDependencies = dependencies?.variables;
-    const filteredVariableState = filterVariableStateMap(variableState, variableDependencies);
+    const dependencies = plugin?.dependsOn?.(definition.plugin.spec, context);
+    const filteredVariableState = filterVariableStateMap(variableState, dependencies?.variables);
     const variablesValueKey = getVariableValuesKey(filteredVariableState);
-    const queryKey = [
-        ANNOTATION_KEY,
-        definition,
-        absoluteTimeRange,
-        variablesValueKey
-    ];
-    let waitToLoad = false;
-    if (variableDependencies) {
-        waitToLoad = variableDependencies.some((v)=>variableState[v]?.loading);
-    }
-    const queryEnabled = plugin !== undefined && !waitToLoad;
+    // Only declared variable dependencies delay the query, like other query plugins.
+    const waitToLoad = dependencies?.variables?.some((name)=>variableState[name]?.loading) ?? false;
     return {
-        queryKey,
-        queryEnabled
+        // ['annotation', spec] prefix: refreshed by TimeRangeProvider and invalidated by the annotation editor preview.
+        queryKey: [
+            'annotation',
+            definition,
+            absoluteTimeRange,
+            variablesValueKey
+        ],
+        enabled: plugin !== undefined && !waitToLoad,
+        refetchOnMount: false,
+        refetchOnWindowFocus: false,
+        refetchOnReconnect: false,
+        staleTime: Infinity,
+        queryFn: async ({ signal })=>{
+            if (plugin === undefined) {
+                throw new Error('Expected annotation plugin to be loaded');
+            }
+            const data = await plugin.getAnnotationData(definition.plugin.spec, context, signal);
+            return data;
+        }
     };
 }
-export function useAnnotations(definitions) {
-    const { getPlugin } = usePluginRegistry();
+/**
+ * Resolves annotation specs through the shared query cache. Panels requesting the same spec,
+ * absolute time range, and variable values share both in-flight requests and cached data with previews.
+ */ export function useAnnotations(definitions) {
     const context = useAnnotationContext();
     const pluginLoaderResponse = usePlugins('Annotation', definitions.map((d)=>({
-            kind: d.plugin.kind
+            kind: d.plugin.kind,
+            version: d.plugin.metadata?.version,
+            registry: d.plugin.metadata?.registry
         })));
-    // useQueries() handles data fetching from query plugins
     return useQueries({
-        queries: definitions.map((definition, idx)=>{
-            const plugin = pluginLoaderResponse[idx]?.data;
-            const { queryEnabled, queryKey } = getQueryOptions({
+        queries: definitions.map((definition, index)=>getQueryOptions({
                 context,
                 definition,
-                plugin
-            });
-            const annotationKind = definition?.plugin?.kind;
-            return {
-                enabled: queryEnabled,
-                queryKey: queryKey,
-                refetchOnMount: false,
-                refetchOnWindowFocus: false,
-                refetchOnReconnect: false,
-                staleTime: Infinity,
-                queryFn: async ({ signal })=>{
-                    const plugin = await getPlugin({
-                        kind: ANNOTATION_KEY,
-                        name: annotationKind
-                    });
-                    const data = await plugin.getAnnotationData(definition.plugin.spec, context, signal);
-                    return data;
-                }
-            };
-        })
+                plugin: pluginLoaderResponse[index]?.data
+            }))
     });
 }
-export function useAnnotationData(spec) {
-    const { data: annotationPlugin } = usePlugin('Annotation', spec.plugin.kind);
-    const datasourceStore = useDatasourceStore();
-    const allVariables = useAllVariableValues();
-    const { absoluteTimeRange: timeRange } = useTimeRange();
-    const variablePluginCtx = {
-        absoluteTimeRange: timeRange,
-        datasourceStore,
-        variableState: allVariables
-    };
-    let dependsOnVariables = Object.keys(allVariables); // Default to all variables
-    if (annotationPlugin?.dependsOn) {
-        const dependencies = annotationPlugin.dependsOn(spec.plugin.spec, variablePluginCtx);
-        dependsOnVariables = dependencies.variables ? dependencies.variables : dependsOnVariables;
-    }
-    const variables = useAllVariableValues(dependsOnVariables);
-    let waitToLoad = false;
-    if (dependsOnVariables) {
-        waitToLoad = dependsOnVariables.some((v)=>variables[v]?.loading);
-    }
-    const variablesValueKey = getVariableValuesKey(variables);
-    return useQuery({
-        queryKey: [
-            'annotation',
-            spec,
-            timeRange,
-            variablesValueKey
-        ],
-        queryFn: async ({ signal })=>{
-            const resp = await annotationPlugin?.getAnnotationData(spec.plugin.spec, {
-                ...variablePluginCtx,
-                variableState: variables
-            }, signal);
-            if (!resp?.length) {
-                return [];
-            }
-            return resp;
-        },
-        enabled: !!annotationPlugin || waitToLoad
+/**
+ * Resolves one annotation spec using the same cache and fetch policy as {@link useAnnotations}.
+ * Used by annotation previews; also exposes loading, error, and refetch state to individual consumers.
+ */ export function useAnnotationData(spec) {
+    const { data: plugin } = usePlugin(ANNOTATION_KEY, spec.plugin.kind, {
+        version: spec.plugin.metadata?.version,
+        registry: spec.plugin.metadata?.registry
     });
+    const context = useAnnotationContext();
+    return useQuery(getQueryOptions({
+        plugin,
+        definition: spec,
+        context
+    }));
 }
 
 //# sourceMappingURL=annotations.js.map

package/dist/runtime/annotations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/annotations.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 { AnnotationData, AnnotationSpec } from '@perses-dev/spec';\nimport type { QueryKey, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries, useQuery } from '@tanstack/react-query';\n\nimport type { AnnotationContext, AnnotationPlugin } 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 const ANNOTATION_KEY = 'Annotation';\n\nfunction useAnnotationContext(): AnnotationContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n    absoluteTimeRange,\n  };\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: AnnotationPlugin;\n  definition: AnnotationSpec;\n  context: AnnotationContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { variableState, absoluteTimeRange } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariableState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariableState);\n  const queryKey = [ANNOTATION_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\nexport function useAnnotations(definitions: AnnotationSpec[]): Array<UseQueryResult<AnnotationData[]>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useAnnotationContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'Annotation',\n    definitions.map((d) => ({ kind: d.plugin.kind })),\n  );\n\n  // useQueries() handles data fetching from query plugins\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 annotationKind = definition?.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<AnnotationData[]> => {\n          const plugin = await getPlugin({ kind: ANNOTATION_KEY, name: annotationKind });\n          const data = await plugin.getAnnotationData(definition.plugin.spec, context, signal);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nexport function useAnnotationData(spec: AnnotationSpec): UseQueryResult<AnnotationData[]> {\n  const { data: annotationPlugin } = usePlugin('Annotation', spec.plugin.kind);\n\n  const datasourceStore = useDatasourceStore();\n  const allVariables = useAllVariableValues();\n  const { absoluteTimeRange: timeRange } = useTimeRange();\n  const variablePluginCtx = { absoluteTimeRange: timeRange, datasourceStore, variableState: allVariables };\n\n  let dependsOnVariables: string[] = Object.keys(allVariables); // Default to all variables\n  if (annotationPlugin?.dependsOn) {\n    const dependencies = annotationPlugin.dependsOn(spec.plugin.spec, variablePluginCtx);\n    dependsOnVariables = dependencies.variables ? dependencies.variables : dependsOnVariables;\n  }\n\n  const variables = useAllVariableValues(dependsOnVariables);\n\n  let waitToLoad = false;\n  if (dependsOnVariables) {\n    waitToLoad = dependsOnVariables.some((v) => variables[v]?.loading);\n  }\n\n  const variablesValueKey = getVariableValuesKey(variables);\n\n  return useQuery({\n    queryKey: ['annotation', spec, timeRange, variablesValueKey],\n    queryFn: async ({ signal }) => {\n      const resp = await annotationPlugin?.getAnnotationData(\n        spec.plugin.spec,\n        { ...variablePluginCtx, variableState: variables },\n        signal,\n      );\n      if (!resp?.length) {\n        return [];\n      }\n      return resp;\n    },\n    enabled: !!annotationPlugin || waitToLoad,\n  });\n}\n"],"names":["useQueries","useQuery","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","useTimeRange","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","ANNOTATION_KEY","useAnnotationContext","absoluteTimeRange","variableState","datasourceStore","getQueryOptions","plugin","definition","context","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariableState","variablesValueKey","queryKey","waitToLoad","some","v","loading","queryEnabled","undefined","useAnnotations","definitions","getPlugin","pluginLoaderResponse","map","d","kind","queries","idx","data","annotationKind","enabled","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","getAnnotationData","useAnnotationData","annotationPlugin","allVariables","timeRange","variablePluginCtx","dependsOnVariables","Object","keys","resp","length"],"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,EAAEC,QAAQ,QAAQ,wBAAwB;AAG7D,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,SAAS,EAAEC,iBAAiB,EAAEC,UAAU,QAAQ,uBAAoB;AAC7E,SAASC,YAAY,QAAQ,+BAAsB;AACnD,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,aAAU;AACvE,SAASC,oBAAoB,QAAQ,iBAAc;AAEnD,OAAO,MAAMC,iBAAiB,aAAa;AAE3C,SAASC;IACP,MAAM,EAAEC,iBAAiB,EAAE,GAAGN;IAC9B,MAAMO,gBAAgBJ;IACtB,MAAMK,kBAAkBZ;IAExB,OAAO;QACLW;QACAC;QACAF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBC,MAAM,EACNC,UAAU,EACVC,OAAO,EAKR;IAIC,MAAM,EAAEL,aAAa,EAAED,iBAAiB,EAAE,GAAGM;IAE7C,MAAMC,eAAeH,QAAQI,YAAYJ,OAAOI,SAAS,CAACH,WAAWD,MAAM,CAACK,IAAI,EAAEH,WAAW,CAAC;IAC9F,MAAMI,uBAAuBH,cAAcI;IAE3C,MAAMC,wBAAwBjB,uBAAuBM,eAAeS;IACpE,MAAMG,oBAAoBjB,qBAAqBgB;IAC/C,MAAME,WAAW;QAAChB;QAAgBO;QAAYL;QAAmBa;KAAkB;IAEnF,IAAIE,aAAa;IACjB,IAAIL,sBAAsB;QACxBK,aAAaL,qBAAqBM,IAAI,CAAC,CAACC,IAAMhB,aAAa,CAACgB,EAAE,EAAEC;IAClE;IAEA,MAAMC,eAAef,WAAWgB,aAAa,CAACL;IAC9C,OAAO;QACLD;QACAK;IACF;AACF;AAEA,OAAO,SAASE,eAAeC,WAA6B;IAC1D,MAAM,EAAEC,SAAS,EAAE,GAAG/B;IACtB,MAAMc,UAAUP;IAEhB,MAAMyB,uBAAuB/B,WAC3B,cACA6B,YAAYG,GAAG,CAAC,CAACC,IAAO,CAAA;YAAEC,MAAMD,EAAEtB,MAAM,CAACuB,IAAI;QAAC,CAAA;IAGhD,wDAAwD;IACxD,OAAOvC,WAAW;QAChBwC,SAASN,YAAYG,GAAG,CAAC,CAACpB,YAAYwB;YACpC,MAAMzB,SAASoB,oBAAoB,CAACK,IAAI,EAAEC;YAC1C,MAAM,EAAEX,YAAY,EAAEL,QAAQ,EAAE,GAAGX,gBAAgB;gBAAEG;gBAASD;gBAAYD;YAAO;YACjF,MAAM2B,iBAAiB1B,YAAYD,QAAQuB;YAC3C,OAAO;gBACLK,SAASb;gBACTL,UAAUA;gBACVmB,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAWC;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMnC,SAAS,MAAMmB,UAAU;wBAAEI,MAAM7B;wBAAgB0C,MAAMT;oBAAe;oBAC5E,MAAMD,OAAO,MAAM1B,OAAOqC,iBAAiB,CAACpC,WAAWD,MAAM,CAACK,IAAI,EAAEH,SAASiC;oBAC7E,OAAOT;gBACT;YACF;QACF;IACF;AACF;AAEA,OAAO,SAASY,kBAAkBjC,IAAoB;IACpD,MAAM,EAAEqB,MAAMa,gBAAgB,EAAE,GAAGpD,UAAU,cAAckB,KAAKL,MAAM,CAACuB,IAAI;IAE3E,MAAMzB,kBAAkBZ;IACxB,MAAMsD,eAAe/C;IACrB,MAAM,EAAEG,mBAAmB6C,SAAS,EAAE,GAAGnD;IACzC,MAAMoD,oBAAoB;QAAE9C,mBAAmB6C;QAAW3C;QAAiBD,eAAe2C;IAAa;IAEvG,IAAIG,qBAA+BC,OAAOC,IAAI,CAACL,eAAe,2BAA2B;IACzF,IAAID,kBAAkBnC,WAAW;QAC/B,MAAMD,eAAeoC,iBAAiBnC,SAAS,CAACC,KAAKL,MAAM,CAACK,IAAI,EAAEqC;QAClEC,qBAAqBxC,aAAaI,SAAS,GAAGJ,aAAaI,SAAS,GAAGoC;IACzE;IAEA,MAAMpC,YAAYd,qBAAqBkD;IAEvC,IAAIhC,aAAa;IACjB,IAAIgC,oBAAoB;QACtBhC,aAAagC,mBAAmB/B,IAAI,CAAC,CAACC,IAAMN,SAAS,CAACM,EAAE,EAAEC;IAC5D;IAEA,MAAML,oBAAoBjB,qBAAqBe;IAE/C,OAAOtB,SAAS;QACdyB,UAAU;YAAC;YAAcL;YAAMoC;YAAWhC;SAAkB;QAC5DyB,SAAS,OAAO,EAAEC,MAAM,EAAE;YACxB,MAAMW,OAAO,MAAMP,kBAAkBF,kBACnChC,KAAKL,MAAM,CAACK,IAAI,EAChB;gBAAE,GAAGqC,iBAAiB;gBAAE7C,eAAeU;YAAU,GACjD4B;YAEF,IAAI,CAACW,MAAMC,QAAQ;gBACjB,OAAO,EAAE;YACX;YACA,OAAOD;QACT;QACAlB,SAAS,CAAC,CAACW,oBAAoB5B;IACjC;AACF"}
+{"version":3,"sources":["../../src/runtime/annotations.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 { AnnotationData, AnnotationSpec } from '@perses-dev/spec';\nimport type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';\nimport { useQueries, useQuery } from '@tanstack/react-query';\n\nimport type { AnnotationContext, AnnotationPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport const ANNOTATION_KEY = 'Annotation';\n\nfunction useAnnotationContext(): AnnotationContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n    absoluteTimeRange,\n  };\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: AnnotationPlugin;\n  definition: AnnotationSpec;\n  context: AnnotationContext;\n}): UseQueryOptions<AnnotationData[]> {\n  const { variableState, absoluteTimeRange } = context;\n  const dependencies = plugin?.dependsOn?.(definition.plugin.spec, context);\n  const filteredVariableState = filterVariableStateMap(variableState, dependencies?.variables);\n  const variablesValueKey = getVariableValuesKey(filteredVariableState);\n  // Only declared variable dependencies delay the query, like other query plugins.\n  const waitToLoad = dependencies?.variables?.some((name) => variableState[name]?.loading) ?? false;\n\n  return {\n    // ['annotation', spec] prefix: refreshed by TimeRangeProvider and invalidated by the annotation editor preview.\n    queryKey: ['annotation', definition, absoluteTimeRange, variablesValueKey],\n    enabled: plugin !== undefined && !waitToLoad,\n    refetchOnMount: false,\n    refetchOnWindowFocus: false,\n    refetchOnReconnect: false,\n    staleTime: Infinity,\n    queryFn: async ({ signal }): Promise<AnnotationData[]> => {\n      if (plugin === undefined) {\n        throw new Error('Expected annotation plugin to be loaded');\n      }\n      const data = await plugin.getAnnotationData(definition.plugin.spec, context, signal);\n      return data;\n    },\n  };\n}\n\n/**\n * Resolves annotation specs through the shared query cache. Panels requesting the same spec,\n * absolute time range, and variable values share both in-flight requests and cached data with previews.\n */\nexport function useAnnotations(definitions: AnnotationSpec[]): Array<UseQueryResult<AnnotationData[]>> {\n  const context = useAnnotationContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'Annotation',\n    definitions.map((d) => ({\n      kind: d.plugin.kind,\n      version: d.plugin.metadata?.version,\n      registry: d.plugin.metadata?.registry,\n    })),\n  );\n\n  return useQueries({\n    queries: definitions.map((definition, index) =>\n      getQueryOptions({ context, definition, plugin: pluginLoaderResponse[index]?.data }),\n    ),\n  });\n}\n\n/**\n * Resolves one annotation spec using the same cache and fetch policy as {@link useAnnotations}.\n * Used by annotation previews; also exposes loading, error, and refetch state to individual consumers.\n */\nexport function useAnnotationData(spec: AnnotationSpec): UseQueryResult<AnnotationData[]> {\n  const { data: plugin } = usePlugin(ANNOTATION_KEY, spec.plugin.kind, {\n    version: spec.plugin.metadata?.version,\n    registry: spec.plugin.metadata?.registry,\n  });\n  const context = useAnnotationContext();\n\n  return useQuery(getQueryOptions({ plugin, definition: spec, context }));\n}\n"],"names":["useQueries","useQuery","useDatasourceStore","usePlugin","usePlugins","useTimeRange","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","ANNOTATION_KEY","useAnnotationContext","absoluteTimeRange","variableState","datasourceStore","getQueryOptions","plugin","definition","context","dependencies","dependsOn","spec","filteredVariableState","variables","variablesValueKey","waitToLoad","some","name","loading","queryKey","enabled","undefined","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","Error","data","getAnnotationData","useAnnotations","definitions","pluginLoaderResponse","map","d","kind","version","metadata","registry","queries","index","useAnnotationData"],"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,EAAEC,QAAQ,QAAQ,wBAAwB;AAG7D,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,SAAS,EAAEC,UAAU,QAAQ,uBAAoB;AAC1D,SAASC,YAAY,QAAQ,+BAAsB;AACnD,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,aAAU;AACvE,SAASC,oBAAoB,QAAQ,iBAAc;AAEnD,OAAO,MAAMC,iBAAiB,aAAa;AAE3C,SAASC;IACP,MAAM,EAAEC,iBAAiB,EAAE,GAAGN;IAC9B,MAAMO,gBAAgBJ;IACtB,MAAMK,kBAAkBX;IAExB,OAAO;QACLU;QACAC;QACAF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBC,MAAM,EACNC,UAAU,EACVC,OAAO,EAKR;IACC,MAAM,EAAEL,aAAa,EAAED,iBAAiB,EAAE,GAAGM;IAC7C,MAAMC,eAAeH,QAAQI,YAAYH,WAAWD,MAAM,CAACK,IAAI,EAAEH;IACjE,MAAMI,wBAAwBf,uBAAuBM,eAAeM,cAAcI;IAClF,MAAMC,oBAAoBhB,qBAAqBc;IAC/C,iFAAiF;IACjF,MAAMG,aAAaN,cAAcI,WAAWG,KAAK,CAACC,OAASd,aAAa,CAACc,KAAK,EAAEC,YAAY;IAE5F,OAAO;QACL,gHAAgH;QAChHC,UAAU;YAAC;YAAcZ;YAAYL;YAAmBY;SAAkB;QAC1EM,SAASd,WAAWe,aAAa,CAACN;QAClCO,gBAAgB;QAChBC,sBAAsB;QACtBC,oBAAoB;QACpBC,WAAWC;QACXC,SAAS,OAAO,EAAEC,MAAM,EAAE;YACxB,IAAItB,WAAWe,WAAW;gBACxB,MAAM,IAAIQ,MAAM;YAClB;YACA,MAAMC,OAAO,MAAMxB,OAAOyB,iBAAiB,CAACxB,WAAWD,MAAM,CAACK,IAAI,EAAEH,SAASoB;YAC7E,OAAOE;QACT;IACF;AACF;AAEA;;;CAGC,GACD,OAAO,SAASE,eAAeC,WAA6B;IAC1D,MAAMzB,UAAUP;IAEhB,MAAMiC,uBAAuBvC,WAC3B,cACAsC,YAAYE,GAAG,CAAC,CAACC,IAAO,CAAA;YACtBC,MAAMD,EAAE9B,MAAM,CAAC+B,IAAI;YACnBC,SAASF,EAAE9B,MAAM,CAACiC,QAAQ,EAAED;YAC5BE,UAAUJ,EAAE9B,MAAM,CAACiC,QAAQ,EAAEC;QAC/B,CAAA;IAGF,OAAOjD,WAAW;QAChBkD,SAASR,YAAYE,GAAG,CAAC,CAAC5B,YAAYmC,QACpCrC,gBAAgB;gBAAEG;gBAASD;gBAAYD,QAAQ4B,oBAAoB,CAACQ,MAAM,EAAEZ;YAAK;IAErF;AACF;AAEA;;;CAGC,GACD,OAAO,SAASa,kBAAkBhC,IAAoB;IACpD,MAAM,EAAEmB,MAAMxB,MAAM,EAAE,GAAGZ,UAAUM,gBAAgBW,KAAKL,MAAM,CAAC+B,IAAI,EAAE;QACnEC,SAAS3B,KAAKL,MAAM,CAACiC,QAAQ,EAAED;QAC/BE,UAAU7B,KAAKL,MAAM,CAACiC,QAAQ,EAAEC;IAClC;IACA,MAAMhC,UAAUP;IAEhB,OAAOT,SAASa,gBAAgB;QAAEC;QAAQC,YAAYI;QAAMH;IAAQ;AACtE"}

package/dist/runtime/datasources.d.ts

@@ -1,6 +1,10 @@
 import type { DatasourceSelector, DatasourceSpec } from '@perses-dev/spec';
 import type { UseQueryResult } from '@tanstack/react-query';
 export interface DatasourceStore {
+    /**
+     * Project whose datasources are listed alongside global ones. Undefined for a global-only scope.
+     */
+    project?: string;
     getDatasource(selector: DatasourceSelector): Promise<DatasourceSpec>;
     /**
      * Gets a cached datasource spec synchronously if available.

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

@@ -1 +1 @@
-{"version":3,"file":"datasources.d.ts","sourceRoot":"","sources":["../../src/runtime/datasources.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,WAAW,eAAe;IAE9B,aAAa,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE;;;;OAIG;IACH,qBAAqB,CAAC,CAAC,QAAQ,EAAE,kBAAkB,GAAG,cAAc,GAAG,SAAS,CAAC;IAEjF;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3E;;OAEG;IACH,yBAAyB,CAAC,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAE9F;;OAEG;IACH,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAEtD;;OAEG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC;IAEvE;;OAEG;IACH,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAEtD;;OAEG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,oBAAoB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,4BAA4B,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,sBAAsB,sDAAwD,CAAC;AAE5F,wBAAgB,kBAAkB,IAAI,eAAe,CAMpD;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,MAAM,GACf,cAAc,CAAC,yBAAyB,EAAE,CAAC,CAM7C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,CAMhG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,kBAAkB,GAAG,cAAc,CAAC,cAAc,CAAC,CAM1F"}
+{"version":3,"file":"datasources.d.ts","sourceRoot":"","sources":["../../src/runtime/datasources.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,aAAa,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE;;;;OAIG;IACH,qBAAqB,CAAC,CAAC,QAAQ,EAAE,kBAAkB,GAAG,cAAc,GAAG,SAAS,CAAC;IAEjF;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3E;;OAEG;IACH,yBAAyB,CAAC,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAE9F;;OAEG;IACH,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAEtD;;OAEG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC;IAEvE;;OAEG;IACH,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAEtD;;OAEG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,oBAAoB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,4BAA4B,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,sBAAsB,sDAAwD,CAAC;AAE5F,wBAAgB,kBAAkB,IAAI,eAAe,CAMpD;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,MAAM,GACf,cAAc,CAAC,yBAAyB,EAAE,CAAC,CAO7C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,CAMhG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,kBAAkB,GAAG,cAAc,CAAC,cAAc,CAAC,CAM1F"}

package/dist/runtime/datasources.js

@@ -24,14 +24,15 @@ export function useDatasourceStore() {
  * Lists all available Datasource selection items for a given datasource plugin kind.
  * Returns a list, with all information that can be used in a datasource selection context (group, name, selector, kind, ...)
  */ export function useListDatasourceSelectItems(datasourcePluginName, project) {
-    const { listDatasourceSelectItems } = useDatasourceStore();
+    const store = useDatasourceStore();
+    // Results are scoped by the store's project; the explicit parameter only remains as a fallback discriminator.
     return useQuery({
         queryKey: [
             'listDatasourceSelectItems',
             datasourcePluginName,
-            project
+            store.project ?? project
         ],
-        queryFn: ()=>listDatasourceSelectItems(datasourcePluginName)
+        queryFn: ()=>store.listDatasourceSelectItems(datasourcePluginName)
     });
 }
 /**

package/dist/runtime/datasources.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/datasources.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 { DatasourceSelector, DatasourceSpec } from '@perses-dev/spec';\nimport type { UseQueryResult } from '@tanstack/react-query';\nimport { useQuery } from '@tanstack/react-query';\nimport { createContext, useContext } from 'react';\n\nexport interface DatasourceStore {\n  // TODO: Do we even need this method?\n  getDatasource(selector: DatasourceSelector): Promise<DatasourceSpec>;\n\n  /**\n   * Gets a cached datasource spec synchronously if available.\n   * Used by variable dependency resolution to avoid async calls in dependsOn().\n   * Returns undefined if the spec is not cached.\n   */\n  getDatasourceSpecSync?(selector: DatasourceSelector): DatasourceSpec | undefined;\n\n  /**\n   * Given a DatasourceSelector, gets a `Client` object from the corresponding Datasource plugin.\n   */\n  getDatasourceClient<Client>(selector: DatasourceSelector): Promise<Client>;\n\n  /**\n   * Gets a list of datasource selection items for a plugin kind.\n   */\n  listDatasourceSelectItems(datasourcePluginName: string): Promise<DatasourceSelectItemGroup[]>;\n\n  /**\n   * Gets the list of datasources defined in the dashboard\n   */\n  getLocalDatasources(): Record<string, DatasourceSpec>;\n\n  /**\n   * Sets the list of datasources defined in the dashboard\n   */\n  setLocalDatasources(datasources: Record<string, DatasourceSpec>): void;\n\n  /**\n   * Gets the list of datasources that are available in the dashboard (i.e. dashboards that have been created on the server side that we can use).\n   */\n  getSavedDatasources(): Record<string, DatasourceSpec>;\n\n  /**\n   * Sets the list of datasources that are saved in the dashboard\n   */\n  setSavedDatasources(datasources: Record<string, DatasourceSpec>): void;\n}\n\nexport interface DatasourceSelectItemGroup {\n  group?: string;\n  editLink?: string;\n  items: DatasourceSelectItem[];\n}\n\nexport interface DatasourceSelectItem {\n  name: string;\n  overridden?: boolean;\n  overriding?: boolean;\n  saved?: boolean;\n  selector: DatasourceSelectItemSelector;\n}\n\n/**\n * Datasource Selector used by the frontend only to differentiate datasources coming from different group.\n */\nexport interface DatasourceSelectItemSelector extends DatasourceSelector {\n  /**\n   * Group of the datasource.\n   * Omit it if you don't store datasource by group.\n   */\n  group?: string;\n}\n\nexport const DatasourceStoreContext = createContext<DatasourceStore | undefined>(undefined);\n\nexport function useDatasourceStore(): DatasourceStore {\n  const ctx = useContext(DatasourceStoreContext);\n  if (ctx === undefined) {\n    throw new Error('No DatasourceStoreContext found. Did you forget a Provider?');\n  }\n  return ctx;\n}\n\n/**\n * Lists all available Datasource selection items for a given datasource plugin kind.\n * Returns a list, with all information that can be used in a datasource selection context (group, name, selector, kind, ...)\n */\nexport function useListDatasourceSelectItems(\n  datasourcePluginName: string,\n  project?: string,\n): UseQueryResult<DatasourceSelectItemGroup[]> {\n  const { listDatasourceSelectItems } = useDatasourceStore();\n  return useQuery<DatasourceSelectItemGroup[]>({\n    queryKey: ['listDatasourceSelectItems', datasourcePluginName, project],\n    queryFn: () => listDatasourceSelectItems(datasourcePluginName),\n  });\n}\n\n/**\n * Provides a convenience hook for getting a DatasourceClient for a given DatasourceSelector.\n */\nexport function useDatasourceClient<Client>(selector: DatasourceSelector): UseQueryResult<Client> {\n  const store = useDatasourceStore();\n  return useQuery<Client>({\n    queryKey: ['getDatasourceClient', selector],\n    queryFn: () => store.getDatasourceClient<Client>(selector),\n  });\n}\n\nexport function useDatasource(selector: DatasourceSelector): UseQueryResult<DatasourceSpec> {\n  const store = useDatasourceStore();\n  return useQuery<DatasourceSpec>({\n    queryKey: ['getDatasource', selector],\n    queryFn: () => store.getDatasource(selector),\n  });\n}\n"],"names":["useQuery","createContext","useContext","DatasourceStoreContext","undefined","useDatasourceStore","ctx","Error","useListDatasourceSelectItems","datasourcePluginName","project","listDatasourceSelectItems","queryKey","queryFn","useDatasourceClient","selector","store","getDatasourceClient","useDatasource","getDatasource"],"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,QAAQ,QAAQ,wBAAwB;AACjD,SAASC,aAAa,EAAEC,UAAU,QAAQ,QAAQ;AAqElD,OAAO,MAAMC,yBAAyBF,cAA2CG,WAAW;AAE5F,OAAO,SAASC;IACd,MAAMC,MAAMJ,WAAWC;IACvB,IAAIG,QAAQF,WAAW;QACrB,MAAM,IAAIG,MAAM;IAClB;IACA,OAAOD;AACT;AAEA;;;CAGC,GACD,OAAO,SAASE,6BACdC,oBAA4B,EAC5BC,OAAgB;IAEhB,MAAM,EAAEC,yBAAyB,EAAE,GAAGN;IACtC,OAAOL,SAAsC;QAC3CY,UAAU;YAAC;YAA6BH;YAAsBC;SAAQ;QACtEG,SAAS,IAAMF,0BAA0BF;IAC3C;AACF;AAEA;;CAEC,GACD,OAAO,SAASK,oBAA4BC,QAA4B;IACtE,MAAMC,QAAQX;IACd,OAAOL,SAAiB;QACtBY,UAAU;YAAC;YAAuBG;SAAS;QAC3CF,SAAS,IAAMG,MAAMC,mBAAmB,CAASF;IACnD;AACF;AAEA,OAAO,SAASG,cAAcH,QAA4B;IACxD,MAAMC,QAAQX;IACd,OAAOL,SAAyB;QAC9BY,UAAU;YAAC;YAAiBG;SAAS;QACrCF,SAAS,IAAMG,MAAMG,aAAa,CAACJ;IACrC;AACF"}
+{"version":3,"sources":["../../src/runtime/datasources.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 { DatasourceSelector, DatasourceSpec } from '@perses-dev/spec';\nimport type { UseQueryResult } from '@tanstack/react-query';\nimport { useQuery } from '@tanstack/react-query';\nimport { createContext, useContext } from 'react';\n\nexport interface DatasourceStore {\n  /**\n   * Project whose datasources are listed alongside global ones. Undefined for a global-only scope.\n   */\n  project?: string;\n\n  // TODO: Do we even need this method?\n  getDatasource(selector: DatasourceSelector): Promise<DatasourceSpec>;\n\n  /**\n   * Gets a cached datasource spec synchronously if available.\n   * Used by variable dependency resolution to avoid async calls in dependsOn().\n   * Returns undefined if the spec is not cached.\n   */\n  getDatasourceSpecSync?(selector: DatasourceSelector): DatasourceSpec | undefined;\n\n  /**\n   * Given a DatasourceSelector, gets a `Client` object from the corresponding Datasource plugin.\n   */\n  getDatasourceClient<Client>(selector: DatasourceSelector): Promise<Client>;\n\n  /**\n   * Gets a list of datasource selection items for a plugin kind.\n   */\n  listDatasourceSelectItems(datasourcePluginName: string): Promise<DatasourceSelectItemGroup[]>;\n\n  /**\n   * Gets the list of datasources defined in the dashboard\n   */\n  getLocalDatasources(): Record<string, DatasourceSpec>;\n\n  /**\n   * Sets the list of datasources defined in the dashboard\n   */\n  setLocalDatasources(datasources: Record<string, DatasourceSpec>): void;\n\n  /**\n   * Gets the list of datasources that are available in the dashboard (i.e. dashboards that have been created on the server side that we can use).\n   */\n  getSavedDatasources(): Record<string, DatasourceSpec>;\n\n  /**\n   * Sets the list of datasources that are saved in the dashboard\n   */\n  setSavedDatasources(datasources: Record<string, DatasourceSpec>): void;\n}\n\nexport interface DatasourceSelectItemGroup {\n  group?: string;\n  editLink?: string;\n  items: DatasourceSelectItem[];\n}\n\nexport interface DatasourceSelectItem {\n  name: string;\n  overridden?: boolean;\n  overriding?: boolean;\n  saved?: boolean;\n  selector: DatasourceSelectItemSelector;\n}\n\n/**\n * Datasource Selector used by the frontend only to differentiate datasources coming from different group.\n */\nexport interface DatasourceSelectItemSelector extends DatasourceSelector {\n  /**\n   * Group of the datasource.\n   * Omit it if you don't store datasource by group.\n   */\n  group?: string;\n}\n\nexport const DatasourceStoreContext = createContext<DatasourceStore | undefined>(undefined);\n\nexport function useDatasourceStore(): DatasourceStore {\n  const ctx = useContext(DatasourceStoreContext);\n  if (ctx === undefined) {\n    throw new Error('No DatasourceStoreContext found. Did you forget a Provider?');\n  }\n  return ctx;\n}\n\n/**\n * Lists all available Datasource selection items for a given datasource plugin kind.\n * Returns a list, with all information that can be used in a datasource selection context (group, name, selector, kind, ...)\n */\nexport function useListDatasourceSelectItems(\n  datasourcePluginName: string,\n  project?: string,\n): UseQueryResult<DatasourceSelectItemGroup[]> {\n  const store = useDatasourceStore();\n  // Results are scoped by the store's project; the explicit parameter only remains as a fallback discriminator.\n  return useQuery<DatasourceSelectItemGroup[]>({\n    queryKey: ['listDatasourceSelectItems', datasourcePluginName, store.project ?? project],\n    queryFn: () => store.listDatasourceSelectItems(datasourcePluginName),\n  });\n}\n\n/**\n * Provides a convenience hook for getting a DatasourceClient for a given DatasourceSelector.\n */\nexport function useDatasourceClient<Client>(selector: DatasourceSelector): UseQueryResult<Client> {\n  const store = useDatasourceStore();\n  return useQuery<Client>({\n    queryKey: ['getDatasourceClient', selector],\n    queryFn: () => store.getDatasourceClient<Client>(selector),\n  });\n}\n\nexport function useDatasource(selector: DatasourceSelector): UseQueryResult<DatasourceSpec> {\n  const store = useDatasourceStore();\n  return useQuery<DatasourceSpec>({\n    queryKey: ['getDatasource', selector],\n    queryFn: () => store.getDatasource(selector),\n  });\n}\n"],"names":["useQuery","createContext","useContext","DatasourceStoreContext","undefined","useDatasourceStore","ctx","Error","useListDatasourceSelectItems","datasourcePluginName","project","store","queryKey","queryFn","listDatasourceSelectItems","useDatasourceClient","selector","getDatasourceClient","useDatasource","getDatasource"],"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,QAAQ,QAAQ,wBAAwB;AACjD,SAASC,aAAa,EAAEC,UAAU,QAAQ,QAAQ;AA0ElD,OAAO,MAAMC,yBAAyBF,cAA2CG,WAAW;AAE5F,OAAO,SAASC;IACd,MAAMC,MAAMJ,WAAWC;IACvB,IAAIG,QAAQF,WAAW;QACrB,MAAM,IAAIG,MAAM;IAClB;IACA,OAAOD;AACT;AAEA;;;CAGC,GACD,OAAO,SAASE,6BACdC,oBAA4B,EAC5BC,OAAgB;IAEhB,MAAMC,QAAQN;IACd,8GAA8G;IAC9G,OAAOL,SAAsC;QAC3CY,UAAU;YAAC;YAA6BH;YAAsBE,MAAMD,OAAO,IAAIA;SAAQ;QACvFG,SAAS,IAAMF,MAAMG,yBAAyB,CAACL;IACjD;AACF;AAEA;;CAEC,GACD,OAAO,SAASM,oBAA4BC,QAA4B;IACtE,MAAML,QAAQN;IACd,OAAOL,SAAiB;QACtBY,UAAU;YAAC;YAAuBI;SAAS;QAC3CH,SAAS,IAAMF,MAAMM,mBAAmB,CAASD;IACnD;AACF;AAEA,OAAO,SAASE,cAAcF,QAA4B;IACxD,MAAML,QAAQN;IACd,OAAOL,SAAyB;QAC9BY,UAAU;YAAC;YAAiBI;SAAS;QACrCH,SAAS,IAAMF,MAAMQ,aAAa,CAACH;IACrC;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"log-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/log-queries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAM3D,MAAM,MAAM,kBAAkB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACnG,eAAO,MAAM,aAAa,aAAa,CAAC;AAExC,wBAAgB,aAAa,CAAC,WAAW,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAiCtG"}
+{"version":3,"file":"log-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/log-queries.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAM3D,MAAM,MAAM,kBAAkB,CAAC,UAAU,GAAG,WAAW,IAAI,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACnG,eAAO,MAAM,aAAa,aAAa,CAAC;AAExC,wBAAgB,aAAa,CAAC,WAAW,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAsCtG"}

package/dist/runtime/log-queries.js

@@ -46,7 +46,9 @@ export function useLogQueries(definitions) {
                 queryFn: async ({ signal })=>{
                     const plugin = await getPlugin({
                         kind: LOG_QUERY_KEY,
-                        name: logQueryKind
+                        name: logQueryKind,
+                        version: definition.spec.plugin.metadata?.version,
+                        registry: definition.spec.plugin.metadata?.registry
                     });
                     const data = await plugin.getLogData(definition.spec.plugin.spec, context, signal);
                     return data;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/log-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 } from '@perses-dev/spec';\nimport type { UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { LogQueryResult } from '../model/log-queries';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useVariableValues } from './variables';\n\nexport type LogQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'LogQuery', PluginSpec>;\nexport const LOG_QUERY_KEY = 'LogQuery';\n\nexport function useLogQueries(definitions: LogQueryDefinition[]): Array<UseQueryResult<LogQueryResult>> {\n  const { getPlugin } = usePluginRegistry();\n  const datasourceStore = useDatasourceStore();\n  const { absoluteTimeRange } = useTimeRange();\n  const variableValues = useVariableValues();\n\n  const context = {\n    timeRange: absoluteTimeRange,\n    variableState: variableValues,\n    datasourceStore,\n    refreshKey: '',\n  };\n\n  return useQueries({\n    queries: definitions.map((definition) => {\n      const queryKey = ['query', LOG_QUERY_KEY, definition, absoluteTimeRange, variableValues] as const;\n      const logQueryKind = 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<LogQueryResult> => {\n          const plugin = await getPlugin({ kind: LOG_QUERY_KEY, name: logQueryKind });\n          const data = await plugin.getLogData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","useVariableValues","LOG_QUERY_KEY","useLogQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","variableValues","context","timeRange","variableState","refreshKey","queries","map","definition","queryKey","logQueryKind","spec","plugin","kind","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","data","getLogData","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;AAGnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,QAAQ,uBAAoB;AACtD,SAASC,YAAY,QAAQ,+BAAsB;AACnD,SAASC,iBAAiB,QAAQ,iBAAc;AAGhD,OAAO,MAAMC,gBAAgB,WAAW;AAExC,OAAO,SAASC,cAAcC,WAAiC;IAC7D,MAAM,EAAEC,SAAS,EAAE,GAAGN;IACtB,MAAMO,kBAAkBR;IACxB,MAAM,EAAES,iBAAiB,EAAE,GAAGP;IAC9B,MAAMQ,iBAAiBP;IAEvB,MAAMQ,UAAU;QACdC,WAAWH;QACXI,eAAeH;QACfF;QACAM,YAAY;IACd;IAEA,OAAOf,WAAW;QAChBgB,SAAST,YAAYU,GAAG,CAAC,CAACC;YACxB,MAAMC,WAAW;gBAAC;gBAASd;gBAAea;gBAAYR;gBAAmBC;aAAe;YACxF,MAAMS,eAAeF,YAAYG,MAAMC,QAAQC;YAC/C,OAAO;gBACLJ,UAAUA;gBACVK,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAWC;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMR,SAAS,MAAMd,UAAU;wBAAEe,MAAMlB;wBAAe0B,MAAMX;oBAAa;oBACzE,MAAMY,OAAO,MAAMV,OAAOW,UAAU,CAACf,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAET,SAASkB;oBAC3E,OAAOE;gBACT;gBAEAE,mBAAmB;YACrB;QACF;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/log-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 } from '@perses-dev/spec';\nimport type { UseQueryResult } from '@tanstack/react-query';\nimport { useQueries } from '@tanstack/react-query';\n\nimport type { LogQueryResult } from '../model/log-queries';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useVariableValues } from './variables';\n\nexport type LogQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'LogQuery', PluginSpec>;\nexport const LOG_QUERY_KEY = 'LogQuery';\n\nexport function useLogQueries(definitions: LogQueryDefinition[]): Array<UseQueryResult<LogQueryResult>> {\n  const { getPlugin } = usePluginRegistry();\n  const datasourceStore = useDatasourceStore();\n  const { absoluteTimeRange } = useTimeRange();\n  const variableValues = useVariableValues();\n\n  const context = {\n    timeRange: absoluteTimeRange,\n    variableState: variableValues,\n    datasourceStore,\n    refreshKey: '',\n  };\n\n  return useQueries({\n    queries: definitions.map((definition) => {\n      const queryKey = ['query', LOG_QUERY_KEY, definition, absoluteTimeRange, variableValues] as const;\n      const logQueryKind = 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<LogQueryResult> => {\n          const plugin = await getPlugin({\n            kind: LOG_QUERY_KEY,\n            name: logQueryKind,\n            version: definition.spec.plugin.metadata?.version,\n            registry: definition.spec.plugin.metadata?.registry,\n          });\n          const data = await plugin.getLogData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","useVariableValues","LOG_QUERY_KEY","useLogQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","variableValues","context","timeRange","variableState","refreshKey","queries","map","definition","queryKey","logQueryKind","spec","plugin","kind","refetchOnMount","refetchOnWindowFocus","refetchOnReconnect","staleTime","Infinity","queryFn","signal","name","version","metadata","registry","data","getLogData","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;AAGnD,SAASC,kBAAkB,QAAQ,mBAAgB;AACnD,SAASC,iBAAiB,QAAQ,uBAAoB;AACtD,SAASC,YAAY,QAAQ,+BAAsB;AACnD,SAASC,iBAAiB,QAAQ,iBAAc;AAGhD,OAAO,MAAMC,gBAAgB,WAAW;AAExC,OAAO,SAASC,cAAcC,WAAiC;IAC7D,MAAM,EAAEC,SAAS,EAAE,GAAGN;IACtB,MAAMO,kBAAkBR;IACxB,MAAM,EAAES,iBAAiB,EAAE,GAAGP;IAC9B,MAAMQ,iBAAiBP;IAEvB,MAAMQ,UAAU;QACdC,WAAWH;QACXI,eAAeH;QACfF;QACAM,YAAY;IACd;IAEA,OAAOf,WAAW;QAChBgB,SAAST,YAAYU,GAAG,CAAC,CAACC;YACxB,MAAMC,WAAW;gBAAC;gBAASd;gBAAea;gBAAYR;gBAAmBC;aAAe;YACxF,MAAMS,eAAeF,YAAYG,MAAMC,QAAQC;YAC/C,OAAO;gBACLJ,UAAUA;gBACVK,gBAAgB;gBAChBC,sBAAsB;gBACtBC,oBAAoB;gBACpBC,WAAWC;gBACXC,SAAS,OAAO,EAAEC,MAAM,EAA4B;oBAClD,MAAMR,SAAS,MAAMd,UAAU;wBAC7Be,MAAMlB;wBACN0B,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,UAAU,CAAClB,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAET,SAASkB;oBAC3E,OAAOK;gBACT;gBAEAE,mBAAmB;YACrB;QACF;IACF;AACF"}

package/dist/runtime/plugin-registry.d.ts

@@ -1,10 +1,11 @@
-import type { BuiltinVariableDefinition } from '@perses-dev/spec';
+import type { BuiltinVariableDefinition, PluginDefinitionMetadata } from '@perses-dev/spec';
 import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
 import type { DefaultPluginKinds, PluginImplementation, PluginMetadataWithModule, PluginType, PluginCompoundKey } from '../model';
 export interface PluginRegistryContextType {
     getPlugin<T extends PluginType>(compoundKey: PluginCompoundKey<T>): Promise<PluginImplementation<T>>;
-    listPluginMetadata(pluginTypes: PluginType[]): Promise<PluginMetadataWithModule[]>;
+    listPluginMetadata(pluginTypes?: PluginType[]): Promise<PluginMetadataWithModule[]>;
     defaultPluginKinds?: DefaultPluginKinds;
+    pluginsBaseURL?: string;
 }
 export declare const PluginRegistryContext: import("react").Context<PluginRegistryContextType | undefined>;
 /**
@@ -12,22 +13,36 @@ export declare const PluginRegistryContext: import("react").Context<PluginRegist
  * be using `usePlugin` or `useListPluginMetadata` instead.
  */
 export declare function usePluginRegistry(): PluginRegistryContextType;
-type UsePluginOptions<T extends PluginType> = Omit<UseQueryOptions<PluginImplementation<T>, Error, PluginImplementation<T>, [string, PluginType | undefined, string]>, 'queryKey' | 'queryFn'>;
+type UsePluginQueryKey = [string, PluginType | undefined, string, string, string];
+type UsePluginOptions<T extends PluginType> = Omit<UseQueryOptions<PluginImplementation<T>, Error, PluginImplementation<T>, UsePluginQueryKey>, 'queryKey' | 'queryFn'> & {
+    /** Pin resolution to a specific plugin version. When omitted, the latest available version is used. */
+    version?: string;
+    /** Pin resolution to a specific plugin registry. */
+    registry?: string;
+};
 /**
  * Loads a plugin and returns the plugin implementation, along with loading/error state.
+ *
+ * When `options.version` is provided, the plugin is resolved with an exact version match: if that version is not
+ * installed, the query fails instead of silently falling back to the latest available version.
  */
 export declare function usePlugin<T extends PluginType>(pluginType: T | undefined, kind: string, options?: UsePluginOptions<T>): UseQueryResult<PluginImplementation<T>, Error>;
 /**
- * Loads a list of plugins and returns the plugin implementation, along with loading/error state.
+ * A plugin reference to load, optionally pinned to a specific version/registry.
  */
-export declare function usePlugins<T extends PluginType>(pluginType: T, plugins: Array<{
+export interface UsePluginsItem extends PluginDefinitionMetadata {
     kind: string;
-}>): Array<UseQueryResult<PluginImplementation<T>>>;
+}
+/**
+ * Loads a list of plugins and returns the plugin implementation, along with loading/error state.
+ */
+export declare function usePlugins<T extends PluginType>(pluginType: T, plugins: UsePluginsItem[]): Array<UseQueryResult<PluginImplementation<T>>>;
 type UseListPluginMetadataOptions = Omit<UseQueryOptions<PluginMetadataWithModule[], Error, PluginMetadataWithModule[], [string, string[]]>, 'queryKey' | 'queryFn'>;
 /**
- * Gets a list of plugin metadata for the specified plugin type and returns it, along with loading/error state.
+ * Gets a list of plugin metadata for the specified plugin types and returns it, along with loading/error state. When
+ * `pluginTypes` is omitted, the metadata of every installed plugin is returned, whatever its type.
  */
-export declare function useListPluginMetadata(pluginTypes: PluginType[], options?: UseListPluginMetadataOptions): UseQueryResult<PluginMetadataWithModule[]>;
+export declare function useListPluginMetadata(pluginTypes?: PluginType[], options?: UseListPluginMetadataOptions): UseQueryResult<PluginMetadataWithModule[]>;
 export declare function usePluginBuiltinVariableDefinitions(): UseQueryResult<BuiltinVariableDefinition[]>;
 export {};
 //# sourceMappingURL=plugin-registry.d.ts.map

package/dist/runtime/plugin-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-registry.d.ts","sourceRoot":"","sources":["../../src/runtime/plugin-registry.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI7E,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,kBAAkB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACnF,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AAED,eAAO,MAAM,qBAAqB,gEAAkE,CAAC;AAErG;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,yBAAyB,CAM7D;AAGD,KAAK,gBAAgB,CAAC,CAAC,SAAS,UAAU,IAAI,IAAI,CAChD,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,EAAE,MAAM,CAAC,CAAC,EAClH,UAAU,GAAG,SAAS,CACvB,CAAC;AAEF;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAC5C,UAAU,EAAE,CAAC,GAAG,SAAS,EACzB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC5B,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAYhD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,UAAU,EAC7C,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAC/B,KAAK,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAoBhD;AAGD,KAAK,4BAA4B,GAAG,IAAI,CACtC,eAAe,CAAC,wBAAwB,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,EAClG,UAAU,GAAG,SAAS,CACvB,CAAC;AAEF;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EAAE,EACzB,OAAO,CAAC,EAAE,4BAA4B,GACrC,cAAc,CAAC,wBAAwB,EAAE,CAAC,CAO5C;AAED,wBAAgB,mCAAmC,IAAI,cAAc,CAAC,yBAAyB,EAAE,CAAC,CAkBjG"}
+{"version":3,"file":"plugin-registry.d.ts","sourceRoot":"","sources":["../../src/runtime/plugin-registry.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI7E,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,kBAAkB,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACpF,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,qBAAqB,gEAAkE,CAAC;AAErG;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,yBAAyB,CAM7D;AAED,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAGlF,KAAK,gBAAgB,CAAC,CAAC,SAAS,UAAU,IAAI,IAAI,CAChD,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAC3F,UAAU,GAAG,SAAS,CACvB,GAAG;IACF,uGAAuG;IACvG,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAC5C,UAAU,EAAE,CAAC,GAAG,SAAS,EACzB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC5B,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAahD;AAED;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,wBAAwB;IAC9D,IAAI,EAAE,MAAM,CAAC;CACd;AAUD;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,UAAU,EAC7C,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,KAAK,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CA6BhD;AAGD,KAAK,4BAA4B,GAAG,IAAI,CACtC,eAAe,CAAC,wBAAwB,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,EAClG,UAAU,GAAG,SAAS,CACvB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,CAAC,EAAE,UAAU,EAAE,EAC1B,OAAO,CAAC,EAAE,4BAA4B,GACrC,cAAc,CAAC,wBAAwB,EAAE,CAAC,CAQ5C;AAED,wBAAgB,mCAAmC,IAAI,cAAc,CAAC,yBAAyB,EAAE,CAAC,CAkBjG"}

package/dist/runtime/plugin-registry.js

@@ -25,63 +25,99 @@ export const PluginRegistryContext = createContext(undefined);
 }
 /**
  * Loads a plugin and returns the plugin implementation, along with loading/error state.
+ *
+ * When `options.version` is provided, the plugin is resolved with an exact version match: if that version is not
+ * installed, the query fails instead of silently falling back to the latest available version.
  */ export function usePlugin(pluginType, kind, options) {
+    const { version, registry, ...queryOptions } = options ?? {};
     // We never want to ask for a plugin when the kind isn't set yet, so disable those queries automatically
-    options = {
-        ...options,
-        enabled: (options?.enabled ?? true) && pluginType !== undefined && kind !== ''
+    const useQueryOptions = {
+        ...queryOptions,
+        enabled: (queryOptions.enabled ?? true) && pluginType !== undefined && kind !== ''
     };
     const { getPlugin } = usePluginRegistry();
     return useQuery({
         queryKey: [
             'getPlugin',
             pluginType,
-            kind
+            kind,
+            version ?? '',
+            registry ?? ''
         ],
         queryFn: ()=>getPlugin({
                 kind: pluginType,
-                name: kind
+                name: kind,
+                version,
+                registry
             }),
-        ...options
+        ...useQueryOptions
     });
 }
+/**
+ * Full identity of a plugin to load. Two definitions pinned to different versions (or registries) of the same kind are
+ * distinct plugins and must be loaded independently.
+ */ function getUsePluginsItemIdentity(plugin) {
+    return `${plugin.kind}:${plugin.version ?? ''}:${plugin.registry ?? ''}`;
+}
 /**
  * Loads a list of plugins and returns the plugin implementation, along with loading/error state.
  */ export function usePlugins(pluginType, plugins) {
     const { getPlugin } = usePluginRegistry();
-    // useQueries() does not support queries with duplicate keys, therefore we de-duplicate the plugin kinds before running useQueries()
+    // useQueries() does not support queries with duplicate keys, therefore we de-duplicate the plugins before running useQueries()
     // This resolves the following warning in the JS console: "[QueriesObserver]: Duplicate Queries found. This might result in unexpected behavior."
     // https://github.com/TanStack/query/issues/8224#issuecomment-2523554831
     // https://github.com/TanStack/query/issues/4187#issuecomment-1256336901
-    const kinds = [
-        ...new Set(plugins.map((p)=>p.kind))
+    const uniquePlugins = new Map();
+    for (const p of plugins){
+        const key = getUsePluginsItemIdentity(p);
+        if (!uniquePlugins.has(key)) {
+            uniquePlugins.set(key, p);
+        }
+    }
+    const uniqueKeys = [
+        ...uniquePlugins.keys()
+    ];
+    const uniqueValues = [
+        ...uniquePlugins.values()
     ];
     const result = useQueries({
-        queries: kinds.map((kind)=>{
+        queries: uniqueValues.map((p)=>{
             return {
                 queryKey: [
                     'getPlugin',
                     pluginType,
-                    kind
+                    p.kind,
+                    p.version ?? '',
+                    p.registry ?? ''
                 ],
                 queryFn: ()=>getPlugin({
                         kind: pluginType,
-                        name: kind
+                        name: p.kind,
+                        version: p.version,
+                        registry: p.registry
                     })
             };
         })
     });
-    // Re-assemble array in original order
-    return plugins.map((p)=>result[kinds.indexOf(p.kind)]);
+    // Re-assemble array in original order. Index lookups go through a Map so this stays linear on large panels.
+    const indexByIdentity = new Map(uniqueKeys.map((key, index)=>[
+            key,
+            index
+        ]));
+    return plugins.map((p)=>result[indexByIdentity.get(getUsePluginsItemIdentity(p))]);
 }
 /**
- * Gets a list of plugin metadata for the specified plugin type and returns it, along with loading/error state.
+ * Gets a list of plugin metadata for the specified plugin types and returns it, along with loading/error state. When
+ * `pluginTypes` is omitted, the metadata of every installed plugin is returned, whatever its type.
  */ export function useListPluginMetadata(pluginTypes, options) {
     const { listPluginMetadata } = usePluginRegistry();
     return useQuery({
+        // `['*']` marks the "every plugin type" query so it gets its own cache entry.
         queryKey: [
             'listPluginMetadata',
-            pluginTypes
+            pluginTypes ?? [
+                '*'
+            ]
         ],
         queryFn: ()=>listPluginMetadata(pluginTypes),
         ...options