Skip to content

Commit b352c46

Browse files
committed
convert to ts
1 parent 61214c6 commit b352c46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+13597
-11572
lines changed

package.json

Lines changed: 2 additions & 1 deletion
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",

packages/@ember/debug/ember-inspector-support/.eslintrc.js

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

packages/@ember/debug/ember-inspector-support/adapters/basic.js renamed to packages/@ember/debug/ember-inspector-support/adapters/basic.ts

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
/* eslint no-console: 0 */
2-
import { onReady } from '@ember/debug/ember-inspector-support/utils/on-ready';
32
import BaseObject from '../utils/base-object';
3+
import { DEBUG } from '@glimmer/env';
4+
import { onReady } from '../utils/on-ready';
45

56
export default class BasicAdapter extends BaseObject {
7+
private _messageCallbacks: any[] = [];
8+
private __environment = '';
9+
interval: number | undefined;
610
init() {
711
Promise.resolve(this.connect()).then(() => {
812
this.onConnectionReady();
@@ -20,43 +24,42 @@ export default class BasicAdapter extends BaseObject {
2024
*/
2125
get environment() {
2226
if (!this.__environment) {
23-
this.__environment =
24-
requireModule('@ember/debug/ember-inspector-support/config')['default'].environment;
27+
this.__environment = DEBUG ? 'development' : 'production';
2528
}
2629
return this.__environment;
2730
}
2831

29-
debug() {
30-
return console.debug(...arguments);
32+
debug(...args: any[]) {
33+
return console.debug(...args);
3134
}
3235

33-
log() {
34-
return console.log(...arguments);
36+
log(...args: any[]) {
37+
return console.log(...args);
3538
}
3639

3740
/**
3841
* A wrapper for `console.warn`.
3942
*
4043
* @method warn
4144
*/
42-
warn() {
43-
return console.warn(...arguments);
45+
warn(...args: any[]) {
46+
return console.warn(...args);
4447
}
4548

4649
/**
4750
Used to send messages to EmberExtension
4851
4952
@param {Object} type the message to the send
5053
*/
51-
sendMessage(/* options */) {}
54+
sendMessage(_options: any) {}
5255

5356
/**
5457
Register functions to be called
5558
when a message from EmberExtension is received
5659
5760
@param {Function} callback
5861
*/
59-
onMessageReceived(callback) {
62+
onMessageReceived(callback: () => void) {
6063
this._messageCallbacks.push(callback);
6164
}
6265

@@ -71,9 +74,9 @@ export default class BasicAdapter extends BaseObject {
7174
For functions, it will open the sources tab and goto the definition
7275
@param {Node|Function} node
7376
*/
74-
inspectValue(/* value */) {}
77+
inspectValue(_value: any) {}
7578

76-
_messageReceived(message) {
79+
_messageReceived(message: any) {
7780
this._messageCallbacks.forEach((callback) => {
7881
callback(message);
7982
});
@@ -92,7 +95,7 @@ export default class BasicAdapter extends BaseObject {
9295
* @method handleError
9396
* @param {Error} error
9497
*/
95-
handleError(error) {
98+
handleError(error: any) {
9699
if (this.environment === 'production') {
97100
if (error && error instanceof Error) {
98101
error = `Error message: ${error.message}\nStack trace: ${error.stack}`;
@@ -122,9 +125,9 @@ export default class BasicAdapter extends BaseObject {
122125
reject();
123126
}
124127
this.interval = setInterval(() => {
125-
if (document.documentElement.dataset.emberExtension) {
128+
if (document.documentElement.dataset['emberExtension']) {
126129
clearInterval(this.interval);
127-
resolve();
130+
resolve(true);
128131
}
129132
}, 10);
130133
});
@@ -137,11 +140,11 @@ export default class BasicAdapter extends BaseObject {
137140
}
138141

139142
_isReady = false;
140-
_pendingMessages = [];
143+
_pendingMessages: any[] = [];
141144

142-
send(options) {
145+
send(options: any) {
143146
if (this._isReady) {
144-
this.sendMessage(...arguments);
147+
this.sendMessage(options);
145148
} else {
146149
this._pendingMessages.push(options);
147150
}

packages/@ember/debug/ember-inspector-support/adapters/bookmarklet.js renamed to packages/@ember/debug/ember-inspector-support/adapters/bookmarklet.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ export default class extends BasicAdapter {
66
this._listen();
77
}
88

9-
sendMessage(options) {
9+
sendMessage(options: any) {
1010
options = options || {};
11-
window.emberInspector.w.postMessage(options, window.emberInspector.url);
11+
const w = window as any;
12+
w.emberInspector.w.postMessage(options, w.emberInspector.url);
1213
}
1314

1415
_listen() {
16+
const w = window as any;
1517
window.addEventListener('message', (e) => {
16-
if (e.origin !== window.emberInspector.url) {
18+
if (e.origin !== w.emberInspector.url) {
1719
return;
1820
}
1921
const message = e.data;
File renamed without changes.

packages/@ember/debug/ember-inspector-support/adapters/firefox.js renamed to packages/@ember/debug/ember-inspector-support/adapters/firefox.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
import WebExtension from './web-extension';
33

44
export default class extends WebExtension {
5-
debug() {
5+
debug(...args: unknown[]) {
66
// WORKAROUND: temporarily workaround issues with firebug console object:
77
// - https://github.com/tildeio/ember-extension/issues/94
88
// - https://github.com/firebug/firebug/pull/109
99
// - https://code.google.com/p/fbug/issues/detail?id=7045
1010
try {
11-
super.debug(...arguments);
12-
} catch (e) {}
11+
super.debug(...args);
12+
} catch {}
1313
}
1414

15-
log() {
15+
log(...args: any[]) {
1616
// WORKAROUND: temporarily workaround issues with firebug console object:
1717
// - https://github.com/tildeio/ember-extension/issues/94
1818
// - https://github.com/firebug/firebug/pull/109
1919
// - https://code.google.com/p/fbug/issues/detail?id=7045
2020
try {
21-
super.log(...arguments);
22-
} catch (e) {}
21+
super.log(...args);
22+
} catch {}
2323
}
2424
}
Lines changed: 7 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import BasicAdapter from './basic';
2-
import { typeOf } from '@ember/debug/ember-inspector-support/utils/type-check';
2+
import { run } from '@ember/runloop';
33

4-
import Ember from '@ember/debug/ember-inspector-support/utils/ember';
5-
import { run } from '@ember/debug/ember-inspector-support/utils/ember/runloop';
6-
7-
const { isArray } = Array;
8-
const { keys } = Object;
9-
10-
export default class extends BasicAdapter {
4+
export default class WebExtension extends BasicAdapter {
5+
private _channel!: MessageChannel;
6+
private _chromePort!: MessagePort;
117
init() {
128
this._channel = new MessageChannel();
139
this._chromePort = this._channel?.port1;
@@ -27,10 +23,10 @@ export default class extends BasicAdapter {
2723
// would not be considered native arrays, so it's not possible to
2824
// "clone" them through postMessage unless they are converted to a
2925
// native array.
30-
options = deepClone(options);
3126
try {
3227
this._chromePort.postMessage(options);
3328
} catch (e) {
29+
// eslint-disable-next-line no-console
3430
console.log('failed to send message', e);
3531
}
3632
}
@@ -40,7 +36,7 @@ export default class extends BasicAdapter {
4036
*
4137
* @param {Node|Function} value The DOM node to select
4238
*/
43-
inspectValue(value) {
39+
inspectValue(value: any) {
4440
// NOTE:
4541
//
4642
// Basically, we are just trying to call `inspect(node)` here.
@@ -62,8 +58,7 @@ export default class extends BasicAdapter {
6258

6359
let name = `__EMBER_INSPECTOR_${(Math.random() * 100000000).toFixed(0)}`;
6460

65-
window[name] = value;
66-
61+
(window as any)[name] = value;
6762
this.namespace.port.send('view:inspectJSValue', { name });
6863
}
6964

@@ -96,51 +91,3 @@ export default class extends BasicAdapter {
9691
chromePort.start();
9792
}
9893
}
99-
100-
// On some older Ember version `Ember.ENV.EXTEND_PROTOTYPES` is not
101-
// guarenteed to be an object. While this code only support 3.4+ (all
102-
// of which normalizes `EXTEND_PROTOTYPES` for us), startup-wrapper.js
103-
// eagerly require/load ember-debug modules, which ultimately causes
104-
// this top-level code to run, even we are going to pick a different
105-
// adapter later. See GH #1114.
106-
const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
107-
try {
108-
return Ember.ENV.EXTEND_PROTOTYPES.Array === true;
109-
} catch (e) {
110-
return false;
111-
}
112-
})();
113-
114-
let deepClone;
115-
116-
if (HAS_ARRAY_PROTOTYPE_EXTENSIONS) {
117-
deepClone = function deepClone(item) {
118-
return item;
119-
};
120-
} else {
121-
/**
122-
* Recursively clones all arrays. Needed because Chrome
123-
* refuses to clone Ember Arrays when extend prototypes is disabled.
124-
*
125-
* If the item passed is an array, a clone of the array is returned.
126-
* If the item is an object or an array, or array properties/items are cloned.
127-
*
128-
* @param {Mixed} item The item to clone
129-
* @return {Mixed}
130-
*/
131-
deepClone = function deepClone(item) {
132-
let clone = item;
133-
if (isArray(item)) {
134-
clone = new Array(item.length);
135-
item.forEach((child, key) => {
136-
clone[key] = deepClone(child);
137-
});
138-
} else if (item && typeOf(item) === 'object') {
139-
clone = {};
140-
keys(item).forEach((key) => {
141-
clone[key] = deepClone(item[key]);
142-
});
143-
}
144-
return clone;
145-
};
146-
}

packages/@ember/debug/ember-inspector-support/adapters/websocket.js renamed to packages/@ember/debug/ember-inspector-support/adapters/websocket.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import BasicAdapter from './basic';
22
import { onReady } from '@ember/debug/ember-inspector-support/utils/on-ready';
3-
import { run } from '@ember/debug/ember-inspector-support/utils/ember/runloop';
3+
import { run } from '@ember/runloop';
44

55
export default class extends BasicAdapter {
66
sendMessage(options = {}) {
77
this.socket.emit('emberInspectorMessage', options);
88
}
99

1010
get socket() {
11-
return window.EMBER_INSPECTOR_CONFIG.remoteDebugSocket;
11+
return (window as any).EMBER_INSPECTOR_CONFIG.remoteDebugSocket;
1212
}
1313

1414
_listen() {
15-
this.socket.on('emberInspectorMessage', (message) => {
15+
this.socket.on('emberInspectorMessage', (message: any) => {
1616
// We should generally not be run-wrapping here. Starting a runloop in
1717
// ember-debug will cause the inspected app to revalidate/rerender. We
1818
// are generally not intending to cause changes to the rendered output
@@ -44,12 +44,12 @@ export default class extends BasicAdapter {
4444
if (this.isDestroyed) {
4545
reject();
4646
}
47-
const EMBER_INSPECTOR_CONFIG = window.EMBER_INSPECTOR_CONFIG;
47+
const EMBER_INSPECTOR_CONFIG = (window as any).EMBER_INSPECTOR_CONFIG;
4848
if (
4949
typeof EMBER_INSPECTOR_CONFIG === 'object' &&
5050
EMBER_INSPECTOR_CONFIG.remoteDebugSocket
5151
) {
52-
resolve();
52+
resolve(true);
5353
}
5454
});
5555
}).then(() => {

0 commit comments

Comments
 (0)