xjs-common 13.1.0 → 13.3.0

package/README.md

@@ -33,7 +33,6 @@ import { delay, int2array, UHttp, retry, MaybeArray, Loggable } from "xjs-common
 
     // true
     console.log(UHttp.isHttpSuccess(204));
-
     // https://aaa.com?p1=a&p2=1&p2=2
     console.log(UHttp.concatParamsWithEncoding("https://aaa.com", { p1: "a", p2: ["1", "2"] }));
     // p1=a&p2=1&p2=2
@@ -48,6 +47,8 @@ import { UArray } from "xjs-common";
     // [ 1, 3, 2, 5, 4 ]
     const ary1 = UArray.distinct([1, 3, 2, 2, 1, 5, 4]);
     console.log(ary1);
+    // [1, 1, 2, 2]
+    console.log(UArray.duplicate([1, 3, 2, 2, 1, 5, 4]));
 
     // [ 5, 4 ]
     console.log(UArray.takeOut(ary1, v => v > 3));

package/build/cjs/func/u-obj.js

@@ -23,12 +23,13 @@ var UObj;
         return t;
     }
     UObj.assignProperties = assignProperties;
-    function crop(o, keys_or_ctor, removeKeys) {
+    function crop(o, keys_or_ctor, op) {
+        const _removeKeys = !!op?.removeKeys;
         const tm = Array.isArray(keys_or_ctor) ? null
             : (!keys_or_ctor || o instanceof keys_or_ctor ? o[d_type_1.smbl_tm] : new keys_or_ctor()[d_type_1.smbl_tm]);
         const _keys = tm ? Object.keys(tm) : (keys_or_ctor ?? []);
         if (_keys.length === 0)
-            return removeKeys ? o : {};
+            return _removeKeys ? o : {};
         Object.keys(o).filter(k => {
             if (tm && tm[k] && o[k]) {
                 if (tm[k].cls)
@@ -38,7 +39,10 @@ var UObj;
                     Object.values(o[k]).forEach(v => crop(v, vCtor));
                 }
             }
-            return !!removeKeys === _keys.includes(k);
+            const rm = _removeKeys === _keys.includes(k);
+            if (!rm && op?.recursive && u_type_1.UType.isObject(o[k]))
+                crop(o[k], _keys, op);
+            return rm;
         }).forEach(k => delete o[k]);
         return o;
     }

package/build/cjs/func/u.js

@@ -4,7 +4,6 @@ exports.getJSTDate = getJSTDate;
 exports.delay = delay;
 exports.int2array = int2array;
 exports.array2map = array2map;
-exports.bitor = bitor;
 exports.retry = retry;
 const xjs_err_1 = require("../obj/xjs-err");
 const s_errCode = 10;
@@ -20,20 +19,18 @@ function int2array(size) {
         throw new xjs_err_1.XjsErr(s_errCode, "size of the argument is not number.");
     return Array.from(Array(s).keys());
 }
-function array2map(array, keyGen) {
+function array2map(array, keyGen, op) {
+    const _acm = op?.accumulate ?? true;
     const map = new Map();
     for (const e of array) {
         const k = keyGen(e);
         if (map.has(k))
-            map.get(k).push(e);
+            _acm && map.get(k).push(e);
         else
-            map.set(k, [e]);
+            map.set(k, _acm ? [e] : e);
     }
     return map;
 }
-function bitor(...bit) {
-    return bit.reduce((a, b) => a | b);
-}
 ;
 ;
 ;

package/build/esm/func/u-obj.d.ts

@@ -12,9 +12,13 @@ export declare namespace UObj {
      * crop properties of the object other than specified. the properties are to be removed with `delete` operator.
      * @param o object whose properties to be removed.
      * @param keys property names to be remained.
-     * @param removeKeys if true, it removes `keys` instead of remaining it.
+     * @param op.removeKeys if true, it removes `keys` instead of remaining it.
+     * @param op.recursive whether it crops properties of an object recursively. default is false.
      */
-    function crop<T extends NormalRecord>(o: T, keys: (keyof T)[], removeKeys?: boolean): Partial<T>;
+    function crop<T extends NormalRecord>(o: T, keys: (keyof T)[], op?: {
+        removeKeys?: boolean;
+        recursive?: boolean;
+    }): Partial<T>;
     /**
      * crop properties that is not decorated with {@link DType}. the properties will be removed with `delete` operator.
      * this treats constructual decorator such as {@link DType.object} recursively.

package/build/esm/func/u-obj.js

@@ -20,12 +20,13 @@ export var UObj;
         return t;
     }
     UObj.assignProperties = assignProperties;
-    function crop(o, keys_or_ctor, removeKeys) {
+    function crop(o, keys_or_ctor, op) {
+        const _removeKeys = !!op?.removeKeys;
         const tm = Array.isArray(keys_or_ctor) ? null
             : (!keys_or_ctor || o instanceof keys_or_ctor ? o[smbl_tm] : new keys_or_ctor()[smbl_tm]);
         const _keys = tm ? Object.keys(tm) : (keys_or_ctor ?? []);
         if (_keys.length === 0)
-            return removeKeys ? o : {};
+            return _removeKeys ? o : {};
         Object.keys(o).filter(k => {
             if (tm && tm[k] && o[k]) {
                 if (tm[k].cls)
@@ -35,7 +36,10 @@ export var UObj;
                     Object.values(o[k]).forEach(v => crop(v, vCtor));
                 }
             }
-            return !!removeKeys === _keys.includes(k);
+            const rm = _removeKeys === _keys.includes(k);
+            if (!rm && op?.recursive && UType.isObject(o[k]))
+                crop(o[k], _keys, op);
+            return rm;
         }).forEach(k => delete o[k]);
         return o;
     }

package/build/esm/func/u.d.ts

@@ -2,8 +2,19 @@ import { Loggable, MaybePromise } from "../const/types";
 export declare function getJSTDate(d?: Date): Date;
 export declare function delay(sec: number): Promise<void>;
 export declare function int2array(size: number): number[];
+/**
+ * generate `Map` object from an array.
+ * @param array source array.
+ * @param keyGen predicate which generates map keys from a value of the array.
+ * @param op.accumulate flag whether values of the map are accumulated or not if key/value from the array conflict. default is true.
+ */
 export declare function array2map<K, T>(array: T[], keyGen: (e: T) => K): Map<K, T[]>;
-export declare function bitor(...bit: number[]): number;
+export declare function array2map<K, T>(array: T[], keyGen: (e: T) => K, op: {
+    accumulate: false;
+}): Map<K, T>;
+export declare function array2map<K, T>(array: T[], keyGen: (e: T) => K, op?: {
+    accumulate?: boolean;
+}): Map<K, T[]>;
 export interface RetryOption<T = MaybePromise> {
     /**
      * number of retries. default is 1.

package/build/esm/func/u.js

@@ -12,20 +12,18 @@ export function int2array(size) {
         throw new XjsErr(s_errCode, "size of the argument is not number.");
     return Array.from(Array(s).keys());
 }
-export function array2map(array, keyGen) {
+export function array2map(array, keyGen, op) {
+    const _acm = op?.accumulate ?? true;
     const map = new Map();
     for (const e of array) {
         const k = keyGen(e);
         if (map.has(k))
-            map.get(k).push(e);
+            _acm && map.get(k).push(e);
         else
-            map.set(k, [e]);
+            map.set(k, _acm ? [e] : e);
     }
     return map;
 }
-export function bitor(...bit) {
-    return bit.reduce((a, b) => a | b);
-}
 ;
 ;
 ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xjs-common",
-  "version": "13.1.0",
+  "version": "13.3.0",
   "description": "library modules for typescript that bundled general-purpose implementations.",
   "repository": {
     "type": "git",