@kizmann/pico-js 2.0.7 → 2.0.9

package/src/utils/{Array.js → Array.ts}

@@ -1,4 +1,4 @@
-import { Obj, Mix, Any } from "../index.esm.js";
+import { Obj, Mix, Any, Arr } from "../index.esm.ts";
 
 export class PicoArray
 {
@@ -12,7 +12,7 @@ export class PicoArray
      * @param {any} value Value to wrap
      * @returns {Array<any>} Wrapped array
      */
-    static all(value)
+    static all(value : any) : Array<any>
     {
         return Mix.isArr(value) ? value : [value];
     }
@@ -28,7 +28,7 @@ export class PicoArray
      * @param {any} [fallback] Fallback value
      * @returns {any} Item or fallback
      */
-    static get(value, index, fallback = null)
+    static get(value : any, index : number, fallback : any = null) : any
     {
         if ( !Mix.isArr(value) ) {
             return value;
@@ -46,12 +46,12 @@ export class PicoArray
      *
      * @example Arr.set([1,2], 0, 9) // => [9,2]
      *
-     * @param {Array<any>} target Target array
+     * @param {any} target Target array
      * @param {number} index Index to set
      * @param {any} value Value to set
      * @returns {any} Splice result
      */
-    static set(target, index, value)
+    static set(target : any, index : number, value : any) : any
     {
         return this.splice(target, index, 1, value);
     }
@@ -61,15 +61,41 @@ export class PicoArray
      *
      * @example Arr.unset([1,2], 0) // => [1]
      *
-     * @param {Array<any>} target Target array
+     * @param {any} target Target array
      * @param {number} index Index to remove
      * @returns {any} Splice result
      */
-    static unset(target, index)
+    static unset(target : any, index : number) : any
     {
         return this.splice(target, index, 1);
     }
 
+    static prev(target : any, index : number) : number
+    {
+        if ( Mix.isEmpty(target) || !Mix.isArr(target) ) {
+            return 0;
+        }
+
+        if ( index - 1 < 0 ) {
+            return target.length - 1;
+        }
+
+        return index - 1;
+    }
+
+    static next(target : any, index : number) : number
+    {
+        if ( Mix.isEmpty(target) || !Mix.isArr(target) ) {
+            return 0;
+        }
+
+        if ( index + 1 > target.length ) {
+            return 0;
+        }
+
+        return index + 1;
+    }
+
     /**
      * Create array with callback values
      *
@@ -80,7 +106,7 @@ export class PicoArray
      * @param {any} [cb] Value or mapper
      * @returns {Array<any>} Generated array
      */
-    static make(length, cb = null)
+    static make(length : number, cb : any = null) : Array<any>
     {
         let result = new Array(length);
 
@@ -88,7 +114,7 @@ export class PicoArray
             cb = (i) => i;
         }
 
-        for ( let i = 0; i < length; i ++ ) {
+        for ( let i = 0; i < length; i++ ) {
             result[i] = typeof cb === 'function' ? cb(i) : cb;
         }
 
@@ -105,10 +131,10 @@ export class PicoArray
      * @param {any} search Search value
      * @returns {boolean} True if found
      */
-    static has(value, search)
+    static has(value : any, search : any) : boolean
     {
         if ( !Mix.isPrim(search) ) {
-            return this.findIndex(value, search) !== - 1;
+            return this.findIndex(value, search) !== -1;
         }
 
         if ( !Mix.isRef(value) ) {
@@ -119,11 +145,11 @@ export class PicoArray
             value = Mix.vals(value);
         }
 
-        let index = value.findIndex((val) => {
+        let index = value.findIndex((val : any) => {
             return val == search;
         });
 
-        return index !== - 1;
+        return index !== -1;
     }
 
     /**
@@ -131,10 +157,10 @@ export class PicoArray
      *
      * @example Arr.unique(["a","a"]) // => ["a"]
      *
-     * @param {Array<any>} value Input list
+     * @param {any[]} value Input list
      * @returns {Array<any>} Unique list
      */
-    static unique(value)
+    static unique(value : any[]) : Array<any>
     {
         let buffer = {};
 
@@ -150,15 +176,15 @@ export class PicoArray
      *
      * @example Arr.lengths([1],[2]) // => true
      *
-     * @param {Array<any>} value Base array
-     * @param {...Array<any>} args Other arrays
+     * @param {any[]} value Base array
+     * @param {[...any[]]} args Other arrays
      * @returns {boolean} True if equal
      */
-    static lengths(value, ...args)
+    static lengths(value : any[], ...args : [...any[]]) : boolean
     {
         let length = value.length;
 
-        for ( let i = 0; i < args.length; i ++ ) {
+        for ( let i = 0; i < args.length; i++ ) {
             if ( args[i].length !== length ) {
                 return false;
             }
@@ -172,11 +198,11 @@ export class PicoArray
      *
      * @example Arr.first([1,2]) // => 1
      *
-     * @param {Array<any>} value Input array
+     * @param {any} value Input array
      * @param {any} [fallback] Fallback value
      * @returns {any} First item
      */
-    static first(value, fallback = null)
+    static first(value : any, fallback : any = null) : any
     {
         return this.get(value, 0, fallback);
     }
@@ -186,11 +212,11 @@ export class PicoArray
      *
      * @example Arr.second([1,2]) // => 2
      *
-     * @param {Array<any>} value Input array
+     * @param {any} value Input array
      * @param {any} [fallback] Fallback value
      * @returns {any} Second item
      */
-    static second(value, fallback = null)
+    static second(value : any, fallback : any = null) : any
     {
         return this.get(value, 2, fallback);
     }
@@ -200,11 +226,11 @@ export class PicoArray
      *
      * @example Arr.third([1,2,3]) // => 3
      *
-     * @param {Array<any>} value Input array
+     * @param {any} value Input array
      * @param {any} [fallback] Fallback value
      * @returns {any} Third item
      */
-    static third(value, fallback = null)
+    static third(value : any, fallback : any = null) : any
     {
         return this.get(value, 2, fallback);
     }
@@ -214,11 +240,11 @@ export class PicoArray
      *
      * @example Arr.last([1,2]) // => 2
      *
-     * @param {Array<any>} value Input array
+     * @param {any} value Input array
      * @param {any} [fallback] Fallback value
      * @returns {any} Last item
      */
-    static last(value, fallback = null)
+    static last(value : any, fallback : any = null) : any
     {
         return this.get(value, value.length - 1, fallback);
     }
@@ -229,11 +255,11 @@ export class PicoArray
      * @example Arr.each([1], v => v+1) // => [2]
      *
      * @param {any} value Input list
-     * @param {function} cb Map callback
+     * @param {Function} cb Map callback
      * @param {any} [retval] Forced return
      * @returns {any} Mapped array
      */
-    static each(value, cb, retval = null)
+    static each(value : any, cb : Function, retval : any = null) : any
     {
         if ( Mix.isObj(value) ) {
             return this.eachObj(value, cb, retval);
@@ -245,7 +271,7 @@ export class PicoArray
 
         let result = new Array(value.length);
 
-        for ( let i = 0; i < value.length; i ++ ) {
+        for ( let i = 0; i < value.length; i++ ) {
             result[i] = cb(value[i], i);
         }
 
@@ -258,11 +284,11 @@ export class PicoArray
      * @example Arr.eachObj({a:1}, (v,k) => v+1) // => [2]
      *
      * @param {any} value Input object
-     * @param {function} cb Iterate callback
+     * @param {Function} cb Iterate callback
      * @param {any} [retval] Return value override
      * @returns {any} Mapped values or retval
      */
-    static eachObj(value, cb, retval = null)
+    static eachObj(value : any, cb : Function, retval : any = null) : any
     {
         if ( Mix.isArr(value) ) {
             return this.each(value, cb, retval);
@@ -285,16 +311,16 @@ export class PicoArray
      * @example Arr.map([1], v => v+1) // => [2]
      *
      * @param {any} value Input list
-     * @param {function} cb Map callback
+     * @param {Function} cb Map callback
      * @returns {any} Mutated input
      */
-    static map(value, cb)
+    static map(value : any, cb : Function) : any
     {
         let [isArr, keys] = [
             Mix.isArr(value), Mix.keys(value)
         ];
 
-        let fn = (key) => {
+        let fn = (key : any) => {
             return isArr ? parseInt(key) : key;
         };
 
@@ -312,14 +338,14 @@ export class PicoArray
      *
      * @param {any} value Input list
      * @param {string} key Child key
-     * @param {function} cb Node callback
-     * @param {Array<any>} [cascade] Parent chain
+     * @param {Function} cb Node callback
+     * @param {any[]} [cascade] Parent chain
      * @returns {any} Mapped tree
      */
-    static recursive(value, key, cb, cascade = [])
+    static recursive(value : any, key : string, cb : Function, cascade : any[] = []) : any
     {
         // NIE WIEDER ANFASSEN !!!
-        let fn = (cas) => (val) => {
+        let fn = (cas : any) => (val : any) => {
             return this.recursive(val, key, cb, cas);
         };
 
@@ -350,6 +376,29 @@ export class PicoArray
         return value;
     }
 
+    static cascade(value : any, childs : string, key : string, cascade : any[] = [], result : any = {}) : any
+    {
+        if ( value == null ) {
+            return result;
+        }
+
+        if ( Mix.isObj(value) ) {
+            return this.cascade(value[key], childs, key);
+        }
+
+        const fn = (val : any) => {
+            return this.cascade(...[
+                val[childs], childs, key, result[val[key]], result
+            ]);
+        };
+
+        this.each(value, (val : any) => {
+            (result[val[key]] = [...cascade, val[key]], fn(val));
+        });
+
+        return result;
+    }
+
     /**
      * Get matching indexes by filter
      *
@@ -357,16 +406,16 @@ export class PicoArray
      *
      * @param {any} value Input list
      * @param {any} [filter] Filter spec
-     * @returns {Array<string>} Matching keys
+     * @returns {Array<any>} Matching keys
      */
-    static filterIndex(value, filter = null)
+    static filterIndex(value : any, filter : any = null) : Array<any>
     {
         if ( value == null ) {
             return [];
         }
 
         if ( filter == null ) {
-            filter = (val) => !Mix.isEmpty(val);
+            filter = (val : any) => !Mix.isEmpty(val);
         }
 
         return Mix.keys(value).filter((key) => {
@@ -392,7 +441,7 @@ export class PicoArray
      * @param {any} [filter] Filter spec
      * @returns {any} Mutated list
      */
-    static filterRemove(value, filter = null)
+    static filterRemove(value : any, filter : any = null) : any
     {
         if ( value == null ) {
             return value;
@@ -416,14 +465,14 @@ export class PicoArray
      * @param {any} [filter] Filter spec
      * @returns {Array<any>} Filtered values
      */
-    static filter(value, filter = null)
+    static filter(value : any, filter : any = null) : Array<any>
     {
         if ( value == null ) {
             return [];
         }
 
         if ( filter == null ) {
-            filter = (val) => !Mix.isEmpty(val);
+            filter = (val : any) => !Mix.isEmpty(val);
         }
 
         return Mix.vals(value).filter((val, key) => {
@@ -445,22 +494,22 @@ export class PicoArray
      *
      * @example Arr.findIndex([1,2], 2) // => 1
      *
-     * @param {Array<any>} value Input array
+     * @param {any} value Input array
      * @param {any} [filter] Filter spec
      * @param {number} [fallback] Fallback index
      * @returns {number} Found index
      */
-    static findIndex(value, filter = null, fallback = - 1)
+    static findIndex(value : any, filter : any = null, fallback : number = -1) : number
     {
         if ( value == null ) {
             return fallback;
         }
 
         if ( filter == null ) {
-            filter = (val) => !Mix.isEmpty(val);
+            filter = (val : any) => !Mix.isEmpty(val);
         }
 
-        for ( let i = 0; i < value.length; i ++ ) {
+        for ( let i = 0; i < value.length; i++ ) {
 
             if ( Mix.isFunc(filter) ) {
                 if ( filter.call({}, value[i], i) ) {
@@ -485,16 +534,16 @@ export class PicoArray
      *
      * @example Arr.find([1,2], 2) // => 2
      *
-     * @param {Array<any>} value Input array
+     * @param {any} value Input array
      * @param {any} [filter] Filter spec
      * @param {any} [fallback] Fallback value
      * @returns {any} Found value
      */
-    static find(value, filter = null, fallback = null)
+    static find(value : any, filter : any = null, fallback : any = null) : any
     {
         let index = this.findIndex(value, filter);
 
-        if ( index === - 1 ) {
+        if ( index === -1 ) {
             return fallback;
         }
 
@@ -510,7 +559,7 @@ export class PicoArray
      * @param {any} [key] Key or compare fn
      * @returns {Array<any>} Sorted list
      */
-    static sort(value, key = null)
+    static sort(value : any, key : any = null) : Array<any>
     {
         if ( Mix.isFunc(key) ) {
             return this.sortFunc(value, key);
@@ -529,10 +578,10 @@ export class PicoArray
      * @example Arr.sortFunc([2,1], (a,b)=>a-b) // => [1,2]
      *
      * @param {any} value Input list
-     * @param {function} cb Compare callback
+     * @param {Function} cb Compare callback
      * @returns {Array<any>} Sorted list
      */
-    static sortFunc(value, cb)
+    static sortFunc(value : any, cb : Function) : Array<any>
     {
         let keys = Mix.keys(value).sort((a, b) => {
             return cb.call({}, value[a], value[b]);
@@ -556,9 +605,9 @@ export class PicoArray
      * @param {any} key Key path
      * @returns {Array<any>} Sorted list
      */
-    static sortDeep(value, key)
+    static sortDeep(value : any, key : any) : Array<any>
     {
-        let fn = (val) => {
+        let fn = (val : any) => {
             return Obj.get(val, key);
         }
 
@@ -583,7 +632,7 @@ export class PicoArray
      * @param {any} value Input list
      * @returns {Array<any>} Sorted list
      */
-    static sortPrim(value)
+    static sortPrim(value : any) : Array<any>
     {
         let keys = Mix.keys(value).sort((a, b) => {
             return Mix.compare(a, b);
@@ -603,11 +652,11 @@ export class PicoArray
      *
      * @example Arr.merge([1],[2]) // => [1,2]
      *
-     * @param {Array<any>} value Base array
-     * @param {...any} args Arrays to add
+     * @param {any[]} value Base array
+     * @param {[...any[]]} args Arrays to add
      * @returns {Array<any>} Merged array
      */
-    static merge(value, ...args)
+    static merge(value : any[], ...args : [...any[]]) : Array<any>
     {
         return value.concat(...args);
     }
@@ -617,11 +666,11 @@ export class PicoArray
      *
      * @example Arr.prepend([2], 1) // => [1,2]
      *
-     * @param {Array<any>} value Target array
-     * @param {...any} args Items to add
+     * @param {any[]} value Target array
+     * @param {[...any[]]} args Items to add
      * @returns {Array<any>} Mutated array
      */
-    static prepend(value, ...args)
+    static prepend(value : any[], ...args : [...any[]]) : Array<any>
     {
         return (value.unshift(...args), value);
     }
@@ -631,11 +680,11 @@ export class PicoArray
      *
      * @example Arr.append([1], 2) // => [1,2]
      *
-     * @param {Array<any>} value Target array
-     * @param {...any} args Items to add
+     * @param {any[]} value Target array
+     * @param {[...any[]]} args Items to add
      * @returns {Array<any>} Mutated array
      */
-    static append(value, ...args)
+    static append(value : any[], ...args : [...any[]]) : Array<any>
     {
         return (value.push(...args), value);
     }
@@ -645,18 +694,18 @@ export class PicoArray
      *
      * @example Arr.add([1], 2) // => [1,2]
      *
-     * @param {Array<any>} value Target array
+     * @param {any[]} value Target array
      * @param {any} target Item to add
      * @param {any} [finder] Finder value
      * @returns {Array<any>} Mutated array
      */
-    static add(value, target, finder = null)
+    static add(value : any[], target : any, finder : any = null) : Array<any>
     {
         if ( finder == null ) {
             finder = target;
         }
 
-        if ( this.findIndex(value, finder) !== - 1 ) {
+        if ( this.findIndex(value, finder) !== -1 ) {
             return value;
         }
 
@@ -668,12 +717,12 @@ export class PicoArray
      *
      * @example Arr.replace([1], 2) // => [1,2]
      *
-     * @param {Array<any>} value Target array
+     * @param {any[]} value Target array
      * @param {any} target Item to add
      * @param {any} [finder] Finder value
      * @returns {Array<any>} Mutated array
      */
-    static replace(value, target, finder = null)
+    static replace(value : any[], target : any, finder : any = null) : Array<any>
     {
         if ( finder == null ) {
             finder = target;
@@ -681,7 +730,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index !== - 1 ) {
+        if ( index !== -1 ) {
             this.splice(value, index, 1);
         }
 
@@ -693,12 +742,12 @@ export class PicoArray
      *
      * @example Arr.remove([1,2], 1) // => [2]
      *
-     * @param {Array<any>} value Target array
+     * @param {any[]} value Target array
      * @param {any} target Item to remove
      * @param {any} [finder] Finder value
      * @returns {Array<any>} Mutated array
      */
-    static remove(value, target, finder = null)
+    static remove(value : any[], target : any, finder : any = null) : Array<any>
     {
         if ( finder == null ) {
             finder = target;
@@ -706,7 +755,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index === - 1 ) {
+        if ( index === -1 ) {
             return value;
         }
 
@@ -719,12 +768,12 @@ export class PicoArray
      * @example Arr.toggle([1], 1) // => []
      * @example Arr.toggle([], 1) // => [1]
      *
-     * @param {Array<any>} value Target array
+     * @param {any[]} value Target array
      * @param {any} target Item to toggle
      * @param {any} [finder] Finder value
      * @returns {Array<any>} Mutated array
      */
-    static toggle(value, target, finder = null)
+    static toggle(value : any[], target : any, finder : any = null) : Array<any>
     {
         if ( finder == null ) {
             finder = target;
@@ -732,7 +781,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index === - 1 ) {
+        if ( index === -1 ) {
             return (value.push(target), value);
         }
 
@@ -744,12 +793,12 @@ export class PicoArray
      *
      * @example Arr.insert([1,3], 1, 2) // => [1,2,3]
      *
-     * @param {Array<any>} value Target array
+     * @param {any[]} value Target array
      * @param {number} index Insert index
      * @param {any} target Item to insert
      * @returns {Array<any>} Mutated array
      */
-    static insert(value, index, target)
+    static insert(value : any[], index : number, target : any) : Array<any>
     {
         return (this.splice(value, index, 0, target), value);
     }
@@ -759,14 +808,14 @@ export class PicoArray
      *
      * @example Arr.slice([1,2,3], 1, 2) // => [2,3]
      *
-     * @param {Array<any>} value Source array
-     * @param {number} index Start index
+     * @param {any[]} value Source array
+     * @param {any} index Start index
      * @param {number} [length] Slice length
      * @returns {Array<any>} Sliced array
      */
-    static slice(value, index, length = 1)
+    static slice(value : any[], index : any, length : number = 1) : Array<any>
     {
-        return value.slice(parseInt(index), length);
+        return value.slice(Mix.num(index), length);
     }
 
     /**
@@ -774,15 +823,15 @@ export class PicoArray
      *
      * @example Arr.splice([1,2], 0, 1) // => [1]
      *
-     * @param {Array<any>} value Target array
-     * @param {number} index Start index
+     * @param {any[]} value Target array
+     * @param {any} index Start index
      * @param {number} [length] Remove count
-     * @param {...any} args Items to add
-     * @returns {any} Splice result
+     * @param {[...any]} args Items to add
+     * @returns {Array<any>} Splice result
      */
-    static splice(value, index, length = 1, ...args)
+    static splice(value : any[], index : any, length : number = 1, ...args : [...any]) : Array<any>
     {
-        return value.splice(parseInt(index), length, ...args);
+        return value.splice(Mix.num(index), length, ...args);
     }
 
     /**
@@ -790,14 +839,14 @@ export class PicoArray
      *
      * @example Arr.splices([1,2,3],[0,2]) // => [2]
      *
-     * @param {Array<any>} value Target array
-     * @param {Array<number>} indexies Index list
+     * @param {any[]} value Target array
+     * @param {any[]} indexies Index list
      * @param {number} [length] Remove count
      * @returns {Array<any>} Mutated array
      */
-    static splices(value, indexies, length = 1)
+    static splices(value : any[], indexies : any[], length : number = 1) : Array<any>
     {
-        this.each(indexies, (index) => {
+        this.each(indexies, (index : number) => {
             this.splice(value, index, length);
         });
 
@@ -812,7 +861,7 @@ export class PicoArray
      * @param {any} value Value to clone
      * @returns {any} Cloned value
      */
-    static clone(value)
+    static clone(value : any) : any
     {
         if ( Mix.isPrim(value) ) {
             return value;
@@ -828,7 +877,7 @@ export class PicoArray
 
         let result = new Array(value.length);
 
-        for ( let i = 0; i < value.length; i ++ ) {
+        for ( let i = 0; i < value.length; i++ ) {
             result[i] = this.clone(value[i]);
         }
 
@@ -840,45 +889,55 @@ export class PicoArray
      *
      * @example Arr.diff([1,2],[2]) // => [1]
      *
-     * @param {...Array<any>} args Arrays to diff
+     * @param {[...any[]]} args Arrays to diff
      * @returns {Array<any>} Difference list
      */
-    static diff(...args)
+    static diff(...args : [...any[]]) : Array<any>
     {
         return args.reduce((a, c) => {
-            return a.filter(i => !c.includes(i))
+            return a.filter((i : any) => !c.includes(i))
         });
     }
 
+    /**
+     * @see PicoArray.diff
+     */
+    static diffrence = PicoArray.diff;
+
     /**
      * Get intersecting items
      *
      * @example Arr.isect([1,2],[2,3]) // => [2]
      *
-     * @param {...Array<any>} args Arrays to intersect
+     * @param {[...any[]]} args Arrays to intersect
      * @returns {Array<any>} Intersection list
      */
-    static isect(...args)
+    static isect(...args : [...any[]]) : Array<any>
     {
         return args.reduce((a, c) => {
-            return a.filter(i => c.includes(i))
+            return a.filter((i : any) => c.includes(i))
         });
     }
 
+    /**
+     * @see PicoArray.diff
+     */
+    static intersect = PicoArray.isect;
+
     /**
      * Extract property values from list
      *
      * @example Arr.extract([{id:1}], "id") // => [1]
      *
-     * @param {Array<any>} value Input list
+     * @param {any[]} value Input list
      * @param {any} key Key path
      * @returns {Array<any>} Extracted list
      */
-    static extract(value, key)
+    static extract(value : any, key : any) : Array<any>
     {
         let result = new Array(value.length);
 
-        for ( let i = 0; i < value.length; i ++ ) {
+        for ( let i = 0; i < value.length; i++ ) {
             result[i] = Obj.get(value[i], key);
         }
 
@@ -891,12 +950,13 @@ export class PicoArray
      * @example Arr.reduce([1,2], (a,c)=>a+c, 0) // => 3
      *
      * @param {any} value Input list
-     * @param {function} callback Reducer callback
+     * @param {Function} callback Reducer callback
      * @param {any} accumulator Start value
      * @returns {any} Reduced value
      */
-    static reduce(value, callback, accumulator)
+    static reduce(value : any, callback : Function, accumulator : any) : any
     {
+        // @ts-ignore
         return Mix.vals(value).reduce(callback, accumulator);
     }
 
@@ -905,11 +965,11 @@ export class PicoArray
      *
      * @example Arr.chunk([1,2,3], 2) // => [[1,2],[3]]
      *
-     * @param {Array<any>} value Source array
+     * @param {any[]} value Source array
      * @param {number} [chunk] Chunk size
-     * @returns {Array<Array<any>>} Chunked list
+     * @returns {Array<any[]>} Chunked list
      */
-    static chunk(value, chunk = 10)
+    static chunk(value : any[], chunk : number = 10) : Array<any[]>
     {
         let res = [];
 
@@ -930,7 +990,7 @@ export class PicoArray
      * @param {any} search Search spec
      * @returns {boolean} True if includes
      */
-    static includes(value, search)
+    static includes(value : any, search : any) : boolean
     {
         if ( Mix.isObj(search) ) {
             return Obj.includes(value, search);
@@ -948,7 +1008,7 @@ export class PicoArray
             return true;
         }
 
-        for ( let i = 0; result === false && i < length; i ++ ) {
+        for ( let i = 0; result === false && i < length; i++ ) {
             result ||= this.has(value, search[i]);
         }
 
@@ -964,12 +1024,12 @@ export class PicoArray
      * @param {any} val Required values
      * @returns {boolean} True if contains
      */
-    static contains(arr, val)
+    static contains(arr : any, val : any) : boolean
     {
         let result = true;
 
         for ( let key of Mix.vals(val) ) {
-            result &&= Mix.vals(arr).indexOf(key) !== - 1;
+            result &&= Mix.vals(arr).indexOf(key) !== -1;
         }
 
         return result;
@@ -984,7 +1044,7 @@ export class PicoArray
      * @param {any} search Search spec
      * @returns {boolean} True if matches
      */
-    static matches(value, search)
+    static matches(value : any, search : any) : boolean
     {
         if ( Mix.isObj(search) ) {
             return Obj.matches(value, search);
@@ -1004,7 +1064,7 @@ export class PicoArray
             return false;
         }
 
-        for ( let i = 0; result === true && i < length; i ++ ) {
+        for ( let i = 0; result === true && i < length; i++ ) {
             result &&= this.has(value, search[i]);
         }
 
@@ -1013,60 +1073,35 @@ export class PicoArray
 
 }
 
-/**
- * @see PicoArray.unset
- */
-PicoArray.removeIndex = function (...args) {
+// @ts-ignore
+PicoArray.removeIndex = function (...args : Parameters<typeof PicoArray.splice>) {
     console.warn('Arr.removeIndex() is deprecated, use Arr.unset() instead.');
     return this.unset(...args);
 };
 
-/**
- * @see PicoArray.sortPrim
- */
-PicoArray.sortString = function (...args) {
+// @ts-ignore
+PicoArray.sortString = function (...args : Parameters<typeof PicoArray.sortPrim>) {
     console.warn('Arr.sortString() is deprecated, use Arr.sortPrim() instead.');
     return this.sortPrim(...args);
 };
 
-/**
- * @see PicoArray.append
- */
-PicoArray.push = function (...args) {
+// @ts-ignore
+PicoArray.push = function (...args : Parameters<typeof PicoArray.append>) {
     console.warn('Arr.push() is deprecated, use Arr.append() instead.');
     return this.append(...args);
 };
 
-/**
- * @see PicoArray.merge
- */
-PicoArray.concat = function (...args) {
+// @ts-ignore
+PicoArray.concat = function (...args : Parameters<typeof PicoArray.merge>) {
     console.warn('Arr.concat() is deprecated, use Arr.merge() instead.');
     return this.merge(...args);
 };
 
-/**
- * @see PicoArray.matches
- */
-PicoArray.equal = function (...args) {
+// @ts-ignore
+PicoArray.equal = function (...args : Parameters<typeof PicoArray.matches>) {
     console.warn('Arr.equal() is deprecated, use Arr.matches() instead.');
     return this.matches(...args);
 };
 
-/**
- * @see PicoArray.diff
- */
-PicoArray.diffrence = function (...args) {
-    console.warn('Arr.diffrence() is deprecated, use Arr.diff() instead.');
-    return this.diff(...args);
-};
-
-/**
- * @see PicoArray.isect
- */
-PicoArray.intersect = function (...args) {
-    console.warn('Arr.intersect() is deprecated, use Arr.isect() instead.');
-    return this.isect(...args);
-};
 
 export default PicoArray;