Skip to content

Commit f2fd00b

Browse files
committed
Improve typechecking of webamp-modern
1 parent b99ea29 commit f2fd00b

File tree

10 files changed

+33
-24
lines changed

10 files changed

+33
-24
lines changed

packages/webamp-modern/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"devDependencies": {
2323
"@babel/core": "^7.17.10",
2424
"@babel/preset-env": "^7.17.10",
25-
"@types/eslint": "^7.2.14",
2625
"@types/estree": "^0.0.50",
2726
"@types/jest": "^27.5.0",
2827
"@typescript-eslint/eslint-plugin": "^7.1.0",

packages/webamp-modern/src/skin/AudioPlayer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class AudioPlayer {
4343

4444
constructor() {
4545
this._context = this._context = new (window.AudioContext ||
46-
window.webkitAudioContext)();
46+
(window as any).webkitAudioContext)();
4747

4848
// Fix for iOS and Chrome (Canary) which require that the context be created
4949
// or resumed by a user interaction.

packages/webamp-modern/src/skin/TrueTypeFont.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default class TrueTypeFont {
4040
}
4141

4242
dispose() {
43-
document.fonts.delete(this._fontFace);
43+
(document.fonts as any).delete(this._fontFace);
4444
}
4545

4646
getBase64() {
@@ -68,6 +68,6 @@ export default class TrueTypeFont {
6868

6969
const font = new FontFace(fontFamily, `url(${fontUrl})`);
7070
this._fontFace = await font.load();
71-
document.fonts.add(this._fontFace);
71+
(document.fonts as any).add(this._fontFace);
7272
}
7373
}

packages/webamp-modern/src/skin/kjofolClasses/ButtonKjofol.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ export default class ButtonKjofol extends Button {
1010

1111
_renderX() {
1212
super._renderX();
13-
this._div.style.setProperty("--left", px(-this._x ?? 0));
13+
this._div.style.setProperty("--left", px(-this._x));
1414
}
1515

1616
_renderY() {
1717
super._renderY();
18-
this._div.style.setProperty("--top", px(-this._y ?? 0));
18+
this._div.style.setProperty("--top", px(-this._y));
1919
}
2020
}

packages/webamp-modern/src/skin/kjofolClasses/ToggleButtonKjofol.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ export default class ToggleButtonKjofol extends ToggleButton {
1010

1111
_renderX() {
1212
super._renderX();
13-
this._div.style.setProperty("--left", px(-this._x ?? 0));
13+
this._div.style.setProperty("--left", px(-this._x));
1414
}
1515

1616
_renderY() {
1717
super._renderY();
18-
this._div.style.setProperty("--top", px(-this._y ?? 0));
18+
this._div.style.setProperty("--top", px(-this._y));
1919
}
2020
}

packages/webamp-modern/src/skin/makiClasses/Status.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import GuiObj from "./GuiObj";
22
import { AUDIO_PAUSED, AUDIO_STOPPED, AUDIO_PLAYING } from "../AudioPlayer";
3+
import { UIRoot } from "../../UIRoot";
34

45
// Maybe this?
56
// http://wiki.winamp.com/wiki/XML_GUI_Objects#.3CWasabi:StandardFrame:Status.2F.3E

packages/webamp-modern/src/skin/makiClasses/SystemObject.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,7 @@ export default class SystemObject extends BaseObject {
13161316
*/
13171317
getviewportheightfrompoint(x: number, y: number): number {
13181318
// TODO
1319+
return unimplemented(0);
13191320
}
13201321

13211322
/**
@@ -1334,6 +1335,7 @@ export default class SystemObject extends BaseObject {
13341335
*/
13351336
getmonitorheightfrompoint(x: number, y: number): number {
13361337
// TODO
1338+
return unimplemented(0);
13371339
}
13381340

13391341
/**
@@ -1342,6 +1344,7 @@ export default class SystemObject extends BaseObject {
13421344
*/
13431345
getmonitorheightfromguiobject(g: GuiObj): number {
13441346
// TODO
1347+
return unimplemented(0);
13451348
}
13461349

13471350
/**
@@ -1359,6 +1362,7 @@ export default class SystemObject extends BaseObject {
13591362
*/
13601363
getmonitorleftfromguiobject(g: GuiObj): number {
13611364
// TODO
1365+
return unimplemented(0);
13621366
}
13631367

13641368
/**
@@ -1369,6 +1373,7 @@ export default class SystemObject extends BaseObject {
13691373
*/
13701374
getmonitorleftfrompoint(x: number, y: number): number {
13711375
// TODO
1376+
return unimplemented(0);
13721377
}
13731378

13741379
/**
@@ -1391,6 +1396,7 @@ export default class SystemObject extends BaseObject {
13911396
*/
13921397
getmonitortopfromguiobject(g: GuiObj): number {
13931398
// TODO
1399+
return unimplemented(0);
13941400
}
13951401

13961402
/**
@@ -1401,6 +1407,7 @@ export default class SystemObject extends BaseObject {
14011407
*/
14021408
getmonitortopfrompoint(x: number, y: number): number {
14031409
// TODO
1410+
return unimplemented(0);
14041411
}
14051412

14061413
getviewportleft(): number {
@@ -1425,6 +1432,7 @@ export default class SystemObject extends BaseObject {
14251432
*/
14261433
getviewportleftfrompoint(x: number, y: number): number {
14271434
// TODO
1435+
return unimplemented(0);
14281436
}
14291437

14301438
/**
@@ -1443,6 +1451,7 @@ export default class SystemObject extends BaseObject {
14431451
*/
14441452
getviewporttopfrompoint(x: number, y: number): number {
14451453
// TODO
1454+
return unimplemented(0);
14461455
}
14471456

14481457
/**

packages/webamp-modern/src/skin/makiClasses/WasabiTitle.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ export default class WasabiTitleBar extends Group {
2929
_renderX() {
3030
this._div.style.left =
3131
this._relatx == "1"
32-
? relative(this._padtitleleft + this._x ?? 0)
33-
: px(this._padtitleleft + this._x ?? 0);
32+
? relative(this._padtitleleft + this._x)
33+
: px(this._padtitleleft + this._x);
3434
}
3535

3636
_renderWidth() {
3737
this._div.style.width =
3838
this._relatw == "1"
39-
? relative(-this._padtitleleft + -this._padtitleright + this._w ?? 0)
39+
? relative(-this._padtitleleft + -this._padtitleright + this._w)
4040
: px(-this._padtitleright + this.getwidth());
4141
}
4242

packages/webamp-modern/tsconfig.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
"esModuleInterop": true,
44
"allowJs": true,
55
"resolveJsonModule": true,
6-
"target": "es5"
7-
}
6+
"target": "es2018",
7+
"lib": ["es2018", "dom"],
8+
"downlevelIteration": true,
9+
"skipLibCheck": true,
10+
"moduleResolution": "node",
11+
"strict": false,
12+
"noEmit": true
13+
},
14+
"exclude": [
15+
"node_modules",
16+
"**/*.test.ts",
17+
"tools/eslint-rules/proper-maki-types.ts"
18+
]
819
}

pnpm-lock.yaml

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)