@kizmann/pico-js 2.0.5 → 2.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "license": "MIT",
     "type": "module",
     "private": false,

package/src/utils/Array.js

@@ -1,4 +1,4 @@
-import { Obj, Mix } from "../index.esm.js";
+import { Obj, Mix, Any } from "../index.esm.js";
 
 export class PicoArray
 {
@@ -30,7 +30,7 @@ export class PicoArray
      */
     static get(value, index, fallback = null)
     {
-        if ( ! Mix.isArr(value) ) {
+        if ( !Mix.isArr(value) ) {
             return value;
         }
 
@@ -111,7 +111,7 @@ export class PicoArray
             return this.findIndex(value, search) !== - 1;
         }
 
-        if ( ! Mix.isArr(value) ) {
+        if ( !Mix.isArr(value) ) {
             value = [value];
         }
 
@@ -241,13 +241,23 @@ 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);
         }
 
         return retval != null ? retval : result;
     }
 
+    /**
+     * Iterate over object keys
+     *
+     * @example Arr.eachObj({a:1}, (v,k) => v+1) // => [2]
+     *
+     * @param {any} value Input object
+     * @param {function} cb Iterate callback
+     * @param {any} [retval] Return value override
+     * @returns {any} Mapped values or retval
+     */
     static eachObj(value, cb, retval = null)
     {
         if ( Mix.isArr(value) ) {
@@ -304,32 +314,32 @@ export class PicoArray
      */
     static recursive(value, key, cb, cascade = [])
     {
-        if ( value == null ) {
-            return value;
+        // NIE WIEDER ANFASSEN !!!
+        let fn = (cas) => (val) => {
+            return this.recursive(val, key, cb, cas);
+        };
+
+        if ( Mix.isArr(value) ) {
+            return this.map(value, fn(cascade));
         }
 
         if ( Mix.isObj(value) ) {
-            return this.recursiveObj(value, key, cb, cascade);
+            value = cb(value, cascade) ?? value;
         }
 
-        return this.each(value, (item) => {
-            return (this.recursive(item[key], key, cb, [
-                ...cascade, value
-            ]), cb(item, this.clone(cascade)));
-        });
+        cascade = [
+            ...this.clone(cascade), value
+        ];
 
-        // [{childs: [{ childs: [] } ] }, { childs: [] } ] }]
-    }
+        if ( Mix.isObj(value[key]) ) {
+            value[key] = fn(cascade)(value[key]);
+        }
 
-    static recursiveObj(value, key, cb, cascade = [])
-    {
-        if ( value == null ) {
-            return value;
+        if ( Mix.isArr(value[key]) ) {
+            value[key] = this.map(value[key], fn(cascade));
         }
 
-        return this.recursive(value[key], key, cb, [
-            ...cascade, value
-        ]), cb(item, this.clone(cascade))
+        return value;
     }
 
     /**
@@ -365,6 +375,15 @@ export class PicoArray
         });
     }
 
+    /**
+     * Remove values matching filter (mutates)
+     *
+     * @example Arr.filterRemove([1,2], 2) // => [1]
+     *
+     * @param {any} value Input list
+     * @param {any} [filter] Filter spec
+     * @returns {any} Mutated list
+     */
     static filterRemove(value, filter = null)
     {
         if ( value == null ) {
@@ -531,8 +550,12 @@ export class PicoArray
      */
     static sortDeep(value, key)
     {
+        let fn = (val) => {
+            return Obj.get(val, key);
+        }
+
         let keys = Mix.keys(value).sort((a, b) => {
-            return Mix.compare(Obj.get(a, key), Obj.get(b, key));
+            return Mix.compare(fn(value[a]), fn(value[b]));
         });
 
         let result = [];
@@ -625,7 +648,7 @@ export class PicoArray
             finder = target;
         }
 
-        if ( this.findIndex(value, finder) !== -1 ) {
+        if ( this.findIndex(value, finder) !== - 1 ) {
             return value;
         }
 
@@ -650,7 +673,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index !== -1 ) {
+        if ( index !== - 1 ) {
             this.splice(value, index, 1);
         }
 
@@ -675,7 +698,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index === -1 ) {
+        if ( index === - 1 ) {
             return value;
         }
 
@@ -701,7 +724,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index === -1 ) {
+        if ( index === - 1 ) {
             return (value.push(target), value);
         }
 
@@ -791,7 +814,7 @@ export class PicoArray
             return Obj.clone(value);
         }
 
-        if ( ! Mix.isArr(value) ) {
+        if ( !Mix.isArr(value) ) {
             return value;
         }
 
@@ -905,7 +928,7 @@ export class PicoArray
             return Obj.includes(value, search);
         }
 
-        if ( ! Mix.isArr(search) ) {
+        if ( !Mix.isArr(search) ) {
             return value === search;
         }
 
@@ -917,7 +940,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]);
         }
 
@@ -938,7 +961,7 @@ export class PicoArray
         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;
@@ -959,7 +982,7 @@ export class PicoArray
             return Obj.matches(value, search);
         }
 
-        if ( ! Mix.isArr(value) ) {
+        if ( !Mix.isArr(value) ) {
             return value === search;
         }
 
@@ -973,7 +996,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]);
         }
 

package/src/utils/Runner.js

@@ -233,18 +233,28 @@ export class PicoRunner
      *
      * @param {function} cb Callback to run
      * @param {string} key Buffer key
-     * @param {number} [order] Sort order
+     * @param {number} [priority] Sort priority
      * @returns {function} Buffered handler
      */
-    static framebuffer(cb, key, order = 1000)
+    static framebuffer(cb, key, priority = 1000)
     {
+        const item = {
+            key, cb, priority, args: [], active: false
+        };
+
+        Arr.add(this.$buffer, item);
+
+        let fn = () => {
+            this.runFramebuffer();
+        };
+
         return (e, ...args) => {
 
-            Arr.replace(PicoRunner.$buffer, {
-                key, cb, order, args: [e, ...args], active: true
-            }, { key });
+            Obj.assign(item, {
+                args: [e, ...args], active: true
+            });
 
-            (e.preventDefault(), PicoRunner.runFramebuffer());
+            (e.preventDefault(), fn());
         };
     }
 
@@ -262,10 +272,11 @@ export class PicoRunner
         }
 
         this.$idler = setTimeout(() => {
+            console.log('delayed runFramebuffer')
             this.runFramebuffer();
         }, 50);
 
-        if ( Date.now() - this.$timer <= 50 ) {
+        if ( Date.now() - this.$timer < 50 ) {
             return;
         }
 
@@ -283,10 +294,10 @@ export class PicoRunner
             return;
         }
 
-        this.frame(() => {
-            Arr.each(Arr.sort(buffer, 'order'), (item) => {
-                item.cb(...item.args); item.active = false;
-            });
+        buffer = Arr.sort(buffer, 'priority');
+
+        Arr.each(buffer.reverse(), (item) => {
+            item.cb(...item.args); item.active = false;
         });
     }
 

package/types/utils/Array.d.ts

@@ -134,7 +134,17 @@ export class PicoArray {
      * @returns {any} Mapped array
      */
     static each(value: any, cb: Function, retval?: any): any;
-    static eachObj(value: any, cb: any, retval?: any): any;
+    /**
+     * Iterate over object keys
+     *
+     * @example Arr.eachObj({a:1}, (v,k) => v+1) // => [2]
+     *
+     * @param {any} value Input object
+     * @param {function} cb Iterate callback
+     * @param {any} [retval] Return value override
+     * @returns {any} Mapped values or retval
+     */
+    static eachObj(value: any, cb: Function, retval?: any): any;
     /**
      * Map values in place (mutates)
      *
@@ -157,7 +167,6 @@ export class PicoArray {
      * @returns {any} Mapped tree
      */
     static recursive(value: any, key: string, cb: Function, cascade?: Array<any>): any;
-    static recursiveObj(value: any, key: any, cb: any, cascade?: any[]): any;
     /**
      * Get matching indexes by filter
      *
@@ -168,6 +177,15 @@ export class PicoArray {
      * @returns {Array<string>} Matching keys
      */
     static filterIndex(value: any, filter?: any): Array<string>;
+    /**
+     * Remove values matching filter (mutates)
+     *
+     * @example Arr.filterRemove([1,2], 2) // => [1]
+     *
+     * @param {any} value Input list
+     * @param {any} [filter] Filter spec
+     * @returns {any} Mutated list
+     */
     static filterRemove(value: any, filter?: any): any;
     /**
      * Filter values by filter

package/types/utils/Runner.d.ts

@@ -107,10 +107,10 @@ export class PicoRunner {
      *
      * @param {function} cb Callback to run
      * @param {string} key Buffer key
-     * @param {number} [order] Sort order
+     * @param {number} [priority] Sort priority
      * @returns {function} Buffered handler
      */
-    static framebuffer(cb: Function, key: string, order?: number): Function;
+    static framebuffer(cb: Function, key: string, priority?: number): Function;
     /**
      * Flush buffered frame events
      *