@thi.ng/geom 3.3.0 → 3.3.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2022-06-20T17:33:30Z
+- **Last updated**: 2022-06-23T12:16:18Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [3.3.1](https://github.com/thi-ng/umbrella/tree/@thi.ng/geom@3.3.1) (2022-06-23)
+
+#### ♻️ Refactoring
+
+- update size handling in various ctors ([ab4b93d](https://github.com/thi-ng/umbrella/commit/ab4b93d))
+
 ## [3.3.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/geom@3.3.0) (2022-06-20)
 
 #### 🚀 Features

package/README.md

@@ -50,6 +50,7 @@ themselves too):
 - [@thi.ng/geom-isoline](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-isoline) - Fast 2D contour line extraction / generation
 - [@thi.ng/geom-poly-utils](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-poly-utils) - 2D polygon/polyline analysis & processing utilities
 - [@thi.ng/geom-resample](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-resample) - Customizable nD polyline interpolation, re-sampling, splitting & nearest point computation
+- [@thi.ng/geom-sdf](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-sdf) - 2D Signed Distance Field creation from [@thi.ng/geom](https://github.com/thi-ng/umbrella/tree/develop/packages/geom) shapes, conversions, sampling, combinators
 - [@thi.ng/geom-splines](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-splines) - nD cubic & quadratic curve analysis, conversion, interpolation, splitting
 - [@thi.ng/geom-subdiv-curve](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-subdiv-curve) - Freely customizable, iterative nD subdivision curves for open / closed geometries
 - [@thi.ng/geom-tessellate](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-tessellate) - 2D/3D convex polygon tessellators
@@ -84,7 +85,7 @@ node --experimental-repl-await
 > const geom = await import("@thi.ng/geom");
 ```
 
-Package sizes (gzipped, pre-treeshake): ESM: 12.44 KB
+Package sizes (gzipped, pre-treeshake): ESM: 12.67 KB
 
 ## Dependencies
 

package/api/aabb.js

@@ -1,20 +1,20 @@
-import { isNumber } from "@thi.ng/checks/is-number";
 import { add3 } from "@thi.ng/vectors/add";
 import { addN3 } from "@thi.ng/vectors/addn";
-import { set } from "@thi.ng/vectors/set";
+import { set3 } from "@thi.ng/vectors/set";
 import { subN3 } from "@thi.ng/vectors/subn";
+import { __asVec } from "../internal/args.js";
 import { __copyAttribs } from "../internal/copy.js";
 export class AABB {
     constructor(pos = [0, 0, 0], size = 1, attribs) {
         this.pos = pos;
         this.attribs = attribs;
-        this.size = isNumber(size) ? [size, size, size] : size;
+        this.size = __asVec(size, 3);
     }
     get type() {
         return "aabb";
     }
     copy() {
-        return new AABB(set([], this.pos), set([], this.size), __copyAttribs(this));
+        return new AABB(set3([], this.pos), set3([], this.size), __copyAttribs(this));
     }
     max() {
         return add3([], this.pos, this.size);

package/api/ellipse.js

@@ -1,11 +1,11 @@
-import { isNumber } from "@thi.ng/checks/is-number";
 import { set } from "@thi.ng/vectors/set";
+import { __asVec } from "../internal/args.js";
 import { __copyAttribs } from "../internal/copy.js";
 export class Ellipse {
     constructor(pos = [0, 0], r = [1, 1], attribs) {
         this.pos = pos;
         this.attribs = attribs;
-        this.r = isNumber(r) ? [r, r] : r;
+        this.r = __asVec(r);
     }
     get type() {
         return "ellipse";

package/api/plane.js

@@ -1,4 +1,4 @@
-import { set } from "@thi.ng/vectors/set";
+import { set3 } from "@thi.ng/vectors/set";
 import { __copyAttribs } from "../internal/copy.js";
 export class Plane {
     constructor(normal = [0, 1, 0], w = 0, attribs) {
@@ -10,7 +10,7 @@ export class Plane {
         return "plane";
     }
     copy() {
-        return new Plane(set([], this.normal), this.w, __copyAttribs(this));
+        return new Plane(set3([], this.normal), this.w, __copyAttribs(this));
     }
     toHiccup() {
         return ["plane", this.attribs, this.normal, this.w];

package/api/rect.js

@@ -1,14 +1,14 @@
-import { isNumber } from "@thi.ng/checks/is-number";
 import { add2 } from "@thi.ng/vectors/add";
 import { addN2 } from "@thi.ng/vectors/addn";
 import { set2 } from "@thi.ng/vectors/set";
 import { subN2 } from "@thi.ng/vectors/subn";
+import { __asVec } from "../internal/args.js";
 import { __copyAttribs } from "../internal/copy.js";
 export class Rect {
     constructor(pos = [0, 0], size = 1, attribs) {
         this.pos = pos;
         this.attribs = attribs;
-        this.size = isNumber(size) ? [size, size] : size;
+        this.size = __asVec(size);
     }
     get type() {
         return "rect";

package/internal/args.d.ts

@@ -1,3 +1,4 @@
+import type { Vec } from "@thi.ng/vectors";
 /**
  * Takes an array of arguments, checks if last element is a plain object or
  * nullish and if so, removes value from array and returns it (`null` will be
@@ -26,4 +27,5 @@ export declare const __argsVV: (args: any[]) => any[];
  * @internal
  */
 export declare const __argsVN: (args: any[]) => any[];
+export declare const __asVec: (x: number | Vec, size?: number) => any[] | Vec;
 //# sourceMappingURL=args.d.ts.map

package/internal/args.js

@@ -1,5 +1,6 @@
 import { isNumber } from "@thi.ng/checks/is-number";
 import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { vecOf } from "@thi.ng/vectors/vec-of";
 /**
  * Takes an array of arguments, checks if last element is a plain object or
  * nullish and if so, removes value from array and returns it (`null` will be
@@ -53,3 +54,4 @@ export const __argsVN = (args) => {
                 : [args[0], undefined, attr]
         : [undefined, undefined, attr];
 };
+export const __asVec = (x, size = 2) => isNumber(x) ? vecOf(size, x) : x;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Functional, polymorphic API for 2D geometry types & SVG generation",
   "type": "module",
   "module": "./index.js",
@@ -42,20 +42,20 @@
     "@thi.ng/defmulti": "^2.1.7",
     "@thi.ng/equiv": "^2.1.7",
     "@thi.ng/errors": "^2.1.7",
-    "@thi.ng/geom-api": "^3.2.0",
-    "@thi.ng/geom-arc": "^2.1.15",
-    "@thi.ng/geom-clip-line": "^2.1.15",
-    "@thi.ng/geom-clip-poly": "^2.1.15",
+    "@thi.ng/geom-api": "^3.2.1",
+    "@thi.ng/geom-arc": "^2.1.16",
+    "@thi.ng/geom-clip-line": "^2.1.16",
+    "@thi.ng/geom-clip-poly": "^2.1.16",
     "@thi.ng/geom-closest-point": "^2.1.14",
     "@thi.ng/geom-hull": "^2.1.14",
-    "@thi.ng/geom-isec": "^2.1.15",
-    "@thi.ng/geom-poly-utils": "^2.2.7",
-    "@thi.ng/geom-resample": "^2.1.15",
-    "@thi.ng/geom-splines": "^2.1.15",
-    "@thi.ng/geom-subdiv-curve": "^2.1.15",
-    "@thi.ng/geom-tessellate": "^2.1.15",
+    "@thi.ng/geom-isec": "^2.1.16",
+    "@thi.ng/geom-poly-utils": "^2.3.0",
+    "@thi.ng/geom-resample": "^2.1.16",
+    "@thi.ng/geom-splines": "^2.1.16",
+    "@thi.ng/geom-subdiv-curve": "^2.1.16",
+    "@thi.ng/geom-tessellate": "^2.1.16",
     "@thi.ng/hiccup": "^4.2.9",
-    "@thi.ng/hiccup-svg": "^4.3.0",
+    "@thi.ng/hiccup-svg": "^4.3.1",
     "@thi.ng/math": "^5.3.3",
     "@thi.ng/matrices": "^2.1.14",
     "@thi.ng/random": "^3.3.2",
@@ -371,5 +371,5 @@
   "thi.ng": {
     "year": 2013
   },
-  "gitHead": "f50e292ecc7dc74a6705b07fc739bf827cc5efd7\n"
+  "gitHead": "73139849c7b46c0451693d994e14a34bc2434280\n"
 }

package/rect.d.ts

@@ -8,8 +8,8 @@ export declare function rect(size: number | Vec, attribs?: Attribs): Rect;
 export declare function rect(attribs?: Attribs): Rect;
 export declare const rectFromMinMax: (min: Vec, max: Vec, attribs?: Attribs) => Rect;
 export declare const rectFromMinMaxWithMargin: (min: Vec, max: Vec, margin: number, attribs?: Attribs) => Rect;
-export declare const rectFromCentroid: (centroid: Vec, size: Vec, attribs?: Attribs) => Rect;
-export declare const rectFromCentroidWithMargin: (centroid: Vec, size: Vec, margin: number, attribs?: Attribs) => Rect;
+export declare const rectFromCentroid: (centroid: Vec, size: number | Vec, attribs?: Attribs) => Rect;
+export declare const rectFromCentroidWithMargin: (centroid: Vec, size: number | Vec, margin: number, attribs?: Attribs) => Rect;
 /**
  * Returns the intersection rect of given inputs or `undefined` if they
  * are non-overlapping.

package/rect.js

@@ -9,13 +9,16 @@ import { min2 } from "@thi.ng/vectors/min";
 import { sub2 } from "@thi.ng/vectors/sub";
 import { subN2 } from "@thi.ng/vectors/subn";
 import { Rect } from "./api/rect.js";
-import { __argsVV } from "./internal/args.js";
+import { __argsVV, __asVec } from "./internal/args.js";
 export function rect(...args) {
     return new Rect(...__argsVV(args));
 }
 export const rectFromMinMax = (min, max, attribs) => new Rect(min, sub2([], max, min), attribs);
 export const rectFromMinMaxWithMargin = (min, max, margin, attribs) => rectFromMinMax(min, max, attribs).offset(margin);
-export const rectFromCentroid = (centroid, size, attribs) => new Rect(maddN2([], size, -0.5, centroid), size, attribs);
+export const rectFromCentroid = (centroid, size, attribs) => {
+    size = __asVec(size);
+    return new Rect(maddN2([], size, -0.5, centroid), size, attribs);
+};
 export const rectFromCentroidWithMargin = (centroid, size, margin, attribs) => rectFromCentroid(centroid, size, attribs).offset(margin);
 /**
  * Returns the intersection rect of given inputs or `undefined` if they