Patch types

Author: shakiba

.changeset/nine-elephants-poke.md

@@ -0,0 +1,5 @@
+---
+"stage-js": patch
+---
+
+Patch types

.prettierrc.json

@@ -1,3 +1,4 @@
 {
-  "printWidth": 100
+  "printWidth": 100,
+  "quoteProps": "preserve"
 }

src/core/anim.ts

@@ -111,11 +111,11 @@ export class Anim extends Node {
     return this;
   }
 
-  moveFrame(move) {
+  moveFrame(move: number) {
     return this.gotoFrame(this._index + move);
   }
 
-  repeat(repeat, callback) {
+  repeat(repeat: number, callback?: () => void) {
     this._repeat = repeat * this._frames.length - 1;
     this._callback = callback;
     this.play();

src/core/core.ts

@@ -948,6 +948,7 @@ export class Node implements Pinned {
 
   scale(value: Vec2Value): this;
   scale(x: number, y: number): this;
+  scale(s: number): this;
   scale(a?: Vec2Value | number, b?: number) {
     // Pin shortcut, used by Transition and Node
     if (typeof a === "object") {

src/core/transition.ts

@@ -237,6 +237,7 @@ export class Transition implements Pinned {
 
   scale(value: Vec2Value): this;
   scale(x: number, y: number): this;
+  scale(s: number): this;
   scale(a: number | Vec2Value, b?: number) {
     // Pin shortcut, used by Transition and Node
     if (typeof a === "object") {

src/texture/atlas.ts

@@ -17,23 +17,26 @@ export interface AtlasTextureDefinition {
   bottom?: number;
 }
 
-type AtlasTextureReferenceOne = AtlasTextureDefinition | string;
-type AtlasTextureReferenceMap = Record<string, AtlasTextureReferenceOne>;
-type AtlasTextureReferenceArray = AtlasTextureReferenceOne[];
+type MonotypeAtlasTextureDefinition = Record<string, AtlasTextureDefinition | Texture | string>;
+type AnimAtlasTextureDefinition = (AtlasTextureDefinition | Texture | string)[];
 
 export interface AtlasDefinition {
   name?: string;
-  image?: {
-    /** @deprecated */
-    url: string;
-    src: string;
-    ratio?: number;
-  };
+  image?:
+    | {
+        src: string;
+        ratio?: number;
+      }
+    | {
+        /** @deprecated Use src instead of url */
+        url: string;
+        ratio?: number;
+      };
 
   ppu?: number;
   textures?: Record<
     string,
-    AtlasTextureDefinition | AtlasTextureReferenceMap | AtlasTextureReferenceArray
+    AtlasTextureDefinition | Texture | MonotypeAtlasTextureDefinition | AnimAtlasTextureDefinition
   >;
 
   map?: (texture: AtlasTextureDefinition) => AtlasTextureDefinition;
@@ -72,7 +75,11 @@ export class Atlas extends ImageTexture {
     this._textures = def.textures;
 
     if (typeof def.image === "object" && isHash(def.image)) {
-      this._imageSrc = def.image.src || def.image.url;
+      if ("src" in def.image) {
+        this._imageSrc = def.image.src;
+      } else if ("url" in def.image) {
+        this._imageSrc = def.image.url;
+      }
       if (typeof def.image.ratio === "number") {
         this._pixelRatio = def.image.ratio;
       }