@kizmann/pico-js 2.0.7 → 2.0.9

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

@@ -1,4 +1,4 @@
-import { go, Mix, Arr } from "../index.esm.js";
+import { Mix, Arr } from "../index.esm.ts";
 
 export class PicoObject
 {
@@ -10,10 +10,10 @@ export class PicoObject
      *
      * @param {any} keys Key path
      * @param {boolean} [flatten] Flatten keys
-     * @param {boolean|null} [isstr] Is string flag
+     * @param {boolean} [isstr] Is string flag
      * @returns {Array<any>} Key segments
      */
-    static keyoptim(keys, flatten = false, isstr = null)
+    static keyoptim(keys : any, flatten : boolean = false, isstr : boolean = null) : Array<any>
     {
         if ( isstr === null ) {
             isstr = Mix.isStr(keys);
@@ -37,7 +37,7 @@ export class PicoObject
      * @param {boolean} [flatten] Flatten keys
      * @returns {boolean} True if exists
      */
-    static has(target, keys, flatten = false)
+    static has(target : any, keys : any, flatten : boolean = false) : boolean
     {
         if ( target == null || keys == null ) {
             return false;
@@ -63,8 +63,8 @@ export class PicoObject
             return target[list] !== undefined;
         }
 
-        while ( target != null && index < length ) {
-            target = target[keys[index ++]];
+        while (target != null && index < length) {
+            target = target[keys[index++]];
         }
 
         if ( target == null ) {
@@ -87,7 +87,7 @@ export class PicoObject
      * @param {boolean} [flatten] Flatten keys
      * @returns {any} Nested value
      */
-    static get(target, keys, fallback = null, flatten = false)
+    static get(target : any, keys : any, fallback : any = null, flatten : boolean = false) : any
     {
         if ( target == null || keys == null ) {
             return fallback;
@@ -111,8 +111,8 @@ export class PicoObject
             return fallback;
         }
 
-        while ( target != null && index < length ) {
-            target = target[keys[index ++]];
+        while (target != null && index < length) {
+            target = target[keys[index++]];
         }
 
         if ( target == null ) {
@@ -134,7 +134,7 @@ export class PicoObject
      * @param {boolean} [flatten] Flatten keys
      * @returns {any} Mutated target
      */
-    static set(target, keys, value, flatten = false)
+    static set(target : any, keys : any, value : any, flatten : boolean = false) : any
     {
         if ( keys == null ) {
             return target;
@@ -158,7 +158,7 @@ export class PicoObject
 
         let nested = target;
 
-        for ( let mod, src, i = 0; i < keys.length; i++) {
+        for ( let mod : any, src : any, i = 0; i < keys.length; i++ ) {
 
             mod = src = String(keys[i]);
 
@@ -195,7 +195,7 @@ export class PicoObject
      * @param {boolean} [flatten] Flatten keys
      * @returns {any} Mutated target
      */
-    static unset(target, keys, flatten = false)
+    static unset(target : any, keys : any, flatten : boolean = false) : any
     {
         if ( keys == null ) {
             return target;
@@ -221,8 +221,8 @@ export class PicoObject
             return target;
         }
 
-        while ( nested != null && index < length ) {
-            nested = nested[keys[index ++]];
+        while (nested != null && index < length) {
+            nested = nested[keys[index++]];
         }
 
         if ( nested == null ) {
@@ -242,7 +242,7 @@ export class PicoObject
      * @param {any} key Key path
      * @returns {boolean} True if empty
      */
-    static empty(target, key)
+    static empty(target : any, key : any) : boolean
     {
         return Mix.isEmpty(this.get(target, key));
     }
@@ -258,7 +258,7 @@ export class PicoObject
      */
     static remove(target, keys)
     {
-        if ( ! Mix.isArr(keys) ) {
+        if ( !Mix.isArr(keys) ) {
             return target;
         }
 
@@ -275,11 +275,11 @@ export class PicoObject
      * @example Obj.each({a:1}, v => v+1) // => {a:2}
      *
      * @param {any} value Source object
-     * @param {function} cb Map callback
+     * @param {Function} cb Map callback
      * @param {any} [retval] Forced return
      * @returns {any} Mapped object
      */
-    static each(value, cb, retval = null)
+    static each(value : any, cb : Function, retval : any = null) : any
     {
         let result = {};
 
@@ -300,10 +300,10 @@ export class PicoObject
      * @example Obj.map({a:1}, v => v+1) // => {a:2}
      *
      * @param {any} value Source object
-     * @param {function} cb Map callback
+     * @param {Function} cb Map callback
      * @returns {Record<string, any>} Mapped object
      */
-    static map(value, cb)
+    static map(value : any, cb : Function) : Record<string, any>
     {
         for ( let key of Mix.keys(value) ) {
             value[key] = cb(value[key], key);
@@ -321,7 +321,7 @@ export class PicoObject
      * @param {any} [filter] Filter spec
      * @returns {Array<any>} Key list
      */
-    static filterIndex(value, filter = null)
+    static filterIndex(value : any, filter : any = null) : Array<any>
     {
         return Arr.filterIndex(value, filter);
     }
@@ -335,11 +335,11 @@ export class PicoObject
      * @param {any} [filter] Filter spec
      * @returns {Record<string, any>} Filtered object
      */
-    static filter(value, filter = null)
+    static filter(value : any, filter : any = null) : Record<string, any>
     {
         let result = {};
 
-        for (let key of this.filterIndex(value, filter)) {
+        for ( let key of this.filterIndex(value, filter) ) {
             result[key] = value[key];
         }
 
@@ -353,10 +353,10 @@ export class PicoObject
      *
      * @param {any} value Source object
      * @param {string} [prefix] Key prefix
-     * @param {Record<string, any>} [result] Result map
+     * @param {any} [result] Result map
      * @returns {Record<string, any>} Flat map
      */
-    static flatten(value, prefix = '', result = {})
+    static flatten(value : any, prefix : string = '', result : any = {}) : Record<string, any>
     {
         if ( typeof value !== 'object' ) {
             return result[prefix] = value;
@@ -380,16 +380,16 @@ export class PicoObject
      *
      * @param {any} value Source object
      * @param {string} [prefix] Key prefix
-     * @param {Record<string, any>} [result] Result map
+     * @param {any} [result] Result map
      * @returns {Record<string, any>} Flat map
      */
-    static flattenForm(value, prefix = '', result = {})
+    static flattenForm(value : any, prefix : string = '', result : any = {}) : Record<string, any>
     {
         if ( typeof value !== 'object' ) {
             return result[prefix] = value;
         }
 
-        let fn = (key) => {
+        let fn = (key : any) => {
             return prefix ? `${prefix}[${key}]` : key;
         };
 
@@ -406,12 +406,12 @@ export class PicoObject
      * @example Obj.unpack({"a.b":1}) // => {a:{b:1}}
      *
      * @param {any} value Flat key map
-     * @param {Record<string, any>} [result] Result object
-     * @returns {Record<string, any>} Unpacked object
+     * @param {any} [result] Result object
+     * @returns {any} Unpacked object
      */
-    static unpack(value, result = {})
+    static unpack(value : any, result : any = {}) : any
     {
-        Arr.each(Mix.keys(value), (key) => {
+        Arr.each(Mix.keys(value), (key : any) => {
             this.set(result, key, value[key]);
         });
 
@@ -423,11 +423,12 @@ export class PicoObject
      *
      * @example Obj.assign({}, {a:1}) // => {a:1}
      *
-     * @param {...any} args Assign args
+     * @param {[...any]} args Assign args
      * @returns {any} Assigned object
      */
-    static assign(...args)
+    static assign(...args : [...any]) : any
     {
+        // @ts-ignore
         return Object.assign(...args);
     }
 
@@ -440,7 +441,7 @@ export class PicoObject
      * @param {any} [merge] Merge values
      * @returns {any} Cloned value
      */
-    static clone(value, merge = null)
+    static clone(value : any, merge : any = null) : any
     {
         if ( Mix.isPrim(value) ) {
             return value;
@@ -450,7 +451,7 @@ export class PicoObject
             return Arr.clone(value);
         }
 
-        if ( ! Mix.isObj(value) ) {
+        if ( !Mix.isObj(value) ) {
             return value;
         }
 
@@ -477,7 +478,7 @@ export class PicoObject
      * @param {any} [fallback] Fallback value
      * @returns {any} Plucked value
      */
-    static pluck(value, key, fallback = null)
+    static pluck(value : any, key : any, fallback : any = null) : any
     {
         let result = this.get(value, key, fallback);
 
@@ -492,15 +493,15 @@ export class PicoObject
      * @example Obj.only({a:1,b:2}, ["a"]) // => {a:1}
      *
      * @param {any} value Source object
-     * @param {Array<any>} keys Allowed keys
+     * @param {string[]} keys Allowed keys
      * @param {any} [merge] Merge values
-     * @returns {Record<string, any>} Picked object
+     * @returns {any} Picked object
      */
-    static only(value, keys, merge = null)
+    static only(value : any, keys : string[], merge : any = null) : any
     {
         let result = {};
 
-        this.each(value, (val, key) => {
+        this.each(value, (val : any, key : any) => {
             if ( Arr.has(keys, key) ) result[key] = val;
         });
 
@@ -517,16 +518,16 @@ export class PicoObject
      * @example Obj.except({a:1,b:2}, ["a"]) // => {b:2}
      *
      * @param {any} value Source object
-     * @param {Array<any>} keys Excluded keys
+     * @param {string[]} keys Excluded keys
      * @param {any} [merge] Merge values
-     * @returns {Record<string, any>} Picked object
+     * @returns {any} Picked object
      */
-    static except(value, keys, merge = null)
+    static except(value : any, keys : string[], merge : any = null) : any
     {
         let result = {};
 
         this.each(value, (val, key) => {
-            if ( ! Arr.has(keys, key) ) result[key] = val;
+            if ( !Arr.has(keys, key) ) result[key] = val;
         });
 
         if ( merge == null ) {
@@ -546,13 +547,13 @@ export class PicoObject
      * @param {any} search Search spec
      * @returns {boolean} True if includes
      */
-    static includes(value, search)
+    static includes(value : any, search : any) : boolean
     {
         if ( Mix.isArr(search) ) {
             return Arr.includes(value, search);
         }
 
-        if ( ! Mix.isObj(search) ) {
+        if ( !Mix.isObj(search) ) {
             return value === search;
         }
 
@@ -562,7 +563,7 @@ export class PicoObject
             true, keys.length,
         ];
 
-        for ( let i = 0; result === true && i < length; i++) {
+        for ( let i = 0; result === true && i < length; i++ ) {
             result = this.includes(...[
                 value[keys[i]], search[keys[i]]
             ]);
@@ -581,13 +582,13 @@ export class PicoObject
      * @param {any} search Search spec
      * @returns {boolean} True if matches
      */
-    static matches(value, search)
+    static matches(value : any, search : any) : boolean
     {
         if ( Mix.isArr(search) ) {
             return Arr.matches(value, search);
         }
 
-        if ( ! Mix.isObj(value) ) {
+        if ( !Mix.isObj(value) ) {
             return value === search;
         }
 
@@ -599,7 +600,7 @@ export class PicoObject
             true, keys.length,
         ];
 
-        for ( let i = 0; result === true && i < length; i++) {
+        for ( let i = 0; result === true && i < length; i++ ) {
             result &&= this.matches(...[
                 value[keys[i]], search[keys[i]]
             ]);
@@ -608,51 +609,12 @@ export class PicoObject
         return result;
     }
 
-    static sort(obj, key)
+    static sort(value : any, key : string) : any
     {
-        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 = [];
+        let result = Arr.sort(value, key);
 
-        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];
+        Arr.each(result, (val : any, key : any) => {
+            value[key]['_key'] = key;
         });
 
         return result;
@@ -660,44 +622,28 @@ export class PicoObject
 
 }
 
-/**
- * @see PicoMixed.vals
- */
-PicoObject.values = (...args) => {
+// @ts-ignore
+PicoObject.sortString = (...args : Parameters<typeof PicoObject.sort>) => {
+    console.warn('Obj.sortString() is deprecated, use Obj.sort() instead.');
+    return PicoObject.sort(...args);
+};
+
+// @ts-ignore
+PicoObject.values = (...args : Parameters<typeof Mix.vals>) => {
     console.warn('Obj.values() is deprecated, use Mix.vals() instead.');
     return Mix.vals(...args);
 };
 
-/**
- * @see PicoArray.find
- */
-PicoObject.find = (...args) => {
+// @ts-ignore
+PicoObject.find = (...args : Parameters<typeof Arr.find>) => {
     console.warn('Obj.find() is deprecated, use Arr.find() instead.');
     return Arr.find(...args);
 };
 
-/**
- * @see PicoArray.findIndex
- */
-PicoObject.findIndex = (...args) => {
+// @ts-ignore
+PicoObject.findIndex = (...args : Parameters<typeof Arr.findIndex>) => {
     console.warn('Obj.findIndex() is deprecated, use Arr.findIndex() instead.');
     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);
-// };
-
 export default PicoObject

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

@@ -1,9 +1,11 @@
-import { Arr, For, Locale, Mix, Obj } from "../index.esm.js";
+import { For, Mix, Obj } from "../index.esm.ts";
 
 export class PicoRoute
 {
-
-    static $routes = {};
+    /**
+     * @type {any}
+     */
+    static $routes : any = {};
 
     /**
      * Store route template by key
@@ -14,7 +16,7 @@ export class PicoRoute
      * @param {string} value Route template
      * @returns {void} No return value
      */
-    static set(key, value)
+    static set(key : string, value : string) : void
     {
         this.$routes[key] = value;
     }
@@ -30,19 +32,19 @@ export class PicoRoute
      * @param {any} [query] Query params
      * @returns {string} Built url
      */
-    static get(key, values = null, query = null)
+    static get(key : string, values : any = null, query : any = null) : string
     {
         let route = key;
 
-        if ( ! /^https?:\/\//.test(route) ) {
+        if ( !/^https?:\/\//.test(route) ) {
             route = this.$routes[key] || key
         }
 
-        Obj.each(values, (val, key) => {
+        Obj.each(values, (val : any, key : any) => {
             route = route.replace(new RegExp('{' + key + '}', 'g'), val);
         });
 
-        if ( ! Mix.isEmpty(query) ) {
+        if ( !Mix.isEmpty(query) ) {
             route += '?' + For.castParams(query);
         }
 
@@ -59,7 +61,7 @@ export class PicoRoute
      * @param {any} [params] Query params
      * @returns {void} No return value
      */
-    static goto(key, values = null, params = null)
+    static goto(key : string, values : any = null, params : any = null) : void
     {
         window.location.href = this.get(key, values, params);
     }