@thi.ng/fuzzy-viz 2.1.101 → 2.1.102

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

@@ -50,7 +50,7 @@ For Node.js REPL:
 const fuzzyViz = await import("@thi.ng/fuzzy-viz");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.00 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.01 KB
 
 ## Dependencies
 

package/api.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/fuzzy-viz",
-  "version": "2.1.101",
+  "version": "2.1.102",
   "description": "Visualization, instrumentation & introspection utils for @thi.ng/fuzzy",
   "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,16 +35,17 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.11",
-    "@thi.ng/fuzzy": "^2.1.52",
-    "@thi.ng/hiccup": "^5.1.0",
-    "@thi.ng/hiccup-svg": "^5.0.37",
-    "@thi.ng/math": "^5.7.6",
-    "@thi.ng/strings": "^3.7.2",
-    "@thi.ng/text-canvas": "^2.6.22"
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/fuzzy": "^2.1.53",
+    "@thi.ng/hiccup": "^5.1.1",
+    "@thi.ng/hiccup-svg": "^5.0.38",
+    "@thi.ng/math": "^5.7.7",
+    "@thi.ng/strings": "^3.7.3",
+    "@thi.ng/text-canvas": "^2.6.23"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -89,5 +92,5 @@
     "parent": "@thi.ng/fuzzy",
     "year": 2020
   },
-  "gitHead": "25f2ac8ff795a432a930119661b364d4d93b59a0\n"
+  "gitHead": "5e7bafedfc3d53bc131469a28de31dd8e5b4a3ff\n"
 }

package/strategy.js

@@ -5,108 +5,63 @@ import { fit } from "@thi.ng/math/fit";
 import { repeat } from "@thi.ng/strings/repeat";
 import { barChartHLines } from "@thi.ng/text-canvas/bars";
 import { varToHiccup } from "./var.js";
-/**
- * Higher order function. Takes an existing
- * [`DefuzzStrategy`](https://docs.thi.ng/umbrella/fuzzy/types/DefuzzStrategy.html)
- * and an instrumentation function. Returns new `DefuzzStrategy` which first
- * executes original `strategy`, then calls `instrument` with the same args AND
- * the computed result obtained from `strategy`. Returns result of original
- * `strategy`.
- *
- * @remarks
- * The instrumentation function is intended to perform side effects (e.g. debug
- * outputs) and/or produce secondary results (e.g. visualizations). The latter
- * can be obtained through the
- * [`IDeref`](https://docs.thi.ng/umbrella/api/interfaces/IDeref.html) mechanism
- * implemented by the returned function. Since {@link defuzz} might call the
- * strategy multiple times (i.e. if there are multiple output vars used),
- * `.deref()` will always return an array of secondary results.
- *
- * Note: The secondary results from the instrumentation function will persist &
- * accumulate. If re-using the instrumented strategy for multiple `defuzz()`
- * invocations, it's highly recommended to clear any previous results using
- * `.clear()`.
- *
- * @example
- * ```ts
- * const strategy = instrumentStrategy(
- *   cogStrategy({ samples: 1000 }),
- *   fuzzySetToAscii({ width: 40, height: 8 })
- * );
- *
- * strategy(gaussian(5, 2), [0, 10]);
- * // 4.995
- *
- * console.log(strategy.deref()[0])
- * // .................▄▆█|█▆▄.................
- * // ...............▅████|████▅...............
- * // .............▄██████|██████▄.............
- * // ...........▂▇███████|███████▇▂...........
- * // ..........▅█████████|█████████▅..........
- * // .......▁▅███████████|███████████▅▁.......
- * // .....▃▆█████████████|█████████████▆▃.....
- * // ▃▄▅▇████████████████|████████████████▇▅▄▃
- * //                     ^ 5.00
- *
- * // cleanup (optional)
- * strategy.clear();
- * ```
- *
- * @param strategy -
- * @param instrument -
- */
-export const instrumentStrategy = (strategy, instrument) => {
-    const acc = [];
-    const impl = (fn, domain) => {
-        const res = strategy(fn, domain);
-        acc.push(instrument(fn, domain, res));
-        return res;
-    };
-    impl.clear = () => (acc.length = 0);
-    impl.deref = () => acc;
-    return impl;
+const instrumentStrategy = (strategy, instrument) => {
+  const acc = [];
+  const impl = (fn, domain) => {
+    const res = strategy(fn, domain);
+    acc.push(instrument(fn, domain, res));
+    return res;
+  };
+  impl.clear = () => acc.length = 0;
+  impl.deref = () => acc;
+  return impl;
 };
-export const fuzzySetToHiccup = (opts) => (fn, domain, res) => {
-    const tree = varToHiccup(variable(domain, { main: fn }), {
-        labels: false,
-        stroke: () => "#333",
-        fill: () => "#999",
-        ...opts,
-    });
-    const { width, height } = tree[1];
-    const x = fit(res, domain[0], domain[1], 0, width);
-    tree.push([
-        "g",
-        { translate: [x, 0] },
-        ["line", { stroke: "red" }, [0, 0], [0, height - 12]],
-        [
-            "text",
-            { align: "center", fill: "red" },
-            [0, height - 2],
-            res.toFixed(2),
-        ],
-    ]);
-    return tree;
+const fuzzySetToHiccup = (opts) => (fn, domain, res) => {
+  const tree = varToHiccup(variable(domain, { main: fn }), {
+    labels: false,
+    stroke: () => "#333",
+    fill: () => "#999",
+    ...opts
+  });
+  const { width, height } = tree[1];
+  const x = fit(res, domain[0], domain[1], 0, width);
+  tree.push([
+    "g",
+    { translate: [x, 0] },
+    ["line", { stroke: "red" }, [0, 0], [0, height - 12]],
+    [
+      "text",
+      { align: "center", fill: "red" },
+      [0, height - 2],
+      res.toFixed(2)
+    ]
+  ]);
+  return tree;
 };
-export const fuzzySetToSvg = (opts) => (fn, domain, res) => serialize(convertTree(fuzzySetToHiccup(opts)(fn, domain, res)));
-export const fuzzySetToAscii = (opts) => (fn, domain, res) => {
-    const { width, height, empty } = {
-        width: 100,
-        height: 16,
-        empty: ".",
-        ...opts,
-    };
-    const [min, max] = domain;
-    const delta = (max - min) / width;
-    const vals = [];
-    for (let i = min; i <= max; i += delta) {
-        vals.push(fn(i));
-    }
-    const index = Math.round(fit(res, min, max, 0, vals.length));
-    let chart = barChartHLines(height, vals, 0, 1)
-        .map((line) => line.substring(0, index) + "|" + line.substring(index + 1))
-        .join("\n")
-        .replace(/ /g, empty);
-    const legend = repeat(" ", index) + "^ " + res.toFixed(2);
-    return chart + "\n" + legend;
+const fuzzySetToSvg = (opts) => (fn, domain, res) => serialize(convertTree(fuzzySetToHiccup(opts)(fn, domain, res)));
+const fuzzySetToAscii = (opts) => (fn, domain, res) => {
+  const { width, height, empty } = {
+    width: 100,
+    height: 16,
+    empty: ".",
+    ...opts
+  };
+  const [min, max] = domain;
+  const delta = (max - min) / width;
+  const vals = [];
+  for (let i = min; i <= max; i += delta) {
+    vals.push(fn(i));
+  }
+  const index = Math.round(fit(res, min, max, 0, vals.length));
+  let chart = barChartHLines(height, vals, 0, 1).map(
+    (line) => line.substring(0, index) + "|" + line.substring(index + 1)
+  ).join("\n").replace(/ /g, empty);
+  const legend = repeat(" ", index) + "^ " + res.toFixed(2);
+  return chart + "\n" + legend;
+};
+export {
+  fuzzySetToAscii,
+  fuzzySetToHiccup,
+  fuzzySetToSvg,
+  instrumentStrategy
 };

package/var.js

@@ -3,101 +3,102 @@ import { svg } from "@thi.ng/hiccup-svg/svg";
 import { serialize } from "@thi.ng/hiccup/serialize";
 import { fit } from "@thi.ng/math/fit";
 import { inRange } from "@thi.ng/math/interval";
-/**
- * Takes an [`LVar`](https://docs.thi.ng/umbrella/fuzzy/interfaces/LVar.html)
- * and visualization options. Evaluates all of the var's fuzzy sets in the var's
- * value domain and visualizes them as polygons. Returns a
- * [thi.ng/hiccup-canvas](https://thi.ng/thi.ng/hiccup-canvas) compatible shape
- * component tree.
- *
- * @param var -
- * @param opts -
- */
-export const varToHiccup = ({ domain: [min, max], terms }, opts = {}) => {
-    const { samples, width, height, labels, stroke: strokeFn, fill: fillFn, } = {
-        samples: 200,
-        width: 600,
-        height: 100,
-        labels: true,
-        stroke: (x) => `hsl(${(x * 360) | 0},100%,40%)`,
-        fill: (x) => `hsla(${(x * 360) | 0},100%,50%,20%)`,
-        ...opts,
-    };
-    const keys = Object.keys(terms);
-    const dt = (max - min) / samples;
-    const ds = width / samples;
-    const dn = 1 / keys.length;
-    const curves = [];
-    const legend = [];
-    for (let i = 0; i < keys.length; i++) {
-        const id = keys[i];
-        const f = terms[id];
-        const y = (i + 1) * 12;
-        const stroke = strokeFn(i * dn);
-        const curr = [];
-        for (let i = 0; i <= samples; i++) {
-            curr.push([i * ds, (1 - f(min + i * dt)) * height]);
-        }
-        curr.push([width, height], [0, height]);
-        curves.push([
-            "polygon",
-            {
-                stroke,
-                fill: fillFn(i * dn),
-            },
-            curr,
-        ]);
-        if (labels) {
-            legend.push(["line", { stroke }, [0, y], [20, y]], [
-                "text",
-                {
-                    baseline: "middle",
-                    fill: "black",
-                },
-                [30, y],
-                id,
-            ]);
-        }
+const varToHiccup = ({ domain: [min, max], terms }, opts = {}) => {
+  const {
+    samples,
+    width,
+    height,
+    labels,
+    stroke: strokeFn,
+    fill: fillFn
+  } = {
+    samples: 200,
+    width: 600,
+    height: 100,
+    labels: true,
+    stroke: (x) => `hsl(${x * 360 | 0},100%,40%)`,
+    fill: (x) => `hsla(${x * 360 | 0},100%,50%,20%)`,
+    ...opts
+  };
+  const keys = Object.keys(terms);
+  const dt = (max - min) / samples;
+  const ds = width / samples;
+  const dn = 1 / keys.length;
+  const curves = [];
+  const legend = [];
+  for (let i = 0; i < keys.length; i++) {
+    const id = keys[i];
+    const f = terms[id];
+    const y = (i + 1) * 12;
+    const stroke = strokeFn(i * dn);
+    const curr = [];
+    for (let i2 = 0; i2 <= samples; i2++) {
+      curr.push([i2 * ds, (1 - f(min + i2 * dt)) * height]);
     }
-    const zero = fit(0, min, max, 0, width);
-    return svg({
-        width,
-        height: height + 12,
-        fill: "none",
-        "font-family": "sans-serif",
-        "font-size": 10,
-    }, ...curves, ...legend, inRange(zero, width * 0.05, width * 0.95)
-        ? [
-            "g",
-            {},
-            [
-                "line",
-                {
-                    stroke: "black",
-                    dash: [1, 1],
-                },
-                [zero, 0],
-                [zero, height],
-            ],
-            [
-                "text",
-                { align: "center", fill: "black" },
-                [zero, height + 10],
-                "0.00",
-            ],
-        ]
-        : null, [
-        "g",
-        { fill: "black" },
-        ["text", {}, [0, height + 10], min.toFixed(2)],
-        ["text", { align: "end" }, [width, height + 10], max.toFixed(2)],
+    curr.push([width, height], [0, height]);
+    curves.push([
+      "polygon",
+      {
+        stroke,
+        fill: fillFn(i * dn)
+      },
+      curr
     ]);
+    if (labels) {
+      legend.push(
+        ["line", { stroke }, [0, y], [20, y]],
+        [
+          "text",
+          {
+            baseline: "middle",
+            fill: "black"
+          },
+          [30, y],
+          id
+        ]
+      );
+    }
+  }
+  const zero = fit(0, min, max, 0, width);
+  return svg(
+    {
+      width,
+      height: height + 12,
+      fill: "none",
+      "font-family": "sans-serif",
+      "font-size": 10
+    },
+    ...curves,
+    ...legend,
+    inRange(zero, width * 0.05, width * 0.95) ? [
+      "g",
+      {},
+      [
+        "line",
+        {
+          stroke: "black",
+          dash: [1, 1]
+        },
+        [zero, 0],
+        [zero, height]
+      ],
+      [
+        "text",
+        { align: "center", fill: "black" },
+        [zero, height + 10],
+        "0.00"
+      ]
+    ] : null,
+    [
+      "g",
+      { fill: "black" },
+      ["text", {}, [0, height + 10], min.toFixed(2)],
+      ["text", { align: "end" }, [width, height + 10], max.toFixed(2)]
+    ]
+  );
+};
+const varToSvg = ($var, opts) => serialize(convertTree(varToHiccup($var, opts)));
+export {
+  varToHiccup,
+  varToSvg
 };
-/**
- * Similar to {@link varToHiccup}, but then also serializes the result to an
- * actual SVG string.
- *
- * @param $var
- * @param opts -
- */
-export const varToSvg = ($var, opts) => serialize(convertTree(varToHiccup($var, opts)));