Migrate more modules to ts (#34)

* Move anyPass to ts

* Add js to ts git shortcut

* Move append to ts

* Move concat to ts

* Move assoc to ts

* Supress ts warning

* Remove assocPath function

* Move both to ts

* Move clamp to ts

* Move comparator to ts

* Move complement to ts

* Fix ts warning

.changeset/beige-poets-admire.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move anyPass to ts

.changeset/forty-experts-breathe.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move complement to ts

.changeset/serious-crews-beam.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move concat to ts

.changeset/serious-stingrays-cough.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move assoc to ts

.changeset/seven-shirts-walk.md

@@ -0,0 +1,5 @@
+---
+'frans': major
+---
+
+Remove assocPath function

.changeset/spicy-masks-work.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move both to ts

.changeset/tough-chefs-rhyme.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move append to ts

.changeset/tricky-kings-complain.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move comparator to ts

.changeset/young-buses-tap.md

@@ -0,0 +1,5 @@
+---
+'frans': minor
+---
+
+Move clamp to ts

package.json

@@ -28,7 +28,8 @@
     "type-check": "tsc --noEmit",
     "validate": "yarn run lint && yarn run test --coverage && yarn run build",
     "release": "yarn build && yarn changeset publish",
-    "create-module": "node scripts/create-module.js"
+    "create-module": "node scripts/create-module.js",
+    "mv:ts": "sh -c 'git mv src/${0}.js src/${0}.ts && git mv src/__tests__/${0}.js src/__tests__/${0}.ts'"
   },
   "dependencies": {},
   "devDependencies": {

src/__tests__/anyPass.js → src/__tests__/anyPass.ts

@@ -1,12 +1,12 @@
 import { anyPass } from '../anyPass';
 
 describe('Core.anyPass', () => {
-  const odd = (n) => n % 2 !== 0;
-  const lt20 = (n) => n < 20;
-  const gt5 = (n) => n > 5;
+  const odd = (n: number) => n % 2 !== 0;
+  const lt20 = (n: number) => n < 20;
+  const gt5 = (n: number) => n > 5;
 
   test('reports whether all predicates are satisfied by a given value', () => {
-    const ok = (x) => anyPass([odd, lt20, gt5], x);
+    const ok = (x: number) => anyPass([odd, lt20, gt5], x);
 
     expect(ok(7)).toBeTruthy();
     expect(ok(9)).toBeTruthy();

src/__tests__/append.js → src/__tests__/append.ts

@@ -3,7 +3,11 @@ import { append } from '../append';
 describe('Core.append', () => {
   test('adds the element to the end of the list', () => {
     expect(append('z', ['x', 'y'])).toEqual(['x', 'y', 'z']);
-    expect(append(['a', 'z'], ['x', 'y'])).toEqual(['x', 'y', ['a', 'z']]);
+    expect(append(['a', 'z'], ['x', 'y'] as (string | string[])[])).toEqual([
+      'x',
+      'y',
+      ['a', 'z'],
+    ]);
   });
 
   test('works on empty list', () => {

src/__tests__/assoc.js → src/__tests__/assoc.ts

@@ -13,7 +13,7 @@ describe('Core.assoc', () => {
 
   test('is the equivalent of clone and set if the property is not on the original', () => {
     const obj1 = { a: 1, b: { c: 2, d: 3 }, e: 4, f: 5 };
-    const obj2 = assoc('z', { x: 42 }, obj1);
+    const obj2 = assoc('z', { x: 42 }, (obj1 as unknown) as any);
     expect(obj2).toEqual({ a: 1, b: { c: 2, d: 3 }, e: 4, f: 5, z: { x: 42 } });
 
     expect(obj2.a).toBe(obj1.a);

src/__tests__/both.js → src/__tests__/both.ts

@@ -2,8 +2,8 @@ import { both } from '../both';
 
 describe('Core.both', () => {
   test('combines two boolean-returning functions into one', () => {
-    const even = (x) => x % 2 === 0;
-    const gt10 = (x) => x > 10;
+    const even = (x: any) => x % 2 === 0;
+    const gt10 = (x: any) => x > 10;
     const f = both(even, gt10);
 
     expect(f(8)).toBeFalsy();
@@ -12,8 +12,8 @@ describe('Core.both', () => {
   });
 
   test('accepts functions that take multiple parameters', () => {
-    const between = (a, b, c) => a < b && b < c;
-    const total20 = (a, b, c) => a + b + c === 20;
+    const between = (a: any, b: any, c: any) => a < b && b < c;
+    const total20 = (a: any, b: any, c: any) => a + b + c === 20;
     const f = both(between, total20);
 
     expect(f(4, 5, 11)).toBeTruthy();
@@ -23,13 +23,14 @@ describe('Core.both', () => {
   });
 
   test('does not evaluate the second expression if the first one is false', () => {
-    let effect = 'not evaluated';
+    let effect = jest.fn();
     const F = () => false;
     const Z = () => {
-      effect = 'Z got evaluated';
+      effect();
+      return true;
     };
 
     both(F, Z)();
-    expect(effect).toBe('not evaluated');
+    expect(effect).not.toHaveBeenCalled();
   });
 });

src/__tests__/clamp.js → src/__tests__/clamp.ts

@@ -2,7 +2,7 @@ import { clamp } from '../clamp';
 
 describe('Core.clamp', () => {
   test('restrict number by min and max values', () => {
-    const min0Max10 = (n) => clamp(0, 10, n);
+    const min0Max10 = (n: number) => clamp(0, 10, n);
     expect(min0Max10(0)).toBe(0);
     expect(min0Max10(0)).toBe(0);
     expect(min0Max10(-1)).toBe(0);

src/__tests__/comparator.js → src/__tests__/comparator.ts

@@ -2,8 +2,8 @@ import { comparator } from '../comparator';
 
 describe('Core.comparator', () => {
   test('builds a comparator function for sorting out of a simple predicate that reports whether the first param is smaller', () => {
-    const compOne = comparator((a, b) => a < b);
-    const compTwo = comparator((a, b) => a > b);
+    const compOne = comparator((a: number, b: number) => a < b);
+    const compTwo = comparator((a: number, b: number) => a > b);
 
     expect([3, 1, 8, 1, 2, 5].sort(compOne)).toEqual([1, 1, 2, 3, 5, 8]);
     expect([3, 1, 8, 1, 2, 5].sort(compTwo)).toEqual([8, 5, 3, 2, 1, 1]);

src/__tests__/complement.js → src/__tests__/complement.ts

@@ -2,22 +2,22 @@ import { complement } from '../complement';
 
 describe('Core.complement', () => {
   test('accepts a boolean returning function and reverses its otput', () => {
-    const isNil = (x) => x == null;
+    const isNil = (x: any) => x == null;
     const isNotNil = complement(isNil);
 
     expect(isNotNil(null)).not.toBe(isNil(null));
   });
 
   test('creates boolean-returning function that reverses another', () => {
-    const even = (x) => x % 2 === 0;
+    const even = (x: number) => x % 2 === 0;
     const f = complement(even);
 
     expect(f(8)).toBeFalsy();
     expect(f(13)).toBeTruthy();
   });
 
   test('accepts a function that take multiple parameters', () => {
-    const between = (a, b, c) => a < b && b < c;
+    const between = (a: number, b: number, c: number) => a < b && b < c;
     const f = complement(between);
 
     expect(f(4, 5, 11)).toBeFalsy();

src/__tests__/concat.js → src/__tests__/concat.ts

@@ -19,10 +19,12 @@ describe('Core.concat', () => {
   });
 
   test('throws if attempting to combine an array with a non-array', () => {
+    // @ts-expect-error
     expect(() => concat([1], 2)).toThrow(TypeError);
   });
 
   test('throws if not an array or String', () => {
+    // @ts-expect-error
     expect(() => concat({}, {})).toThrow(TypeError);
   });
 });

src/adjust.ts

@@ -18,7 +18,7 @@ export function adjust<T, R>(
   const arr = slice(0, Infinity, list);
 
   const idx = i < 0 ? arrLength + i : i;
-  const newArr = concat([], arr) as (T | R)[];
+  const newArr = concat([], arr as (T | R)[]);
   newArr[idx] = fn(arr[idx]);
 
   return newArr;

src/allPass.ts

@@ -1,4 +1,4 @@
-type PredicateFn<T> = (...args: T[]) => boolean;
+import { PredicateFn } from './internal/types';
 
 export function allPass<T>(predicateList: PredicateFn<T>[], ...args: T[]) {
   const { length } = predicateList;

src/anyPass.ts

@@ -0,0 +1,16 @@
+import { PredicateFn } from './internal/types';
+
+export function anyPass<T>(predicateList: PredicateFn<T>[], ...args: T[]) {
+  const { length } = predicateList;
+  let i = 0;
+  let ret = false;
+
+  while (!ret) {
+    if (i >= length) break;
+
+    ret = predicateList[i](...args);
+    i += 1;
+  }
+
+  return ret;
+}

src/append.ts

@@ -0,0 +1,5 @@
+import { concat } from './concat';
+
+export function append<T>(el: T, list: T[]): T[] {
+  return concat(list, [el]);
+}

src/assoc.ts

@@ -0,0 +1,7 @@
+export function assoc<O extends Record<string, unknown>>(
+  prop: keyof O,
+  val: unknown,
+  obj: O,
+): O {
+  return { ...obj, [prop]: val };
+}

src/both.ts

@@ -0,0 +1,5 @@
+import { PredicateFn } from './internal/types';
+
+export function both<T>(a: PredicateFn<T>, b: PredicateFn<T>) {
+  return (...args: T[]) => a(...args) && b(...args);
+}

src/clamp.ts

@@ -0,0 +1,9 @@
+export function clamp(min: number, max: number, n: number): number {
+  if (min > max) {
+    throw new Error(
+      `min (${min}) must be greater than max (${max}) in clamp(min, max, val)`,
+    );
+  }
+
+  return Math.max(min, Math.min(max, n));
+}