issue-#57 - Updated set theory methods for 'list' type.

package.json

@@ -8,13 +8,13 @@
     "@rollup/plugin-typescript": "^8.3.0",
     "@types/jest": "^27.0.2",
     "@types/node": "^13.13.47",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
     "del": "^5.1.0",
-    "eslint": "^8.1.0",
+    "eslint": "^8.22.0",
     "jest": "^27.3.1",
     "jest-cli": "^27.3.1",
-    "rollup": "^2.58.3",
+    "rollup": "^2.77.3",
     "rollup-plugin-terser": "^7.0.2",
     "ts-jest": "^27.0.7",
     "ts-node": "^9.1.1",

packages/fjl/src/list/complement.ts

@@ -1,24 +1,22 @@
-import {reduce} from "./utils/reduce";
 import {append} from "./append";
 import {difference} from "./difference";
-import {Slice} from '../types';
 
 export const
 
   /**
    * Returns the complement of list 0 and the reset of the passed in arrays.
    */
-  complement = <T>(...arrays: Slice<T>[]): Slice<T> => {
+  complement = <T>(...arrays: T[][]): T[] => {
     if (!arrays.length) return [];
     const [arr0] = arrays;
-    return reduce((agg: Slice<T>, arr: Slice<T>) =>
-      append(agg, difference(arr, arr0) as Slice<T>), [], arrays)
+    return arrays.reduce((agg: T[], arr: T[]) =>
+      append(agg, difference(arr, arr0)), []);
   },
 
   /**
    * Returns the complement of list 0 and the reset of the passed in arrays.
    */
-  $complement = <T>(xs1: Slice<T>) =>
-    (xs2: Slice<T>, ...arrays: Slice<T>[]): Slice<T> => complement(xs1, xs2, ...arrays)
+  $complement = <T>(xs1: T[]) =>
+    (xs2: T[], ...arrays: T[][]): T[] => complement(xs1, xs2, ...arrays)
 
 ;

packages/fjl/src/list/difference.ts

@@ -1,15 +1,13 @@
-import {reduce} from "./utils";
-import {sliceCopy} from "./utils/sliceCopy";
-import {includes} from "../platform/slice";
-import {Slice} from "../types";
+import {reduce, sliceCopy} from "./utils";
+import {includes} from "./includes";
 
 export const
 
   /**
    * Returns the difference of list 1 from list 2.
    * @reference https://mathworld.wolfram.com/SetDifference.html
    */
-  difference = <T>(array1: Slice<T>, array2: Slice<T>): Slice<T> => {
+  difference = <T>(array1: T[], array2: T[]): T[] => {
     if (array1 && !array2) {
       return sliceCopy(array1);
     } else if (!array1 && array2 || (!array1 && !array2)) {
@@ -23,5 +21,5 @@ export const
   /**
    * Curried version of `$difference`.
    */
-  $difference = <T>(array1: Slice<T>) =>
-    (array2: Slice<T>): Slice<T> => difference(array1, array2);
+  $difference = <T>(array1: T[]) =>
+    (array2: T[]): T[] => difference(array1, array2);

packages/fjl/src/list/union.ts

@@ -11,11 +11,11 @@ export const
    * @param arr2 {Array}
    * @returns {Array}
    */
-  union = <T>(arr1: Slice<T>, arr2: Slice<T>): Slice<T> =>
+  union = <T>(arr1: T[], arr2: T[]): T[] =>
     append(arr1,
-      filter(elm => !includes(arr1, elm), arr2) as Slice<T>
+      filter(elm => !includes(arr1, elm), arr2) as T[]
     ),
 
-  $union = <T>(arr1: Slice<T>) =>
-    (arr2: Slice<T>): Slice<T> => union(arr1, arr2)
+  $union = <T>(arr1: T[]) =>
+    (arr2: T[]): T[] => union(arr1, arr2)
 ;

packages/fjl/src/platform/slice/index.ts

@@ -2,8 +2,8 @@ import {Slice} from "../../types";
 
 export const
 
-  concat = (...xss: Slice[]): Slice =>
-    (!xss ? xss : xss.shift().concat(...xss as any[])) as Slice,
+  concat = <X, XS extends Slice<X>>(...xss: XS[]): XS =>
+    (!xss ? xss : xss.shift().concat(...xss as XS[])) as XS,
 
   $concat = a => (...b) => concat(a, ...b),
 

packages/fjl/src/types/data.ts

@@ -34,7 +34,7 @@ export interface SliceBase<T = any> {
 
   slice(from: number, to?: number): Slice<T>;
 
-  concat(...xs: ConcatArray<T>[] | string[] | Slice<T>[]): Slice<T>;
+  concat(...xs: (ConcatArray<T> | string | Slice<T>)[]): Slice<T>;
 
   indexOf(x: T, position?: number): number;
 

packages/fjl/tests/list/test-complement.ts

@@ -1,14 +1,13 @@
 import {expectEqual, expectFunction} from "../helpers";
 import {complement} from "../../src";
-import {Slice} from "../../src/types/data";
 
 describe('#complement', () => {
   it('should be a function', () => {
     expectFunction(complement);
   });
   it('should return an empty list when receiving 2 or more values consisting of ' +
     '`null`, `undefined` and/or empty list (`\'\'`, `[]`).', () => {
-    (<Slice<any>[]>[
+    (<any[][]>[
       [undefined, undefined],
       [null, null, '', null],
       [[], null, undefined],
@@ -19,7 +18,10 @@ describe('#complement', () => {
       ['', undefined, ''],
       [undefined, '', [], null]
     ])
-      .forEach(args => expectEqual(complement(...args), []));
+      .forEach(args => {
+        console.log(`complement(${args.join(', ')}) === []`);
+        expect(complement(...args)).toEqual([])
+      });
   });
   it('should return elements not in first list passed to it', () => {
     const testCases: Array<[number[][], number, number[]]> = [

packages/fjl/tests/list/test-union.ts

@@ -1,4 +1,4 @@
-import {append, range, union} from "../../src/list";
+import {range, union} from "../../src/list";
 import {expectEqual} from "../helpers";
 
 describe('#union', () => {
@@ -55,7 +55,6 @@ describe('#union', () => {
       });
   });
   it('should return an empty list when receiving empty lists', () => {
-    expectEqual(union('', ''), '');
     expectEqual(union([], []), []);
   });
 });