From ce809ddeb3c6db5ee43e906c24942465576ffc70 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2020 22:29:36 +0000 Subject: [PATCH 1/4] :arrow_up: Bump typescript from 3.2.2 to 3.9.7 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.2.2 to 3.9.7. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v3.2.2...v3.9.7) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 7436de25..ac2e6d7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8622,11 +8622,16 @@ typedoc@^0.14.0: typedoc-default-themes "^0.5.0" typescript "3.2.x" -typescript@3.2.x, typescript@^3.2.2: +typescript@3.2.x: version "3.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== +typescript@^3.2.2: + version "3.9.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" + integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== + uglify-js@3.4.x, uglify-js@^3.1.4: version "3.4.9" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" From d73f47edc9939b8b4ac9a1777efc141d9986fe82 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2020 22:29:36 +0000 Subject: [PATCH 2/4] :arrow_up: Bump typescript from 3.2.2 to 3.9.7 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.2.2 to 3.9.7. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v3.2.2...v3.9.7) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 243de4a2..704996e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8861,11 +8861,16 @@ typedoc@^0.14.0: typedoc-default-themes "^0.5.0" typescript "3.2.x" -typescript@3.2.x, typescript@^3.2.2: +typescript@3.2.x: version "3.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== +typescript@^3.2.2: + version "3.9.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" + integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== + uglify-js@3.4.x: version "3.4.9" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" From dbbf6bead21bd4e8ce663a2d7cabef9cba29a730 Mon Sep 17 00:00:00 2001 From: Phil Schatz <253202+philschatz@users.noreply.github.com> Date: Tue, 11 Aug 2020 22:16:32 -0500 Subject: [PATCH 3/4] :bug: fix typescript errors --- src/browser/browserSpecUtils.ts | 2 +- src/models/rule.ts | 2 +- src/models/tile.ts | 12 ++++++------ src/sortedList.ts | 4 ++-- src/util.ts | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/browser/browserSpecUtils.ts b/src/browser/browserSpecUtils.ts index ba75e486..7ca324dc 100644 --- a/src/browser/browserSpecUtils.ts +++ b/src/browser/browserSpecUtils.ts @@ -33,7 +33,7 @@ export const consoleHandler = (message: puppeteer.ConsoleMessage) => { case 'trace': console.trace(text); break // tslint:disable-line:no-console case 'assert': console.assert(text); break // tslint:disable-line:no-console case 'profile': console.profile(text); break // tslint:disable-line:no-console - case 'profileEnd': console.profileEnd(text); break // tslint:disable-line:no-console + case 'profileEnd': console.profileEnd(); break // tslint:disable-line:no-console case 'count': console.count(text); break // tslint:disable-line:no-console case 'timeEnd': console.timeEnd(text); break // tslint:disable-line:no-console diff --git a/src/models/rule.ts b/src/models/rule.ts index cf655f89..24ec667b 100644 --- a/src/models/rule.ts +++ b/src/models/rule.ts @@ -1891,7 +1891,7 @@ export class SimpleNeighbor extends BaseForLines implements ICacheable { let didChangeSprites = false let didChangeDirection = false - const orTilesRemoved = new Set() + const orTilesRemoved = new Set() let allMessages: Array> = [] for (const replaceTile of replaceTiles) { const { didActuallyChange, messages } = replaceTile.replace(cell, magicOrTiles, orTilesRemoved) diff --git a/src/models/tile.ts b/src/models/tile.ts index 3b7cb83c..c92309f7 100644 --- a/src/models/tile.ts +++ b/src/models/tile.ts @@ -105,7 +105,7 @@ export abstract class GameSprite extends BaseForLines implements IGameTile { return cell.getSpritesAsSet().has(this) // because of Webworkers, we cannot perform equality tests (unless the sprites match exactly what comes out of gamedata... hmm, maybe that's the way to do it?) } - public getSpritesThatMatch(cell: Cellish) { + public getSpritesThatMatch(cell: Cellish): Set { if (cell.getSpritesAsSet().has(this)) { return new Set([this]) } else { @@ -187,7 +187,7 @@ export abstract class GameSprite extends BaseForLines implements IGameTile { } return false } - public getCellsThatMatch(cells?: Iterable) { + public getCellsThatMatch(cells?: Iterable): Set { if (this.trickleCells.size > 0) { return (this.trickleCells as unknown) as Set } else if (cells) { @@ -345,15 +345,15 @@ export abstract class GameLegendTile extends BaseForLines implements IGameTile { return firstCollisionLayer } public getCollisionLayers() { - const layers = new Set() + const layers = new Set() for (const sprite of this.getSprites()) { layers.add(sprite.getCollisionLayer()) } return [...layers] } - public getCellsThatMatch(cells?: Iterable) { - const matches = new Set() + public getCellsThatMatch(cells?: Iterable): Set { + const matches = new Set() for (const sprite of this.getSprites()) { for (const cell of sprite.getCellsThatMatch(cells)) { matches.add(cell) @@ -448,7 +448,7 @@ export class GameLegendTileSimple extends GameLegendTile { return true } - public getSpritesThatMatch(cell: Cellish) { + public getSpritesThatMatch(cell: Cellish): Set { return setIntersection(new Set(this.getSprites()), cell.getSpritesAsSet()) } diff --git a/src/sortedList.ts b/src/sortedList.ts index dab2f790..7bc71c53 100644 --- a/src/sortedList.ts +++ b/src/sortedList.ts @@ -59,7 +59,7 @@ class ListItem { } } -class IteratorResultDone implements IteratorResult { +class IteratorResultDone implements IteratorReturnResult { public done: true public value: T constructor() { @@ -67,7 +67,7 @@ class IteratorResultDone implements IteratorResult { this.value = {} as T // tslint:disable-line:no-object-literal-type-assertion } } -class ListIteratorResult implements IteratorResult { +class ListIteratorResult implements IteratorYieldResult { public value: T public done: false constructor(value: T) { diff --git a/src/util.ts b/src/util.ts index 7a025805..e772adcc 100644 --- a/src/util.ts +++ b/src/util.ts @@ -118,7 +118,7 @@ export function setAddAll(setA: Set, iterable: Iterable) { } export function setIntersection(setA: Set, setB: Iterable) { - const intersection = new Set() + const intersection = new Set() for (const elem of setB) { if (setA.has(elem)) { intersection.add(elem) From 741774c793452f0bd90daac2dfb5d28fd6ed76a5 Mon Sep 17 00:00:00 2001 From: Phil Schatz <253202+philschatz@users.noreply.github.com> Date: Tue, 11 Aug 2020 22:28:01 -0500 Subject: [PATCH 4/4] typo. remove merge conflict --- yarn.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3029bbcb..704996e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8871,11 +8871,7 @@ typescript@^3.2.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== -<<<<<<< HEAD uglify-js@3.4.x: -======= -uglify-js@3.4.x, uglify-js@^3.1.4: ->>>>>>> typescript-3.9.7 version "3.4.9" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==