@kizmann/pico-js 2.1.3 → 2.1.5

package/package.json

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

package/src/dom/DomBuilder.ts

@@ -32,7 +32,9 @@ export class PicoDomBuilder
             el = document.createElement(el);
         }
 
-        el = Obj.assign(el, options);
+        if ( el != null ) {
+            el = Obj.assign(el, options);
+        }
 
         let ini = new Dom(el);
 

package/src/utils/Array.ts

@@ -406,7 +406,7 @@ export class PicoArray
      * @param {any[]} [result] Initial result
      * @returns {any} Cascade result
      */
-    static cascade(value : any, childs : string, cb: Function, cascade: any[] = [], result = []) : any
+    static cascade(value : any, childs : string, cb : Function, cascade : any[] = [], result = []) : any
     {
         let fn = (cas : any) => (val : any) => {
             return this.cascade(val, childs, cb, cas, result);
@@ -439,6 +439,27 @@ export class PicoArray
         return result;
     }
 
+    /**
+     * Flatten nested array cascade
+     *
+     * @example Arr.cascadeFlatten([{n:1, children:[{n:2}]}]) // => [{n:1,...}, {n:2}]
+     *
+     * @param {any[]} items Input list
+     * @param {string} [key] Child key
+     * @param {any[]} [result] Initial result
+     * @returns {any[]} Flattened list
+     */
+    static cascadeFlatten(items : any[], key : string = 'children', result : any[] = []) : any[]
+    {
+        let cb = (input : any) => {
+            result.push(input), Mix.isArr(input[key]) && input[key].forEach(cb);
+        };
+
+        items.forEach(cb);
+
+        return result;
+    }
+
     /**
      * Find item in cascade
      *
@@ -457,11 +478,11 @@ export class PicoArray
 
         let result = null
 
-        const fn = (val : any, cascade: any[]) => {
+        const fn = (val : any, cascade : any[]) => {
             return cb(val, cascade) ? [...cascade, val] : null;
         };
 
-        this.cascade(value, childs, (val:any, cascade : any[]) => {
+        this.cascade(value, childs, (val : any, cascade : any[]) => {
             if ( result == null ) result = fn(val, cascade);
         });
 

package/src/utils/Locale.ts

@@ -1,4 +1,4 @@
-import { Mix, Obj, Locale } from "../index.esm.ts";
+import { Mix, Obj, Locale, Arr } from "../index.esm.ts";
 
 export class PicoLocale
 {
@@ -16,6 +16,13 @@ export class PicoLocale
      */
     static $sort : Intl.Collator = null;
 
+    /**
+     * Number format
+     *
+     * @type {string[]}
+     */
+    static $number : string[] = null;
+
     /**
      * Active locale code
      *
@@ -124,6 +131,33 @@ export class PicoLocale
         return Locale.$sort;
     }
 
+    /**
+     * Get decimal and group separators
+     *
+     * @returns {string[]} Separators [group, decimal]
+     */
+    static decimals() : string[]
+    {
+        if ( Locale.$number != null ) {
+            return Locale.$number;
+        }
+
+        const parts = new Intl.NumberFormat(Locale.code())
+            .formatToParts(1234.5);
+
+        const group = Arr.find(parts, {
+            type: 'group'
+        });
+
+        const decimal = Arr.find(parts, {
+            type: 'decimal'
+        });
+
+        return Locale.$number = [
+            group.value || ',', decimal.value || '.'
+        ];
+    }
+
     /**
      * Replace :tokens in text
      *
@@ -224,6 +258,46 @@ export class PicoLocale
         return splits[0];
     }
 
+    /**
+     * Parse localized number string
+     *
+     * @example Locale.num("1,234.50") // => 1234.5
+     *
+     * @param {string} value Localized string
+     * @returns {number} Number value
+     */
+    static num(value : string) : number
+    {
+        const [group, decimal] = Locale.decimals();
+
+        const text = value
+            .replaceAll(' ', '')
+            .replaceAll(group, '')
+            .replaceAll(decimal, '.');
+
+        return Mix.num(text);
+    }
+
+    /**
+     * Parse localized integer string
+     *
+     * @example Locale.int("1,234") // => 1234
+     *
+     * @param {string} value Localized string
+     * @returns {number} Integer value
+     */
+    static int(value : string) : number
+    {
+        const [group, decimal] = Locale.decimals();
+
+        const text = value
+            .replaceAll(' ', '')
+            .replaceAll(group, '')
+            .replaceAll(decimal, '.');
+
+        return Mix.int(text);
+    }
+
 }
 
 export default PicoLocale

package/types/utils/Array.d.ts

@@ -200,6 +200,17 @@ export declare class PicoArray {
      * @returns {any} Cascade result
      */
     static cascade(value: any, childs: string, cb: Function, cascade?: any[], result?: any[]): any;
+    /**
+     * Flatten nested array cascade
+     *
+     * @example Arr.cascadeFlatten([{n:1, children:[{n:2}]}]) // => [{n:1,...}, {n:2}]
+     *
+     * @param {any[]} items Input list
+     * @param {string} [key] Child key
+     * @param {any[]} [result] Initial result
+     * @returns {any[]} Flattened list
+     */
+    static cascadeFlatten(items: any[], key?: string, result?: any[]): any[];
     /**
      * Find item in cascade
      *

package/types/utils/Locale.d.ts

@@ -11,6 +11,12 @@ export declare class PicoLocale {
      * @type {Intl.Collator}
      */
     static $sort: Intl.Collator;
+    /**
+     * Number format
+     *
+     * @type {string[]}
+     */
+    static $number: string[];
     /**
      * Active locale code
      *
@@ -67,6 +73,12 @@ export declare class PicoLocale {
      * @returns {Intl.Collator} Collator instance
      */
     static collator(): Intl.Collator;
+    /**
+     * Get decimal and group separators
+     *
+     * @returns {string[]} Separators [group, decimal]
+     */
+    static decimals(): string[];
     /**
      * Replace :tokens in text
      *
@@ -111,5 +123,23 @@ export declare class PicoLocale {
      * @returns {string} Picked text
      */
     static countpick(splits: string[], count?: number): string;
+    /**
+     * Parse localized number string
+     *
+     * @example Locale.num("1,234.50") // => 1234.5
+     *
+     * @param {string} value Localized string
+     * @returns {number} Number value
+     */
+    static num(value: string): number;
+    /**
+     * Parse localized integer string
+     *
+     * @example Locale.int("1,234") // => 1234
+     *
+     * @param {string} value Localized string
+     * @returns {number} Integer value
+     */
+    static int(value: string): number;
 }
 export default PicoLocale;