@vpmedia/phaser 1.124.0 → 1.126.0

package/src/phaser/display/bitmap_text.ts

@@ -80,7 +80,7 @@ export class BitmapText extends DisplayObject {
       return;
     }
 
-    if (!this.exists || !this.parent?.exists) {
+    if (!this.exists || this.parent?.exists !== true) {
       this.renderOrderID = -1;
       return;
     }
@@ -150,7 +150,7 @@ export class BitmapText extends DisplayObject {
       //  What will the line width be if we add this character to it?
       c = (kerning + (charData.texture?.width ?? 0) + charData.xOffset) * scale;
       //  Do we need to line-wrap?
-      if (maxWidth && w + c >= maxWidth && lastSpace > -1) {
+      if (maxWidth !== null && w + c >= maxWidth && lastSpace > -1) {
         //  The last space was at "lastSpace" which was "i - lastSpace" characters ago
         return {
           width: wrappedWidth || w,
@@ -463,7 +463,7 @@ export class BitmapText extends DisplayObject {
    * @returns {boolean} True if smoothing is enabled, false otherwise.
    */
   public get smoothed(): boolean {
-    return !this._data?.base.scaleMode;
+    return this._data?.base.scaleMode === 0;
   }
 
   /**

package/src/phaser/display/button.ts

@@ -93,7 +93,7 @@ export class Button extends Image {
     this._onDownFrame = null;
     this._onUpFrame = null;
     this._onDisabledFrame = null;
-    if (this.onInputOver) {
+    if (this.onInputOver !== null) {
       this.onInputOver.dispose();
       this.onInputOut.dispose();
       this.onInputDown.dispose();
@@ -103,7 +103,7 @@ export class Button extends Image {
     this.onInputOut = null!;
     this.onInputDown = null!;
     this.onInputUp = null!;
-    if (this.input) {
+    if (this.input !== null) {
       this.input.destroy();
     }
     this.input = null!;
@@ -148,7 +148,7 @@ export class Button extends Image {
    */
   public setStateFrame(state: string, frame: string | null, switchImmediately = false): void {
     const frameKey: `_on${string}Frame` = `_on${state}Frame`;
-    if (frame) {
+    if (frame !== null) {
       this[frameKey] = frame;
       if (switchImmediately) {
         this.changeStateFrame(state);
@@ -167,7 +167,7 @@ export class Button extends Image {
     if (this.freezeFrames) {
       return false;
     }
-    const state = this.input.enabled || !this._onDisabledFrame ? newState : STATE_DISABLED;
+    const state = this.input.enabled || this._onDisabledFrame === null ? newState : STATE_DISABLED;
     const frameKey: `_on${string}Frame` = `_on${state}Frame`;
     const frame = this[frameKey];
     if (typeof frame === 'string') {
@@ -199,7 +199,7 @@ export class Button extends Image {
     this.setStateFrame(STATE_OUT, outFrame, !this.input.pointerOver());
     this.setStateFrame(STATE_DOWN, downFrame, this.input.pointerDown());
     this.setStateFrame(STATE_UP, upFrame, this.input.pointerUp());
-    if (disabledFrame) {
+    if (disabledFrame !== null) {
       this.setStateFrame(STATE_DISABLED, disabledFrame, !this.input.enabled);
     }
   }
@@ -218,7 +218,7 @@ export class Button extends Image {
     if (this.onOverMouseOnly && !pointer.isMouse) {
       return;
     }
-    if (this.onInputOver) {
+    if (this.onInputOver !== null) {
       this.onInputOver.dispatch(this, pointer);
     }
   }
@@ -230,7 +230,7 @@ export class Button extends Image {
    */
   public onInputOutHandler(_sprite: Image, pointer: Pointer): void {
     this.changeStateFrame(STATE_OUT);
-    if (this.onInputOut) {
+    if (this.onInputOut !== null) {
       this.onInputOut.dispatch(this, pointer);
     }
   }
@@ -242,7 +242,7 @@ export class Button extends Image {
    */
   public onInputDownHandler(_sprite: Image, pointer: Pointer): void {
     this.changeStateFrame(STATE_DOWN);
-    if (this.onInputDown) {
+    if (this.onInputDown !== null) {
       this.onInputDown.dispatch(this, pointer);
     }
   }
@@ -254,7 +254,7 @@ export class Button extends Image {
    * @param {boolean} isOver - Whether the pointer is currently over the button (default: true).
    */
   public onInputUpHandler(_sprite: Image, pointer: Pointer, isOver: boolean): void {
-    if (this.onInputUp) {
+    if (this.onInputUp !== null) {
       this.onInputUp.dispatch(this, pointer, isOver);
     }
     if (this.freezeFrames) {
@@ -281,7 +281,7 @@ export class Button extends Image {
    * @returns {boolean} True if input is enabled, false otherwise.
    */
   public get inputEnabled(): boolean {
-    return this.input && this.input.enabled;
+    return this.input !== null && this.input.enabled;
   }
 
   /**
@@ -293,10 +293,10 @@ export class Button extends Image {
       if (this.input === null) {
         this.input = new InputHandler(this);
         this.input.start();
-      } else if (this.input && !this.input.enabled) {
+      } else if (this.input !== null && !this.input.enabled) {
         this.input.start();
       }
-    } else if (this.input && this.input.enabled) {
+    } else if (this.input !== null && this.input.enabled) {
       this.input.stop();
     }
   }

package/src/phaser/display/canvas/graphics.ts

@@ -71,7 +71,7 @@ export const renderGraphics = (graphics: Graphics, context: CanvasRenderingConte
         context.stroke();
       }
     } else if (shape instanceof Rectangle) {
-      if (data.fillColor || data.fillColor === 0) {
+      if (data.fillColor !== null) {
         context.globalAlpha = data.fillAlpha * worldAlpha;
         context.fillStyle = `#${`00000${Math.trunc(fillColor ?? 0).toString(16)}`.slice(-6)}`;
         context.fillRect(shape.x, shape.y, shape.width, shape.height);
@@ -144,7 +144,7 @@ export const renderGraphics = (graphics: Graphics, context: CanvasRenderingConte
       context.lineTo(rx + radius, ry);
       context.quadraticCurveTo(rx, ry, rx, ry + radius);
       context.closePath();
-      if (data.fillColor || data.fillColor === 0) {
+      if (data.fillColor !== null) {
         context.globalAlpha = data.fillAlpha * worldAlpha;
         context.fillStyle = `#${`00000${Math.trunc(fillColor ?? 0).toString(16)}`.slice(-6)}`;
         context.fill();

package/src/phaser/display/canvas/pool.ts

@@ -16,7 +16,7 @@ export const getPool = (): CanvasPoolEntry[] => {
 export const getFirst = (): number => {
   const pool = getPool();
   for (let i = 0; i < pool.length; i += 1) {
-    if (!pool[i]!.parent) {
+    if (pool[i]!.parent === null) {
       return i;
     }
   }
@@ -61,7 +61,7 @@ export const getTotal = (): number => {
   const pool = getPool();
   let c = 0;
   for (const entry of pool) {
-    if (entry.parent) {
+    if (entry.parent !== null) {
       c += 1;
     }
   }
@@ -76,7 +76,7 @@ export const getFree = (): number => {
   const pool = getPool();
   let c = 0;
   for (const entry of pool) {
-    if (!entry.parent) {
+    if (entry.parent === null) {
       c += 1;
     }
   }

package/src/phaser/display/canvas/renderer.ts

@@ -28,6 +28,7 @@ import { detectCapabilities } from './tinter.js';
 import { getSmoothingPrefix, setSmoothing } from './util.js';
 import type { DisplayObject } from '../display_object.js';
 import type { RenderSession } from '../render_session.js';
+import type { StageBackgroundColor } from '../../core/stage.js';
 
 export class CanvasRenderer {
   public type!: number;
@@ -64,7 +65,7 @@ export class CanvasRenderer {
       willReadFrequently: false,
       alpha: this.transparent,
     })!;
-    if (!this.context) {
+    if (!(this.context as CanvasRenderingContext2D | undefined)) {
       throw new Error(ENGINE_ERROR_CREATING_CANVAS_2D_CONTEXT);
     }
     this.refresh = true;
@@ -86,7 +87,7 @@ export class CanvasRenderer {
    * @param {Stage} root - The root stage to render.
    */
   public render(root: Stage): void {
-    if (!this.context) {
+    if (!(this.context as CanvasRenderingContext2D | undefined)) {
       return;
     }
     this.context.setTransform(1, 0, 0, 1, 0, 0);
@@ -98,7 +99,7 @@ export class CanvasRenderer {
     if (this.clearBeforeRender) {
       if (this.transparent) {
         this.context.clearRect(0, 0, this.width, this.height);
-      } else if (root._bgColor) {
+      } else if (root._bgColor as StageBackgroundColor | undefined) {
         this.context.fillStyle = root._bgColor.rgba;
         this.context.fillRect(0, 0, this.width, this.height);
       }
@@ -130,7 +131,7 @@ export class CanvasRenderer {
       this.view.style.width = `${this.width / this.resolution}px`;
       this.view.style.height = `${this.height / this.resolution}px`;
     }
-    if (this.renderSession.smoothProperty) {
+    if (this.renderSession.smoothProperty !== null) {
       setSmoothing(this.context, this.renderSession.smoothProperty, this.renderSession.scaleMode === SCALE_LINEAR);
     }
   }
@@ -151,7 +152,7 @@ export class CanvasRenderer {
    * Maps blend modes to canvas rendering operations.
    */
   public mapBlendModes(): void {
-    if (globalThis.PhaserRegistry.blendModesCanvas) {
+    if (globalThis.PhaserRegistry.blendModesCanvas as GlobalCompositeOperation[] | undefined) {
       return;
     }
     const b: GlobalCompositeOperation[] = [];

package/src/phaser/display/canvas/tinter.ts

@@ -179,7 +179,7 @@ export const canUseNewCanvasBlendModes = (): boolean => {
   context.globalCompositeOperation = 'multiply';
   context.drawImage(magenta, 0, 0);
   context.drawImage(yellow, 2, 0);
-  if (!context.getImageData(2, 0, 1, 1)) {
+  if (context.getImageData(2, 0, 1, 1) === null) {
     return false;
   }
   const { data } = context.getImageData(2, 0, 1, 1);

package/src/phaser/display/canvas/util.ts

@@ -141,7 +141,7 @@ export const getSmoothingPrefix = (context: CanvasRenderingContext2D): string |
   const smoothingFlags = context as unknown as Record<string, boolean | undefined>;
   for (const vendor of VENDORS) {
     const flag = `${vendor}mageSmoothingEnabled`;
-    if (smoothingFlags[flag]) {
+    if (smoothingFlags[flag] !== undefined) {
       return flag;
     }
   }
@@ -166,7 +166,7 @@ export const setSmoothing = (context: CanvasRenderingContext2D, property: string
  */
 export const setSmoothingEnabled = (context: CanvasRenderingContext2D, value: boolean): CanvasRenderingContext2D => {
   const s = getSmoothingPrefix(context);
-  if (s) {
+  if (s !== null) {
     setSmoothing(context, s, value);
   }
   return context;

package/src/phaser/display/display_object.ts

@@ -10,6 +10,7 @@ import type { UserData } from '../core/callback.js';
 import type { EventManager } from '../core/event_manager.js';
 import type { Image } from './image.js';
 import type { RenderSession } from './render_session.js';
+import type { IdentifiedWebGLRenderingContext } from './webgl/util.js';
 
 export class DisplayObject {
   /** @type {boolean} */
@@ -127,7 +128,7 @@ export class DisplayObject {
    * @param {boolean} _destroyTexture - Whether the subclass should destroy its texture too.
    */
   public destroy(_destroyChildren = true, _destroyTexture = false): void {
-    if (this.children) {
+    if (this.children as DisplayObject[] | undefined) {
       let i = this.children.length;
       while (i) {
         i -= 1;
@@ -284,12 +285,12 @@ export class DisplayObject {
    * @returns {DisplayObject[]} The array of removed child display objects.
    * @throws {Error} If the range is invalid.
    */
-  public removeChildren(beginIndex: number, endIndex: number): DisplayObject[] {
-    beginIndex ??= 0;
-    endIndex ??= this.children.length;
-    const range = endIndex - beginIndex;
-    if (range > 0 && range <= endIndex) {
-      const removed = this.children.splice(beginIndex, range);
+  public removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[] {
+    const begin = beginIndex ?? 0;
+    const end = endIndex ?? this.children.length;
+    const range = end - begin;
+    if (range > 0 && range <= end) {
+      const removed = this.children.splice(begin, range);
       for (const child of removed) {
         child.parent = null;
       }
@@ -310,7 +311,7 @@ export class DisplayObject {
     if (!parent && !this.parent) {
       return this;
     }
-    if (!this.game || !this.visible) {
+    if (!(this.game as Game | undefined) || !this.visible) {
       return this;
     }
     const p = parent ?? this.parent ?? this.game.world;
@@ -607,12 +608,10 @@ export class DisplayObject {
    * @param {DisplayObject} from - The display object to convert from (defaults to this).
    * @returns {Point} The converted local position.
    */
-  public toLocal(position: Point, from: DisplayObject): Point {
-    if (from) {
-      position = from.toGlobal(position);
-    }
+  public toLocal(position: Point, from: DisplayObject | null): Point {
+    const global = from ? from.toGlobal(position) : position;
     this.updateTransform();
-    return this.worldTransform.applyInverse(position);
+    return this.worldTransform.applyInverse(global);
   }
 
   /**
@@ -624,7 +623,7 @@ export class DisplayObject {
       return;
     }
     this._cachedSprite.worldAlpha = this.worldAlpha;
-    if (renderSession.gl) {
+    if (renderSession.gl as IdentifiedWebGLRenderingContext | undefined) {
       renderWebGL(this._cachedSprite, renderSession);
     } else {
       renderCanvas(this._cachedSprite, renderSession);

package/src/phaser/display/graphics.test.ts

@@ -135,13 +135,13 @@ describe('Graphics', (): void => {
   describe('drawTriangles', (): void => {
     it('reads a flat coordinate list as triangles', (): void => {
       const graphics = createGraphics();
-      graphics.drawTriangles([0, 0, 10, 0, 0, 10, 20, 20, 30, 20, 20, 30], null as unknown as number[]);
+      graphics.drawTriangles([0, 0, 10, 0, 0, 10, 20, 20, 30, 20, 20, 30], null);
       expect(graphics.graphicsData).toHaveLength(2);
     });
 
     it('reads a point list as triangles', (): void => {
       const graphics = createGraphics();
-      graphics.drawTriangles([new Point(0, 0), new Point(10, 0), new Point(0, 10)], null as unknown as number[]);
+      graphics.drawTriangles([new Point(0, 0), new Point(10, 0), new Point(0, 10)], null);
       expect(graphics.graphicsData).toHaveLength(1);
     });
 

package/src/phaser/display/graphics.ts

@@ -343,19 +343,17 @@ export class Graphics extends DisplayObject {
     if (startAngle === endAngle) {
       return this;
     }
-    if (!anticlockwise && endAngle <= startAngle) {
-      endAngle += Math.PI * 2;
-    } else if (anticlockwise && startAngle <= endAngle) {
-      startAngle += Math.PI * 2;
-    }
-    const sweep = anticlockwise ? (startAngle - endAngle) * -1 : endAngle - startAngle;
+    const fullTurn = Math.PI * 2;
+    const from = anticlockwise && startAngle <= endAngle ? startAngle + fullTurn : startAngle;
+    const to = !anticlockwise && endAngle <= startAngle ? endAngle + fullTurn : endAngle;
+    const sweep = anticlockwise ? (from - to) * -1 : to - from;
     const segs = Math.ceil(Math.abs(sweep) / (Math.PI * 2)) * segments;
     //  Sweep check - moved here because we don't want to do the moveTo below if the arc fails
     if (sweep === 0) {
       return this;
     }
-    const startX = cx + Math.cos(startAngle) * radius;
-    const startY = cy + Math.sin(startAngle) * radius;
+    const startX = cx + Math.cos(from) * radius;
+    const startY = cy + Math.sin(from) * radius;
     if (anticlockwise && this.filling) {
       this.moveTo(cx, cy);
     } else {
@@ -371,7 +369,7 @@ export class Graphics extends DisplayObject {
     const remainder = (segMinus % 1) / segMinus;
     for (let i = 0; i <= segMinus; i += 1) {
       const real = i + remainder * i;
-      const angle = theta + startAngle + theta2 * real;
+      const angle = theta + from + theta2 * real;
       const c = Math.cos(angle);
       const s = -Math.sin(angle);
       points.push((cTheta * c + sTheta * s) * radius + cx, (cTheta * -s + sTheta * c) * radius + cy);
@@ -915,10 +913,10 @@ export class Graphics extends DisplayObject {
    * @param {number[]} indices - The indices of the vertices to use.
    * @param {boolean} cull - Whether to perform backface culling.
    */
-  public drawTriangles(vertices: Point[] | number[], indices: number[], cull = false): void {
+  public drawTriangles(vertices: Point[] | number[], indices: number[] | null, cull = false): void {
     let points: Point[] = [];
     let i;
-    if (!indices) {
+    if (indices === null) {
       if (vertices[0] instanceof Point) {
         const corners = vertices as Point[];
         for (i = 0; i < corners.length / 3; i += 1) {

package/src/phaser/display/group.ts

@@ -3,6 +3,7 @@ import { Signal } from '../core/signal.js';
 import { DisplayObject } from './display_object.js';
 import { Image } from './image.js';
 import type { Game } from '../core/game.js';
+import type { EventManager } from '../core/event_manager.js';
 
 export const SORT_ASCENDING = -1;
 export const SORT_DESCENDING = 1;
@@ -33,7 +34,7 @@ export class Group extends DisplayObject {
     super(game);
     /** @type {number} */
     this.type = GROUP;
-    parent ??= game.world;
+    const target = parent ?? game.world;
     /** @type {string} */
     this.name = name ?? 'group';
     /** @type {number} */
@@ -41,9 +42,9 @@ export class Group extends DisplayObject {
     if (addToStage) {
       this.game.stage.addChild(this);
       this.z = this.game.stage.children.length;
-    } else if (parent) {
-      parent.addChild(this);
-      this.z = parent.children.length;
+    } else if (target as DisplayObject | undefined) {
+      target.addChild(this);
+      this.z = target.children.length;
     }
     /** @type {boolean} */
     this.ignoreDestroy = false;
@@ -112,10 +113,10 @@ export class Group extends DisplayObject {
       this.updateZ();
     }
     const inputChild = child as T & { input?: unknown; inputEnabled?: boolean };
-    if (this.inputEnableChildren && (!inputChild.input || inputChild.inputEnabled)) {
+    if (this.inputEnableChildren && (inputChild.input === undefined || inputChild.inputEnabled === true)) {
       inputChild.inputEnabled = true;
     }
-    if (!silent && child.events) {
+    if (!silent && (child.events as EventManager | undefined)) {
       child.events.onAddedToGroup$dispatch(child, this);
     }
     this.cursor ??= child;
@@ -252,7 +253,7 @@ export class Group extends DisplayObject {
       this.destroy();
       return;
     }
-    if (!this.exists || !this.parent?.exists) {
+    if (!this.exists || this.parent?.exists !== true) {
       this.renderOrderID = -1;
       return;
     }
@@ -292,7 +293,7 @@ export class Group extends DisplayObject {
     if (this.children.length === 0 || !this.children.includes(child)) {
       return false;
     }
-    if (!silent && child.events) {
+    if (!silent && (child.events as EventManager | undefined)) {
       child.events.onRemovedFromGroup$dispatch(child, this);
     }
     const removed = this.removeChild(child);
@@ -318,7 +319,7 @@ export class Group extends DisplayObject {
     }
     do {
       const first = this.children[0]!;
-      if (!silent && first.events) {
+      if (!silent && (first.events as EventManager | undefined)) {
         first.events.onRemovedFromGroup$dispatch(first, this);
       }
       const removed = this.removeChild(first);

package/src/phaser/display/image.ts

@@ -11,6 +11,7 @@ import { Frame } from '../core/frame.js';
 import type { Matrix } from '../geom/matrix.js';
 import type { RenderSession } from './render_session.js';
 import type { AbstractFilter } from './webgl/abstract_filter.js';
+import type { ImageCacheEntry } from '../core/cache.js';
 
 export class Image extends DisplayObject {
   public key!: string | number | Texture | null;
@@ -99,11 +100,11 @@ export class Image extends DisplayObject {
     this.tintedTexture = null;
     this.shader = null;
     this._frame = null;
-    if (this.events) {
+    if (this.events as EventManager | undefined) {
       this.events.destroy();
     }
     this.events = null!;
-    if (this.animations) {
+    if (this.animations as AnimationManager | undefined) {
       this.animations.destroy();
     }
     this.animations = null!;
@@ -118,7 +119,7 @@ export class Image extends DisplayObject {
       this.destroy();
       return;
     }
-    if (!this.exists || !this.parent?.exists) {
+    if (!this.exists || this.parent?.exists !== true) {
       this.renderOrderID = -1;
       return;
     }
@@ -126,7 +127,7 @@ export class Image extends DisplayObject {
       this.game.stage.currentRenderOrderID += 1;
       this.renderOrderID = this.game.stage.currentRenderOrderID;
     }
-    if (this.animations) {
+    if (this.animations as AnimationManager | undefined) {
       this.animations.update();
     }
     for (const child of this.children) {
@@ -162,7 +163,7 @@ export class Image extends DisplayObject {
       this.setTexture(textureKey);
     } else {
       const img = cache.getImage(textureKey ?? undefined, true);
-      if (img) {
+      if (img as ImageCacheEntry | undefined) {
         this.key = img.key;
         this.setTexture(new Texture(img.base));
         this.texture.baseTexture.skipRender = textureKey === '__default';
@@ -283,7 +284,7 @@ export class Image extends DisplayObject {
    * @param {boolean} copy - Whether to copy the rect or use it directly.
    */
   public crop(rect: Rectangle, copy = false): void {
-    if (rect) {
+    if (rect as Rectangle | undefined) {
       if (copy && this.cropRect !== null) {
         this.cropRect.setTo(rect.x, rect.y, rect.width, rect.height);
       } else if (copy && this.cropRect === null) {

package/src/phaser/display/sprite_util.ts

@@ -222,7 +222,7 @@ export const renderCanvas = (
     renderSession.context.globalAlpha = target.worldAlpha;
 
     //  If smoothingEnabled is supported and we need to change the smoothing property for this texture
-    if (renderSession.smoothProperty && renderSession.scaleMode !== target.texture.baseTexture.scaleMode) {
+    if (renderSession.smoothProperty !== null && renderSession.scaleMode !== target.texture.baseTexture.scaleMode) {
       renderSession.scaleMode = target.texture.baseTexture.scaleMode;
       setSmoothing(renderSession.context, renderSession.smoothProperty, renderSession.scaleMode === SCALE_LINEAR);
     }