ember-inspector 4.13.1 → 4.15.0

package/ember_debug/route-debug.js

@@ -1,16 +1,18 @@
 /* eslint-disable ember/no-private-routing-service */
-import DebugPort from './debug-port';
-import { compareVersion } from 'ember-debug/utils/version';
-import { VERSION } from 'ember-debug/utils/ember';
-import classify from 'ember-debug/utils/classify';
-import dasherize from 'ember-debug/utils/dasherize';
-import { _backburner, later } from 'ember-debug/utils/ember/runloop';
-import bound from 'ember-debug/utils/bound-method';
+import DebugPort from './debug-port.js';
+import { compareVersion } from './utils/version';
+import { VERSION } from './utils/ember';
+import classify from './utils/classify';
+import dasherize from './utils/dasherize';
+import { _backburner, later } from './utils/ember/runloop';
+import bound from './utils/bound-method';
 
 const { hasOwnProperty } = Object.prototype;
 
 export default class RouteDebug extends DebugPort {
   _cachedRouteTree = null;
+
+  // eslint-disable-next-line ember/classic-decorator-hooks
   init() {
     super.init();
     this.__currentURL = this.currentURL;
@@ -67,7 +69,6 @@ export default class RouteDebug extends DebugPort {
     };
   }
 
-  // eslint-disable-next-line ember/no-observers
   sendCurrentRoute() {
     const { currentPath: name, currentURL: url } = this;
     later(() => {
@@ -133,7 +134,7 @@ export default class RouteDebug extends DebugPort {
         // Module exists and found
         className = className.replace(
           new RegExp(`^/?(${prefix}|${podPrefix})/${type}s/`),
-          ''
+          '',
         );
       } else {
         // Module does not exist

package/ember_debug/services/session.js

@@ -1,4 +1,4 @@
-import BaseObject from 'ember-debug/utils/base-object';
+import BaseObject from '../utils/base-object';
 
 class Session extends BaseObject {
   setItem(/*key, val*/) {}
@@ -12,7 +12,7 @@ try {
   if (typeof sessionStorage !== 'undefined') {
     SESSION_STORAGE_SUPPORTED = true;
   }
-} catch (e) {
+} catch {
   // This can be reached with the following succession of events:
   //
   //   1. On Google Chrome

package/ember_debug/utils/classify.js

@@ -18,6 +18,6 @@ export default function classify(str) {
   return parts
     .join('/')
     .replace(STRING_CLASSIFY_REGEXP_3, (match /*, separator, chr */) =>
-      match.toUpperCase()
+      match.toUpperCase(),
     );
 }

package/ember_debug/utils/ember/object/internals.js

@@ -1,14 +1,4 @@
-import Ember from '../../ember';
-
-let module;
-
-try {
-  module = requireModule('@ember/object/internals');
-} catch {
-  module = Ember;
-}
-
-let { cacheFor, guidFor: emberGuidFor } = module;
+import { cacheFor, guidFor as emberGuidFor } from '../../ember.js';
 
 // it can happen that different ember apps/iframes have the same id for different objects
 // since the implementation is just a counter, so we add a prefix per iframe & app

package/ember_debug/utils/ember/own-runloop.js

@@ -1,4 +1,4 @@
-import Backburner from 'ember-debug/deps/backburner';
+import Backburner from 'backburner.js';
 
 let currentRunLoop = null;
 export function _getCurrentRunLoop() {

package/ember_debug/utils/ember/runloop.js

@@ -1,19 +1,16 @@
-import Ember from '../ember';
-import * as runloop from './own-runloop';
+import { Runloop as EmberRunloop } from '../ember.js';
+import * as runloop from './own-runloop.js';
 
+// it could happen that runloop is available but _backburner is not exported (dead code)
+// then we need to use our own.
 let module = runloop;
 let _backburner = runloop._backburner;
 
 const keys = ['cancel', 'debounce', 'join', 'later', 'scheduleOnce'];
 
-try {
-  module = requireModule('@ember/runloop');
-  // it could happen that runloop is available but _backburner is not exported (dead code)
-  // then we need to use our own
-  _backburner = module._backburner;
-} catch {
-  _backburner = Ember?.run?.backburner || module._backburner;
-  module = Ember?.run || module;
+if (EmberRunloop?._backburner || EmberRunloop?.backburner) {
+  module = EmberRunloop;
+  _backburner = EmberRunloop._backburner || EmberRunloop.backburner;
 }
 
 if (!keys.every((k) => k in module)) {

package/ember_debug/utils/ember-object-names.js

@@ -1,5 +1,4 @@
-import { compareVersion } from 'ember-debug/utils/version';
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
+import { compareVersion } from '../utils/version';
 import {
   VERSION,
   ActionHandler,
@@ -10,10 +9,12 @@ import {
   MutableArray,
   Component,
   Evented,
+  InternalsRuntime,
+  InternalsViews,
   PromiseProxyMixin,
   EmberObject,
   Observable,
-} from 'ember-debug/utils/ember';
+} from '../utils/ember';
 
 /**
  * Add Known Ember Mixins and Classes so we can label them correctly in the inspector
@@ -26,21 +27,22 @@ const emberNames = new Map([
   [NativeArray, 'NativeArray Mixin'],
   [Observable, 'Observable Mixin'],
   [ControllerMixin, 'Controller Mixin'],
-  [ActionHandler, 'ActionHandler Mixin'],
   [CoreObject, 'CoreObject'],
   [EmberObject, 'EmberObject'],
   [Component, 'Component'],
 ]);
 
+if (ActionHandler) {
+  emberNames.set(ActionHandler, 'ActionHandler Mixin');
+}
+
 if (compareVersion(VERSION, '3.27.0') === -1) {
-  const TargetActionSupport = emberSafeRequire(
-    '@ember/-internals/runtime'
-  )?.TargetActionSupport;
+  const TargetActionSupport = InternalsRuntime?.TargetActionSupport;
   emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin');
 }
 
 try {
-  const Views = emberSafeRequire('@ember/-internals/views') || {};
+  const Views = InternalsViews || {};
   emberNames.set(Views.ViewStateSupport, 'ViewStateSupport Mixin');
   emberNames.set(Views.ViewMixin, 'View Mixin');
   emberNames.set(Views.ActionSupport, 'ActionSupport Mixin');
@@ -49,7 +51,7 @@ try {
   emberNames.set(Views.ViewStateSupport, 'ViewStateSupport  Mixin');
   // this one is not a Mixin, but an .extend({}), which results in a class
   emberNames.set(Views.CoreView, 'CoreView');
-} catch (e) {
+} catch {
   // do nothing
 }
 

package/ember_debug/utils/ember.js

@@ -1,71 +1,242 @@
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
-
+/* eslint-disable ember/new-module-imports */
 let Ember;
 
 try {
-  Ember = requireModule('ember').default;
+  Ember = requireModule('ember/barrel').default;
+} catch {
+  // pass through
+}
+
+try {
+  Ember = Ember || requireModule('ember').default;
 } catch {
   Ember = window.Ember;
 }
 
-let {
-  ArrayProxy,
+const wrappedRequire = function (id) {
+  try {
+    return Ember.__loader.require(id);
+  } catch {
+    return requireModule(id);
+  }
+};
+
+export function emberSafeRequire(id) {
+  try {
+    return wrappedRequire(id);
+  } catch {
+    return undefined;
+  }
+}
+
+let Application,
+  ApplicationModule,
   Namespace,
   ActionHandler,
   ControllerMixin,
   CoreObject,
-  Application,
-  MutableArray,
+  Debug,
   MutableEnumerable,
   NativeArray,
+  ArrayProxy,
+  MutableArray,
   Component,
   Observable,
   Evented,
   PromiseProxyMixin,
   Service,
-  Object: EmberObject,
   ObjectProxy,
+  InternalsMetal,
+  InternalsRuntime,
+  InternalsUtils,
+  InternalsViews,
+  EmberDestroyable,
+  ObjectInternals,
+  Instrumentation,
+  Runloop,
+  GlimmerComponent,
+  GlimmerManager,
+  GlimmerReference,
+  GlimmerRuntime,
+  GlimmerUtil,
+  GlimmerValidator,
+  RSVP,
   VERSION,
   ComputedProperty,
   meta,
   get,
   set,
   computed,
-  _captureRenderTree: captureRenderTree,
-} = Ember || {};
+  EmberObject,
+  Owner,
+  captureRenderTree,
+  getEnv,
+  getOwner;
+
+// This global is defined in Embroider to bring Vite support to the Inspector.
+// Having it defined is enough to assert the inspected app runs with Vite.
+if (globalThis.emberInspectorApps) {
+  // emberInspectorApps has been implemented as an array to support multiple
+  // apps in the future. So far, the inspector has supported only one app, so
+  // we rely on the first item in the array to keep the current behavior.
+  const appLoader = globalThis.emberInspectorApps[0];
+  const internalEmberModules = await appLoader.loadCompatInspector();
 
-let getEnv = () => Ember.ENV;
+  Application = internalEmberModules.Application.default;
+  ApplicationModule = internalEmberModules.Application;
+  Namespace = internalEmberModules.ApplicationNamespace.default;
+  NativeArray = internalEmberModules.Array.NativeArray;
+  MutableArray = internalEmberModules.ArrayMutable.default;
+  ArrayProxy = internalEmberModules.ArrayProxy.default;
+  Component = internalEmberModules.Component.default;
+  ControllerMixin = internalEmberModules.Controller.ControllerMixin;
+  Debug = internalEmberModules.Debug;
+  CoreObject = internalEmberModules.ObjectCore.default;
+  MutableEnumerable = internalEmberModules.EnumerableMutable.default;
+  getEnv = internalEmberModules.InternalsEnvironment?.getENV;
+  meta = internalEmberModules.InternalsMeta?.meta;
+  InternalsMetal = internalEmberModules.InternalsMetal;
+  ComputedProperty = InternalsMetal?.ComputedProperty;
+  InternalsRuntime = internalEmberModules.InternalsRuntime;
+  InternalsUtils = internalEmberModules.InternalsUtils;
+  InternalsViews = internalEmberModules.InternalsViews;
+  ObjectInternals = internalEmberModules.ObjectInternals;
+  Instrumentation = internalEmberModules.Instrumentation;
+  captureRenderTree = internalEmberModules.Debug.captureRenderTree;
+  ObjectProxy = internalEmberModules.ObjectProxy.default;
+  Observable = internalEmberModules.ObjectObservable.default;
+  Evented = internalEmberModules.ObjectEvented.default;
+  PromiseProxyMixin = internalEmberModules.ObjectPromiseProxyMixin.default;
+  Runloop = internalEmberModules.Runloop;
+  Service = internalEmberModules.Service.default;
+  EmberDestroyable = internalEmberModules.EmberDestroyable;
+  EmberObject = internalEmberModules.Object.default;
+  VERSION = internalEmberModules.VERSION.default;
+  set = internalEmberModules.Object.set;
+  get = internalEmberModules.Object.get;
+  RSVP = internalEmberModules.RSVP;
+  GlimmerComponent = internalEmberModules.GlimmerComponent;
+  GlimmerManager = internalEmberModules.GlimmerManager;
+  GlimmerReference = internalEmberModules.GlimmerReference;
+  GlimmerRuntime = internalEmberModules.GlimmerRuntime;
+  GlimmerUtil = internalEmberModules.GlimmerUtil;
+  GlimmerValidator = internalEmberModules.GlimmerValidator;
+  // owner was not available in all versions of ember that we support
+  Owner = internalEmberModules.Owner;
+}
+
+Debug = Debug ?? emberSafeRequire('@ember/debug');
+InternalsMetal = InternalsMetal ?? emberSafeRequire('@ember/-internals/metal');
+InternalsRuntime =
+  InternalsRuntime ?? emberSafeRequire('@ember/-internals/runtime');
+InternalsUtils = InternalsUtils ?? emberSafeRequire('@ember/-internals/utils');
+InternalsViews = InternalsViews ?? emberSafeRequire('@ember/-internals/views');
+EmberDestroyable = EmberDestroyable ?? emberSafeRequire('@ember/destroyable');
+ObjectInternals =
+  ObjectInternals ?? emberSafeRequire('@ember/object/internals');
+Instrumentation = Instrumentation ?? emberSafeRequire('@ember/instrumentation');
+Runloop = Runloop ?? emberSafeRequire('@ember/runloop');
+RSVP = RSVP ?? emberSafeRequire('rsvp');
+GlimmerComponent = GlimmerComponent ?? emberSafeRequire('@glimmer/component');
+GlimmerManager = GlimmerManager ?? emberSafeRequire('@glimmer/manager');
+GlimmerReference = GlimmerReference ?? emberSafeRequire('@glimmer/reference');
+GlimmerRuntime = GlimmerRuntime ?? emberSafeRequire('@glimmer/runtime');
+GlimmerUtil = GlimmerUtil ?? emberSafeRequire('@glimmer/util');
+GlimmerValidator = GlimmerValidator ?? emberSafeRequire('@glimmer/validator');
+Owner = Owner ?? emberSafeRequire('@ember/owner');
+ApplicationModule = ApplicationModule ?? emberSafeRequire('@ember/application');
+
+let inspect = Debug?.inspect || InternalsUtils?.inspect;
+let subscribe = Instrumentation?.subscribe;
+let cacheFor = ObjectInternals?.cacheFor;
+let guidFor = ObjectInternals?.guidFor;
+let libraries = InternalsMetal?.libraries;
 
-if (!Ember) {
-  captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;
-  getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
-  ArrayProxy = emberSafeRequire('@ember/array/proxy')?.default;
-  ObjectProxy = emberSafeRequire('@ember/object/proxy')?.default;
-  MutableArray = emberSafeRequire('@ember/array/mutable')?.default;
-  Namespace = emberSafeRequire('@ember/application/namespace')?.default;
-  MutableEnumerable = emberSafeRequire('@ember/enumerable/mutable')?.default;
-  NativeArray = emberSafeRequire('@ember/array')?.NativeArray;
-  ControllerMixin = emberSafeRequire('@ember/controller')?.ControllerMixin;
-  CoreObject = emberSafeRequire('@ember/object/core')?.default;
-  Application = emberSafeRequire('@ember/application')?.default;
-  Component = emberSafeRequire('@ember/component')?.default;
-  Observable = emberSafeRequire('@ember/object/observable')?.default;
-  Evented = emberSafeRequire('@ember/object/evented')?.default;
-  PromiseProxyMixin = emberSafeRequire(
-    '@ember/object/promise-proxy-mixin'
-  )?.default;
-  Service = emberSafeRequire('@ember/service')?.default;
-  EmberObject = emberSafeRequire('@ember/object')?.default;
-  VERSION = emberSafeRequire('ember/version')?.default;
-  ComputedProperty = emberSafeRequire(
-    '@ember/-internals/metal'
-  )?.ComputedProperty;
-  meta = emberSafeRequire('@ember/-internals/meta')?.meta;
-  set = emberSafeRequire('@ember/object')?.set;
-  get = emberSafeRequire('@ember/object')?.get;
+if (Ember) {
+  Application = Ember.Application;
+  Namespace = Ember.Namespace;
+  ArrayProxy = Ember.ArrayProxy;
+  MutableArray = Ember.MutableArray;
+  MutableEnumerable = Ember.MutableEnumerable;
+  NativeArray = Ember.NativeArray;
+  ControllerMixin = Ember.ControllerMixin;
+  CoreObject = Ember.CoreObject;
+  Component = Ember.Component;
+  Observable = Ember.Observable;
+  Evented = Ember.Evented;
+  PromiseProxyMixin = Ember.PromiseProxyMixin;
+  Service = Ember.Service;
+  ObjectProxy = Ember.ObjectProxy;
+  VERSION = Ember.VERSION;
+  ComputedProperty = Ember.ComputedProperty;
+  meta = Ember.meta;
+  get = Ember.get;
+  set = Ember.set;
+  computed = Ember.computed;
+  EmberObject = Ember.Object;
+  captureRenderTree = Ember._captureRenderTree;
+  getEnv = () => Ember.ENV;
+  ActionHandler = Ember.ActionHandler;
+  Debug = Debug ?? Ember.Debug;
+  inspect = inspect ?? Ember.inspect;
+  Instrumentation = Instrumentation ?? Ember.Instrumentation;
+  subscribe = subscribe ?? Ember.subscribe;
+  RSVP = RSVP ?? Ember.RSVP;
+  Runloop = Runloop ?? Ember.run;
+  cacheFor = cacheFor ?? Ember.cacheFor;
+  guidFor = guidFor ?? Ember.guidFor;
+  libraries = libraries ?? Ember.libraries;
+} else {
+  captureRenderTree =
+    captureRenderTree ?? emberSafeRequire('@ember/debug')?.captureRenderTree;
+  getEnv = getEnv ?? emberSafeRequire('@ember/-internals/environment')?.getENV;
+  ArrayProxy = ArrayProxy ?? emberSafeRequire('@ember/array/proxy')?.default;
+  ObjectProxy = ObjectProxy ?? emberSafeRequire('@ember/object/proxy')?.default;
+  MutableArray =
+    MutableArray ?? emberSafeRequire('@ember/array/mutable')?.default;
+  Namespace =
+    Namespace ?? emberSafeRequire('@ember/application/namespace')?.default;
+  MutableEnumerable =
+    MutableEnumerable ?? emberSafeRequire('@ember/enumerable/mutable')?.default;
+  NativeArray = NativeArray ?? emberSafeRequire('@ember/array')?.NativeArray;
+  ControllerMixin =
+    ControllerMixin ?? emberSafeRequire('@ember/controller')?.ControllerMixin;
+  CoreObject = CoreObject ?? emberSafeRequire('@ember/object/core')?.default;
+  Application = Application ?? emberSafeRequire('@ember/application')?.default;
+  Component = Component ?? emberSafeRequire('@ember/component')?.default;
+  Observable =
+    Observable ?? emberSafeRequire('@ember/object/observable')?.default;
+  Evented = Evented ?? emberSafeRequire('@ember/object/evented')?.default;
+  PromiseProxyMixin =
+    PromiseProxyMixin ??
+    emberSafeRequire('@ember/object/promise-proxy-mixin')?.default;
+  Service = Service ?? emberSafeRequire('@ember/service')?.default;
+  EmberObject = EmberObject ?? emberSafeRequire('@ember/object')?.default;
+  VERSION = VERSION ?? emberSafeRequire('ember/version')?.default;
+  ComputedProperty =
+    ComputedProperty ??
+    emberSafeRequire('@ember/-internals/metal')?.ComputedProperty;
+  meta = meta ?? emberSafeRequire('@ember/-internals/meta')?.meta;
+  set = set ?? emberSafeRequire('@ember/object')?.set;
+  get = get ?? emberSafeRequire('@ember/object')?.get;
+}
+
+if (Owner) {
+  getOwner = Owner.getOwner;
+} else {
+  getOwner = ApplicationModule?.getOwner;
 }
 
 export {
+  Runloop,
+  Debug,
+  InternalsMetal,
+  InternalsRuntime,
+  InternalsUtils,
+  InternalsViews,
+  ObjectInternals,
+  Instrumentation,
+  RSVP,
   ArrayProxy,
   Namespace,
   ActionHandler,
@@ -81,6 +252,7 @@ export {
   Evented,
   Service,
   PromiseProxyMixin,
+  EmberDestroyable,
   EmberObject,
   VERSION,
   ComputedProperty,
@@ -90,6 +262,16 @@ export {
   set,
   captureRenderTree,
   getEnv,
+  inspect,
+  subscribe,
+  cacheFor,
+  guidFor,
+  libraries,
+  GlimmerComponent,
+  GlimmerManager,
+  GlimmerReference,
+  GlimmerRuntime,
+  GlimmerUtil,
+  GlimmerValidator,
+  getOwner,
 };
-
-export default Ember;

package/ember_debug/utils/evented.js

@@ -40,7 +40,7 @@ export default class Evented {
     }
     const listeners = this[ListenersSymbol][name] || [];
     const idx = listeners.findIndex(
-      (l) => l.target === target && l.method === method
+      (l) => l.target === target && l.method === method,
     );
     if (idx >= 0) {
       listeners.splice(idx, 1);

package/ember_debug/utils/get-object-name.js

@@ -1,4 +1,4 @@
-import emberNames from './ember-object-names';
+import emberNames from './ember-object-names.js';
 
 export default function getObjectName(object) {
   let name = '';
@@ -30,7 +30,7 @@ export default function getObjectName(object) {
     ) {
       try {
         name = constructor.toString();
-      } catch (e) {
+      } catch {
         name = constructor.name;
       }
     } else {
@@ -43,7 +43,7 @@ export default function getObjectName(object) {
   ) {
     try {
       name = object.toString();
-    } catch (e) {
+    } catch {
       //
     }
   }

package/ember_debug/utils/type-check.js

@@ -1,10 +1,10 @@
-import Debug, { inspect as emberInspect } from 'ember-debug/utils/ember/debug';
+import { Debug, inspect as emberInspect } from '../utils/ember';
 import {
   ComputedProperty,
   EmberObject,
   meta as emberMeta,
-} from 'ember-debug/utils/ember';
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
+  InternalsMetal,
+} from '../utils/ember';
 
 /**
  * Check if given key on the passed object is a computed property
@@ -41,7 +41,7 @@ export function getDescriptorFor(object, key) {
   // exists longer than ember 3.10
   if (Debug.isComputed) {
     const { descriptorForDecorator, descriptorForProperty } =
-      emberSafeRequire('@ember/-internals/metal') || {};
+      InternalsMetal || {};
     return (
       descriptorForDecorator?.(object[key]) ||
       descriptorForProperty?.(object, key)
@@ -91,7 +91,7 @@ export function inspect(value) {
     ) {
       try {
         return `<Object:${value.toString()}>`;
-      } catch (e) {
+      } catch {
         //
       }
     }
@@ -119,6 +119,10 @@ export function inspect(value) {
         if (typeOf(v) === 'object') {
           v = '[Object]';
         }
+        // to avoid TypeError: Cannot convert a Symbol value to a string
+        if (typeOf(v) === 'symbol') {
+          v = v.toString();
+        }
         ret.push(`${key}: ${v}`);
       }
     }

package/ember_debug/view-debug.js

@@ -1,8 +1,8 @@
 /* eslint no-cond-assign:0 */
-import DebugPort from './debug-port';
-import RenderTree from 'ember-debug/libs/render-tree';
-import ViewInspection from 'ember-debug/libs/view-inspection';
-import bound from 'ember-debug/utils/bound-method';
+import DebugPort from './debug-port.js';
+import RenderTree from './libs/render-tree';
+import ViewInspection from './libs/view-inspection';
+import bound from './utils/bound-method';
 
 export default class extends DebugPort {
   get adapter() {
@@ -52,6 +52,7 @@ export default class extends DebugPort {
     };
   }
 
+  // eslint-disable-next-line ember/classic-decorator-hooks
   init() {
     super.init();
 
@@ -59,11 +60,11 @@ export default class extends DebugPort {
       owner: this.getOwner(),
       retainObject: bound(
         this.objectInspector,
-        this.objectInspector.retainObject
+        this.objectInspector.retainObject,
       ),
       releaseObject: bound(
         this.objectInspector,
-        this.objectInspector.releaseObject
+        this.objectInspector.releaseObject,
       ),
       inspectNode: bound(this, this.inspectNode),
     }));
@@ -102,6 +103,11 @@ export default class extends DebugPort {
   onRightClick(event) {
     if (event.button === 2) {
       this.lastRightClicked = event.target;
+      if (event.target.shadowRoot) {
+        this.lastRightClicked =
+          event.target.shadowRoot.elementFromPoint(event.x, event.y) ||
+          event.target;
+      }
     }
   }