@ntf/math 1.3.1 → 1.3.2

package/dist/index.d.mts

@@ -337,7 +337,6 @@ declare class Rectangle implements IRectangle, IGeometryObject, IToString {
     static cast(a: unknown): Rectangle | undefined;
     static is(a: unknown): a is RectangleLike;
     constructor(pos: Vec2Like, size: SizeLike);
-    constructor(x: number, y: number, width: number, height: number);
     toArray(w?: boolean): RectangleArray;
     toString(w?: boolean): RectangleString;
     toJSON(): IRectangle;

package/dist/index.d.ts

@@ -337,7 +337,6 @@ declare class Rectangle implements IRectangle, IGeometryObject, IToString {
     static cast(a: unknown): Rectangle | undefined;
     static is(a: unknown): a is RectangleLike;
     constructor(pos: Vec2Like, size: SizeLike);
-    constructor(x: number, y: number, width: number, height: number);
     toArray(w?: boolean): RectangleArray;
     toString(w?: boolean): RectangleString;
     toJSON(): IRectangle;

package/dist/index.js

@@ -1259,9 +1259,9 @@ var Rectangle = class _Rectangle {
     if (a == null || typeof a == "undefined")
       return void 0;
     if (check_number_array(a, 4))
-      return new this(a[0], a[1], a[2], a[3]);
+      return new this([a[0], a[1]], [a[2], a[3]]);
     if (check_number_array(a, 5)) {
-      const rect = new this(a[0], a[1], a[3], a[4]);
+      const rect = new this([a[0], a[1]], [a[3], a[4]]);
       rect.w = a[2];
       return rect;
     }
@@ -1271,12 +1271,12 @@ var Rectangle = class _Rectangle {
       const size = Size.cast(ssize);
       if (typeof pos == "undefined" || typeof size == "undefined")
         return void 0;
-      const rect = new this(pos.x, pos.y, size.width, size.height);
+      const rect = new this([pos.x, pos.y], [size.width, size.height]);
       rect.w = pos.w;
       return rect;
     }
     if (has_property(a, "x", "number") && has_property(a, "y", "number") && has_property(a, "width", "number") && has_property(a, "height", "number")) {
-      const rect = new this(a.x, a.y, a.width, a.height);
+      const rect = new this([a.x, a.y], [a.width, a.height]);
       if (has_property(a, "w", "number"))
         rect.w = a.w;
       return rect;
@@ -1286,23 +1286,9 @@ var Rectangle = class _Rectangle {
   static is(a) {
     return typeof this.cast(a) != "undefined";
   }
-  constructor(a, b, c, d) {
-    const vec = Vec2.is(a) ? Vec2.resolve(a) : void 0;
-    const size = Size.is(b) ? Size.resolve(b) : void 0;
-    const x = typeof a == "number" ? a : vec?.x;
-    if (!check_number(x))
-      throw new TypeError("expected number for x position");
-    const y = typeof b == "number" ? b : vec?.y;
-    if (!check_number(y))
-      throw new TypeError("expected number for y position");
-    const width = typeof c == "number" ? c : size?.width;
-    if (!check_number(width))
-      throw new TypeError("expected number for width");
-    const height = typeof d == "number" ? d : size?.height;
-    if (!check_number(height))
-      throw new TypeError("expected number for height");
-    this.position = new Vec2(x, y);
-    this.size = new Size(width, height);
+  constructor(pos, size) {
+    this.position = Vec2.resolve(pos);
+    this.size = Size.resolve(size);
   }
   toArray(w = false) {
     return [...this.position.toArray(w), ...this.size.toArray()];
@@ -1405,7 +1391,7 @@ var BoundingBox = class _BoundingBox {
     return new Size(this.width, this.height);
   }
   toRectangle() {
-    return new Rectangle(this.left, this.top, this.width, this.height);
+    return new Rectangle([this.left, this.top], [this.width, this.height]);
   }
   inside(a) {
     const bbox = _BoundingBox.resolve(a);
@@ -2427,7 +2413,7 @@ var RGBAColor = class _RGBAColor {
     } : this.alpha == 1 ? { red: this.red, green: this.green, blue: this.blue } : this.toJSON(true);
   }
   toString(withAlpha = false) {
-    return withAlpha ? `rgba(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)},${_fix_integer(this.alpha)})` : this.alpha == 1 ? `rgb(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)})` : this.toString(true);
+    return withAlpha ? `rgba(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)},${this.alpha})` : this.alpha == 1 ? `rgb(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)})` : this.toString(true);
   }
   toHSL(withAlpha = true) {
     const red = this.red, green = this.green, blue = this.blue;
@@ -2542,7 +2528,7 @@ var HSLColor = class _HSLColor {
     } : this.alpha == 1 ? { hue: this.hue, saturation: this.saturation, luminace: this.luminace } : this.toJSON(true);
   }
   toString(withAlpha = false) {
-    return withAlpha ? `hsla(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)},${_fix_integer(this.alpha)})` : this.alpha == 1 ? `hsl(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)})` : this.toString(true);
+    return withAlpha ? `hsla(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)},${this.alpha})` : this.alpha == 1 ? `hsl(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)})` : this.toString(true);
   }
   toRGB(withAlpha = true) {
     if (this.saturation == 0)

package/dist/index.mjs

@@ -1187,9 +1187,9 @@ var Rectangle = class _Rectangle {
     if (a == null || typeof a == "undefined")
       return void 0;
     if (check_number_array(a, 4))
-      return new this(a[0], a[1], a[2], a[3]);
+      return new this([a[0], a[1]], [a[2], a[3]]);
     if (check_number_array(a, 5)) {
-      const rect = new this(a[0], a[1], a[3], a[4]);
+      const rect = new this([a[0], a[1]], [a[3], a[4]]);
       rect.w = a[2];
       return rect;
     }
@@ -1199,12 +1199,12 @@ var Rectangle = class _Rectangle {
       const size = Size.cast(ssize);
       if (typeof pos == "undefined" || typeof size == "undefined")
         return void 0;
-      const rect = new this(pos.x, pos.y, size.width, size.height);
+      const rect = new this([pos.x, pos.y], [size.width, size.height]);
       rect.w = pos.w;
       return rect;
     }
     if (has_property(a, "x", "number") && has_property(a, "y", "number") && has_property(a, "width", "number") && has_property(a, "height", "number")) {
-      const rect = new this(a.x, a.y, a.width, a.height);
+      const rect = new this([a.x, a.y], [a.width, a.height]);
       if (has_property(a, "w", "number"))
         rect.w = a.w;
       return rect;
@@ -1214,23 +1214,9 @@ var Rectangle = class _Rectangle {
   static is(a) {
     return typeof this.cast(a) != "undefined";
   }
-  constructor(a, b, c, d) {
-    const vec = Vec2.is(a) ? Vec2.resolve(a) : void 0;
-    const size = Size.is(b) ? Size.resolve(b) : void 0;
-    const x = typeof a == "number" ? a : vec?.x;
-    if (!check_number(x))
-      throw new TypeError("expected number for x position");
-    const y = typeof b == "number" ? b : vec?.y;
-    if (!check_number(y))
-      throw new TypeError("expected number for y position");
-    const width = typeof c == "number" ? c : size?.width;
-    if (!check_number(width))
-      throw new TypeError("expected number for width");
-    const height = typeof d == "number" ? d : size?.height;
-    if (!check_number(height))
-      throw new TypeError("expected number for height");
-    this.position = new Vec2(x, y);
-    this.size = new Size(width, height);
+  constructor(pos, size) {
+    this.position = Vec2.resolve(pos);
+    this.size = Size.resolve(size);
   }
   toArray(w = false) {
     return [...this.position.toArray(w), ...this.size.toArray()];
@@ -1333,7 +1319,7 @@ var BoundingBox = class _BoundingBox {
     return new Size(this.width, this.height);
   }
   toRectangle() {
-    return new Rectangle(this.left, this.top, this.width, this.height);
+    return new Rectangle([this.left, this.top], [this.width, this.height]);
   }
   inside(a) {
     const bbox = _BoundingBox.resolve(a);
@@ -2355,7 +2341,7 @@ var RGBAColor = class _RGBAColor {
     } : this.alpha == 1 ? { red: this.red, green: this.green, blue: this.blue } : this.toJSON(true);
   }
   toString(withAlpha = false) {
-    return withAlpha ? `rgba(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)},${_fix_integer(this.alpha)})` : this.alpha == 1 ? `rgb(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)})` : this.toString(true);
+    return withAlpha ? `rgba(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)},${this.alpha})` : this.alpha == 1 ? `rgb(${_fix_integer(this.red)},${_fix_integer(this.green)},${_fix_integer(this.blue)})` : this.toString(true);
   }
   toHSL(withAlpha = true) {
     const red = this.red, green = this.green, blue = this.blue;
@@ -2470,7 +2456,7 @@ var HSLColor = class _HSLColor {
     } : this.alpha == 1 ? { hue: this.hue, saturation: this.saturation, luminace: this.luminace } : this.toJSON(true);
   }
   toString(withAlpha = false) {
-    return withAlpha ? `hsla(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)},${_fix_integer(this.alpha)})` : this.alpha == 1 ? `hsl(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)})` : this.toString(true);
+    return withAlpha ? `hsla(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)},${this.alpha})` : this.alpha == 1 ? `hsl(${_fix_integer(this.hue)},${_fix_integer(this.saturation)},${_fix_integer(this.luminace)})` : this.toString(true);
   }
   toRGB(withAlpha = true) {
     if (this.saturation == 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntf/math",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Another math library",
   "files": [
     "dist"