@grafana/scenes 6.29.0--canary.1197.16594646941.0 → 6.29.0

package/dist/index.js

@@ -607,246 +607,77 @@ var __accessCheck$3 = (obj, member, msg) => member.has(obj) || __typeError$3("Ca
 var __privateGet$3 = (obj, member, getter) => (__accessCheck$3(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd$3 = (obj, member, value) => member.has(obj) ? __typeError$3("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet$3 = (obj, member, value, setter) => (__accessCheck$3(obj, member, "write to private field"), member.set(obj, value), value);
-var _profileInProgress, _profileStartTs, _trailAnimationFrameId, _recordedTrailingSpans;
-const POST_STORM_WINDOW = 2e3;
-const SPAN_THRESHOLD = 30;
-class SceneRenderProfiler {
-  constructor(queryController) {
-    this.queryController = queryController;
-    __privateAdd$3(this, _profileInProgress, null);
-    __privateAdd$3(this, _profileStartTs, null);
-    __privateAdd$3(this, _trailAnimationFrameId, null);
-    // Will keep measured lengths trailing frames
-    __privateAdd$3(this, _recordedTrailingSpans, []);
-    this.lastFrameTime = 0;
-    this.measureTrailingFrames = (measurementStartTs, lastFrameTime, profileStartTs) => {
-      const currentFrameTime = performance.now();
-      const frameLength = currentFrameTime - lastFrameTime;
-      __privateGet$3(this, _recordedTrailingSpans).push(frameLength);
-      if (currentFrameTime - measurementStartTs < POST_STORM_WINDOW) {
-        __privateSet$3(this, _trailAnimationFrameId, requestAnimationFrame(
-          () => this.measureTrailingFrames(measurementStartTs, currentFrameTime, profileStartTs)
-        ));
-      } else {
-        const slowFrames = processRecordedSpans(__privateGet$3(this, _recordedTrailingSpans));
-        const slowFramesTime = slowFrames.reduce((acc, val) => acc + val, 0);
-        writeSceneLog(
-          this.constructor.name,
-          "Profile tail recorded, slow frames duration:",
-          slowFramesTime,
-          slowFrames,
-          __privateGet$3(this, _profileInProgress)
-        );
-        __privateSet$3(this, _recordedTrailingSpans, []);
-        const profileDuration = measurementStartTs - profileStartTs;
-        writeSceneLog(
-          this.constructor.name,
-          "Stoped recording, total measured time (network included):",
-          profileDuration + slowFramesTime
-        );
-        __privateSet$3(this, _trailAnimationFrameId, null);
-        const profileEndTs = profileStartTs + profileDuration + slowFramesTime;
-        performance.measure(`DashboardInteraction ${__privateGet$3(this, _profileInProgress).origin}`, {
-          start: profileStartTs,
-          end: profileEndTs
-        });
-        const networkDuration = captureNetwork(profileStartTs, profileEndTs);
-        if (this.queryController.state.onProfileComplete) {
-          this.queryController.state.onProfileComplete({
-            origin: __privateGet$3(this, _profileInProgress).origin,
-            crumbs: __privateGet$3(this, _profileInProgress).crumbs,
-            duration: profileDuration + slowFramesTime,
-            networkDuration,
-            // @ts-ignore
-            jsHeapSizeLimit: performance.memory ? performance.memory.jsHeapSizeLimit : 0,
-            // @ts-ignore
-            usedJSHeapSize: performance.memory ? performance.memory.usedJSHeapSize : 0,
-            // @ts-ignore
-            totalJSHeapSize: performance.memory ? performance.memory.totalJSHeapSize : 0
-          });
-          __privateSet$3(this, _profileInProgress, null);
-        }
-        if (window.__runs) {
-          window.__runs += `${Date.now()}, ${profileDuration + slowFramesTime}
-`;
-        } else {
-          window.__runs = `${Date.now()}, ${profileDuration + slowFramesTime}
-`;
-        }
-      }
-    };
-  }
-  startProfile(name) {
-    if (__privateGet$3(this, _profileInProgress)) {
-      if (__privateGet$3(this, _trailAnimationFrameId)) {
-        cancelAnimationFrame(__privateGet$3(this, _trailAnimationFrameId));
-        __privateSet$3(this, _trailAnimationFrameId, null);
-        writeSceneLog(this.constructor.name, "New profile: Stopped recording frames ");
-        __privateSet$3(this, _profileInProgress, { origin: name, crumbs: [] });
-        __privateSet$3(this, _profileStartTs, performance.now());
-        writeSceneLog(this.constructor.name, "Profile started:", __privateGet$3(this, _profileInProgress), __privateGet$3(this, _profileStartTs));
-      } else {
-        this.addCrumb(name);
-      }
-    } else {
-      __privateSet$3(this, _profileInProgress, { origin: name, crumbs: [] });
-      __privateSet$3(this, _profileStartTs, performance.now());
-      writeSceneLog(this.constructor.name, "Profile started:", __privateGet$3(this, _profileInProgress), __privateGet$3(this, _profileStartTs));
-    }
-  }
-  recordProfileTail(measurementStartTime, profileStartTs) {
-    __privateSet$3(this, _trailAnimationFrameId, requestAnimationFrame(
-      () => this.measureTrailingFrames(measurementStartTime, measurementStartTime, profileStartTs)
-    ));
-  }
-  tryCompletingProfile() {
-    writeSceneLog(this.constructor.name, "Trying to complete profile", __privateGet$3(this, _profileInProgress));
-    if (this.queryController.runningQueriesCount() === 0 && __privateGet$3(this, _profileInProgress)) {
-      writeSceneLog(this.constructor.name, "All queries completed, stopping profile");
-      this.recordProfileTail(performance.now(), __privateGet$3(this, _profileStartTs));
-    }
-  }
-  isTailRecording() {
-    return Boolean(__privateGet$3(this, _trailAnimationFrameId));
-  }
-  cancelTailRecording() {
-    if (__privateGet$3(this, _trailAnimationFrameId)) {
-      cancelAnimationFrame(__privateGet$3(this, _trailAnimationFrameId));
-      __privateSet$3(this, _trailAnimationFrameId, null);
-      writeSceneLog(this.constructor.name, "Cancelled recording frames, new profile started");
-    }
-  }
-  addCrumb(crumb) {
-    if (__privateGet$3(this, _profileInProgress)) {
-      writeSceneLog(this.constructor.name, "Adding crumb:", crumb);
-      __privateGet$3(this, _profileInProgress).crumbs.push(crumb);
-    }
-  }
-}
-_profileInProgress = new WeakMap();
-_profileStartTs = new WeakMap();
-_trailAnimationFrameId = new WeakMap();
-_recordedTrailingSpans = new WeakMap();
-function processRecordedSpans(spans) {
-  for (let i = spans.length - 1; i >= 0; i--) {
-    if (spans[i] > SPAN_THRESHOLD) {
-      return spans.slice(0, i + 1);
-    }
-  }
-  return [spans[0]];
-}
-function captureNetwork(startTs, endTs) {
-  const entries = performance.getEntriesByType("resource");
-  performance.clearResourceTimings();
-  const networkEntries = entries.filter((entry) => entry.startTime >= startTs && entry.startTime <= endTs);
-  for (const entry of networkEntries) {
-    performance.measure("Network entry " + entry.name, {
-      start: entry.startTime,
-      end: entry.responseEnd
-    });
-  }
-  return calculateNetworkTime(networkEntries);
-}
-function calculateNetworkTime(requests) {
-  if (requests.length === 0) {
-    return 0;
-  }
-  requests.sort((a, b) => a.startTime - b.startTime);
-  let totalNetworkTime = 0;
-  let currentStart = requests[0].startTime;
-  let currentEnd = requests[0].responseEnd;
-  for (let i = 1; i < requests.length; i++) {
-    if (requests[i].startTime <= currentEnd) {
-      currentEnd = Math.max(currentEnd, requests[i].responseEnd);
-    } else {
-      totalNetworkTime += currentEnd - currentStart;
-      currentStart = requests[i].startTime;
-      currentEnd = requests[i].responseEnd;
-    }
-  }
-  totalNetworkTime += currentEnd - currentStart;
-  return totalNetworkTime;
-}
-const REFRESH_INTERACTION = "refresh";
-const TIME_RANGE_CHANGE_INTERACTION = "time_range_change";
-const FILTER_REMOVED_INTERACTION = "filter_removed";
-const FILTER_CHANGED_INTERACTION = "filter_changed";
-const FILTER_RESTORED_INTERACTION = "filter_restored";
-const VARIABLE_VALUE_CHANGED_INTERACTION = "variable_value_changed";
-const SCOPES_CHANGED_INTERACTION = "scopes_changed";
-
-var __typeError$2 = (msg) => {
-  throw TypeError(msg);
-};
-var __accessCheck$2 = (obj, member, msg) => member.has(obj) || __typeError$2("Cannot " + msg);
-var __privateGet$2 = (obj, member, getter) => (__accessCheck$2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd$2 = (obj, member, value) => member.has(obj) ? __typeError$2("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet$2 = (obj, member, value, setter) => (__accessCheck$2(obj, member, "write to private field"), member.set(obj, value), value);
 var _running, _tryCompleteProfileFrameId;
 function isQueryController(s) {
   return "isQueryController" in s;
 }
 class SceneQueryController extends SceneObjectBase {
-  constructor(state = {}) {
+  constructor(state = {}, profiler) {
     super({ ...state, isRunning: false });
+    this.profiler = profiler;
     this.isQueryController = true;
-    this.profiler = new SceneRenderProfiler(this);
-    __privateAdd$2(this, _running, /* @__PURE__ */ new Set());
-    __privateAdd$2(this, _tryCompleteProfileFrameId, null);
+    __privateAdd$3(this, _running, /* @__PURE__ */ new Set());
+    __privateAdd$3(this, _tryCompleteProfileFrameId, null);
     this.runningQueriesCount = () => {
-      return __privateGet$2(this, _running).size;
+      return __privateGet$3(this, _running).size;
     };
+    if (profiler) {
+      this.profiler = profiler;
+      profiler.setQueryController(this);
+    }
     this.addActivationHandler(() => {
-      return () => __privateGet$2(this, _running).clear();
+      return () => __privateGet$3(this, _running).clear();
     });
   }
   startProfile(name) {
+    var _a;
     if (!this.state.enableProfiling) {
       return;
     }
-    this.profiler.startProfile(name);
+    (_a = this.profiler) == null ? void 0 : _a.startProfile(name);
   }
   queryStarted(entry) {
-    __privateGet$2(this, _running).add(entry);
+    __privateGet$3(this, _running).add(entry);
     this.changeRunningQueryCount(1, entry);
     if (!this.state.isRunning) {
       this.setState({ isRunning: true });
     }
   }
   queryCompleted(entry) {
-    if (!__privateGet$2(this, _running).has(entry)) {
+    if (!__privateGet$3(this, _running).has(entry)) {
       return;
     }
-    __privateGet$2(this, _running).delete(entry);
+    __privateGet$3(this, _running).delete(entry);
     this.changeRunningQueryCount(-1);
-    if (__privateGet$2(this, _running).size === 0) {
+    if (__privateGet$3(this, _running).size === 0) {
       this.setState({ isRunning: false });
     }
   }
   changeRunningQueryCount(dir, entry) {
-    var _a;
+    var _a, _b, _c, _d;
     window.__grafanaRunningQueryCount = ((_a = window.__grafanaRunningQueryCount) != null ? _a : 0) + dir;
     if (dir === 1 && this.state.enableProfiling) {
       if (entry) {
-        this.profiler.addCrumb(`${entry.origin.constructor.name}/${entry.type}`);
+        (_b = this.profiler) == null ? void 0 : _b.addCrumb(`${entry.type}`);
       }
-      if (this.profiler.isTailRecording()) {
-        writeSceneLog(this.constructor.name, "New query started, cancelling tail recording");
-        this.profiler.cancelTailRecording();
+      if ((_c = this.profiler) == null ? void 0 : _c.isTailRecording()) {
+        writeSceneLog("SceneQueryController", "New query started, cancelling tail recording");
+        (_d = this.profiler) == null ? void 0 : _d.cancelTailRecording();
       }
     }
     if (this.state.enableProfiling) {
-      if (__privateGet$2(this, _tryCompleteProfileFrameId)) {
-        cancelAnimationFrame(__privateGet$2(this, _tryCompleteProfileFrameId));
+      if (__privateGet$3(this, _tryCompleteProfileFrameId)) {
+        cancelAnimationFrame(__privateGet$3(this, _tryCompleteProfileFrameId));
       }
-      __privateSet$2(this, _tryCompleteProfileFrameId, requestAnimationFrame(() => {
-        this.profiler.tryCompletingProfile();
+      __privateSet$3(this, _tryCompleteProfileFrameId, requestAnimationFrame(() => {
+        var _a2;
+        (_a2 = this.profiler) == null ? void 0 : _a2.tryCompletingProfile();
       }));
     }
   }
   cancelAll() {
     var _a;
-    for (const entry of __privateGet$2(this, _running).values()) {
+    for (const entry of __privateGet$3(this, _running).values()) {
       (_a = entry.cancel) == null ? void 0 : _a.call(entry);
     }
   }
@@ -1012,9 +843,185 @@ function isValid$1(value, roundUp, timeZone) {
   if (data.dateMath.isMathString(value)) {
     return data.dateMath.isValid(value);
   }
-  const parsed = data.dateTimeParse(value, { roundUp, timeZone });
-  return parsed.isValid();
+  const parsed = data.dateTimeParse(value, { roundUp, timeZone });
+  return parsed.isValid();
+}
+
+var __typeError$2 = (msg) => {
+  throw TypeError(msg);
+};
+var __accessCheck$2 = (obj, member, msg) => member.has(obj) || __typeError$2("Cannot " + msg);
+var __privateGet$2 = (obj, member, getter) => (__accessCheck$2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd$2 = (obj, member, value) => member.has(obj) ? __typeError$2("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet$2 = (obj, member, value, setter) => (__accessCheck$2(obj, member, "write to private field"), member.set(obj, value), value);
+var _profileInProgress, _profileStartTs, _trailAnimationFrameId, _recordedTrailingSpans;
+const POST_STORM_WINDOW = 2e3;
+const SPAN_THRESHOLD = 30;
+class SceneRenderProfiler {
+  constructor(queryController) {
+    this.queryController = queryController;
+    __privateAdd$2(this, _profileInProgress, null);
+    __privateAdd$2(this, _profileStartTs, null);
+    __privateAdd$2(this, _trailAnimationFrameId, null);
+    // Will keep measured lengths trailing frames
+    __privateAdd$2(this, _recordedTrailingSpans, []);
+    this.lastFrameTime = 0;
+    this.measureTrailingFrames = (measurementStartTs, lastFrameTime, profileStartTs) => {
+      var _a;
+      const currentFrameTime = performance.now();
+      const frameLength = currentFrameTime - lastFrameTime;
+      __privateGet$2(this, _recordedTrailingSpans).push(frameLength);
+      if (currentFrameTime - measurementStartTs < POST_STORM_WINDOW) {
+        if (__privateGet$2(this, _profileInProgress)) {
+          __privateSet$2(this, _trailAnimationFrameId, requestAnimationFrame(
+            () => this.measureTrailingFrames(measurementStartTs, currentFrameTime, profileStartTs)
+          ));
+        }
+      } else {
+        const slowFrames = processRecordedSpans(__privateGet$2(this, _recordedTrailingSpans));
+        const slowFramesTime = slowFrames.reduce((acc, val) => acc + val, 0);
+        writeSceneLog(
+          this.constructor.name,
+          "Profile tail recorded, slow frames duration:",
+          slowFramesTime,
+          slowFrames,
+          __privateGet$2(this, _profileInProgress)
+        );
+        __privateSet$2(this, _recordedTrailingSpans, []);
+        const profileDuration = measurementStartTs - profileStartTs;
+        writeSceneLog(
+          this.constructor.name,
+          "Stoped recording, total measured time (network included):",
+          profileDuration + slowFramesTime
+        );
+        __privateSet$2(this, _trailAnimationFrameId, null);
+        const profileEndTs = profileStartTs + profileDuration + slowFramesTime;
+        performance.measure(`DashboardInteraction ${__privateGet$2(this, _profileInProgress).origin}`, {
+          start: profileStartTs,
+          end: profileEndTs
+        });
+        const networkDuration = captureNetwork(profileStartTs, profileEndTs);
+        if ((_a = this.queryController) == null ? void 0 : _a.state.onProfileComplete) {
+          this.queryController.state.onProfileComplete({
+            origin: __privateGet$2(this, _profileInProgress).origin,
+            crumbs: __privateGet$2(this, _profileInProgress).crumbs,
+            duration: profileDuration + slowFramesTime,
+            networkDuration,
+            startTs: profileStartTs,
+            endTs: profileEndTs,
+            // @ts-ignore
+            jsHeapSizeLimit: performance.memory ? performance.memory.jsHeapSizeLimit : 0,
+            // @ts-ignore
+            usedJSHeapSize: performance.memory ? performance.memory.usedJSHeapSize : 0,
+            // @ts-ignore
+            totalJSHeapSize: performance.memory ? performance.memory.totalJSHeapSize : 0
+          });
+          __privateSet$2(this, _profileInProgress, null);
+          __privateSet$2(this, _trailAnimationFrameId, null);
+        }
+        if (window.__runs) {
+          window.__runs += `${Date.now()}, ${profileDuration + slowFramesTime}
+`;
+        } else {
+          window.__runs = `${Date.now()}, ${profileDuration + slowFramesTime}
+`;
+        }
+      }
+    };
+  }
+  setQueryController(queryController) {
+    this.queryController = queryController;
+  }
+  startProfile(name) {
+    if (__privateGet$2(this, _profileInProgress)) {
+      this.addCrumb(name);
+    } else {
+      __privateSet$2(this, _profileInProgress, { origin: name, crumbs: [] });
+      __privateSet$2(this, _profileStartTs, performance.now());
+      writeSceneLog("SceneRenderProfiler", "Profile started:", __privateGet$2(this, _profileInProgress), __privateGet$2(this, _profileStartTs));
+    }
+  }
+  recordProfileTail(measurementStartTime, profileStartTs) {
+    __privateSet$2(this, _trailAnimationFrameId, requestAnimationFrame(
+      () => this.measureTrailingFrames(measurementStartTime, measurementStartTime, profileStartTs)
+    ));
+  }
+  tryCompletingProfile() {
+    var _a;
+    writeSceneLog("SceneRenderProfiler", "Trying to complete profile", __privateGet$2(this, _profileInProgress));
+    if (((_a = this.queryController) == null ? void 0 : _a.runningQueriesCount()) === 0 && __privateGet$2(this, _profileInProgress)) {
+      writeSceneLog("SceneRenderProfiler", "All queries completed, stopping profile");
+      this.recordProfileTail(performance.now(), __privateGet$2(this, _profileStartTs));
+    }
+  }
+  isTailRecording() {
+    return Boolean(__privateGet$2(this, _trailAnimationFrameId));
+  }
+  cancelTailRecording() {
+    if (__privateGet$2(this, _trailAnimationFrameId)) {
+      cancelAnimationFrame(__privateGet$2(this, _trailAnimationFrameId));
+      __privateSet$2(this, _trailAnimationFrameId, null);
+      writeSceneLog("SceneRenderProfiler", "Cancelled recording frames, new profile started");
+    }
+  }
+  addCrumb(crumb) {
+    if (__privateGet$2(this, _profileInProgress)) {
+      writeSceneLog("SceneRenderProfiler", "Adding crumb:", crumb);
+      __privateGet$2(this, _profileInProgress).crumbs.push(crumb);
+    }
+  }
+}
+_profileInProgress = new WeakMap();
+_profileStartTs = new WeakMap();
+_trailAnimationFrameId = new WeakMap();
+_recordedTrailingSpans = new WeakMap();
+function processRecordedSpans(spans) {
+  for (let i = spans.length - 1; i >= 0; i--) {
+    if (spans[i] > SPAN_THRESHOLD) {
+      return spans.slice(0, i + 1);
+    }
+  }
+  return [spans[0]];
+}
+function captureNetwork(startTs, endTs) {
+  const entries = performance.getEntriesByType("resource");
+  performance.clearResourceTimings();
+  const networkEntries = entries.filter((entry) => entry.startTime >= startTs && entry.startTime <= endTs);
+  for (const entry of networkEntries) {
+    performance.measure("Network entry " + entry.name, {
+      start: entry.startTime,
+      end: entry.responseEnd
+    });
+  }
+  return calculateNetworkTime(networkEntries);
+}
+function calculateNetworkTime(requests) {
+  if (requests.length === 0) {
+    return 0;
+  }
+  requests.sort((a, b) => a.startTime - b.startTime);
+  let totalNetworkTime = 0;
+  let currentStart = requests[0].startTime;
+  let currentEnd = requests[0].responseEnd;
+  for (let i = 1; i < requests.length; i++) {
+    if (requests[i].startTime <= currentEnd) {
+      currentEnd = Math.max(currentEnd, requests[i].responseEnd);
+    } else {
+      totalNetworkTime += currentEnd - currentStart;
+      currentStart = requests[i].startTime;
+      currentEnd = requests[i].responseEnd;
+    }
+  }
+  totalNetworkTime += currentEnd - currentStart;
+  return totalNetworkTime;
 }
+const REFRESH_INTERACTION = "refresh";
+const TIME_RANGE_CHANGE_INTERACTION = "time_range_change";
+const FILTER_REMOVED_INTERACTION = "filter_removed";
+const FILTER_CHANGED_INTERACTION = "filter_changed";
+const FILTER_RESTORED_INTERACTION = "filter_restored";
+const VARIABLE_VALUE_CHANGED_INTERACTION = "variable_value_changed";
+const SCOPES_CHANGED_INTERACTION = "scopes_changed";
 
 class SceneTimeRange extends SceneObjectBase {
   constructor(state = {}) {
@@ -2420,13 +2427,17 @@ const macrosIndex = /* @__PURE__ */ new Map([
   ["__interval", IntervalMacro],
   ["__interval_ms", IntervalMacro]
 ]);
-function registerVariableMacro(name, macro) {
-  if (macrosIndex.get(name)) {
+function registerVariableMacro(name, macro, replace = false) {
+  if (!replace && macrosIndex.get(name)) {
     throw new Error(`Macro already registered ${name}`);
   }
   macrosIndex.set(name, macro);
   return () => {
-    macrosIndex.delete(name);
+    if (replace) {
+      throw new Error(`Replaced macros can not be unregistered. They need to be restored manually.`);
+    } else {
+      macrosIndex.delete(name);
+    }
   };
 }
 
@@ -2588,7 +2599,7 @@ async function getDataSource(datasource, scopedVars) {
     if (queryControler && queryControler.state.enableProfiling) {
       wrapPromiseInStateObservable(dsPromise).pipe(
         registerQueryWithController({
-          type: `plugin/${(_a = datasource == null ? void 0 : datasource.type) != null ? _a : "unknown"}`,
+          type: `getDataSource/${(_a = datasource == null ? void 0 : datasource.type) != null ? _a : "unknown"}`,
           origin: scopedVars.__sceneObject.value.valueOf()
         })
       ).subscribe(() => {
@@ -6518,7 +6529,7 @@ class SceneQueryRunner extends SceneObjectBase {
       }
       stream = stream.pipe(
         registerQueryWithController({
-          type: "data",
+          type: "SceneQueryRunner/runQueries",
           request: primary,
           origin: this,
           cancel: () => this.cancelQuery()
@@ -7439,7 +7450,7 @@ class QueryVariable extends MultiValueVariable {
         const request = this.getRequest(target, args.searchFilter);
         return runner.runRequest({ variable: this, searchFilter: args.searchFilter }, request).pipe(
           registerQueryWithController({
-            type: "variable",
+            type: "QueryVariable/getValueOptions",
             request,
             origin: this
           }),
@@ -8497,6 +8508,253 @@ const createProperty = (color) => {
   };
 };
 
+class SceneDataLayerSetBase extends SceneObjectBase {
+  constructor() {
+    super(...arguments);
+    /** Mark it as a data layer */
+    this.isDataLayer = true;
+    /**
+     * Subject to emit results to.
+     */
+    this._results = new rxjs.ReplaySubject(1);
+    this._dataLayersMerger = new DataLayersMerger();
+  }
+  subscribeToAllLayers(layers) {
+    if (layers.length > 0) {
+      this.querySub = this._dataLayersMerger.getMergedStream(layers).subscribe(this._onLayerUpdateReceived.bind(this));
+    } else {
+      this._results.next({ origin: this, data: emptyPanelData });
+      this.setStateHelper({ data: emptyPanelData });
+    }
+  }
+  _onLayerUpdateReceived(results) {
+    var _a;
+    let series = [];
+    for (const result of results) {
+      if ((_a = result.data) == null ? void 0 : _a.series) {
+        series = series.concat(result.data.series);
+      }
+    }
+    const combinedData = { ...emptyPanelData, series };
+    this._results.next({ origin: this, data: combinedData });
+    this.setStateHelper({ data: combinedData });
+  }
+  getResultsStream() {
+    return this._results;
+  }
+  cancelQuery() {
+    var _a;
+    (_a = this.querySub) == null ? void 0 : _a.unsubscribe();
+  }
+  /**
+   * This helper function is to counter the contravariance of setState
+   */
+  setStateHelper(state) {
+    setBaseClassState(this, state);
+  }
+}
+class SceneDataLayerSet extends SceneDataLayerSetBase {
+  constructor(state) {
+    var _a, _b;
+    super({
+      name: (_a = state.name) != null ? _a : "Data layers",
+      layers: (_b = state.layers) != null ? _b : []
+    });
+    this.addActivationHandler(() => this._onActivate());
+  }
+  _onActivate() {
+    this._subs.add(
+      this.subscribeToState((newState, oldState) => {
+        var _a;
+        if (newState.layers !== oldState.layers) {
+          (_a = this.querySub) == null ? void 0 : _a.unsubscribe();
+          this.subscribeToAllLayers(newState.layers);
+        }
+      })
+    );
+    this.subscribeToAllLayers(this.state.layers);
+    return () => {
+      var _a;
+      (_a = this.querySub) == null ? void 0 : _a.unsubscribe();
+    };
+  }
+}
+SceneDataLayerSet.Component = ({ model }) => {
+  const { layers } = model.useState();
+  return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, layers.map((layer) => /* @__PURE__ */ React__default.default.createElement(layer.Component, { model: layer, key: layer.state.key })));
+};
+
+class SceneDataTransformer extends SceneObjectBase {
+  constructor(state) {
+    super(state);
+    this._results = new rxjs.ReplaySubject(1);
+    /**
+     * Scan transformations for variable usage and re-process transforms when a variable values change
+     */
+    this._variableDependency = new VariableDependencyConfig(
+      this,
+      {
+        statePaths: ["transformations"],
+        onReferencedVariableValueChanged: () => this.reprocessTransformations()
+      }
+    );
+    this.addActivationHandler(() => this.activationHandler());
+  }
+  activationHandler() {
+    const sourceData = this.getSourceData();
+    this._subs.add(sourceData.subscribeToState((state) => this.transform(state.data)));
+    if (sourceData.state.data) {
+      this.transform(sourceData.state.data);
+    }
+    return () => {
+      if (this._transformSub) {
+        this._transformSub.unsubscribe();
+      }
+    };
+  }
+  getSourceData() {
+    if (this.state.$data) {
+      if (this.state.$data instanceof SceneDataLayerSet) {
+        throw new Error("SceneDataLayerSet can not be used as data provider for SceneDataTransformer.");
+      }
+      return this.state.$data;
+    }
+    if (!this.parent || !this.parent.parent) {
+      throw new Error("SceneDataTransformer must either have $data set on it or have a parent.parent with $data");
+    }
+    return sceneGraph.getData(this.parent.parent);
+  }
+  setContainerWidth(width) {
+    if (this.state.$data && this.state.$data.setContainerWidth) {
+      this.state.$data.setContainerWidth(width);
+    }
+  }
+  isDataReadyToDisplay() {
+    const dataObject = this.getSourceData();
+    if (dataObject.isDataReadyToDisplay) {
+      return dataObject.isDataReadyToDisplay();
+    }
+    return true;
+  }
+  reprocessTransformations() {
+    this.transform(this.getSourceData().state.data, true);
+  }
+  cancelQuery() {
+    var _a, _b;
+    (_b = (_a = this.getSourceData()).cancelQuery) == null ? void 0 : _b.call(_a);
+  }
+  getResultsStream() {
+    return this._results;
+  }
+  clone(withState) {
+    const clone = super.clone(withState);
+    if (this._prevDataFromSource) {
+      clone["_prevDataFromSource"] = this._prevDataFromSource;
+    }
+    return clone;
+  }
+  haveAlreadyTransformedData(data) {
+    if (!this._prevDataFromSource) {
+      return false;
+    }
+    if (data === this._prevDataFromSource) {
+      return true;
+    }
+    const { series, annotations } = this._prevDataFromSource;
+    if (data.series === series && data.annotations === annotations) {
+      if (this.state.data && data.state !== this.state.data.state) {
+        this.setState({ data: { ...this.state.data, state: data.state } });
+      }
+      return true;
+    }
+    return false;
+  }
+  transform(data$1, force = false) {
+    var _a;
+    if (this.state.transformations.length === 0 || !data$1) {
+      this._prevDataFromSource = data$1;
+      this.setState({ data: data$1 });
+      if (data$1) {
+        this._results.next({ origin: this, data: data$1 });
+      }
+      return;
+    }
+    if (!force && this.haveAlreadyTransformedData(data$1)) {
+      return;
+    }
+    let interpolatedTransformations = this._interpolateVariablesInTransformationConfigs(data$1);
+    const seriesTransformations = interpolatedTransformations.filter((transformation) => {
+      if ("options" in transformation || "topic" in transformation) {
+        return transformation.topic == null || transformation.topic === data.DataTopic.Series;
+      }
+      return true;
+    }).map((transformation) => "operator" in transformation ? transformation.operator : transformation);
+    const annotationsTransformations = interpolatedTransformations.filter((transformation) => {
+      if ("options" in transformation || "topic" in transformation) {
+        return transformation.topic === data.DataTopic.Annotations;
+      }
+      return false;
+    }).map((transformation) => "operator" in transformation ? transformation.operator : transformation);
+    if (this._transformSub) {
+      this._transformSub.unsubscribe();
+    }
+    const ctx = {
+      interpolate: (value) => {
+        var _a2;
+        return sceneGraph.interpolate(this, value, (_a2 = data$1.request) == null ? void 0 : _a2.scopedVars);
+      }
+    };
+    let streams = [data.transformDataFrame(seriesTransformations, data$1.series, ctx)];
+    if (data$1.annotations && data$1.annotations.length > 0 && annotationsTransformations.length > 0) {
+      streams.push(data.transformDataFrame(annotationsTransformations, (_a = data$1.annotations) != null ? _a : []));
+    }
+    this._transformSub = rxjs.forkJoin(streams).pipe(
+      rxjs.map((values) => {
+        const transformedSeries = values[0];
+        const transformedAnnotations = values[1];
+        return {
+          ...data$1,
+          series: transformedSeries,
+          annotations: transformedAnnotations != null ? transformedAnnotations : data$1.annotations
+        };
+      }),
+      rxjs.catchError((err) => {
+        var _a2;
+        console.error("Error transforming data: ", err);
+        const sourceErr = ((_a2 = this.getSourceData().state.data) == null ? void 0 : _a2.errors) || [];
+        const transformationError = runtime.toDataQueryError(err);
+        transformationError.message = `Error transforming data: ${transformationError.message}`;
+        const result = {
+          ...data$1,
+          state: data.LoadingState.Error,
+          // Combine transformation error with upstream errors
+          errors: [...sourceErr, transformationError]
+        };
+        return rxjs.of(result);
+      })
+    ).subscribe((transformedData) => {
+      this.setState({ data: transformedData });
+      this._results.next({ origin: this, data: transformedData });
+      this._prevDataFromSource = data$1;
+    });
+  }
+  _interpolateVariablesInTransformationConfigs(data) {
+    var _a;
+    const transformations = this.state.transformations;
+    if (this._variableDependency.getNames().size === 0) {
+      return transformations;
+    }
+    const onlyObjects = transformations.every((t) => typeof t === "object");
+    if (onlyObjects) {
+      return JSON.parse(sceneGraph.interpolate(this, JSON.stringify(transformations), (_a = data.request) == null ? void 0 : _a.scopedVars));
+    }
+    return transformations.map((t) => {
+      var _a2;
+      return typeof t === "object" ? JSON.parse(sceneGraph.interpolate(this, JSON.stringify(t), (_a2 = data.request) == null ? void 0 : _a2.scopedVars)) : t;
+    });
+  }
+}
+
 class VizPanel extends SceneObjectBase {
   constructor(state) {
     var _a;
@@ -8688,7 +8946,7 @@ class VizPanel extends SceneObjectBase {
         const panelPromise = importPanelPlugin(pluginId);
         const queryControler = sceneGraph.getQueryController(this);
         if (queryControler && queryControler.state.enableProfiling) {
-          wrapPromiseInStateObservable(panelPromise).pipe(registerQueryWithController({ type: `plugin/${pluginId}`, origin: this })).subscribe(() => {
+          wrapPromiseInStateObservable(panelPromise).pipe(registerQueryWithController({ type: `VizPanel/loadPlugin/${pluginId}`, origin: this })).subscribe(() => {
           });
         }
         const result = await panelPromise;
@@ -8735,6 +8993,18 @@ class VizPanel extends SceneObjectBase {
     if (plugin.onPanelMigration && currentVersion !== pluginVersion && !isAfterPluginChange) {
       panel.options = await plugin.onPanelMigration(panel);
     }
+    let $data = this.state.$data;
+    if (panel.transformations && $data) {
+      if ($data instanceof SceneDataTransformer) {
+        $data.setState({ transformations: panel.transformations });
+      } else if ($data instanceof SceneQueryRunner) {
+        $data.clearParent();
+        $data = new SceneDataTransformer({
+          transformations: panel.transformations,
+          $data
+        });
+      }
+    }
     const withDefaults = data.getPanelOptionsWithDefaults({
       plugin,
       currentOptions: panel.options,
@@ -8743,6 +9013,7 @@ class VizPanel extends SceneObjectBase {
     });
     this._plugin = plugin;
     this.setState({
+      $data,
       options: withDefaults.options,
       fieldConfig: withDefaults.fieldConfig,
       pluginVersion: currentVersion,
@@ -9480,7 +9751,7 @@ class AnnotationsDataLayer extends SceneDataLayerBase {
       const ds = await this.resolveDataSource(query);
       let stream = executeAnnotationQuery(ds, timeRange, query, this).pipe(
         registerQueryWithController({
-          type: "annotations",
+          type: "AnnotationsDataLayer/annotationsLoading",
           origin: this,
           cancel: () => this.cancelQuery()
         }),
@@ -9642,253 +9913,6 @@ class DataProviderProxy extends SceneObjectBase {
   }
 }
 
-class SceneDataLayerSetBase extends SceneObjectBase {
-  constructor() {
-    super(...arguments);
-    /** Mark it as a data layer */
-    this.isDataLayer = true;
-    /**
-     * Subject to emit results to.
-     */
-    this._results = new rxjs.ReplaySubject(1);
-    this._dataLayersMerger = new DataLayersMerger();
-  }
-  subscribeToAllLayers(layers) {
-    if (layers.length > 0) {
-      this.querySub = this._dataLayersMerger.getMergedStream(layers).subscribe(this._onLayerUpdateReceived.bind(this));
-    } else {
-      this._results.next({ origin: this, data: emptyPanelData });
-      this.setStateHelper({ data: emptyPanelData });
-    }
-  }
-  _onLayerUpdateReceived(results) {
-    var _a;
-    let series = [];
-    for (const result of results) {
-      if ((_a = result.data) == null ? void 0 : _a.series) {
-        series = series.concat(result.data.series);
-      }
-    }
-    const combinedData = { ...emptyPanelData, series };
-    this._results.next({ origin: this, data: combinedData });
-    this.setStateHelper({ data: combinedData });
-  }
-  getResultsStream() {
-    return this._results;
-  }
-  cancelQuery() {
-    var _a;
-    (_a = this.querySub) == null ? void 0 : _a.unsubscribe();
-  }
-  /**
-   * This helper function is to counter the contravariance of setState
-   */
-  setStateHelper(state) {
-    setBaseClassState(this, state);
-  }
-}
-class SceneDataLayerSet extends SceneDataLayerSetBase {
-  constructor(state) {
-    var _a, _b;
-    super({
-      name: (_a = state.name) != null ? _a : "Data layers",
-      layers: (_b = state.layers) != null ? _b : []
-    });
-    this.addActivationHandler(() => this._onActivate());
-  }
-  _onActivate() {
-    this._subs.add(
-      this.subscribeToState((newState, oldState) => {
-        var _a;
-        if (newState.layers !== oldState.layers) {
-          (_a = this.querySub) == null ? void 0 : _a.unsubscribe();
-          this.subscribeToAllLayers(newState.layers);
-        }
-      })
-    );
-    this.subscribeToAllLayers(this.state.layers);
-    return () => {
-      var _a;
-      (_a = this.querySub) == null ? void 0 : _a.unsubscribe();
-    };
-  }
-}
-SceneDataLayerSet.Component = ({ model }) => {
-  const { layers } = model.useState();
-  return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, layers.map((layer) => /* @__PURE__ */ React__default.default.createElement(layer.Component, { model: layer, key: layer.state.key })));
-};
-
-class SceneDataTransformer extends SceneObjectBase {
-  constructor(state) {
-    super(state);
-    this._results = new rxjs.ReplaySubject(1);
-    /**
-     * Scan transformations for variable usage and re-process transforms when a variable values change
-     */
-    this._variableDependency = new VariableDependencyConfig(
-      this,
-      {
-        statePaths: ["transformations"],
-        onReferencedVariableValueChanged: () => this.reprocessTransformations()
-      }
-    );
-    this.addActivationHandler(() => this.activationHandler());
-  }
-  activationHandler() {
-    const sourceData = this.getSourceData();
-    this._subs.add(sourceData.subscribeToState((state) => this.transform(state.data)));
-    if (sourceData.state.data) {
-      this.transform(sourceData.state.data);
-    }
-    return () => {
-      if (this._transformSub) {
-        this._transformSub.unsubscribe();
-      }
-    };
-  }
-  getSourceData() {
-    if (this.state.$data) {
-      if (this.state.$data instanceof SceneDataLayerSet) {
-        throw new Error("SceneDataLayerSet can not be used as data provider for SceneDataTransformer.");
-      }
-      return this.state.$data;
-    }
-    if (!this.parent || !this.parent.parent) {
-      throw new Error("SceneDataTransformer must either have $data set on it or have a parent.parent with $data");
-    }
-    return sceneGraph.getData(this.parent.parent);
-  }
-  setContainerWidth(width) {
-    if (this.state.$data && this.state.$data.setContainerWidth) {
-      this.state.$data.setContainerWidth(width);
-    }
-  }
-  isDataReadyToDisplay() {
-    const dataObject = this.getSourceData();
-    if (dataObject.isDataReadyToDisplay) {
-      return dataObject.isDataReadyToDisplay();
-    }
-    return true;
-  }
-  reprocessTransformations() {
-    this.transform(this.getSourceData().state.data, true);
-  }
-  cancelQuery() {
-    var _a, _b;
-    (_b = (_a = this.getSourceData()).cancelQuery) == null ? void 0 : _b.call(_a);
-  }
-  getResultsStream() {
-    return this._results;
-  }
-  clone(withState) {
-    const clone = super.clone(withState);
-    if (this._prevDataFromSource) {
-      clone["_prevDataFromSource"] = this._prevDataFromSource;
-    }
-    return clone;
-  }
-  haveAlreadyTransformedData(data) {
-    if (!this._prevDataFromSource) {
-      return false;
-    }
-    if (data === this._prevDataFromSource) {
-      return true;
-    }
-    const { series, annotations } = this._prevDataFromSource;
-    if (data.series === series && data.annotations === annotations) {
-      if (this.state.data && data.state !== this.state.data.state) {
-        this.setState({ data: { ...this.state.data, state: data.state } });
-      }
-      return true;
-    }
-    return false;
-  }
-  transform(data$1, force = false) {
-    var _a;
-    if (this.state.transformations.length === 0 || !data$1) {
-      this._prevDataFromSource = data$1;
-      this.setState({ data: data$1 });
-      if (data$1) {
-        this._results.next({ origin: this, data: data$1 });
-      }
-      return;
-    }
-    if (!force && this.haveAlreadyTransformedData(data$1)) {
-      return;
-    }
-    let interpolatedTransformations = this._interpolateVariablesInTransformationConfigs(data$1);
-    const seriesTransformations = interpolatedTransformations.filter((transformation) => {
-      if ("options" in transformation || "topic" in transformation) {
-        return transformation.topic == null || transformation.topic === data.DataTopic.Series;
-      }
-      return true;
-    }).map((transformation) => "operator" in transformation ? transformation.operator : transformation);
-    const annotationsTransformations = interpolatedTransformations.filter((transformation) => {
-      if ("options" in transformation || "topic" in transformation) {
-        return transformation.topic === data.DataTopic.Annotations;
-      }
-      return false;
-    }).map((transformation) => "operator" in transformation ? transformation.operator : transformation);
-    if (this._transformSub) {
-      this._transformSub.unsubscribe();
-    }
-    const ctx = {
-      interpolate: (value) => {
-        var _a2;
-        return sceneGraph.interpolate(this, value, (_a2 = data$1.request) == null ? void 0 : _a2.scopedVars);
-      }
-    };
-    let streams = [data.transformDataFrame(seriesTransformations, data$1.series, ctx)];
-    if (data$1.annotations && data$1.annotations.length > 0 && annotationsTransformations.length > 0) {
-      streams.push(data.transformDataFrame(annotationsTransformations, (_a = data$1.annotations) != null ? _a : []));
-    }
-    this._transformSub = rxjs.forkJoin(streams).pipe(
-      rxjs.map((values) => {
-        const transformedSeries = values[0];
-        const transformedAnnotations = values[1];
-        return {
-          ...data$1,
-          series: transformedSeries,
-          annotations: transformedAnnotations != null ? transformedAnnotations : data$1.annotations
-        };
-      }),
-      rxjs.catchError((err) => {
-        var _a2;
-        console.error("Error transforming data: ", err);
-        const sourceErr = ((_a2 = this.getSourceData().state.data) == null ? void 0 : _a2.errors) || [];
-        const transformationError = runtime.toDataQueryError(err);
-        transformationError.message = `Error transforming data: ${transformationError.message}`;
-        const result = {
-          ...data$1,
-          state: data.LoadingState.Error,
-          // Combine transformation error with upstream errors
-          errors: [...sourceErr, transformationError]
-        };
-        return rxjs.of(result);
-      })
-    ).subscribe((transformedData) => {
-      this.setState({ data: transformedData });
-      this._results.next({ origin: this, data: transformedData });
-      this._prevDataFromSource = data$1;
-    });
-  }
-  _interpolateVariablesInTransformationConfigs(data) {
-    var _a;
-    const transformations = this.state.transformations;
-    if (this._variableDependency.getNames().size === 0) {
-      return transformations;
-    }
-    const onlyObjects = transformations.every((t) => typeof t === "object");
-    if (onlyObjects) {
-      return JSON.parse(sceneGraph.interpolate(this, JSON.stringify(transformations), (_a = data.request) == null ? void 0 : _a.scopedVars));
-    }
-    return transformations.map((t) => {
-      var _a2;
-      return typeof t === "object" ? JSON.parse(sceneGraph.interpolate(this, JSON.stringify(t), (_a2 = data.request) == null ? void 0 : _a2.scopedVars)) : t;
-    });
-  }
-}
-
 class VariableValueSelectors extends SceneObjectBase {
 }
 VariableValueSelectors.Component = VariableValueSelectorsRenderer;
@@ -14596,6 +14620,7 @@ exports.SceneObjectUrlSyncConfig = SceneObjectUrlSyncConfig;
 exports.SceneQueryRunner = SceneQueryRunner;
 exports.SceneReactObject = SceneReactObject;
 exports.SceneRefreshPicker = SceneRefreshPicker;
+exports.SceneRenderProfiler = SceneRenderProfiler;
 exports.SceneTimePicker = SceneTimePicker;
 exports.SceneTimeRange = SceneTimeRange;
 exports.SceneTimeRangeCompare = SceneTimeRangeCompare;