ts wip

Author: patricklx

packages/@ember/debug/ember-inspector-support/debug-port.ts

@@ -2,6 +2,8 @@ import BaseObject from '@ember/debug/ember-inspector-support/utils/base-object';
 
 export default class extends BaseObject {
   declare port: any;
+  declare portNamespace: string;
+  declare messages: Record<string, Function>;
   constructor(data: any) {
     super(data);
     if (!data) {
@@ -16,7 +18,7 @@ export default class extends BaseObject {
     this.setupOrRemovePortListeners('off');
   }
 
-  sendMessage(name: string, message: any) {
+  sendMessage(name: string, message?: any) {
     if (this.isDestroyed) return;
     this.port.send(this.messageName(name), message);
   }
@@ -33,12 +35,12 @@ export default class extends BaseObject {
    * Setup or tear down port listeners. Call on `init` and `willDestroy`
    * @param {String} onOrOff 'on' or 'off' the functions to call i.e. port.on or port.off for adding or removing listeners
    */
-  setupOrRemovePortListeners(onOrOff) {
+  setupOrRemovePortListeners(onOrOff: 'on' | 'off') {
     let port = this.port;
     let messages = this.messages;
 
     for (let name in messages) {
-      if (messages.hasOwnProperty(name)) {
+      if (Object.prototype.hasOwnProperty.call(messages, name)) {
         port[onOrOff](this.messageName(name), this, messages[name]);
       }
     }

packages/@ember/debug/ember-inspector-support/general-debug.ts

@@ -1,8 +1,7 @@
 /* eslint no-empty:0 */
+import libraries from '@ember/-internals/metal/lib/libraries';
 import DebugPort from './debug-port';
 
-import Ember from '@ember/debug/ember-inspector-support/utils/ember';
-
 /**
  * Class that handles gathering general information of the inspected app.
  * ex:
@@ -12,7 +11,26 @@ import Ember from '@ember/debug/ember-inspector-support/utils/ember';
  *
  * @module ember-debug/general-debug
  */
-export default class extends DebugPort {
+export default class GeneralDebug extends DebugPort {
+  portNamespace!: string;
+  messages!: {
+    /**
+     * Called from the inspector to check if the inspected app has been booted.
+     */
+    applicationBooted(): void;
+    /**
+     * Called from the inspector to fetch the libraries that are displayed in
+     * the info tab.
+     */
+    getLibraries(): void;
+    getEmberCliConfig(): void;
+    /**
+     * Called from the inspector to refresh the inspected app.
+     * Used in case the inspector was opened late and therefore missed capturing
+     * all info.
+     */
+    refresh(): void;
+  };
   /**
    * Fetches the ember-cli configuration info and sets them on
    * the `emberCliConfig` property.
@@ -21,8 +39,8 @@ export default class extends DebugPort {
     let found = findMetaTag('name', /environment$/);
     if (found) {
       try {
-        return JSON.parse(unescape(found.getAttribute('content')));
-      } catch (e) {}
+        return JSON.parse(decodeURI(found.getAttribute('content')!));
+      } catch {}
     }
   }
 
@@ -78,21 +96,21 @@ export default class extends DebugPort {
       /**
        * Called from the inspector to check if the inspected app has been booted.
        */
-      applicationBooted() {
+      applicationBooted(this: GeneralDebug) {
         this.sendBooted();
       },
 
       /**
        * Called from the inspector to fetch the libraries that are displayed in
        * the info tab.
        */
-      getLibraries() {
+      getLibraries(this: GeneralDebug) {
         this.sendMessage('libraries', {
-          libraries: Ember.libraries?._registry,
+          libraries: libraries?._registry,
         });
       },
 
-      getEmberCliConfig() {
+      getEmberCliConfig(this: GeneralDebug) {
         this.sendMessage('emberCliConfig', {
           emberCliConfig: this.emberCliConfig,
         });
@@ -117,10 +135,10 @@ export default class extends DebugPort {
  * @param  {RegExp} regExp
  * @return {Element}
  */
-function findMetaTag(attribute, regExp = /.*/) {
+function findMetaTag(attribute: string, regExp = /.*/) {
   let metas = document.querySelectorAll(`meta[${attribute}]`);
   for (let i = 0; i < metas.length; i++) {
-    let match = metas[i].getAttribute(attribute).match(regExp);
+    let match = metas[i]!.getAttribute(attribute)?.match(regExp);
     if (match) {
       return metas[i];
     }

packages/@ember/debug/ember-inspector-support/libs/promise-assembler.ts

@@ -10,6 +10,15 @@ import RSVP from 'rsvp';
 import BaseObject from '@ember/debug/ember-inspector-support/utils/base-object';
 import Evented from '../utils/evented';
 
+export type PromiseUpdatedEvent = {
+  promise: PromiseModel;
+};
+
+export type PromiseChainedEvent = {
+  promise: PromiseModel;
+  child: PromiseModel;
+};
+
 class PromiseAssembler extends Evented.extend(BaseObject) {
   // RSVP lib to debug
   isStarted = false;
@@ -135,7 +144,7 @@ function fulfill(this: PromiseAssembler, event: any) {
     state: 'fulfilled',
     value: event.detail,
   });
-  this.trigger('fulfilled', { promise });
+  this.trigger('fulfilled', { promise } as PromiseUpdatedEvent);
 }
 
 function reject(this: PromiseAssembler, event: any) {
@@ -146,7 +155,7 @@ function reject(this: PromiseAssembler, event: any) {
     state: 'rejected',
     reason: event.detail,
   });
-  this.trigger('rejected', { promise });
+  this.trigger('rejected', { promise } as PromiseUpdatedEvent);
 }
 
 function chain(this: PromiseAssembler, event: any) {
@@ -161,7 +170,7 @@ function chain(this: PromiseAssembler, event: any) {
   child.parent = promise;
   children.push(child);
 
-  this.trigger('chained', { promise, child });
+  this.trigger('chained', { promise, child } as PromiseChainedEvent);
 }
 
 function create(this: PromiseAssembler, event: any) {
@@ -177,5 +186,5 @@ function create(this: PromiseAssembler, event: any) {
   if (!promise.state) {
     promise.state = 'created';
   }
-  this.trigger('created', { promise });
+  this.trigger('created', { promise } as PromiseUpdatedEvent);
 }

packages/@ember/debug/ember-inspector-support/main.ts

@@ -11,13 +11,14 @@ import ContainerDebug from '@ember/debug/ember-inspector-support/container-debug
 import DeprecationDebug from '@ember/debug/ember-inspector-support/deprecation-debug';
 import Session from '@ember/debug/ember-inspector-support/services/session';
 
-import { Application, Namespace } from '@ember/debug/ember-inspector-support/utils/ember';
+import Application from '@ember/application';
 import {
   guidFor,
   setGuidPrefix,
 } from '@ember/debug/ember-inspector-support/utils/ember/object/internals';
 import { run } from '@ember/runloop';
 import BaseObject from '@ember/debug/ember-inspector-support/utils/base-object';
+import Namespace from '@ember/application/namespace';
 
 class EmberDebug extends BaseObject {
   /**
@@ -27,6 +28,13 @@ class EmberDebug extends BaseObject {
    * @default false
    */
   isTesting = false;
+  private _application: any;
+  private owner: any;
+  private started!: boolean;
+  adapter!: BasicAdapter;
+  port!: Port;
+  generalDebug!: GeneralDebug;
+  objectInspector!: ObjectInspector;
 
   get applicationName() {
     return this._application.name || this._application.modulePrefix;
@@ -51,7 +59,7 @@ class EmberDebug extends BaseObject {
   Port = Port;
   Adapter = BasicAdapter;
 
-  start($keepAdapter) {
+  start($keepAdapter: boolean) {
     if (this.started) {
       this.reset($keepAdapter);
       return;
@@ -85,24 +93,24 @@ class EmberDebug extends BaseObject {
       'objectInspector',
       'session',
     ].forEach((prop) => {
-      let handler = this[prop];
+      let handler = (this as any)[prop];
       if (handler) {
         run(handler, 'destroy');
-        this[prop] = null;
+        (this as any)[prop] = null;
       }
     });
   }
 
-  startModule(prop, Module) {
-    this[prop] = new Module({ namespace: this });
+  startModule(prop: string, Module: any) {
+    (this as any)[prop] = new Module({ namespace: this });
   }
 
   willDestroy() {
     this.destroyContainer();
     super.willDestroy();
   }
 
-  reset($keepAdapter) {
+  reset($keepAdapter?: boolean) {
     setGuidPrefix(Math.random().toString());
     if (!this.isTesting && !this.owner) {
       this.owner = getOwner(this._application);
@@ -134,7 +142,7 @@ class EmberDebug extends BaseObject {
     });
   }
 
-  inspect(obj) {
+  inspect(obj: any) {
     this.objectInspector.sendObject(obj);
     this.adapter.log('Sent to the Object Inspector');
     return obj;
@@ -157,16 +165,18 @@ function getApplication() {
       application = namespace;
       return false;
     }
+    return;
   });
   return application;
 }
 
-function getOwner(application) {
+function getOwner(application: Application) {
   if (application.autoboot) {
     return application.__deprecatedInstance__;
   } else if (application._applicationInstances /* Ember 3.1+ */) {
     return [...application._applicationInstances][0];
   }
+  return null;
 }
 
 export default new EmberDebug();