ember-inspector 4.13.1-alpha.2024.8.9 → 4.13.1-alpha.2025.10.2

package/ember_debug/utils/ember.js

@@ -1,15 +1,35 @@
-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 ArrayProxy,
   Namespace,
   ActionHandler,
   ControllerMixin,
@@ -23,7 +43,6 @@ let {
   Evented,
   PromiseProxyMixin,
   Service,
-  Object: EmberObject,
   ObjectProxy,
   VERSION,
   ComputedProperty,
@@ -31,12 +50,73 @@ let {
   get,
   set,
   computed,
-  _captureRenderTree: captureRenderTree,
-} = Ember || {};
+  EmberObject,
+  captureRenderTree,
+  getEnv,
+  getOwner;
+
+let Debug = emberSafeRequire('@ember/debug');
+let InternalsMetal = emberSafeRequire('@ember/-internals/metal');
+let InternalsRuntime = emberSafeRequire('@ember/-internals/runtime');
+let InternalsUtils = emberSafeRequire('@ember/-internals/utils');
+let InternalsViews = emberSafeRequire('@ember/-internals/views');
+let EmberDestroyable = emberSafeRequire('@ember/destroyable');
+let ObjectInternals = emberSafeRequire('@ember/object/internals');
+let Instrumentation = emberSafeRequire('@ember/instrumentation');
+let Runloop = emberSafeRequire('@ember/runloop');
+
+let RSVP = emberSafeRequire('rsvp');
 
-let getEnv = () => Ember.ENV;
+let GlimmerComponent = emberSafeRequire('@glimmer/component');
+let GlimmerManager = emberSafeRequire('@glimmer/manager');
+let GlimmerReference = emberSafeRequire('@glimmer/reference');
+let GlimmerRuntime = emberSafeRequire('@glimmer/runtime');
+let GlimmerUtil = emberSafeRequire('@glimmer/util');
+let GlimmerValidator = emberSafeRequire('@glimmer/validator');
+let EmberOwner = emberSafeRequire('@ember/owner');
+let EmberApplication = emberSafeRequire('@ember/application');
 
-if (!Ember) {
+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 = Ember._captureRenderTree;
+  getEnv = () => Ember.ENV;
+  ArrayProxy = Ember.ArrayProxy;
+  ObjectProxy = Ember.ObjectProxy;
+  MutableArray = Ember.MutableArray;
+  Namespace = Ember.Namespace;
+  MutableEnumerable = Ember.MutableEnumerable;
+  NativeArray = Ember.NativeArray;
+  ControllerMixin = Ember.ControllerMixin;
+  CoreObject = Ember.CoreObject;
+  Application = Ember.Application;
+  Component = Ember.Component;
+  Observable = Ember.Observable;
+  Evented = Ember.Evented;
+  PromiseProxyMixin = Ember.PromiseProxyMixin;
+  Service = Ember.Service;
+  EmberObject = Ember.Object;
+  VERSION = Ember.VERSION;
+  ComputedProperty = Ember.ComputedProperty;
+  meta = Ember.meta;
+  get = Ember.get;
+  set = Ember.set;
+  computed = Ember.computed;
+  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 = emberSafeRequire('@ember/debug')?.captureRenderTree;
   getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
   ArrayProxy = emberSafeRequire('@ember/array/proxy')?.default;
@@ -52,20 +132,35 @@ if (!Ember) {
   Observable = emberSafeRequire('@ember/object/observable')?.default;
   Evented = emberSafeRequire('@ember/object/evented')?.default;
   PromiseProxyMixin = emberSafeRequire(
-    '@ember/object/promise-proxy-mixin'
+    '@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'
+    '@ember/-internals/metal',
   )?.ComputedProperty;
   meta = emberSafeRequire('@ember/-internals/meta')?.meta;
   set = emberSafeRequire('@ember/object')?.set;
   get = emberSafeRequire('@ember/object')?.get;
 }
 
+if (EmberOwner) {
+  getOwner = EmberOwner.getOwner;
+} else {
+  getOwner = EmberApplication.getOwner;
+}
+
 export {
+  Runloop,
+  Debug,
+  InternalsMetal,
+  InternalsRuntime,
+  InternalsUtils,
+  InternalsViews,
+  ObjectInternals,
+  Instrumentation,
+  RSVP,
   ArrayProxy,
   Namespace,
   ActionHandler,
@@ -81,6 +176,7 @@ export {
   Evented,
   Service,
   PromiseProxyMixin,
+  EmberDestroyable,
   EmberObject,
   VERSION,
   ComputedProperty,
@@ -90,6 +186,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;
+      }
     }
   }
 

package/eslint.config.mjs

@@ -0,0 +1,173 @@
+/**
+ * Debugging:
+ *   https://eslint.org/docs/latest/use/configure/debug
+ *  ----------------------------------------------------
+ *
+ *   Print a file's calculated configuration
+ *
+ *     npx eslint --print-config path/to/file.js
+ *
+ *   Inspecting the config
+ *
+ *     npx eslint --inspect-config
+ *
+ */
+import globals from 'globals';
+import js from '@eslint/js';
+
+import ts from 'typescript-eslint';
+
+import ember from 'eslint-plugin-ember/recommended';
+
+import prettier from 'eslint-plugin-prettier/recommended';
+import qunit from 'eslint-plugin-qunit';
+import n from 'eslint-plugin-n';
+
+import babelParser from '@babel/eslint-parser';
+
+const parserOptions = {
+  esm: {
+    js: {
+      ecmaFeatures: { modules: true },
+      ecmaVersion: 'latest',
+      requireConfigFile: false,
+      babelOptions: {
+        plugins: [
+          [
+            '@babel/plugin-proposal-decorators',
+            { decoratorsBeforeExport: true },
+          ],
+        ],
+      },
+    },
+    ts: {
+      projectService: true,
+      tsconfigRootDir: import.meta.dirname,
+    },
+  },
+};
+
+export default ts.config(
+  js.configs.recommended,
+  ember.configs.base,
+  ember.configs.gjs,
+  ember.configs.gts,
+  prettier,
+  /**
+   * Ignores must be in their own object
+   * https://eslint.org/docs/latest/use/configure/ignore
+   */
+  {
+    ignores: [
+      'dist/',
+      'ember_debug/dist/',
+      'node_modules/',
+      'coverage/',
+      '!**/.*',
+      'vendor/',
+      'dist_prev/',
+      'skeletons/',
+      'ember_debug/vendor/startup-wrapper.js',
+    ],
+  },
+  /**
+   * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
+   */
+  {
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+  },
+  { rules: { 'no-prototype-builtins': 'off', 'no-useless-escape': 'off' } },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      parser: babelParser,
+    },
+  },
+  {
+    files: ['**/*.{js,gjs}'],
+    languageOptions: {
+      parserOptions: parserOptions.esm.js,
+      globals: {
+        ...globals.browser,
+        basicContext: false,
+        requireModule: false,
+      },
+    },
+  },
+  {
+    files: ['**/*.{ts,gts}'],
+    languageOptions: {
+      parser: ember.parser,
+      parserOptions: parserOptions.esm.ts,
+    },
+    extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
+    rules: {
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
+  {
+    files: ['tests/**/*-test.{js,gjs,ts,gts}'],
+    plugins: {
+      qunit,
+    },
+  },
+  /**
+   * CJS node files
+   */
+  {
+    files: [
+      '**/*.cjs',
+      'config/**/*.js',
+      'lib/*/index.js',
+      'scripts/**/*.js',
+      'testem.js',
+      'testem*.js',
+      '.prettierrc.js',
+      '.stylelintrc.js',
+      '.template-lintrc.js',
+      'babel.config.js',
+      'ember-cli-build.js',
+      'gulpfile.js',
+    ],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'script',
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.node,
+        basicContext: false,
+        requireModule: false,
+      },
+    },
+  },
+  /**
+   * ESM node files
+   */
+  {
+    files: ['**/*.mjs'],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'module',
+      ecmaVersion: 'latest',
+      parserOptions: parserOptions.esm.js,
+      globals: {
+        ...globals.node,
+        basicContext: false,
+        requireModule: false,
+      },
+    },
+  },
+);

package/gulpfile.js

@@ -5,7 +5,7 @@ const del = require('del');
 const pkg = require('./package.json');
 let versionedPane = `panes-${pkg.emberVersionsSupported[0].replace(
   /\./g,
-  '-'
+  '-',
 )}`;
 
 function compress(baseSrc, archiveName) {