From ff5b11f5edee691e5cb126f6a88d0fc4471bc4d0 Mon Sep 17 00:00:00 2001
From: alex <alex@slab.org>
Date: Fri, 27 Jun 2025 22:44:15 +0100
Subject: [PATCH] test + bugfix for chunkinto

---
 packages/core/pattern.mjs           | 36 ++++++++++++++---------------
 packages/core/test/pattern.test.mjs | 23 ++++++++++++++++++
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index 10527a1a8..c8c744628 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -894,22 +894,6 @@ export class Pattern {
   into(pieces, func) {
     return this.unjoin(pieces, func).innerJoin();
   }
-
-  /**
-   * Like `chunk`, but the function is applied to a looped subcycle of the source pattern.
-   * @name chunkInto
-   * @synonym chunkinto
-   * @memberof Pattern
-   * @example
-   * sound("bd sd ht lt bd - cp lt").chunkInto(4, hurry(2))
-   *   .bank("tr909")
-   */
-  chunkInto(n, func) {
-    return this.into(fastcat(true, ...Array(n - 1).fill(false)).iterback(4), func);
-  }
-  chunkinto(n, func) {
-    return this.chunkInto(n, func);
-  }
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -1858,9 +1842,9 @@ export const { fastGap, fastgap } = register(['fastGap', 'fastgap'], function (f
     const newWhole = !hap.whole
       ? undefined
       : new TimeSpan(
-          newPart.begin.sub(begin.sub(hap.whole.begin).div(factor)),
-          newPart.end.add(hap.whole.end.sub(end).div(factor)),
-        );
+        newPart.begin.sub(begin.sub(hap.whole.begin).div(factor)),
+        newPart.end.add(hap.whole.end.sub(end).div(factor)),
+      );
     return new Hap(newWhole, newPart, hap.value, hap.context);
   };
   return pat.withQuerySpanMaybe(qf).withHap(ef).splitQueries();
@@ -2535,6 +2519,20 @@ export const { fastchunk, fastChunk } = register(
   true,
 );
 
+/**
+ * Like `chunk`, but the function is applied to a looped subcycle of the source pattern.
+ * @name chunkInto
+ * @synonym chunkinto
+ * @memberof Pattern
+ * @example
+ * sound("bd sd ht lt bd - cp lt").chunkInto(4, hurry(2))
+ *   .bank("tr909")
+ */
+export const { chunkinto, chunkInto } = register(['chunkinto', 'chunkInto'],
+  function (n, func, pat) {
+    return pat.into(fastcat(true, ...Array(n - 1).fill(false)).iterback(n), func);
+  });
+
 // TODO - redefine elsewhere in terms of mask
 export const bypass = register(
   'bypass',
diff --git a/packages/core/test/pattern.test.mjs b/packages/core/test/pattern.test.mjs
index 874d45132..8d26a990c 100644
--- a/packages/core/test/pattern.test.mjs
+++ b/packages/core/test/pattern.test.mjs
@@ -1271,4 +1271,27 @@ describe('Pattern', () => {
       );
     });
   });
+  describe('unjoin', () => {
+    it('destructures a pattern into subcycles', () => {
+      sameFirst(
+        fastcat('a', 'b', 'c', 'd').unjoin(fastcat(true, fastcat(true, true))).fmap(fast(2)).join(),
+        fastcat('a', 'b', 'a', 'b', 'c', 'c', 'd', 'd')
+      )
+    })
+  })
+  describe('into', () => {
+    it('applies a function to subcycles of a pattern', () => {
+      sameFirst(
+        fastcat('a', 'b', 'c', 'd').into(fastcat(fastcat('true', 'true'), 'true'), fast(2)),
+        fastcat('a', 'a', 'b', 'b', 'c', 'd', 'c', 'd')
+      )
+    })
+  }),
+    describe('chunkinto', () => {
+      it('chunks into subcycles', () => {
+        sameFirst(fastcat('a', 'b', 'c').chunkInto(3, fast(2)).fast(3),
+          fastcat(fastcat('a', 'a'), 'b', 'c', 'a', fastcat('b', 'b'), 'c', 'a', 'b', fastcat('c', 'c'))
+        )
+      })
+    })
 });