Skip to content

Commit ba0d881

Browse files
patricklxpatricklx
committed
Merge branch 'add-inspector-debug' of https://github.com/patricklx/ember.js into add-inspector-debug
# Conflicts: # packages/@ember/debug/ember-inspector-support/adapters/basic.ts # packages/@ember/debug/ember-inspector-support/adapters/chrome.ts # packages/@ember/debug/ember-inspector-support/adapters/firefox.ts # packages/@ember/debug/ember-inspector-support/adapters/web-extension.ts # packages/@ember/debug/ember-inspector-support/data-debug.ts # packages/@ember/debug/ember-inspector-support/debug-port.ts # packages/@ember/debug/ember-inspector-support/deprecation-debug.ts # packages/@ember/debug/ember-inspector-support/general-debug.ts # packages/@ember/debug/ember-inspector-support/libs/promise-assembler.ts # packages/@ember/debug/ember-inspector-support/libs/render-tree.ts # packages/@ember/debug/ember-inspector-support/libs/source-map.ts # packages/@ember/debug/ember-inspector-support/libs/view-inspection.ts # packages/@ember/debug/ember-inspector-support/models/profile-manager.ts # packages/@ember/debug/ember-inspector-support/models/profile-node.ts # packages/@ember/debug/ember-inspector-support/models/promise.ts # packages/@ember/debug/ember-inspector-support/object-inspector.ts # packages/@ember/debug/ember-inspector-support/port.ts # packages/@ember/debug/ember-inspector-support/promise-debug.ts # packages/@ember/debug/ember-inspector-support/render-debug.ts # packages/@ember/debug/ember-inspector-support/route-debug.ts # packages/@ember/debug/ember-inspector-support/utils/base-object.ts # packages/@ember/debug/ember-inspector-support/utils/ember/object/internals.ts # packages/@ember/debug/ember-inspector-support/utils/evented.ts # packages/@ember/debug/ember-inspector-support/view-debug.ts
2 parents f0e027c + 187c48b commit ba0d881

36 files changed

+1017
-1003
lines changed

‎broccoli/amd-compat-entrypoints/ember.debug.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ d('@ember/controller/index', emberControllerIndex);
197197
import * as emberDebugIndex from '@ember/debug/index';
198198
d('@ember/debug/index', emberDebugIndex);
199199

200+
import * as emberDebugInspectorSupportIndex from '@ember/debug/ember-inspector-support/index';
201+
d('@ember/debug/ember-inspector-support/index', emberDebugInspectorSupportIndex);
202+
200203
import * as emberDebugLibCaptureRenderTree from '@ember/debug/lib/capture-render-tree';
201204
d('@ember/debug/lib/capture-render-tree', emberDebugLibCaptureRenderTree);
202205

‎package.json‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@
103103
"router_js": "^8.0.5",
104104
"semver": "^7.5.2",
105105
"silent-error": "^1.1.1",
106-
"simple-html-tokenizer": "^0.5.11"
106+
"simple-html-tokenizer": "^0.5.11",
107+
"source-map-js": "^1.2.1"
107108
},
108109
"devDependencies": {
109110
"@aws-sdk/client-s3": "^3.321.1",
@@ -113,6 +114,7 @@
113114
"@embroider/shared-internals": "^2.5.0",
114115
"@glimmer/component": "^1.1.2",
115116
"@rollup/plugin-babel": "^6.0.4",
117+
"@rollup/plugin-commonjs": "^28.0.0",
116118
"@simple-dom/document": "^1.4.0",
117119
"@swc-node/register": "^1.6.8",
118120
"@swc/core": "^1.3.100",
@@ -235,6 +237,46 @@
235237
"@ember/controller/index.js": "ember-source/@ember/controller/index.js",
236238
"@ember/debug/container-debug-adapter.js": "ember-source/@ember/debug/container-debug-adapter.js",
237239
"@ember/debug/data-adapter.js": "ember-source/@ember/debug/data-adapter.js",
240+
"@ember/debug/ember-inspector-support/adapters/basic.js": "ember-source/@ember/debug/ember-inspector-support/adapters/basic.js",
241+
"@ember/debug/ember-inspector-support/adapters/bookmarklet.js": "ember-source/@ember/debug/ember-inspector-support/adapters/bookmarklet.js",
242+
"@ember/debug/ember-inspector-support/adapters/chrome.js": "ember-source/@ember/debug/ember-inspector-support/adapters/chrome.js",
243+
"@ember/debug/ember-inspector-support/adapters/firefox.js": "ember-source/@ember/debug/ember-inspector-support/adapters/firefox.js",
244+
"@ember/debug/ember-inspector-support/adapters/index.js": "ember-source/@ember/debug/ember-inspector-support/adapters/index.js",
245+
"@ember/debug/ember-inspector-support/adapters/web-extension.js": "ember-source/@ember/debug/ember-inspector-support/adapters/web-extension.js",
246+
"@ember/debug/ember-inspector-support/adapters/websocket.js": "ember-source/@ember/debug/ember-inspector-support/adapters/websocket.js",
247+
"@ember/debug/ember-inspector-support/container-debug.js": "ember-source/@ember/debug/ember-inspector-support/container-debug.js",
248+
"@ember/debug/ember-inspector-support/data-debug.js": "ember-source/@ember/debug/ember-inspector-support/data-debug.js",
249+
"@ember/debug/ember-inspector-support/debug-port.js": "ember-source/@ember/debug/ember-inspector-support/debug-port.js",
250+
"@ember/debug/ember-inspector-support/deprecation-debug.js": "ember-source/@ember/debug/ember-inspector-support/deprecation-debug.js",
251+
"@ember/debug/ember-inspector-support/general-debug.js": "ember-source/@ember/debug/ember-inspector-support/general-debug.js",
252+
"@ember/debug/ember-inspector-support/index.js": "ember-source/@ember/debug/ember-inspector-support/index.js",
253+
"@ember/debug/ember-inspector-support/libs/capture-render-tree.js": "ember-source/@ember/debug/ember-inspector-support/libs/capture-render-tree.js",
254+
"@ember/debug/ember-inspector-support/libs/promise-assembler.js": "ember-source/@ember/debug/ember-inspector-support/libs/promise-assembler.js",
255+
"@ember/debug/ember-inspector-support/libs/render-tree.js": "ember-source/@ember/debug/ember-inspector-support/libs/render-tree.js",
256+
"@ember/debug/ember-inspector-support/libs/source-map.js": "ember-source/@ember/debug/ember-inspector-support/libs/source-map.js",
257+
"@ember/debug/ember-inspector-support/libs/view-inspection.js": "ember-source/@ember/debug/ember-inspector-support/libs/view-inspection.js",
258+
"@ember/debug/ember-inspector-support/main.js": "ember-source/@ember/debug/ember-inspector-support/main.js",
259+
"@ember/debug/ember-inspector-support/models/profile-manager.js": "ember-source/@ember/debug/ember-inspector-support/models/profile-manager.js",
260+
"@ember/debug/ember-inspector-support/models/profile-node.js": "ember-source/@ember/debug/ember-inspector-support/models/profile-node.js",
261+
"@ember/debug/ember-inspector-support/models/promise.js": "ember-source/@ember/debug/ember-inspector-support/models/promise.js",
262+
"@ember/debug/ember-inspector-support/object-inspector.js": "ember-source/@ember/debug/ember-inspector-support/object-inspector.js",
263+
"@ember/debug/ember-inspector-support/port.js": "ember-source/@ember/debug/ember-inspector-support/port.js",
264+
"@ember/debug/ember-inspector-support/promise-debug.js": "ember-source/@ember/debug/ember-inspector-support/promise-debug.js",
265+
"@ember/debug/ember-inspector-support/render-debug.js": "ember-source/@ember/debug/ember-inspector-support/render-debug.js",
266+
"@ember/debug/ember-inspector-support/route-debug.js": "ember-source/@ember/debug/ember-inspector-support/route-debug.js",
267+
"@ember/debug/ember-inspector-support/services/session.js": "ember-source/@ember/debug/ember-inspector-support/services/session.js",
268+
"@ember/debug/ember-inspector-support/utils/base-object.js": "ember-source/@ember/debug/ember-inspector-support/utils/base-object.js",
269+
"@ember/debug/ember-inspector-support/utils/bound-method.js": "ember-source/@ember/debug/ember-inspector-support/utils/bound-method.js",
270+
"@ember/debug/ember-inspector-support/utils/classify.js": "ember-source/@ember/debug/ember-inspector-support/utils/classify.js",
271+
"@ember/debug/ember-inspector-support/utils/dasherize.js": "ember-source/@ember/debug/ember-inspector-support/utils/dasherize.js",
272+
"@ember/debug/ember-inspector-support/utils/ember-object-names.js": "ember-source/@ember/debug/ember-inspector-support/utils/ember-object-names.js",
273+
"@ember/debug/ember-inspector-support/utils/ember/object/internals.js": "ember-source/@ember/debug/ember-inspector-support/utils/ember/object/internals.js",
274+
"@ember/debug/ember-inspector-support/utils/evented.js": "ember-source/@ember/debug/ember-inspector-support/utils/evented.js",
275+
"@ember/debug/ember-inspector-support/utils/get-object-name.js": "ember-source/@ember/debug/ember-inspector-support/utils/get-object-name.js",
276+
"@ember/debug/ember-inspector-support/utils/name-functions.js": "ember-source/@ember/debug/ember-inspector-support/utils/name-functions.js",
277+
"@ember/debug/ember-inspector-support/utils/on-ready.js": "ember-source/@ember/debug/ember-inspector-support/utils/on-ready.js",
278+
"@ember/debug/ember-inspector-support/utils/type-check.js": "ember-source/@ember/debug/ember-inspector-support/utils/type-check.js",
279+
"@ember/debug/ember-inspector-support/view-debug.js": "ember-source/@ember/debug/ember-inspector-support/view-debug.js",
238280
"@ember/debug/index.js": "ember-source/@ember/debug/index.js",
239281
"@ember/debug/lib/assert.js": "ember-source/@ember/debug/lib/assert.js",
240282
"@ember/debug/lib/capture-render-tree.js": "ember-source/@ember/debug/lib/capture-render-tree.js",
@@ -372,4 +414,4 @@
372414
"node": "16.20.0",
373415
"pnpm": "8.10.0"
374416
}
375-
}
417+
}

‎packages/@ember/debug/ember-inspector-support/adapters/basic.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { onReady } from '../utils/on-ready';
66
export default class BasicAdapter extends BaseObject {
77
private _messageCallbacks: any[] = [];
88
private __environment = '';
9-
interval: number | undefined;
9+
declare interval: number | undefined;
1010
init() {
1111
Promise.resolve(this.connect()).then(() => {
1212
this.onConnectionReady();
@@ -18,9 +18,6 @@ export default class BasicAdapter extends BaseObject {
1818
/**
1919
* Uses the current build's config module to determine
2020
* the environment.
21-
*
22-
* @property environment
23-
* @type {String}
2421
*/
2522
get environment() {
2623
if (!this.__environment) {
@@ -40,7 +37,6 @@ export default class BasicAdapter extends BaseObject {
4037
/**
4138
* A wrapper for `console.warn`.
4239
*
43-
* @method warn
4440
*/
4541
warn(...args: any[]) {
4642
return console.warn(...args);
@@ -59,7 +55,7 @@ export default class BasicAdapter extends BaseObject {
5955
6056
@param {Function} callback
6157
*/
62-
onMessageReceived(callback: () => void) {
58+
onMessageReceived(callback: (msg: any) => void) {
6359
this._messageCallbacks.push(callback);
6460
}
6561

@@ -91,8 +87,6 @@ export default class BasicAdapter extends BaseObject {
9187
* The idea is to control errors triggered by the inspector
9288
* and make sure that users don't get mislead by inspector-caused
9389
* bugs.
94-
*
95-
* @method handleError
9690
* @param {Error} error
9791
*/
9892
handleError(error: any) {
@@ -115,8 +109,6 @@ export default class BasicAdapter extends BaseObject {
115109
116110
A promise that resolves when the connection
117111
with the inspector is set up and ready.
118-
119-
@return {Promise}
120112
*/
121113
connect() {
122114
return new Promise((resolve, reject) => {

‎packages/@ember/debug/ember-inspector-support/adapters/bookmarklet.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import BasicAdapter from './basic';
22

3-
export default class extends BasicAdapter {
3+
export default class BookmarkletAdapter extends BasicAdapter {
44
init() {
55
super.init();
66
this._listen();

‎packages/@ember/debug/ember-inspector-support/adapters/chrome.ts‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎packages/@ember/debug/ember-inspector-support/adapters/firefox.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-empty:0 */
22
import WebExtension from './web-extension';
33

4-
export default class extends WebExtension {
4+
export default class FirefoxAdapter extends WebExtension {
55
debug(...args: unknown[]) {
66
// WORKAROUND: temporarily workaround issues with firebug console object:
77
// - https://github.com/tildeio/ember-extension/issues/94

‎packages/@ember/debug/ember-inspector-support/adapters/index.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { default as BasicAdapter } from './basic';
2+
import { default as BookmarkletAdapter } from './bookmarklet';
3+
import { default as ChromeAdapter } from './chrome';
4+
import { default as FirefoxAdapter } from './firefox';
5+
import { default as WebsocketAdapter } from './websocket';
6+
import { default as WebExtensionAdapter } from './web-extension';
7+
8+
export default {
9+
basic: BasicAdapter,
10+
bookmarklet: BookmarkletAdapter,
11+
chrome: ChromeAdapter,
12+
firefox: FirefoxAdapter,
13+
webExtension: WebExtensionAdapter,
14+
websocket: WebsocketAdapter,
15+
};

‎packages/@ember/debug/ember-inspector-support/adapters/web-extension.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import BasicAdapter from './basic';
22
import { run } from '@ember/runloop';
33

4-
export default class extends BasicAdapter {
5-
private _channel!: MessageChannel;
6-
private _chromePort!: MessagePort;
7-
private namespace: any;
4+
export default class WebExtension extends BasicAdapter {
5+
private declare _channel: MessageChannel;
6+
private declare _chromePort: MessagePort;
87
init() {
98
this._channel = new MessageChannel();
109
this._chromePort = this._channel?.port1;

‎packages/@ember/debug/ember-inspector-support/adapters/websocket.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import BasicAdapter from './basic';
22
import { onReady } from '@ember/debug/ember-inspector-support/utils/on-ready';
33
import { run } from '@ember/runloop';
44

5-
export default class extends BasicAdapter {
5+
export default class WebsocketAdapter extends BasicAdapter {
66
sendMessage(options = {}) {
77
this.socket.emit('emberInspectorMessage', options);
88
}

‎packages/@ember/debug/ember-inspector-support/container-debug.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import DebugPort from './debug-port';
22

3-
export default class extends DebugPort {
3+
export default class ContainerDebug extends DebugPort {
4+
declare objectToConsole: any;
45
get objectInspector() {
56
return this.namespace?.objectInspector;
67
}
@@ -19,12 +20,12 @@ export default class extends DebugPort {
1920
static {
2021
this.prototype.portNamespace = 'container';
2122
this.prototype.messages = {
22-
getTypes() {
23+
getTypes(this: ContainerDebug) {
2324
this.sendMessage('types', {
2425
types: this.getTypes(),
2526
});
2627
},
27-
getInstances(message) {
28+
getInstances(this: ContainerDebug, message: any) {
2829
let instances = this.getInstances(message.containerType);
2930
if (instances) {
3031
this.sendMessage('instances', {
@@ -37,28 +38,28 @@ export default class extends DebugPort {
3738
});
3839
}
3940
},
40-
sendInstanceToConsole(message) {
41+
sendInstanceToConsole(this: ContainerDebug, message: any) {
4142
const instance = this.container.lookup(message.name);
4243
this.objectToConsole.sendValueToConsole(instance);
4344
},
4445
};
4546
}
4647

47-
typeFromKey(key) {
48-
return key.split(':').shift();
48+
typeFromKey(key: string) {
49+
return key.split(':').shift()!;
4950
}
5051

51-
nameFromKey(key) {
52+
nameFromKey(key: string) {
5253
return key.split(':').pop();
5354
}
5455

55-
shouldHide(type) {
56+
shouldHide(type: string) {
5657
return type[0] === '-' || this.TYPES_TO_SKIP.indexOf(type) !== -1;
5758
}
5859

5960
instancesByType() {
6061
let key;
61-
let instancesByType = {};
62+
let instancesByType: Record<string, any> = {};
6263
let cache = this.container.cache;
6364
// Detect if InheritingDict (from Ember < 1.8)
6465
if (typeof cache.dict !== 'undefined' && typeof cache.eachLocal !== 'undefined') {
@@ -90,12 +91,12 @@ export default class extends DebugPort {
9091
return types;
9192
}
9293

93-
getInstances(type) {
94+
getInstances(type: any) {
9495
const instances = this.instancesByType()[type];
9596
if (!instances) {
9697
return null;
9798
}
98-
return instances.map((item) => ({
99+
return instances.map((item: any) => ({
99100
name: this.nameFromKey(item.fullName),
100101
fullName: item.fullName,
101102
inspectable: this.objectInspector.canSend(item.instance),

0 commit comments

Comments
 (0)