@kizmann/pico-js 2.0.7 → 2.0.9

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

@@ -1,27 +1,27 @@
-import { Mix, Obj, Locale } from "../index.esm.js";
+import { Mix, Obj, Locale } from "../index.esm.ts";
 
 export class PicoLocale
 {
     /**
      * Translation dictionary
      *
-     * @type {Record<any, any>}
+     * @type {any}
      */
-    static $text = {};
+    static $text : any = {};
 
     /**
      * Cached collator instance
      *
      * @type {Intl.Collator|null}
      */
-    static $sort = null;
+    static $sort : Intl.Collator;
 
     /**
      * Active locale code
      *
      * @type {string}
      */
-    static $code = 'en';
+    static $code : string = 'en';
 
     /**
      * Check if translation key exists
@@ -32,13 +32,13 @@ export class PicoLocale
      * @param {any} [key] Translation key
      * @returns {boolean} True if exists
      */
-    static has(key = undefined)
+    static has(key : any = undefined) : boolean
     {
         if ( key === undefined ) {
             return true;
         }
 
-        return Mix.has(PicoLocale.$text, key);
+        return Obj.has(PicoLocale.$text, key);
     }
 
     /**
@@ -51,7 +51,7 @@ export class PicoLocale
      * @param {any} [fallback] Fallback value
      * @returns {any} Translation value
      */
-    static get(key = undefined, fallback = null)
+    static get(key : any = undefined, fallback : any = null) : any
     {
         if ( key === undefined ) {
             return PicoLocale.$text;
@@ -70,7 +70,7 @@ export class PicoLocale
      * @param {any} [value] Value to set
      * @returns {any} Updated map
      */
-    static set(key = undefined, value = undefined)
+    static set(key : any = undefined, value : any = undefined) : any
     {
         if ( value === undefined ) {
             return PicoLocale.$text = key;
@@ -85,16 +85,16 @@ export class PicoLocale
      * @example Locale.code() // => "en"
      * @example Locale.code("de") // => "de"
      *
-     * @param {string|null} [code] Locale code
+     * @param {string} [code] Locale code
      * @returns {string} Active code
      */
-    static code(code = null)
+    static code(code : string = null) : string
     {
-        if ( ! Mix.isNull(code) ) {
+        if ( !Mix.isNull(code) ) {
             return Locale.$code = code;
         }
 
-        if ( ! Mix.isNull(Locale.$code) ) {
+        if ( !Mix.isNull(Locale.$code) ) {
             return Locale.$code;
         }
 
@@ -111,9 +111,9 @@ export class PicoLocale
      *
      * @returns {Intl.Collator} Collator instance
      */
-    static collator()
+    static collator() : Intl.Collator
     {
-        if ( ! Mix.isNull(Locale.$sort) ) {
+        if ( !Mix.isNull(Locale.$sort) ) {
             return Locale.$sort;
         }
 
@@ -134,13 +134,13 @@ export class PicoLocale
      * @param {any} [replace] Replace map
      * @returns {string} Replaced text
      */
-    static replace(text, replace = null)
+    static replace(text : string, replace : any = null) : string
     {
         if ( replace == null ) {
             return text;
         }
 
-        Obj.each(replace, (val, key) => {
+        Obj.each(replace, (val : any, key : any) => {
             text = text.replace(new RegExp(':' + key, 'g'), val);
         });
 
@@ -157,7 +157,7 @@ export class PicoLocale
      * @param {any} [replace] Replace map
      * @returns {string} Translated text
      */
-    static trans(text, replace = null)
+    static trans(text : string, replace : any = null) : string
     {
         text = Obj.get(PicoLocale.$text, text, text);
 
@@ -175,7 +175,7 @@ export class PicoLocale
      * @param {any} [replace] Replace map
      * @returns {string} Chosen text
      */
-    static choice(text, count = 0, replace = {})
+    static choice(text : string, count : number = 0, replace : any = {}) : string
     {
         text = Obj.get(PicoLocale.$text, text, text);
 
@@ -193,11 +193,11 @@ export class PicoLocale
      *
      * @example Locale.countpick(["a","b"], 2) // => "b"
      *
-     * @param {Array<string>} splits Variant list
+     * @param {string[]} splits Variant list
      * @param {number} count Choice count
      * @returns {string} Picked text
      */
-    static countpick(splits, count)
+    static countpick(splits : string[], count : number = 0) : string
     {
         let length = splits.length;
 

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

@@ -1,4 +1,4 @@
-import { go, Arr, Mix, Run, Now, Locale, Str, Obj } from "../index.esm.js";
+import { go, Arr, Mix, Run, Locale, Str, Obj } from "../index.esm.ts";
 
 export const MIX_REGEX = {
     'iso': /^\d{4}-\d{2}-\d{2}[T\s]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/,
@@ -18,7 +18,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Returns true if value is not empty
      */
-    static isEmpty(value)
+    static isEmpty(value : any) : boolean
     {
         if ( value == null ) {
             return true;
@@ -54,7 +54,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if null
      */
-    static isNull(value)
+    static isNull(value : any) : boolean
     {
         return value === null;
     }
@@ -70,7 +70,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if undefined
      */
-    static isUndef(value)
+    static isUndef(value : any) : boolean
     {
         return value === undefined;
     }
@@ -86,7 +86,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if null or undefined
      */
-    static isNix(value)
+    static isNix(value : any) : boolean
     {
         return value === undefined || value === null;
     }
@@ -102,7 +102,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if typeof string or number
      */
-    static isPrim(value)
+    static isPrim(value : any) : boolean
     {
         return typeof value === 'string' || typeof value === 'number';
     }
@@ -121,7 +121,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if is string
      */
-    static isStr(value)
+    static isStr(value : any) : boolean
     {
         return typeof value === 'string';
     }
@@ -141,7 +141,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if is number
      */
-    static isNum(value)
+    static isNum(value : any) : boolean
     {
         if ( typeof value === 'number' ) {
             return true;
@@ -170,7 +170,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if is integer
      */
-    static isInt(value)
+    static isInt(value : any) : boolean
     {
         if ( !this.isNum(value) ) {
             return false;
@@ -199,7 +199,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if is boolean
      */
-    static isBool(value)
+    static isBool(value : any) : boolean
     {
         if ( typeof value === 'boolean' ) {
             return true;
@@ -228,7 +228,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Return true if is function
      */
-    static isFunc(value)
+    static isFunc(value : any) : boolean
     {
         return typeof value === 'function';
     }
@@ -250,7 +250,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Returns true if is an object
      */
-    static isRef(value)
+    static isRef(value : any) : boolean
     {
         if ( value == null ) {
             return false;
@@ -273,7 +273,7 @@ export class PicoMixed
      * @param {any} value The value to test
      * @returns {boolean} Returns true if is plain object
      */
-    static isObj(value)
+    static isObj(value : any) : boolean
     {
         if ( value == null ) {
             return false;
@@ -296,7 +296,7 @@ export class PicoMixed
      * @param {any} value The Value to test
      * @returns {boolean} Returns true if is array object
      */
-    static isArr(value)
+    static isArr(value : any) : boolean
     {
         if ( value == null ) {
             return false;
@@ -319,7 +319,7 @@ export class PicoMixed
      * @param {any} value The Value to test
      * @returns {boolean} Returns true if is iterable object
      */
-    static isIter(value)
+    static isIter(value : any) : boolean
     {
         if ( this.isArr(value) ) {
             return false;
@@ -347,7 +347,7 @@ export class PicoMixed
      * @param {any} value The Value to test
      * @returns {boolean} Returns true if is iso date
      */
-    static isIsoDate(value)
+    static isIsoDate(value : any) : boolean
     {
         if ( value instanceof Date ) {
             return true;
@@ -366,7 +366,7 @@ export class PicoMixed
      * @param {any} value The Value to test
      * @returns {boolean} Returns true if is valid date
      */
-    static isDate(value)
+    static isDate(value : any) : boolean
     {
         if ( value instanceof Date ) {
             return true;
@@ -385,7 +385,7 @@ export class PicoMixed
      * @param {any} value The Value to test
      * @returns {boolean} Returns true if is valid time
      */
-    static isTime(value)
+    static isTime(value : any) : boolean
     {
         if ( value instanceof Date ) {
             return true;
@@ -403,7 +403,7 @@ export class PicoMixed
      * @param {any} val Compare value
      * @returns {boolean} True if equal
      */
-    static isEqual(obj, val)
+    static isEqual(obj : any, val : any) : boolean
     {
         if ( obj instanceof Node ) {
             return obj.isEqualNode(val);
@@ -424,7 +424,7 @@ export class PicoMixed
      * @param {any} value Value to convert
      * @returns {Record<string, any>} Converted object
      */
-    static iter(value)
+    static iter(value : any) : Record<string, any>
     {
         if ( value == null ) {
             return {};
@@ -448,7 +448,7 @@ export class PicoMixed
      * @param {any} value Object to iterate
      * @returns {Array<any>} Returns array with keys
      */
-    static keys(value)
+    static keys(value : any) : Array<any>
     {
         if ( value == null ) {
             return [];
@@ -474,7 +474,7 @@ export class PicoMixed
      * @param {any} value Object to iterate
      * @returns {Array<any>} Returns array with values
      */
-    static vals(value)
+    static vals(value : any) : Array<any>
     {
         if ( value == null ) {
             return [];
@@ -494,7 +494,7 @@ export class PicoMixed
 
         let keys = this.keys(value);
 
-        for ( let i = 0; i < keys.length; i ++ ) {
+        for ( let i = 0; i < keys.length; i++ ) {
             keys[i] = value[keys[i]];
         }
 
@@ -509,7 +509,7 @@ export class PicoMixed
      * @param {any} value Source value
      * @returns {Array<any>} Array result
      */
-    static nodes(value)
+    static nodes(value : any) : Array<any>
     {
         return Array.prototype.slice.call(value);
     }
@@ -520,15 +520,15 @@ export class PicoMixed
      * @example Mix.props(Math, ["PI"]) // => {}
      *
      * @param {any} value Source object
-     * @param {Array<any>} [exclude] Exclude keys
+     * @param {string[]} [exclude] Exclude keys
      * @returns {Record<string, any>} Props map
      */
-    static props(value, exclude = [])
+    static props(value : any, exclude : string[] = []) : Record<string, any>
     {
         let result = {};
 
         for ( const key of Object.getOwnPropertyNames(value) ) {
-            if ( exclude.length && ! Arr.has(exclude, key) ) {
+            if ( exclude.length && !Arr.has(exclude, key) ) {
                 result[key] = value[key];
             }
         }
@@ -536,16 +536,48 @@ export class PicoMixed
         return result;
     }
 
+    static extend(target : any, value : any, exclude : string[] = ['constructor'])
+    {
+        if ( value == null ) {
+            return {};
+        }
+
+        let proto = Object.getPrototypeOf(value);
+
+        for ( const key of Object.getOwnPropertyNames(value) ) {
+
+            if ( !exclude.length || Arr.has(exclude, key) ) {
+                continue;
+            }
+
+            let desc = Object.getOwnPropertyDescriptor(proto, key);
+
+            if ( !desc ) {
+                desc = Object.getOwnPropertyDescriptor(value, key);
+            }
+
+            if ( !desc && (!desc.get && !desc.set) ) {
+                target[key] = value[key];
+            }
+
+            if ( desc && (desc.get || desc.set) ) {
+                Object.defineProperty(target, key, desc);
+            }
+        }
+
+        return target;
+    }
+
     /**
      * Get static class props
      *
      * @example Mix.class(MyClass) // => {}
      *
      * @param {any} value Source class
-     * @param {Array<any>} [exclude] Exclude keys
+     * @param {string[any]} [exclude] Exclude keys
      * @returns {Record<string, any>} Props map
      */
-    static class(value, exclude = [])
+    static class(value : any, exclude : string[] = []) : Record<string, any>
     {
         exclude = Arr.merge(exclude, [
             'length', 'name', 'prototype', 'constructor'
@@ -560,10 +592,10 @@ export class PicoMixed
      * @example Mix.proto(MyClass) // => {}
      *
      * @param {any} value Source class
-     * @param {Array<any>} [exclude] Exclude keys
+     * @param {string[]} [exclude] Exclude keys
      * @returns {Record<string, any>} Props map
      */
-    static proto(value, exclude = [])
+    static proto(value : any, exclude : string[] = []) : Record<string, any>
     {
         exclude = Arr.merge(exclude, [
             'constructor'
@@ -580,11 +612,11 @@ export class PicoMixed
      * @param {any} value Source object
      * @returns {FormData} Form instance
      */
-    static form(value)
+    static form(value : any) : FormData
     {
         let form = new FormData();
 
-        Obj.each(Obj.flattenForm(value), (val, key) => {
+        Obj.each(Obj.flattenForm(value), (val : any, key : any) => {
             form.append(key, val);
         });
 
@@ -598,10 +630,10 @@ export class PicoMixed
      * @example Mix.vals(NodeList, (val, key) => null) // => Mix
      *
      * @param {any} value Value to loop
-     * @param {function} cb Callback for each loop
+     * @param {Function} cb Callback for each loop
      * @returns {PicoMixed} Returns Mix instance
      */
-    static each(value, cb)
+    static each(value : any, cb : Function) : PicoMixed
     {
         if ( !this.isRef(value) ) {
             throw new Error('Iterate non object');
@@ -625,13 +657,13 @@ export class PicoMixed
      * @param {any} value The value to count
      * @returns {number} Returns length of value
      */
-    static len(value)
+    static len(value : any) : number
     {
         if ( this.isArr(value) ) {
             return value.length;
         }
 
-        if ( ! this.isRef(value) ) {
+        if ( !this.isRef(value) ) {
             return this.string(value).length;
         }
 
@@ -650,7 +682,7 @@ export class PicoMixed
      * @param {any} compare Second compare value
      * @returns {number} Returns sort position
      */
-    static compare(value, compare)
+    static compare(value : any, compare : any) : number
     {
         return Locale.collator().compare(value, compare);
     }
@@ -664,7 +696,7 @@ export class PicoMixed
      * @param {any} [fallback] Fallback value
      * @returns {any} Null or fallback
      */
-    static null(value, fallback = null)
+    static null(value : any, fallback : any = null) : any
     {
         if ( value === 'null' ) {
             return null;
@@ -685,13 +717,13 @@ export class PicoMixed
      * @param {any} value Source value
      * @returns {Array<any>} Array result
      */
-    static arr(value)
+    static arr(value : any) : Array<any>
     {
         if ( this.isArr(value) ) {
             return value;
         }
 
-        if ( ! this.isStr(value) ) {
+        if ( !this.isStr(value) ) {
             return [value];
         }
 
@@ -719,7 +751,7 @@ export class PicoMixed
      * @param {any} value The value to convert
      * @returns {string} Return value as string
      */
-    static str(value)
+    static str(value : any) : string
     {
         if ( this.isNix(value) ) {
             return String(value);
@@ -747,9 +779,9 @@ export class PicoMixed
      *
      * @param {any} value The value to convert
      * @param {any} fallback Fallback incase it is not primitive
-     * @returns {number|any} Return value as number
+     * @returns {number} Return value as number
      */
-    static num(value, fallback = NaN)
+    static num(value : any, fallback : number = NaN) : number
     {
         if ( !this.isPrim(value) ) {
             return fallback;
@@ -776,10 +808,10 @@ export class PicoMixed
      * @example Mix.int(true) // => NaN
      *
      * @param {any} value The value to convert
-     * @param {any} fallback Fallback incase it is not primitive
-     * @returns {number|any} Return value as integer
+     * @param {number} fallback Fallback incase it is not primitive
+     * @returns {number} Return value as integer
      */
-    static int(value, fallback = NaN)
+    static int(value : any, fallback : number = NaN) : number
     {
         if ( !this.isPrim(value) ) {
             return fallback;
@@ -811,7 +843,7 @@ export class PicoMixed
      * @param {any} value The value to convert
      * @returns {boolean} Return value as boolean
      */
-    static bool(value)
+    static bool(value : any) : boolean
     {
         if ( this.isRef(value) ) {
             return !!this.vals(value).length;
@@ -830,66 +862,77 @@ export class PicoMixed
     static boolean = PicoMixed.bool;
 }
 
-PicoMixed.global = function (...args) {
+// @ts-ignore
+PicoMixed.global = function (...args : Parameters<typeof go>) {
     console.warn('Mix.global() is deprecated, use go() instead.');
     return go(...args);
 };
 
-PicoMixed.isPlain = function (...args) {
+// @ts-ignore
+PicoMixed.isPlain = function (...args : Parameters<typeof Mix.isObj>) {
     console.warn('Mix.isPlain() is deprecated, use Mix.isObj() instead.');
     return Mix.isObj(...args);
 };
 
-PicoMixed.float = function (...args) {
+// @ts-ignore
+PicoMixed.float = function (...args : Parameters<typeof Mix.num>) {
     console.warn('Mix.float() is deprecated, use Mix.num() instead.');
     return Mix.num(...args);
 };
 
-PicoMixed.delay = function (...args) {
+// @ts-ignore
+PicoMixed.delay = function (...args : Parameters<typeof Run.delay>) {
     console.warn('Mix.delay() is deprecated, use Run.delay() instead.');
     return Run.delay(...args);
 };
 
-PicoMixed.async = function (...args) {
+// @ts-ignore
+PicoMixed.async = function (...args : Parameters<typeof Run.async>) {
     console.warn('Mix.async() is deprecated, use Run.async() instead.');
     return Run.async(...args);
 };
 
-PicoMixed.debounce = function (...args) {
+// @ts-ignore
+PicoMixed.debounce = function (...args : Parameters<typeof Run.debounce>) {
     console.warn('Mix.debounce() is deprecated, use Run.debounce() instead.');
     return Run.debounce(...args);
 };
 
-PicoMixed.throttle = function (...args) {
+// @ts-ignore
+PicoMixed.throttle = function (...args : Parameters<typeof Run.throttle>) {
     console.warn('Mix.throttle() is deprecated, use Run.throttle() instead.');
     return Run.throttle(...args);
 };
 
-PicoMixed.framerate = function (...args) {
+// @ts-ignore
+PicoMixed.framerate = function (...args : Parameters<typeof Run.framerate>) {
     console.warn('Mix.framerate() is deprecated, use Run.framerate() instead.');
     return Run.framerate(...args);
 };
 
-PicoMixed.convertString = function (...args) {
+// @ts-ignore
+PicoMixed.convertString = function (...args : Parameters<typeof Str.string>) {
     console.warn('Mix.convertString() is deprecated, use Str.string() instead.');
     return Str.string(...args);
 };
 
-PicoMixed.convertDatetime = function (...args) {
+// @ts-ignore
+PicoMixed.convertDatetime = function (...args : Parameters<typeof Str.date>) {
     console.warn('Mix.convertDatetime() is deprecated, use Str.date() instead.');
     return Str.date(...args);
 };
 
-PicoMixed.convertBool = function (...args) {
+// @ts-ignore
+PicoMixed.convertBool = function (...args : Parameters<typeof Str.boolean>) {
     console.warn('Mix.convertBool() is deprecated, use Str.boolean() instead.');
     return Str.boolean(...args);
 };
 
-PicoMixed.convertBoolean = function (...args) {
+// @ts-ignore
+PicoMixed.convertBoolean = function (...args : Parameters<typeof Str.boolean>) {
     console.warn('Mix.convertBoolean() is deprecated, use Str.boolean() instead.');
     return Str.boolean(...args);
 };
 
 
-
 export default PicoMixed;