@thi.ng/geom-axidraw 0.5.45 → 0.5.47

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-12-09T19:12:03Z
+- **Last updated**: 2023-12-11T10:07:09Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.

package/README.md

@@ -304,7 +304,7 @@ For Node.js REPL:
 const geomAxidraw = await import("@thi.ng/geom-axidraw");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.50 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.49 KB
 
 ## Dependencies
 

package/api.js

@@ -1 +0,0 @@
-export {};

package/as-axidraw.js

@@ -9,46 +9,9 @@ import { __dispatch } from "@thi.ng/geom/internal/dispatch";
 import { __sampleAttribs } from "@thi.ng/geom/internal/vertices";
 import { takeNth } from "@thi.ng/transducers/take-nth";
 import { pointsByNearestNeighbor } from "./sort.js";
-/**
- * Lazily converts given shape (or group) into an iterable of thi.ng/axidraw
- * drawing commands, using optionally provided config options.
- *
- * @remarks
- * The provided conversion options can (and will) be overridden by a shape's
- * `__axi` attribute. See {@link AxiDrawAttribs} for details.
- *
- * Currently supported shape types (at least all types which are supported by
- * the
- * [`asPolyline()`](https://docs.thi.ng/umbrella/geom/functions/asPolyline.html)
- * function):
- *
- * - arc
- * - circle
- * - cubic
- * - ellipse
- * - group
- * - line
- * - path
- * - points
- * - polygon
- * - polyline
- * - quad
- * - quadratic
- * - rect
- * - triangle
- *
- * @example
- * ```ts
- * [...asAxiDraw(circle(100), { samples: 100 })]
- * [
- *   [ 'm', [ 10, 0 ] ],
- *   [ 'd' ],
- *   [ 'm', [ 9.980267284282716, 0.6279051952931337 ], undefined ],
- *   ...
- * ]
- * ```
- */
-export const asAxiDraw = defmulti(__dispatch, {
+const asAxiDraw = defmulti(
+  __dispatch,
+  {
     arc: "circle",
     cubic: "circle",
     ellipse: "circle",
@@ -58,105 +21,111 @@ export const asAxiDraw = defmulti(__dispatch, {
     quad: "polyline",
     quadratic: "circle",
     rect: "polyline",
-    tri: "polyline",
-}, {
+    tri: "polyline"
+  },
+  {
     points: ($, opts) => __points(applyTransforms($).points, $.attribs, opts),
     // used for all shapes which need to be sampled
-    circle: ($, opts) => __polyline(asPolyline(applyTransforms($), opts?.samples).points, $.attribs, opts),
+    circle: ($, opts) => __polyline(
+      asPolyline(applyTransforms($), opts?.samples).points,
+      $.attribs,
+      opts
+    ),
     // ignore sample opts for polyline & other polygonal shapes
     // i.e. use points verbatim
     polyline: ($, opts) => __polyline(asPolyline(applyTransforms($)).points, $.attribs, opts),
-    group: ($, opts) => __group($, opts),
-});
+    group: ($, opts) => __group($, opts)
+  }
+);
 function* __group($, opts) {
-    const $sampleOpts = __sampleAttribs(opts?.samples, $.attribs);
-    const { skip, sort, interleave } = __axiAttribs($.attribs);
-    const children = skip ? [...takeNth(skip + 1, $.children)] : $.children;
-    function* emitChunk(chunk) {
-        const iter = sort ? sort(chunk) : chunk;
-        for (let child of iter) {
-            const shape = applyTransforms(child);
-            shape.attribs = {
-                ...$.attribs,
-                ...shape.attribs,
-                __samples: __sampleAttribs($sampleOpts, shape.attribs),
-            };
-            yield* asAxiDraw(shape, opts);
-        }
+  const $sampleOpts = __sampleAttribs(opts?.samples, $.attribs);
+  const { skip, sort, interleave } = __axiAttribs($.attribs);
+  const children = skip ? [...takeNth(skip + 1, $.children)] : $.children;
+  function* emitChunk(chunk) {
+    const iter = sort ? sort(chunk) : chunk;
+    for (let child of iter) {
+      const shape = applyTransforms(child);
+      shape.attribs = {
+        ...$.attribs,
+        ...shape.attribs,
+        __samples: __sampleAttribs($sampleOpts, shape.attribs)
+      };
+      yield* asAxiDraw(shape, opts);
     }
-    if (interleave) {
-        const { num, commands } = interleave;
-        if (interleave.start !== false)
-            yield* commands(0);
-        for (let i = 0, n = children.length; i < n;) {
-            yield* emitChunk(children.slice(i, i + num));
-            i += num;
-            if (i < n)
-                yield* commands(i);
-        }
-        if (interleave.end)
-            yield* interleave.commands(children.length);
-    }
-    else {
-        yield* emitChunk(children);
+  }
+  if (interleave) {
+    const { num, commands } = interleave;
+    if (interleave.start !== false)
+      yield* commands(0);
+    for (let i = 0, n = children.length; i < n; ) {
+      yield* emitChunk(children.slice(i, i + num));
+      i += num;
+      if (i < n)
+        yield* commands(i);
     }
+    if (interleave.end)
+      yield* interleave.commands(children.length);
+  } else {
+    yield* emitChunk(children);
+  }
 }
 function* __points(pts, attribs, opts) {
+  if (!pts.length)
+    return;
+  const { clip, delayDown, delayUp, down, skip, speed, sort, interleave } = {
+    sort: pointsByNearestNeighbor(),
+    ...__axiAttribs(attribs)
+  };
+  const clipPts = clip || opts?.clip;
+  if (clipPts) {
+    pts = pts.filter((p) => !!pointInPolygon2(p, clipPts));
     if (!pts.length)
-        return;
-    const { clip, delayDown, delayUp, down, skip, speed, sort, interleave } = {
-        sort: pointsByNearestNeighbor(),
-        ...__axiAttribs(attribs),
-    };
-    const clipPts = clip || opts?.clip;
-    if (clipPts) {
-        pts = pts.filter((p) => !!pointInPolygon2(p, clipPts));
-        if (!pts.length)
-            return;
-    }
-    if (skip) {
-        pts = [...takeNth(skip + 1, pts)];
-    }
-    function* emitChunk($pts) {
-        if (down != undefined)
-            yield ["pen", down];
-        for (let p of sort ? sort($pts) : $pts) {
-            yield MOVE(p, speed);
-            yield DOWN(delayDown);
-            yield UP(delayUp);
-        }
-        if (down != undefined)
-            yield ["pen"];
+      return;
+  }
+  if (skip) {
+    pts = [...takeNth(skip + 1, pts)];
+  }
+  function* emitChunk($pts) {
+    if (down != void 0)
+      yield ["pen", down];
+    for (let p of sort ? sort($pts) : $pts) {
+      yield MOVE(p, speed);
+      yield DOWN(delayDown);
+      yield UP(delayUp);
     }
-    yield UP();
-    if (interleave) {
-        const { num, commands } = interleave;
-        if (interleave.start !== false)
-            yield* commands(0);
-        for (let i = 0, n = pts.length; i < n;) {
-            yield* emitChunk(pts.slice(i, i + num));
-            i += num;
-            if (i < n)
-                yield* commands(i);
-        }
-        if (interleave.end)
-            yield* interleave.commands(pts.length);
-    }
-    else {
-        yield* emitChunk(pts);
+    if (down != void 0)
+      yield ["pen"];
+  }
+  yield UP();
+  if (interleave) {
+    const { num, commands } = interleave;
+    if (interleave.start !== false)
+      yield* commands(0);
+    for (let i = 0, n = pts.length; i < n; ) {
+      yield* emitChunk(pts.slice(i, i + num));
+      i += num;
+      if (i < n)
+        yield* commands(i);
     }
+    if (interleave.end)
+      yield* interleave.commands(pts.length);
+  } else {
+    yield* emitChunk(pts);
+  }
 }
 function* __polyline(pts, attribs, opts) {
-    if (!pts.length)
-        return;
-    const { clip, down, delayDown, delayUp, speed } = __axiAttribs(attribs);
-    const clipPts = clip || opts?.clip;
-    const chunks = clipPts ? clipPolylinePoly(pts, clipPts) : [pts];
-    if (!chunks.length)
-        return;
-    for (let chunk of chunks) {
-        yield* polyline(chunk, { down, delayDown, delayUp, speed });
-    }
+  if (!pts.length)
+    return;
+  const { clip, down, delayDown, delayUp, speed } = __axiAttribs(attribs);
+  const clipPts = clip || opts?.clip;
+  const chunks = clipPts ? clipPolylinePoly(pts, clipPts) : [pts];
+  if (!chunks.length)
+    return;
+  for (let chunk of chunks) {
+    yield* polyline(chunk, { down, delayDown, delayUp, speed });
+  }
 }
-/** @internal */
 const __axiAttribs = (attribs) => attribs ? attribs.__axi || {} : {};
+export {
+  asAxiDraw
+};

package/as-geometry.js

@@ -4,109 +4,97 @@ import { polyline } from "@thi.ng/geom/polyline";
 import { add2 } from "@thi.ng/vectors/add";
 import { copy } from "@thi.ng/vectors/copy";
 const DEFAULT_ATTRIBS = {
-    paths: { stroke: "#000" },
-    rapids: { stroke: "#0ff" },
-    ups: { fill: "#0f0", stroke: "none" },
-    downs: { fill: "#f00", stroke: "none" },
+  paths: { stroke: "#000" },
+  rapids: { stroke: "#0ff" },
+  ups: { fill: "#0f0", stroke: "none" },
+  downs: { fill: "#f00", stroke: "none" }
 };
-/**
- * Converts a sequence of
- * [DrawCommands](https://docs.thi.ng/umbrella/axidraw/types/DrawCommand.html)
- * into thi.ng/geom geometry. Returns an object of shapes. The conversion can be
- * controlled via given options.
- *
- * @remarks
- * The returned object contains groups & shapes which are being color coded by
- * default:
- *
- * - `paths`: a group of polylines for which pen is down (#000)
- * - `rapids`: a group of polylines for which pen is up (#0ff)
- * - `ups`: a point cloud of positions where pen is being lifted (#0f0)
- * - `downs`: a point cloud of positions where pen is being placed down (#f00)
- *
- * @param src
- * @param opts
- */
-export const asGeometry = (src, opts = {}) => {
-    opts = {
-        rapids: true,
-        pen: true,
-        ...opts,
-        attribs: { ...DEFAULT_ATTRIBS, ...opts.attribs },
-    };
-    const rapids = [];
-    const paths = [];
-    const downs = [];
-    const ups = [];
-    let penDown = false;
-    let pts = null;
-    let currPos = [0, 0];
-    const $move = (newPos) => {
-        if (penDown || opts.rapids) {
-            if (!pts)
-                pts = [copy(currPos), newPos];
-            else
-                pts.push(newPos);
-        }
-        currPos = newPos;
-    };
-    for (let cmd of src) {
-        switch (cmd[0]) {
-            // absolute
-            case "M":
-                $move(copy(cmd[1]));
-                break;
-            // relative
-            case "m":
-                $move(add2([], currPos, cmd[1]));
-                break;
-            case "u":
-                if (pts) {
-                    if (penDown)
-                        paths.push(pts);
-                    else if (opts.rapids)
-                        rapids.push(pts);
-                    pts = null;
-                }
-                if (opts.pen)
-                    ups.push(copy(currPos));
-                penDown = false;
-                break;
-            case "d":
-                if (pts) {
-                    if (!penDown) {
-                        if (opts.rapids)
-                            rapids.push(pts);
-                    }
-                    else
-                        paths.push(pts);
-                    pts = null;
-                }
-                if (opts.pen)
-                    downs.push(copy(currPos));
-                penDown = true;
-                break;
-            case "home":
-                currPos = [0, 0];
-                if (!pts)
-                    pts = [currPos];
-                else
-                    pts.push(currPos);
-                break;
-            default:
-                console.log("skipping command", cmd);
-        }
+const asGeometry = (src, opts = {}) => {
+  opts = {
+    rapids: true,
+    pen: true,
+    ...opts,
+    attribs: { ...DEFAULT_ATTRIBS, ...opts.attribs }
+  };
+  const rapids = [];
+  const paths = [];
+  const downs = [];
+  const ups = [];
+  let penDown = false;
+  let pts = null;
+  let currPos = [0, 0];
+  const $move = (newPos) => {
+    if (penDown || opts.rapids) {
+      if (!pts)
+        pts = [copy(currPos), newPos];
+      else
+        pts.push(newPos);
     }
-    if (pts) {
-        if (penDown)
+    currPos = newPos;
+  };
+  for (let cmd of src) {
+    switch (cmd[0]) {
+      case "M":
+        $move(copy(cmd[1]));
+        break;
+      case "m":
+        $move(add2([], currPos, cmd[1]));
+        break;
+      case "u":
+        if (pts) {
+          if (penDown)
             paths.push(pts);
-        else
+          else if (opts.rapids)
             rapids.push(pts);
+          pts = null;
+        }
+        if (opts.pen)
+          ups.push(copy(currPos));
+        penDown = false;
+        break;
+      case "d":
+        if (pts) {
+          if (!penDown) {
+            if (opts.rapids)
+              rapids.push(pts);
+          } else
+            paths.push(pts);
+          pts = null;
+        }
+        if (opts.pen)
+          downs.push(copy(currPos));
+        penDown = true;
+        break;
+      case "home":
+        currPos = [0, 0];
+        if (!pts)
+          pts = [currPos];
+        else
+          pts.push(currPos);
+        break;
+      default:
+        console.log("skipping command", cmd);
     }
-    return {
-        paths: group(opts.attribs.paths, paths.map((pts) => polyline(pts))),
-        rapids: group(opts.attribs.rapids, rapids.map((pts) => polyline(pts))),
-        ups: points(ups, opts.attribs.ups),
-        downs: points(downs, opts.attribs.downs),
-    };
+  }
+  if (pts) {
+    if (penDown)
+      paths.push(pts);
+    else
+      rapids.push(pts);
+  }
+  return {
+    paths: group(
+      opts.attribs.paths,
+      paths.map((pts2) => polyline(pts2))
+    ),
+    rapids: group(
+      opts.attribs.rapids,
+      rapids.map((pts2) => polyline(pts2))
+    ),
+    ups: points(ups, opts.attribs.ups),
+    downs: points(downs, opts.attribs.downs)
+  };
+};
+export {
+  asGeometry
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom-axidraw",
-  "version": "0.5.45",
+  "version": "0.5.47",
   "description": "Conversion and preparation of thi.ng/geom shapes & shape groups to/from AxiDraw pen plotter draw commands",
   "type": "module",
   "module": "./index.js",
@@ -24,7 +24,9 @@
   "author": "Karsten Schmidt (https://thi.ng)",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -33,21 +35,22 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.11",
-    "@thi.ng/arrays": "^2.7.7",
-    "@thi.ng/axidraw": "^1.1.39",
-    "@thi.ng/compare": "^2.2.7",
-    "@thi.ng/defmulti": "^3.0.9",
-    "@thi.ng/geom": "^6.0.7",
-    "@thi.ng/geom-accel": "^3.5.33",
-    "@thi.ng/geom-api": "^3.4.49",
-    "@thi.ng/geom-clip-line": "^2.3.49",
-    "@thi.ng/geom-isec": "^2.1.91",
-    "@thi.ng/transducers": "^8.8.14",
-    "@thi.ng/vectors": "^7.8.8"
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/arrays": "^2.7.8",
+    "@thi.ng/axidraw": "^1.1.41",
+    "@thi.ng/compare": "^2.2.8",
+    "@thi.ng/defmulti": "^3.0.10",
+    "@thi.ng/geom": "^6.0.9",
+    "@thi.ng/geom-accel": "^3.5.35",
+    "@thi.ng/geom-api": "^3.4.51",
+    "@thi.ng/geom-clip-line": "^2.3.51",
+    "@thi.ng/geom-isec": "^2.1.93",
+    "@thi.ng/transducers": "^8.8.15",
+    "@thi.ng/vectors": "^7.8.10"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -119,5 +122,5 @@
     "status": "alpha",
     "year": 2022
   },
-  "gitHead": "25f2ac8ff795a432a930119661b364d4d93b59a0\n"
+  "gitHead": "22e36fa838e5431d40165384918b395603bbd92f\n"
 }

package/sort.js

@@ -4,68 +4,42 @@ import { KdTreeSet } from "@thi.ng/geom-accel/kd-tree-set";
 import { centroid } from "@thi.ng/geom/centroid";
 import { ZERO2 } from "@thi.ng/vectors/api";
 import { distSq2 } from "@thi.ng/vectors/distsq";
-/**
- * Higher order point ordering fn. Adds points to given spatial
- * index/acceleration structure and then lazily sorts them by nearest neighbor
- * distance, starting selection of first point based on given `ref` point
- * (default: [0, 0]).
- *
- * @remarks
- * By default is using a
- * [`KdTreeSet`](https://docs.thi.ng/umbrella/geom-accel/classes/KdTreeSet.html)
- * to index all points and then successively perform efficient nearest neighbor
- * searches (always w.r.t the most recent result point).
- *
- * @param accel
- * @param ref
- */
-export const pointsByNearestNeighbor = (accel = new KdTreeSet(2), ref = ZERO2) => function* (pts) {
-    accel.into(pts);
-    // const index = new KdTreeSet(2, pts);
-    while (accel.size) {
-        ref = accel.queryKeys(ref, 1e4, 1)[0];
-        accel.remove(ref);
-        yield ref;
-    }
+const pointsByNearestNeighbor = (accel = new KdTreeSet(2), ref = ZERO2) => function* (pts) {
+  accel.into(pts);
+  while (accel.size) {
+    ref = accel.queryKeys(ref, 1e4, 1)[0];
+    accel.remove(ref);
+    yield ref;
+  }
 };
-/**
- * Higher order point ordering fn. Sorts points by proximity to given `ref` point
- * (default: [0, 0]).
- *
- * @param ref
- */
-export const pointsByProximity = (ref = ZERO2) => (pts) => {
-    return sortByCachedKey(pts.slice(), (p) => distSq2(p, ref), compareNumAsc);
+const pointsByProximity = (ref = ZERO2) => (pts) => {
+  return sortByCachedKey(
+    pts.slice(),
+    (p) => distSq2(p, ref),
+    compareNumAsc
+  );
 };
-/**
- * Higher order shape sorting fn. Sorts shapes by their centroid's proximity to
- * given `ref` point (default: [0, 0]).
- *
- * @param ref
- */
-export const shapesByProximity = (ref = ZERO2) => (shapes) => {
-    return sortByCachedKey(shapes.slice(), (s) => distSq2(centroid(s) || ZERO2, ref), compareNumAsc);
+const shapesByProximity = (ref = ZERO2) => (shapes) => {
+  return sortByCachedKey(
+    shapes.slice(),
+    (s) => distSq2(centroid(s) || ZERO2, ref),
+    compareNumAsc
+  );
 };
-/**
- * Similar to {@link pointsByNearestNeighbor}, however for shapes and requiring
- * an
- * [`ISpatialMap`](https://docs.thi.ng/umbrella/geom-api/interfaces/ISpatialMap.html)
- * implementation and is using shape centroid (auto-computed) to perform
- * indexing and nearest neighbor queries.
- *
- * @remarks
- * Currently recommended to use
- * [`NdQuadtreeMap`](https://docs.thi.ng/umbrella/geom-accel/classes/NdQuadtreeMap.html).
- *
- * @param accel
- * @param ref
- */
-export const shapesByNearestNeighbor = (accel, ref = ZERO2) => function* (shapes) {
-    accel.into(shapes.map((s) => [centroid(s) || [0, 0], s]));
-    while (accel.size) {
-        const pair = accel.query(ref, 1e4, 1)[0];
-        ref = pair[0];
-        accel.remove(ref);
-        yield pair[1];
-    }
+const shapesByNearestNeighbor = (accel, ref = ZERO2) => function* (shapes) {
+  accel.into(
+    shapes.map((s) => [centroid(s) || [0, 0], s])
+  );
+  while (accel.size) {
+    const pair = accel.query(ref, 1e4, 1)[0];
+    ref = pair[0];
+    accel.remove(ref);
+    yield pair[1];
+  }
+};
+export {
+  pointsByNearestNeighbor,
+  pointsByProximity,
+  shapesByNearestNeighbor,
+  shapesByProximity
 };