@thi.ng/ramp 3.1.23 → 3.1.24

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-05-08T18:24:32Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,15 @@ 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.1.24](https://github.com/thi-ng/umbrella/tree/@thi.ng/ramp@3.1.24) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- dedupe samples() impls ([85515e1](https://github.com/thi-ng/umbrella/commit/85515e1))
+  - extract common impl as internal helper
+  - update Group.samples() & Ramp.samples()
+- dedupe nested() min/max impls ([02e1479](https://github.com/thi-ng/umbrella/commit/02e1479))
+
 ## [3.1.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/ramp@3.1.0) (2024-02-19)
 
 #### 🚀 Features

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -70,7 +70,7 @@ For Node.js REPL:
 const ramp = await import("@thi.ng/ramp");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.84 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.87 KB
 
 ## Dependencies
 

package/group.d.ts

@@ -15,7 +15,7 @@ export type GroupImpl<T extends Record<string, any>> = {
  * {@link unconstrained}), which will be applied _prior_ to evaluating any child ramps.
  *
  * @example
- * ```ts
+ * ```ts tangle:../export/group.ts
  * import { group, hermite, linear } from "@thi.ng/ramp";
  *
  * const example = group({
@@ -24,14 +24,14 @@ export type GroupImpl<T extends Record<string, any>> = {
  *   b: hermite([[0, 100], [1, 200]]),
  * });
  *
- * example.at(0.2)
+ * console.log(example.at(0.2));
  * // { a: -2.5, b: 110.4 }
  *
  * // set new keyframe for `b` ramp
  * // (in TS need to cast to proper type first)
  * (<Ramp<number>>example.children.b).setStopAt(0.5, 200);
  *
- * example.at(0.2)
+ * console.log(example.at(0.2));
  * // { a: -2.5, b: 135.2 }
  * ```
  *

package/group.js

@@ -1,7 +1,5 @@
-import { mix } from "@thi.ng/math/mix";
-import { map } from "@thi.ng/transducers/map";
-import { normRange } from "@thi.ng/transducers/norm-range";
 import { unconstrained } from "./domain.js";
+import { __samples } from "./utils.js";
 const group = (children, opts) => new Group(children, opts);
 class Group {
   constructor(children, opts) {
@@ -19,15 +17,7 @@ class Group {
     }, {});
   }
   samples(n = 100, start, end) {
-    if (start == void 0 || end == void 0) {
-      const bounds = this.timeBounds();
-      start = start ?? bounds[0];
-      end = end ?? bounds[1];
-    }
-    return map((t) => {
-      t = mix(start, end, t);
-      return [t, this.at(t)];
-    }, normRange(n));
+    return __samples(this, n, start, end);
   }
   bounds() {
     return this.childEntries.reduce(

package/nested.d.ts

@@ -14,7 +14,7 @@ export type NestedImpl<T extends Record<string, any>> = {
  * are somewhat similar but satisfy different use cases.
  *
  * @example
- * ```ts
+ * ```ts tangle:../export/nested.ts
  * import { ramp, nested, LINEAR_N, HERMITE_N } from "@thi.ng/ramp";
  *
  * const example = ramp(
@@ -27,7 +27,7 @@ export type NestedImpl<T extends Record<string, any>> = {
  *   ]
  * )
  *
- * example.at(25)
+ * console.log(example.at(25));
  * // { a: -2.5, b: 1156.25 }
  * ```
  *

package/nested.js

@@ -1,14 +1,12 @@
 const nested = (children) => {
   const pairs = Object.entries(children);
+  const $minmax = (op) => (acc, x) => pairs.reduce((acc2, [id, impl]) => {
+    acc2[id] = impl[op](acc2[id], x[id]);
+    return acc2;
+  }, acc || {});
   return {
-    min: (acc, x) => pairs.reduce((acc2, [id, impl]) => {
-      acc2[id] = impl.min(acc2[id], x[id]);
-      return acc2;
-    }, acc || {}),
-    max: (acc, x) => pairs.reduce((acc2, [id, impl]) => {
-      acc2[id] = impl.max(acc2[id], x[id]);
-      return acc2;
-    }, acc || {}),
+    min: $minmax("min"),
+    max: $minmax("max"),
     at: (stops, index, t) => pairs.reduce((acc, [id, impl]) => {
       acc[id] = impl.at(
         stops.map((x) => [x[0], x[1][id]]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/ramp",
-  "version": "3.1.23",
+  "version": "3.1.24",
   "description": "Extensible keyframe interpolation/tweening of arbitrary, nested types",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/ramp#readme",
+  "homepage": "https://thi.ng/ramp",
   "funding": [
     {
       "type": "github",
@@ -36,19 +36,19 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.2",
-    "@thi.ng/arrays": "^2.9.6",
-    "@thi.ng/compare": "^2.3.5",
-    "@thi.ng/errors": "^2.5.7",
-    "@thi.ng/math": "^5.10.13",
-    "@thi.ng/transducers": "^9.0.5",
-    "@thi.ng/vectors": "^7.10.31"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/arrays": "^2.9.7",
+    "@thi.ng/compare": "^2.3.6",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/math": "^5.11.0",
+    "@thi.ng/transducers": "^9.0.6",
+    "@thi.ng/vectors": "^7.11.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.2",
-    "esbuild": "^0.21.1",
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
     "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "1d",
@@ -117,5 +117,5 @@
   "thi.ng": {
     "year": 2019
   },
-  "gitHead": "df34b4a9e650cc7323575356de207d78933bdcf3\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/ramp.d.ts

@@ -26,7 +26,7 @@ export declare class Ramp<T> implements ICopy<IRamp<T>>, IEmpty<IRamp<T>>, IRamp
      * @param t
      */
     at(t: number): T;
-    samples(n?: number, start?: number, end?: number): IterableIterator<Frame<T>>;
+    samples(n?: number, start?: number, end?: number): Iterable<Frame<T>>;
     bounds(): RampBounds<T>;
     timeBounds(): [number, number];
     setStopAt(t: number, val: T, eps?: number): boolean;

package/ramp.js

@@ -4,10 +4,8 @@ import { compareNumAsc } from "@thi.ng/compare/numeric";
 import { assert } from "@thi.ng/errors/assert";
 import { absDiff } from "@thi.ng/math/abs";
 import { clamp } from "@thi.ng/math/interval";
-import { mix } from "@thi.ng/math/mix";
-import { map } from "@thi.ng/transducers/map";
-import { normRange } from "@thi.ng/transducers/norm-range";
 import { unconstrained } from "./domain.js";
+import { __samples } from "./utils.js";
 const ramp = (impl, stops, opts) => new Ramp(impl, stops, opts);
 class Ramp {
   constructor(impl, stops, opts) {
@@ -47,15 +45,7 @@ class Ramp {
     return i < 0 ? first[1] : i >= n ? last[1] : impl.at(stops, i, t);
   }
   samples(n = 100, start, end) {
-    if (start == void 0 || end == void 0) {
-      const bounds = this.timeBounds();
-      start = start ?? bounds[0];
-      end = end ?? bounds[1];
-    }
-    return map((t) => {
-      t = mix(start, end, t);
-      return [t, this.at(t)];
-    }, normRange(n));
+    return __samples(this, n, start, end);
   }
   bounds() {
     const { impl, stops } = this;

package/utils.d.ts

@@ -0,0 +1,3 @@
+import type { Frame, IReadonlyRamp } from "./api.js";
+export declare const __samples: <T>(ramp: IReadonlyRamp<T>, n: number, start?: number, end?: number) => IterableIterator<Frame<T>>;
+//# sourceMappingURL=utils.d.ts.map

package/utils.js

@@ -0,0 +1,17 @@
+import { mix } from "@thi.ng/math/mix";
+import { map } from "@thi.ng/transducers/map";
+import { normRange } from "@thi.ng/transducers/norm-range";
+const __samples = (ramp, n, start, end) => {
+  if (start === void 0 || end === void 0) {
+    const bounds = ramp.timeBounds();
+    start = start ?? bounds[0];
+    end = end ?? bounds[1];
+  }
+  return map((t) => {
+    t = mix(start, end, t);
+    return [t, ramp.at(t)];
+  }, normRange(n));
+};
+export {
+  __samples
+};