@kizmann/pico-js 2.0.4 → 2.0.6

package/package.json

@@ -1,12 +1,13 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "2.0.4",
+    "version": "2.0.6",
     "license": "MIT",
     "type": "module",
     "private": false,
     "author": "Eduard Kizmann <kizmann@protonmail.ch>",
     "repository": "https://github.com/vankizmann/pico-js",
     "main": "./src/index.esm.js",
+    "unpkg": "./dist/pico-js.browser.js",
     "jsnext:main": "./src/index.esm.js",
     "typings": "./types/index.esm.d.ts",
     "imports": {
@@ -42,6 +43,7 @@
         "lodash": "^4.17.23",
         "mini-css-extract-plugin": "^2.0.0",
         "mitata": "^1.0.34",
+        "moment": "^2.30.1",
         "postcss": "^8.4.31",
         "postcss-inline-svg": "^5.0.0",
         "postcss-loader": "^5.0.0",

package/src/dom/DomEvent.js

@@ -1,4 +1,4 @@
-import { Arr, Hash, Mix, Obj, Dom } from "../index.esm.js";
+import { Arr, Hash, Mix, Obj, Dom, Run } from "../index.esm.js";
 import { PicoDom } from "../utils/Dom.js";
 
 /**
@@ -6,7 +6,7 @@ import { PicoDom } from "../utils/Dom.js";
  */
 export class PicoDomEventStatic
 {
-    static events = [];
+    static $events = [];
 }
 
 /**
@@ -35,7 +35,7 @@ export class PicoDomEventInstance
             options = { id: options };
         }
 
-        Dom.events = Arr.append(Dom.events, {
+        Dom.$events = Arr.append(Dom.$events, {
             el, event, cb, selector, pause, options
         });
 
@@ -61,7 +61,7 @@ export class PicoDomEventInstance
             options = { id: options };
         }
 
-        let indexes = Arr.filterIndex(Dom.events, {
+        let indexes = Arr.filterIndex(Dom.$events, {
             el, event, selector, options
         });
 
@@ -74,10 +74,10 @@ export class PicoDomEventInstance
         };
 
         Arr.each(indexes.reverse(), (index) => {
-            el.removeEventListener(...args(Dom.events[index]));
+            el.removeEventListener(...args(Dom.$events[index]));
         });
 
-        Arr.splices(Dom.events, indexes);
+        Arr.splices(Dom.$events, indexes);
 
         return this;
     }
@@ -142,6 +142,27 @@ export class PicoDomEventInstance
         return this;
     }
 
+    /**
+     * Stop listening to event with specific options
+     *
+     * @example Dom.find("div").optoff({ id: "my-id" })
+     *
+     * @param {any} [options] Listener options
+     * @returns {PicoDom} Current instance
+     */
+    optoff(options = {})
+    {
+        Run.idle(() => {
+            Arr.filterRemove(Dom.$events, { options });
+        });
+
+        this.each((el) => {
+            el && el.removeAllListeners();
+        });
+
+        return this;
+    }
+
     /**
      * Listen to event once
      *

package/src/dom/DomGlobal.js

@@ -1,4 +1,4 @@
-import { Run, Mix, Obj, Dom } from "../index.esm.js";
+import { Run, Mix, Obj, Dom, Hash } from "../index.esm.js";
 import { PicoDom } from "../utils/Dom.js";
 
 /**
@@ -60,18 +60,18 @@ export class PicoDomGlobalStatic
      */
     static ready(cb, delay = 0, limit = 6000)
     {
+        let [id, el, event] = [
+            Hash.make(), Dom.find(document), 'DOMContentLoaded'
+        ];
+
         let fn = () => {
-            Run.delay(cb, delay);
+            (Run.delay(cb, delay), el.off(event, null, { id }));
         };
 
-        let [el, event] = [
-            Dom.find(document), 'DOMContentLoaded'
-        ];
-
         let ready = Dom.isDomReady;
 
         if ( ! ready() ) {
-            return (el.on(event, fn), this);
+            return (el.on(event, fn, { id }), this);
         }
 
         Run.wait(() => {

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];
         }
 
@@ -231,25 +231,48 @@ export class PicoArray
      */
     static each(value, cb, retval = null)
     {
-        let [isArr, keys] = [
-            Mix.isArr(value), Mix.keys(value)
-        ];
+        if ( Mix.isObj(value) ) {
+            return this.eachObj(value, cb, retval);
+        }
 
-        let fn = (key) => {
-            return isArr ? parseInt(key) : key;
-        };
+        if ( value == null ) {
+            value = [];
+        }
 
-        let result = new Array(keys.length);
+        let result = new Array(value.length);
 
-        for (let i = 0; i < keys.length; i++) {
-            result[i] = cb(value[keys[i]], fn(keys[i]));
+        for ( let i = 0; i < value.length; i ++ ) {
+            result[i] = cb(value[i], i);
         }
 
-        if ( retval != null ) {
-            return retval;
+        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) ) {
+            return this.each(value, cb, retval);
         }
 
-        return result;
+        if ( value == null ) {
+            value = {};
+        }
+
+        let result = Mix.keys(value).map((key) => {
+            return cb(value[key], key);
+        });
+
+        return retval != null ? retval : result;
     }
 
     /**
@@ -291,17 +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));
         }
 
-        return this.map(value, (item) => {
-            return (this.recursive(item[key], key, cb, [
-                ...cascade, value
-            ]), cb(item, cascade));
-        });
+        if ( Mix.isObj(value) ) {
+            value = cb(value, cascade) ?? value;
+        }
+
+        cascade = [
+            ...this.clone(cascade), value
+        ];
+
+        if ( Mix.isObj(value[key]) ) {
+            value[key] = fn(cascade)(value[key]);
+        }
+
+        if ( Mix.isArr(value[key]) ) {
+            value[key] = this.map(value[key], fn(cascade));
+        }
 
-        // [{childs: [{ childs: [] } ] }, { childs: [] } ] }]
+        return value;
     }
 
     /**
@@ -315,6 +353,10 @@ export class PicoArray
      */
     static filterIndex(value, filter = null)
     {
+        if ( value == null ) {
+            return [];
+        }
+
         if ( filter == null ) {
             filter = (val) => !Mix.isEmpty(val);
         }
@@ -333,6 +375,30 @@ 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 ) {
+            return value;
+        }
+
+        let indexes = this.filterIndex(value, filter);
+
+        if ( indexes.length === 0 ) {
+            return value;
+        }
+
+        return this.splices(value, indexes);
+    }
+
     /**
      * Filter values by filter
      *
@@ -344,6 +410,10 @@ export class PicoArray
      */
     static filter(value, filter = null)
     {
+        if ( value == null ) {
+            return [];
+        }
+
         if ( filter == null ) {
             filter = (val) => !Mix.isEmpty(val);
         }
@@ -374,6 +444,10 @@ export class PicoArray
      */
     static findIndex(value, filter = null, fallback = - 1)
     {
+        if ( value == null ) {
+            return fallback;
+        }
+
         if ( filter == null ) {
             filter = (val) => !Mix.isEmpty(val);
         }
@@ -476,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 = [];
@@ -570,7 +648,7 @@ export class PicoArray
             finder = target;
         }
 
-        if ( this.findIndex(value, finder) !== -1 ) {
+        if ( this.findIndex(value, finder) !== - 1 ) {
             return value;
         }
 
@@ -595,7 +673,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index !== -1 ) {
+        if ( index !== - 1 ) {
             this.splice(value, index, 1);
         }
 
@@ -620,7 +698,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index === -1 ) {
+        if ( index === - 1 ) {
             return value;
         }
 
@@ -646,7 +724,7 @@ export class PicoArray
 
         let index = this.findIndex(value, finder);
 
-        if ( index === -1 ) {
+        if ( index === - 1 ) {
             return (value.push(target), value);
         }
 
@@ -736,7 +814,7 @@ export class PicoArray
             return Obj.clone(value);
         }
 
-        if ( ! Mix.isArr(value) ) {
+        if ( !Mix.isArr(value) ) {
             return value;
         }
 
@@ -850,7 +928,7 @@ export class PicoArray
             return Obj.includes(value, search);
         }
 
-        if ( ! Mix.isArr(search) ) {
+        if ( !Mix.isArr(search) ) {
             return value === search;
         }
 
@@ -862,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]);
         }
 
@@ -883,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;
@@ -904,7 +982,7 @@ export class PicoArray
             return Obj.matches(value, search);
         }
 
-        if ( ! Mix.isArr(value) ) {
+        if ( !Mix.isArr(value) ) {
             return value === search;
         }
 
@@ -918,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]);
         }
 
@@ -930,57 +1008,57 @@ export class PicoArray
 /**
  * @see PicoArray.unset
  */
-PicoArray.removeIndex = (...args) => {
+PicoArray.removeIndex = function (...args) {
     console.warn('Arr.removeIndex() is deprecated, use Arr.unset() instead.');
-    return Arr.unset(...args);
+    return this.unset(...args);
 };
 
 /**
  * @see PicoArray.sortPrim
  */
-PicoArray.sortString = (...args) => {
+PicoArray.sortString = function (...args) {
     console.warn('Arr.sortString() is deprecated, use Arr.sortPrim() instead.');
-    return Arr.sortPrim(...args);
+    return this.sortPrim(...args);
 };
 
 /**
  * @see PicoArray.append
  */
-PicoArray.push = (...args) => {
+PicoArray.push = function (...args) {
     console.warn('Arr.push() is deprecated, use Arr.append() instead.');
-    return Arr.append(...args);
+    return this.append(...args);
 };
 
 /**
  * @see PicoArray.merge
  */
-PicoArray.concat = (...args) => {
+PicoArray.concat = function (...args) {
     console.warn('Arr.concat() is deprecated, use Arr.merge() instead.');
-    return Arr.merge(...args);
+    return this.merge(...args);
 };
 
 /**
  * @see PicoArray.matches
  */
-PicoArray.equal = (...args) => {
+PicoArray.equal = function (...args) {
     console.warn('Arr.equal() is deprecated, use Arr.matches() instead.');
-    return Arr.matches(...args);
+    return this.matches(...args);
 };
 
 /**
  * @see PicoArray.diff
  */
-PicoArray.diffrence = (...args) => {
+PicoArray.diffrence = function (...args) {
     console.warn('Arr.diffrence() is deprecated, use Arr.diff() instead.');
-    return Arr.diff(...args);
+    return this.diff(...args);
 };
 
 /**
  * @see PicoArray.isect
  */
-PicoArray.intersect = (...args) => {
+PicoArray.intersect = function (...args) {
     console.warn('Arr.intersect() is deprecated, use Arr.isect() instead.');
-    return Arr.isect(...args);
+    return this.isect(...args);
 };
 
 export default PicoArray;

package/src/utils/Cookie.js

@@ -134,7 +134,7 @@ export class PicoCookie
             this.$cookie[key] = value;
         }
 
-        let plain = key + '=' + value.replaceAll(...[
+        let plain = key + '=' + Mix.str(value).replaceAll(...[
             ';', '{:}'
         ]);
 

package/src/utils/Mixed.js

@@ -279,7 +279,7 @@ export class PicoMixed
             return false;
         }
 
-        return Object.getPrototypeOf(value) === Object.prototype;
+        return typeof value === 'object' && value.constructor === Object;
     }
 
     /**
@@ -302,7 +302,7 @@ export class PicoMixed
             return false;
         }
 
-        return Object.getPrototypeOf(value) === Array.prototype;
+        return typeof value === 'object' && value.constructor === Array;
     }
 
     /**

package/src/utils/Object.js

@@ -305,13 +305,11 @@ export class PicoObject
      */
     static map(value, cb)
     {
-        let result = {};
-
         for ( let key of Mix.keys(value) ) {
-            result[key] = cb(value[key], key);
+            value[key] = cb(value[key], key);
         }
 
-        return result;
+        return value;
     }
 
     /**
@@ -610,6 +608,56 @@ export class PicoObject
         return result;
     }
 
+    static sort(obj, key)
+    {
+        let keys = Mix.keys(obj);
+
+        if ( Mix.isFunction(key) ) {
+            keys = keys.sort((a, b) => {
+                return key.call({}, obj[a], obj[b]);
+            });
+        }
+
+        if ( !Mix.isFunction(key) ) {
+            keys = keys.sort((a, b) => {
+                return Mix.integer(this.get(obj[a], key)) - Mix.integer(this.get(obj[b], key));
+            })
+        }
+
+        let result = [];
+
+        Arr.each(keys, (key, index) => {
+            obj[key]['_key'] = key;
+            result[index] = obj[key];
+        });
+
+        return result;
+    }
+
+    static sortString(obj, key)
+    {
+        let keys = Mix.keys(obj);
+
+        if ( !Mix.isFunction(key) ) {
+            keys = keys.sort((a, b) => {
+
+                let va = Mix.string(this.get(obj[a], key)).toLowerCase();
+                let vb = Mix.string(this.get(obj[b], key)).toLowerCase();
+
+                return (va < vb) ? - 1 : (va > vb) ? 1 : 0;
+            })
+        }
+
+        let result = [];
+
+        Arr.each(keys, (key, index) => {
+            obj[key]['_key'] = key;
+            result[index] = obj[key];
+        });
+
+        return result;
+    }
+
 }
 
 /**
@@ -636,20 +684,20 @@ PicoObject.findIndex = (...args) => {
     return Arr.findIndex(...args);
 };
 
-/**
- * @see PicoArray.sort
- */
-PicoObject.sort = (...args) => {
-    console.warn('Obj.sort() is deprecated, use Arr.sort() instead.');
-    return Arr.sort(...args);
-};
-
-/**
- * @see PicoArray.sortDeep
- */
-PicoObject.sortString = (...args) => {
-    console.warn('Obj.sortString() is deprecated, use Arr.sortDeep() instead.');
-    return Arr.sortDeep(...args);
-};
+// /**
+//  * @see PicoArray.sort
+//  */
+// PicoObject.sort = (...args) => {
+//     console.warn('Obj.sort() is deprecated, use Arr.sort() instead.');
+//     return Arr.sort(...args);
+// };
+//
+// /**
+//  * @see PicoArray.sortDeep
+//  */
+// PicoObject.sortString = (...args) => {
+//     console.warn('Obj.sortString() is deprecated, use Arr.sortDeep() instead.');
+//     return Arr.sortDeep(...args);
+// };
 
 export default PicoObject

package/src/utils/Route.js

@@ -38,10 +38,12 @@ export class PicoRoute
             route = this.$routes[key] || key
         }
 
-        route = Locale.replace(route, values);
+        Obj.each(values, (val, key) => {
+            route = route.replace(new RegExp('{' + key + '}', 'g'), val);
+        });
 
         if ( ! Mix.isEmpty(query) ) {
-            route += '?' + For.castParams(values);
+            route += '?' + For.castParams(query);
         }
 
         return route;