wip

Author: patricklx

ember_debug/adapters/web-extension.js

@@ -1,7 +1,7 @@
 import BasicAdapter from './basic';
 import { typeOf } from 'ember-debug/utils/type-check';
 
-import Ember from 'ember-debug/utils/ember';
+import Ember, { ENV } from 'ember-debug/utils/ember';
 import { run } from 'ember-debug/utils/ember/runloop';
 
 const { isArray } = Array;
@@ -105,7 +105,7 @@ export default class extends BasicAdapter {
 // adapter later. See GH #1114.
 const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
   try {
-    return Ember.ENV.EXTEND_PROTOTYPES.Array === true;
+    return ENV.EXTEND_PROTOTYPES.Array === true;
   } catch (e) {
     return false;
   }

ember_debug/deprecation-debug.js

@@ -1,7 +1,7 @@
 import DebugPort from './debug-port';
 import SourceMap from 'ember-debug/libs/source-map';
 
-import { registerDeprecationHandler } from 'ember-debug/utils/ember/debug';
+import { debug } from 'ember-debug/utils/ember';
 import { guidFor } from 'ember-debug/utils/ember/object/internals';
 import { cancel, debounce } from 'ember-debug/utils/ember/runloop';
 
@@ -194,7 +194,7 @@ export default class extends DebugPort {
   }
 
   handleDeprecations() {
-    registerDeprecationHandler((message, options, next) => {
+    debug.registerDeprecationHandler((message, options, next) => {
       if (!this.adapter) {
         next(message, options);
         return;

ember_debug/general-debug.js

@@ -1,7 +1,7 @@
 /* eslint no-empty:0 */
 import DebugPort from './debug-port';
 
-import Ember from 'ember-debug/utils/ember';
+import { utils } from 'ember-debug/utils/ember';
 
 /**
  * Class that handles gathering general information of the inspected app.
@@ -87,9 +87,7 @@ export default class extends DebugPort {
        * the info tab.
        */
       getLibraries() {
-        this.sendMessage('libraries', {
-          libraries: Ember.libraries?._registry,
-        });
+        this.sendMessage('libraries', { libraries: utils.libraries._registry });
       },
 
       getEmberCliConfig() {

ember_debug/libs/promise-assembler.js

@@ -6,7 +6,7 @@
  */
 
 import Promise from 'ember-debug/models/promise';
-import RSVP from 'ember-debug/utils/rsvp';
+import { classes } from 'ember-debug/utils/ember';
 import BaseObject from 'ember-debug/utils/base-object';
 import Evented from 'ember-debug/utils/evented';
 
@@ -15,7 +15,7 @@ class PromiseAssembler extends BaseObject {
   isStarted = false;
 
   static {
-    this.prototype.RSVP = RSVP;
+    this.prototype.RSVP = classes.RSVP;
   }
 
   constructor(data) {

ember_debug/libs/render-tree.js

@@ -1,9 +1,6 @@
-import captureRenderTree from './capture-render-tree';
 import { guidFor } from 'ember-debug/utils/ember/object/internals';
-import { EmberLoader, emberSafeRequire } from 'ember-debug/utils/ember/loader';
-import { inspect } from 'ember-debug/utils/type-check';
-import { isInVersionSpecifier } from 'ember-debug/utils/version';
-import { VERSION } from 'ember-debug/utils/ember';
+import { EmberLoader } from 'ember-debug/utils/ember/loader';
+import { debug } from 'ember-debug/utils/ember';
 
 class InElementSupportProvider {
   constructor(owner) {
@@ -353,7 +350,7 @@ export default class RenderTree {
   build() {
     this._reset();
 
-    this.tree = captureRenderTree(this.owner);
+    this.tree = debug.captureRenderTree(this.owner);
     let serialized = this._serializeRenderNodes(this.tree);
 
     this._releaseStaleObjects();

ember_debug/models/profile-manager.js

@@ -1,5 +1,5 @@
 import ProfileNode from './profile-node';
-import Ember from 'ember-debug/utils/ember';
+import { ember } from 'ember-debug/utils/ember';
 import { compareVersion } from 'ember-debug/utils/version';
 
 import { later, scheduleOnce, cancel } from 'ember-debug/utils/ember/runloop';
@@ -75,7 +75,7 @@ export default class ProfileManager {
     this.stylesheet = insertStylesheet();
     // keep track of all the active highlights
     this.highlights = [];
-    this.isHighlightEnabled = compareVersion(Ember?.VERSION, '3.20.0') !== -1;
+    this.isHighlightEnabled = compareVersion(ember?.VERSION, '3.20.0') !== -1;
   }
 
   began(timestamp, payload, now) {

ember_debug/object-inspector.js

@@ -8,29 +8,16 @@ import {
   inspect,
 } from 'ember-debug/utils/type-check';
 import { compareVersion } from 'ember-debug/utils/version';
-import {
-  EmberObject,
-  meta as emberMeta,
-  VERSION,
-  CoreObject,
-  ObjectProxy,
-  ArrayProxy,
-  Service,
-  Component,
-} from 'ember-debug/utils/ember';
+import { classes, debug, object, ember } from 'ember-debug/utils/ember';
 import { cacheFor, guidFor } from 'ember-debug/utils/ember/object/internals';
 import { _backburner, join } from 'ember-debug/utils/ember/runloop';
 import emberNames from './utils/ember-object-names';
 import getObjectName from './utils/get-object-name';
 import { EmberLoader } from 'ember-debug/utils/ember/loader';
 
-const GlimmerComponent = (() => {
-  try {
-    return EmberLoader.require('@glimmer/component').default;
-  } catch (e) {
-    // ignore, return undefined
-  }
-})();
+const { CoreObject, ObjectProxy } = classes;
+const { VERSION } = ember;
+const { meta: emberMeta } = object;
 
 let tagValue, tagValidate, track, tagForProperty;
 
@@ -122,7 +109,7 @@ function inspectValue(object, key, computedValue) {
     return { type: `type-${typeOf(value)}`, inspect: inspect(value) };
   }
 
-  if (value instanceof EmberObject) {
+  if (value instanceof classes.EmberObject) {
     return { type: 'type-ember-object', inspect: value.toString() };
   } else if (isComputed(object, key)) {
     string = '<computed>';
@@ -276,8 +263,7 @@ export default class extends DebugPort {
             const tracked = (this.trackedTags[objectId] =
               this.trackedTags[objectId] || {});
 
-            const desc = Object.getOwnPropertyDescriptor(object, item.name);
-            const isSetter = desc && isMandatorySetter(desc);
+            const isSetter = debug.isMandatorySetter(object, item.name);
 
             if (HAS_GLIMMER_TRACKING && item.canTrack && !isSetter) {
               let tagInfo = tracked[item.name] || {
@@ -461,7 +447,7 @@ export default class extends DebugPort {
   canSend(val) {
     return (
       val &&
-      (val instanceof EmberObject ||
+      (val instanceof classes.EmberObject ||
         val instanceof Object ||
         typeOf(val) === 'object' ||
         typeOf(val) === 'array')
@@ -518,7 +504,7 @@ export default class extends DebugPort {
       value = value.stack;
     }
     let args = [value];
-    if (value instanceof EmberObject) {
+    if (value instanceof classes.EmberObject) {
       args.unshift(inspect(value));
     }
     this.adapter.log('Ember Inspector ($E): ', ...args);
@@ -704,7 +690,7 @@ export default class extends DebugPort {
     }
 
     if (
-      object instanceof ArrayProxy &&
+      object instanceof classes.ArrayProxy &&
       object.content &&
       !object._showProxyDetails
     ) {
@@ -910,7 +896,7 @@ function addProperties(properties, hash) {
       continue;
     }
 
-    let options = { isMandatorySetter: isMandatorySetter(desc) };
+    let options = { isMandatorySetter: debug.isMandatorySetter(desc) };
 
     if (typeof hash[prop] === 'object' && hash[prop] !== null) {
       options.isService =
@@ -923,7 +909,7 @@ function addProperties(properties, hash) {
       }
 
       if (!options.isService) {
-        options.isService = desc.value instanceof Service;
+        options.isService = desc.value instanceof classes.Service;
       }
     }
     if (options.isService) {
@@ -1255,7 +1241,7 @@ function getDebugInfo(object) {
   let debugInfo = null;
   let objectDebugInfo = object._debugInfo;
   if (objectDebugInfo && typeof objectDebugInfo === 'function') {
-    if (object instanceof ObjectProxy && object.content) {
+    if (object instanceof classes.ObjectProxy && object.content) {
       object = object.content;
     }
     debugInfo = objectDebugInfo.call(object);
@@ -1268,7 +1254,7 @@ function getDebugInfo(object) {
   skipProperties.push('isDestroyed', 'isDestroying', 'container');
   // 'currentState' and 'state' are un-observable private properties.
   // The rest are skipped to reduce noise in the inspector.
-  if (Component && object instanceof Component) {
+  if (classes.EmberComponent && object instanceof classes.EmberComponent) {
     skipProperties.push(
       'currentState',
       'state',
@@ -1284,7 +1270,7 @@ function getDebugInfo(object) {
       'element',
       'targetObject'
     );
-  } else if (GlimmerComponent && object instanceof GlimmerComponent) {
+  } else if (classes.GlimmerComponent && object instanceof classes.GlimmerComponent) {
     // These properties don't really exist on Glimmer Components, but
     // reading their values trigger a development mode assertion. The
     // more correct long term fix is to make getters lazy (shows "..."
@@ -1303,7 +1289,7 @@ function calculateCP(object, item, errorsForObject) {
   const property = item.name;
   delete errorsForObject[property];
   try {
-    if (object instanceof ArrayProxy && property == parseInt(property)) {
+    if (object instanceof classes.ArrayProxy && property == parseInt(property)) {
       return object.objectAt(property);
     }
     return item.isGetter || property.includes?.('.')

ember_debug/promise-debug.js

@@ -1,7 +1,7 @@
 import DebugPort from './debug-port';
 import PromiseAssembler from 'ember-debug/libs/promise-assembler';
 import { debounce } from 'ember-debug/utils/ember/runloop';
-import RSVP from 'ember-debug/utils/rsvp';
+import { classes } from 'ember-debug/utils/ember';
 
 export default class extends DebugPort {
   get objectInspector() {
@@ -101,7 +101,7 @@ export default class extends DebugPort {
   }
 
   setInstrumentWithStack() {
-    RSVP.configure('instrument-with-stack', this.instrumentWithStack);
+    classes.RSVP.configure('instrument-with-stack', this.instrumentWithStack);
     this.sendInstrumentWithStack();
   }
 

ember_debug/render-debug.js

@@ -1,8 +1,8 @@
 import DebugPort from './debug-port';
 import ProfileManager from './models/profile-manager';
 
-import { subscribe } from 'ember-debug/utils/ember/instrumentation';
 import { _backburner } from 'ember-debug/utils/ember/runloop';
+import { instrumentation } from 'ember-debug/utils/ember';
 import bound from 'ember-debug/utils/bound-method';
 
 // Initial setup, that has to occur before the EmberObject init for some reason
@@ -78,7 +78,7 @@ export default class extends DebugPort {
  * @private
  */
 function _subscribeToRenderEvents() {
-  subscribe('render', {
+  instrumentation.subscribe('render', {
     before(name, timestamp, payload) {
       const info = {
         type: 'began',

ember_debug/route-debug.js

@@ -1,9 +1,9 @@
 /* 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 { ember } from 'ember-debug/utils/ember';
 import { _backburner, later } from 'ember-debug/utils/ember/runloop';
 import bound from 'ember-debug/utils/bound-method';
 
@@ -201,7 +201,7 @@ function buildSubTree(routeTree, route) {
       // 3.9.0 removed intimate APIs from router
       // https://github.com/emberjs/ember.js/pull/17843
       // https://deprecations.emberjs.com/v3.x/#toc_remove-handler-infos
-      if (compareVersion(VERSION, '3.9.0') !== -1) {
+      if (compareVersion(ember.VERSION, '3.9.0') !== -1) {
         // Ember >= 3.9.0
         routeHandler = routerLib.getRoute(handler);
       } else {

ember_debug/utils/ember-object-names.js

@@ -1,52 +1,31 @@
-import { compareVersion } from 'ember-debug/utils/version';
-import { emberSafeRequire } from 'ember-debug/utils/ember/loader';
-import {
-  VERSION,
-  ActionHandler,
-  ControllerMixin,
-  CoreObject,
-  MutableEnumerable,
-  NativeArray,
-  MutableArray,
-  Component,
-  Evented,
-  PromiseProxyMixin,
-  EmberObject,
-  Observable,
-} from 'ember-debug/utils/ember';
+import { classes, Views } from 'ember-debug/utils/ember';
 
 /**
  * Add Known Ember Mixins and Classes so we can label them correctly in the inspector
  */
 const emberNames = new Map([
-  [Evented, 'Evented Mixin'],
-  [PromiseProxyMixin, 'PromiseProxy Mixin'],
-  [MutableArray, 'MutableArray Mixin'],
-  [MutableEnumerable, 'MutableEnumerable Mixin'],
-  [NativeArray, 'NativeArray Mixin'],
-  [Observable, 'Observable Mixin'],
-  [ControllerMixin, 'Controller Mixin'],
-  [ActionHandler, 'ActionHandler Mixin'],
-  [CoreObject, 'CoreObject'],
-  [EmberObject, 'EmberObject'],
-  [Component, 'Component'],
+  [classes.Evented, 'Evented Mixin'],
+  [classes.PromiseProxyMixin, 'PromiseProxy Mixin'],
+  [classes.MutableArray, 'MutableArray Mixin'],
+  [classes.MutableEnumerable, 'MutableEnumerable Mixin'],
+  [classes.NativeArray, 'NativeArray Mixin'],
+  [classes.Observable, 'Observable Mixin'],
+  [classes.ControllerMixin, 'Controller Mixin'],
+  [classes.ActionHandler, 'ActionHandler Mixin'],
+  [classes.CoreObject, 'CoreObject'],
+  [classes.EmberObject, 'EmberObject'],
+  [classes.GlimmerComponent, 'Component'],
+  [classes.EmberComponent, 'Component'],
 ]);
 
-if (compareVersion(VERSION, '3.27.0') === -1) {
-  const TargetActionSupport = emberSafeRequire(
-    '@ember/-internals/runtime'
-  )?.TargetActionSupport;
-  emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin');
-}
-
 try {
-  const Views = emberSafeRequire('@ember/-internals/views') || {};
   emberNames.set(Views.ViewStateSupport, 'ViewStateSupport Mixin');
   emberNames.set(Views.ViewMixin, 'View Mixin');
   emberNames.set(Views.ActionSupport, 'ActionSupport Mixin');
   emberNames.set(Views.ClassNamesSupport, 'ClassNamesSupport Mixin');
   emberNames.set(Views.ChildViewsSupport, 'ChildViewsSupport Mixin');
   emberNames.set(Views.ViewStateSupport, 'ViewStateSupport  Mixin');
+  emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin')
   // this one is not a Mixin, but an .extend({}), which results in a class
   emberNames.set(Views.CoreView, 'CoreView');
 } catch (e) {