refactor(transducers-binary): update reducer handling due to updates …

…in thi.ng/transducers pkg
thi-ng · Apr 3, 2024 · 907c961 · 907c961
1 parent e0e5654
commit 907c961
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/packages/transducers-binary/src/base64.ts b/packages/transducers-binary/src/base64.ts
@@ -1,6 +1,6 @@
 import type { Reducer, Transducer } from "@thi.ng/transducers";
 import { compR } from "@thi.ng/transducers/compr";
-import { iterator, iterator1, __iter } from "@thi.ng/transducers/iterator";
+import { __iter, iterator, iterator1 } from "@thi.ng/transducers/iterator";
 import { isReduced, reduced } from "@thi.ng/transducers/reduced";
 
 const B64_CHARS =
@@ -16,7 +16,7 @@ export function base64Decode(src: string): Uint8Array;
 export function base64Decode(src?: string): any {
 	return src
 		? new Uint8Array(iterator1(base64Decode(), src))
-		: (rfn: Reducer<any, number>) => {
+		: (rfn: Reducer<number, any>) => {
 				const r = rfn[2];
 				let bc = 0,
 					bs = 0;
@@ -68,13 +68,13 @@ export function base64Encode(...args: any[]): any {
 	if (iter) {
 		return [...iter].join("");
 	}
-	return ([init, complete, reduce]: Reducer<any, string>) => {
+	return ([init, complete, reduce]: Reducer<string, any>) => {
 		let state = 0;
 		let b: number;
 		const opts = { safe: false, buffer: 1024, ...args[0] };
 		const chars = opts.safe ? B64_SAFE : B64_CHARS;
 		const buf: string[] = [];
-		return <Reducer<any, number>>[
+		return <Reducer<number, any>>[
 			init,
 			(acc) => {
 				switch (state) {

diff --git a/packages/transducers-binary/src/bits.ts b/packages/transducers-binary/src/bits.ts
@@ -38,7 +38,7 @@ export function bits(
 export function bits(...args: any[]): any {
 	return (
 		__iter(bits, args, iterator) ||
-		((rfn: Reducer<any, number>) => {
+		((rfn: Reducer<number, any>) => {
 			const reduce = rfn[2];
 			const size = args[0] || 8;
 			const msb = args[1] !== false;

diff --git a/packages/transducers-binary/src/bytes.ts b/packages/transducers-binary/src/bytes.ts
@@ -147,7 +147,7 @@ export function asBytes(src?: Iterable<BinStructItem>): any {
 		  });
 }
 
-export function bytes(cap?: number): Reducer<Uint8Array, BinStructItem>;
+export function bytes(cap?: number): Reducer<BinStructItem, Uint8Array>;
 export function bytes(cap: number, src: Iterable<BinStructItem>): Uint8Array;
 export function bytes(cap = 1024, src?: Iterable<BinStructItem>) {
 	let view: DataView;
@@ -179,7 +179,7 @@ export function bytes(cap = 1024, src?: Iterable<BinStructItem>) {
 
 	return src
 		? reduce(bytes(cap), src)
-		: <Reducer<Uint8Array, BinStructItem>>[
+		: <Reducer<BinStructItem, Uint8Array>>[
 				() => new Uint8Array(cap),
 				(acc) => acc.subarray(0, pos),
 				(acc, [type, x, le = false]) => {

diff --git a/packages/transducers-binary/src/partition-bits.ts b/packages/transducers-binary/src/partition-bits.ts
@@ -24,7 +24,7 @@ export function partitionBits(
 export function partitionBits(...args: any[]): any {
 	return (
 		__iter(partitionBits, args, iterator) ||
-		((rfn: Reducer<any, number>) => {
+		((rfn: Reducer<number, any>) => {
 			const destSize = args[0];
 			const srcSize = args[1] || 8;
 			return destSize < srcSize
@@ -37,10 +37,10 @@ export function partitionBits(...args: any[]): any {
 }
 
 const small = (
-	[init, complete, reduce]: Reducer<any, number>,
+	[init, complete, reduce]: Reducer<number, any>,
 	n: number,
 	wordSize: number
-): Reducer<any, number> => {
+): Reducer<number, any> => {
 	const maxb = wordSize - n;
 	const m1 = (1 << wordSize) - 1;
 	const m2 = (1 << n) - 1;
@@ -66,10 +66,10 @@ const small = (
 };
 
 const large = (
-	[init, complete, reduce]: Reducer<any, number>,
+	[init, complete, reduce]: Reducer<number, any>,
 	n: number,
 	wordSize: number
-): Reducer<any, number> => {
+): Reducer<number, any> => {
 	const m1 = (1 << wordSize) - 1;
 	let r = 0;
 	let y = 0;

diff --git a/packages/transducers-binary/src/utf8.ts b/packages/transducers-binary/src/utf8.ts
@@ -16,7 +16,7 @@ export function utf8Decode(src: Iterable<number>): string;
 export function utf8Decode(src?: Iterable<number>): any {
 	return src
 		? [...iterator1(utf8Decode(), src)].join("")
-		: (rfn: Reducer<any, string>) => {
+		: (rfn: Reducer<string, any>) => {
 				const r = rfn[2];
 				let state = 0;
 				let u0: number;
@@ -135,7 +135,7 @@ export function utf8Encode(src: string): Uint8Array;
 export function utf8Encode(src?: string): any {
 	return src != null
 		? new Uint8Array(iterator(utf8Encode(), src))
-		: (rfn: Reducer<any, number>) => {
+		: (rfn: Reducer<number, any>) => {
 				const r = rfn[2];
 				return compR(rfn, (acc, x: string) => {
 					let u = x.charCodeAt(0),