wenay-common 1.0.89 → 1.0.90

package/lib/Common/ByteStream.d.ts

@@ -48,7 +48,7 @@ export declare class ByteStreamW {
     pushUnicode(text: string | null): this;
 }
 type ReaderFromBytes<T> = {
-    read(stream: ByteStreamR | any): T;
+    read(stream: ByteStreamR): T;
 };
 declare class ByteStreamR_<throwable extends boolean> {
     protected _wstream?: Readonly<ByteStreamW>;
@@ -83,8 +83,8 @@ declare class ByteStreamR_<throwable extends boolean> {
     readArray<T>(func: (stream: ByteStreamR) => NonNullable<T>): T[];
     readArray<T extends NumericTypes | Nullable<NumericTypes>>(type: T): T extends NumericTypes ? number[] : (number | null)[];
     readArray<T>(reader: ReaderFromBytes<NonNullable<T>>): T[];
-    protected _readArrayByFunc<T>(func: (stream: ByteStreamR | any) => T): T[] | null;
-    protected _readArrayOfNumeric(type: NumericTypes): (throwable extends true ? number : number)[] | null;
+    protected _readArrayByFunc<T>(func: (stream: ByteStreamR) => T): T[] | null;
+    protected _readArrayOfNumeric(type: NumericTypes): any;
     protected _readArrayByReader<T>(reader: ReaderFromBytes<T>): T[] | null;
     private _readNullableString;
     readAnsi(): string | null;

package/lib/Common/Color.d.ts

@@ -2,7 +2,7 @@ declare type Nominal<T, Name extends string> = T & {
     [Symbol.species]: Name;
 };
 export type ColorNumber = Nominal<number, 'Color'>;
-export type ColorString = `rgb(${number},${number},${number})` | `rgba(${number},${number},${number},${number})`;
+export type ColorString = `rgb(${number},${number},${number})` | `rgba(${number},${number},${number},${number})` | `#${string}`;
 export type ColorRGB = Readonly<{
     red: number;
     green: number;

package/lib/Common/Common.d.ts

@@ -1,9 +1,11 @@
 import { Immutable, KeysWithoutType, Mutable, MutableFull, ReadonlyFull } from "./BaseTypes";
+import "./node_console";
 export declare function GetEnumKeys<TT extends {
     [key: string]: any;
 }>(T: TT): readonly (keyof typeof T)[];
 type const_Date = Omit<Date, "setTime" | "setFullYear" | "setMonth" | "setDate" | "setHours" | "setMinutes" | "setSeconds" | "setMilliseconds" | "setUTCFullYear" | "setUTCMonth" | "setUTCDate" | "setUTCHours" | "setUTCMinutes" | "setUTCSeconds" | "setUTCMilliseconds">;
-export declare function isDate<T>(value: T & (Extract<T, const_Date>)): value is Extract<T, const_Date>;
+export declare function isDate<T>(value: T & (Extract<T, const_Date> extends never ? never : T)): value is Extract<typeof value, const_Date>;
+export { Mutable };
 export declare function shallowClone<T>(val: T): Mutable<T>;
 export declare function _deepClone<T>(src: T, map?: Map<object, object>): T;
 export declare function deepClone<T>(object: T): T;
@@ -12,13 +14,17 @@ export declare function deepCloneObject<T extends object>(object: T): T;
 export declare function deepCloneObjectMutable<T extends object>(object: T): MutableFull<T>;
 export declare function toImmutable<T extends object>(object: T): Immutable<T>;
 export declare function readonlyFull<T>(arg: T): ReadonlyFull<T>;
+export declare function deepEqual<T extends {
+    [key: string]: any;
+}>(object1: T, object2: T): boolean;
+export declare function shallowEqual<T extends {
+    [key: string]: unknown;
+} | undefined>(object1: T, object2: T): boolean;
+export declare function arrayShallowEqual<T extends unknown>(arr1: readonly T[], arr2: readonly T[]): boolean;
 export declare function sleepAsync(msec?: number): Promise<unknown>;
 export declare class CBase {
     readonly [key: number]: void;
 }
-export declare function GetEnumValues(T: {
-    [key: string]: any;
-}): readonly any[];
 export declare enum E_SORTMODE {
     DESCEND = 0,
     ASCEND = 1
@@ -65,28 +71,36 @@ export declare function CreateArrayProxy<T extends {
 }, T2 extends {
     [key: number]: T[number];
 }>(target: T, srcArray: T2): T;
+declare class __NumMap<T> {
+    [nkey: number]: T;
+    keys(): Generator<number, void, unknown>;
+    values(): Generator<T, void, unknown>;
+    entries(): Generator<readonly [number, T], void, unknown>;
+    clone(): __NumMap<unknown> & this;
+    clear(): void;
+}
 export declare class __MyMap<K extends {
     valueOf(): number;
 }, V> {
-    protected map: {
-        [nkey: number]: {
-            key: K;
-            value: V;
-        };
-    };
+    protected map: __NumMap<{
+        key: K;
+        value: V;
+    }>;
     protected keys?: readonly K[] | null;
     protected values?: readonly V[] | null;
     protected createArrays(): void;
-    protected OnModify(key: K): void;
+    protected OnModify?(key: K): void;
     Set(key: K, value: V): void;
     Get(key: K): V | undefined;
     Contains(key: K): boolean;
     TryAdd(key: K, value: V): boolean;
     Add(key: K, value: V): void;
     Remove(key: K): void;
+    Clear(): void;
     Count(): number;
     get sortedKeys(): readonly K[];
     get Values(): readonly V[];
+    assign(other: __MyMap<K, V>): void;
 }
 export declare class MyMap<K extends {
     valueOf(): number;
@@ -186,12 +200,6 @@ export declare class Mutex {
     static createLock(): PromiseLike<() => void>;
 }
 export declare function copyToClipboard(textToCopy: string): Promise<any>;
-export declare function deepEqual<T extends {
-    [key: string]: any;
-}>(object1: T, object2: T): boolean;
-export declare function shallowEqual<T extends {
-    [key: string]: any;
-} | undefined>(object1: T, object2: T): boolean;
 export type ObjectID<TObject, TOwner> = {
     readonly value: number;
     readonly [Symbol.species]: ObjectID<TObject, TOwner>;
@@ -231,4 +239,3 @@ export declare class CCachedValue2<TKey extends [any, any], TVal> extends CCache
     constructor();
 }
 export declare function isObjectCastableTo<T extends object>(object: object, members: readonly (keyof T)[]): object is T;
-export {};

package/lib/Common/Common.js

@@ -1,7 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CCachedValueT = exports.WeakMapExt = exports.MapExt = exports.CObjectID = exports.shallowEqual = exports.deepEqual = exports.copyToClipboard = exports.Mutex = exports.MyTimerInterval = exports.createCancellableTaskWrapper = exports.createCancellableTimer = exports.CancelablePromise = exports.CancelToken = exports.JSON_clone = exports.VirtualItems = exports.ArraySet = exports.ArrayMap = exports.StructSet = exports.StructMap = exports.MyNumMap = exports.MyMap = exports.__MyMap = exports.CreateArrayProxy = exports.ArrayItemHandler = exports.DblToStrAuto = exports.GetDblPrecision = exports.GetDblPrecision2 = exports.MaxCommonDivisorOnArray = exports.MaxCommonDivisor = exports.NormalizeDouble = exports._BSearchNearest = exports.BSearchNearest = exports.BSearchDefault = exports.BSearchAsync = exports.BSearch = exports.E_MATCH = exports.E_SORTMODE = exports.GetEnumValues = exports.CBase = exports.sleepAsync = exports.readonlyFull = exports.toImmutable = exports.deepCloneObjectMutable = exports.deepCloneObject = exports.deepCloneMutable = exports.deepClone = exports._deepClone = exports.shallowClone = exports.isDate = exports.GetEnumKeys = void 0;
+exports.CCachedValueT = exports.WeakMapExt = exports.MapExt = exports.CObjectID = exports.copyToClipboard = exports.Mutex = exports.MyTimerInterval = exports.createCancellableTaskWrapper = exports.createCancellableTimer = exports.CancelablePromise = exports.CancelToken = exports.JSON_clone = exports.VirtualItems = exports.ArraySet = exports.ArrayMap = exports.StructSet = exports.StructMap = exports.MyNumMap = exports.MyMap = exports.__MyMap = exports.CreateArrayProxy = exports.ArrayItemHandler = exports.DblToStrAuto = exports.GetDblPrecision = exports.GetDblPrecision2 = exports.MaxCommonDivisorOnArray = exports.MaxCommonDivisor = exports.NormalizeDouble = exports._BSearchNearest = exports.BSearchNearest = exports.BSearchDefault = exports.BSearchAsync = exports.BSearch = exports.E_MATCH = exports.E_SORTMODE = exports.CBase = exports.sleepAsync = exports.arrayShallowEqual = exports.shallowEqual = exports.deepEqual = exports.readonlyFull = exports.toImmutable = exports.deepCloneObjectMutable = exports.deepCloneObject = exports.deepCloneMutable = exports.deepClone = exports._deepClone = exports.shallowClone = exports.isDate = exports.GetEnumKeys = void 0;
 exports.isObjectCastableTo = exports.CCachedValue2 = void 0;
+require("./node_console");
 function GetEnumKeys(T) { return Object.keys(T).filter(k => isNaN(k)); }
 exports.GetEnumKeys = GetEnumKeys;
 function isDate(value) {
@@ -10,6 +34,12 @@ function isDate(value) {
 exports.isDate = isDate;
 {
     let aaa;
+    let bbb;
+    if (isDate(bbb))
+        bbb.getDate();
+    let ccc;
+    if (isDate(ccc))
+        ccc.getDate();
 }
 if (0)
     Object.prototype.valueOf = function () {
@@ -74,6 +104,48 @@ function toImmutable(object) {
 exports.toImmutable = toImmutable;
 function readonlyFull(arg) { return arg; }
 exports.readonlyFull = readonlyFull;
+function deepEqual(object1, object2) {
+    if (object1 == object2)
+        return true;
+    const keys1 = Object.keys(object1);
+    const keys2 = Object.keys(object2);
+    if (keys1.length != keys2.length)
+        return false;
+    for (const key of keys1) {
+        const val1 = object1[key];
+        const val2 = object2[key];
+        if (val1 === val2)
+            continue;
+        const areObjects = typeof (val1) == "object" && typeof (val2) == "object" && val1 != null && val2 != null;
+        if (!areObjects || !deepEqual(val1, val2))
+            return false;
+    }
+    return true;
+}
+exports.deepEqual = deepEqual;
+function shallowEqual(object1, object2) {
+    if (!object1 || !object2)
+        return object1 == object2;
+    const keys1 = Object.keys(object1);
+    const keys2 = Object.keys(object2);
+    if (keys1.length != keys2.length) {
+        return false;
+    }
+    for (const key of keys1) {
+        const val1 = object1[key];
+        const val2 = object2[key];
+        if (val1 !== val2)
+            return false;
+    }
+    return true;
+}
+exports.shallowEqual = shallowEqual;
+function arrayShallowEqual(arr1, arr2) {
+    if (arr1.length != arr2.length)
+        return false;
+    return arr1.every((item, i) => arr2[i] == item);
+}
+exports.arrayShallowEqual = arrayShallowEqual;
 async function sleepAsync(msec = 0) {
     return new Promise((resolve, reject) => { setTimeout(resolve, msec); });
 }
@@ -81,10 +153,6 @@ exports.sleepAsync = sleepAsync;
 class CBase {
 }
 exports.CBase = CBase;
-function GetEnumValues(T) { let arr = []; for (let k of Object.keys(T))
-    if (isNaN(k))
-        arr.push(T[k]); return arr; }
-exports.GetEnumValues = GetEnumValues;
 var E_SORTMODE;
 (function (E_SORTMODE) {
     E_SORTMODE[E_SORTMODE["DESCEND"] = 0] = "DESCEND";
@@ -330,38 +398,55 @@ function CreateArrayProxy(target, getterOrArray, setter) {
     return new Proxy(target, ArrayItemHandler((target, i) => getterOrArray(i), setter ? (target, i, value) => setter(i, value) : undefined));
 }
 exports.CreateArrayProxy = CreateArrayProxy;
+class __NumMap {
+    *keys() { for (let keyStr of Object.keys(this)) {
+        let key = Number(keyStr);
+        yield key;
+    } }
+    *values() { for (let keyStr of Object.keys(this)) {
+        yield this[keyStr];
+    } }
+    *entries() { for (let keyStr of Object.keys(this)) {
+        let key = Number(keyStr);
+        yield [key, this[keyStr]];
+    } }
+    clone() { return Object.assign(new __NumMap, this); }
+    clear() { for (let k of Object.keys(this))
+        delete this[k]; }
+}
 class __MyMap {
-    map = {};
+    map = new __NumMap;
     keys;
     values;
     createArrays() {
         let thisKeys = this.keys = [];
         let thisValues = this.values = [];
-        for (let key of Object.keys(this.map))
-            if (!isNaN(Number(key))) {
-                let pair = this.map[key];
-                thisKeys.push(pair.key);
-                thisValues.push(pair.value);
-            }
+        for (let pair of this.map.values()) {
+            thisKeys.push(pair.key);
+            thisValues.push(pair.value);
+        }
     }
     OnModify(key) { }
-    Set(key, value) { this.map[key.valueOf()] = { key, value }; this.keys = null; this.OnModify(key); }
+    Set(key, value) { this.map[key.valueOf()] = { key, value }; this.keys = null; this.OnModify?.(key); }
     Get(key) { let pair = this.map[key.valueOf()]; return pair ? pair.value : undefined; }
     Contains(key) { return this.map[key.valueOf()] != undefined; }
     TryAdd(key, value) { if (!this.Contains(key))
         return false; this.Set(key, value); return true; }
     Add(key, value) { if (!this.TryAdd(key, value))
         throw `Key ${key} is already exists for ${typeof value}`; }
-    Remove(key) { delete (this.map[key.valueOf()]); this.keys = null; this.OnModify(key); }
+    Remove(key) { delete (this.map[key.valueOf()]); this.keys = null; this.OnModify?.(key); }
+    Clear() { let pairs = this.OnModify ? this.map.values() : []; this.map.clear(); this.keys = undefined; this.values = undefined; for (let p of pairs)
+        this.OnModify(p.key); }
     Count() { return this.sortedKeys.length; }
     get sortedKeys() { if (!this.keys)
         this.createArrays(); return this.keys; }
     get Values() { if (!this.keys)
         this.createArrays(); return this.values; }
+    assign(other) { this.map = other.map.clone(); this.keys = other.keys; this.values = other.values; }
 }
 exports.__MyMap = __MyMap;
 class MyMap extends __MyMap {
-    Clone() { let newobj = new MyMap(); newobj.map = { ...this.map }; newobj.keys = this.keys; newobj.values = this.values; return newobj; }
+    Clone() { let newobj = new MyMap(); newobj.assign(this); return newobj; }
 }
 exports.MyMap = MyMap;
 class MyNumMap extends __MyMap {
@@ -369,7 +454,7 @@ class MyNumMap extends __MyMap {
         super();
         return CreateArrayProxy(this, (i) => this.Get(i), (key, value) => this.Set(key, value ?? (() => { throw "undefined value"; })()));
     }
-    Clone() { let newobj = new MyNumMap(); newobj.map = { ...this.map }; newobj.keys = this.keys; newobj.values = this.values; return newobj; }
+    Clone() { let newobj = new MyNumMap(); newobj.assign(this); return newobj; }
 }
 exports.MyNumMap = MyNumMap;
 class StructMap {
@@ -433,7 +518,7 @@ class VirtualItems {
     constructor(itemGetter, lengthGetter) {
         this.getLength = lengthGetter;
         this.getValue = itemGetter;
-        return CreateArrayProxy(this, this.getValue);
+        return CreateArrayProxy(this, itemGetter);
     }
 }
 exports.VirtualItems = VirtualItems;
@@ -493,8 +578,7 @@ class MyTimerInterval {
     _timer;
     _onstop;
     constructor(period_ms, onTimer, onStop) { this._timer = setInterval(onTimer, period_ms); this._onstop = onStop; }
-    stop() { clearInterval(this._timer); if (this._onstop)
-        this._onstop(); }
+    stop() { clearInterval(this._timer); this._onstop?.(); }
 }
 exports.MyTimerInterval = MyTimerInterval;
 class Mutex {
@@ -523,7 +607,7 @@ exports.Mutex = Mutex;
 async function copyToClipboard(textToCopy) {
     const moduleName = 'child_process';
     if (typeof window != "object")
-        return (await Promise.resolve(`${moduleName}`).then(s => require(s))).spawn('clip').stdin.end(textToCopy);
+        return (await Promise.resolve(`${moduleName}`).then(s => __importStar(require(s)))).spawn('clip').stdin.end(textToCopy);
     if (navigator.clipboard && window.isSecureContext) {
         return navigator.clipboard.writeText(textToCopy);
     }
@@ -543,43 +627,6 @@ async function copyToClipboard(textToCopy) {
     }
 }
 exports.copyToClipboard = copyToClipboard;
-function deepEqual(object1, object2) {
-    if (object1 == object2)
-        return true;
-    const keys1 = Object.keys(object1);
-    const keys2 = Object.keys(object2);
-    if (keys1.length != keys2.length) {
-        return false;
-    }
-    for (const key of keys1) {
-        const val1 = object1[key];
-        const val2 = object2[key];
-        if (val1 === val2)
-            continue;
-        const areObjects = typeof (val1) == "object" && typeof (val2) == "object" && val1 != null && val2 != null;
-        if (!areObjects || !deepEqual(val1, val2))
-            return false;
-    }
-    return true;
-}
-exports.deepEqual = deepEqual;
-function shallowEqual(object1, object2) {
-    if (!object1 || !object2)
-        return object1 == object2;
-    const keys1 = Object.keys(object1);
-    const keys2 = Object.keys(object2);
-    if (keys1.length != keys2.length) {
-        return false;
-    }
-    for (const key of keys1) {
-        const val1 = object1[key];
-        const val2 = object2[key];
-        if (val1 !== val2)
-            return false;
-    }
-    return true;
-}
-exports.shallowEqual = shallowEqual;
 class CObjectID {
     static #id = 1;
     value = CObjectID.#id++;

package/lib/Common/Time.d.ts

@@ -1,4 +1,18 @@
 import { const_Date } from "./BaseTypes";
+export type DateString = `${number}-${number}-${number}`;
+export type TimeStringHHMM = `${number}:${number}`;
+export type TimeStringHHMMSS = `${number}:${number}:${number}`;
+export type TimeStringHHMMSS_ms = `${number}:${number}:${number}.${number}`;
+type TimeString_ = ` ${TimeStringHHMM | TimeStringHHMMSS | TimeStringHHMMSS_ms}`;
+export type DateTimeString = `${DateString}${TimeString_ | ""}${"Z" | ""}`;
+export { const_Date };
+export declare const H1_S = 3600;
+export declare const D1_S: number;
+export declare const W1_S: number;
+export declare const W1_MS: number;
+export declare const D1_MS: number;
+export declare const H1_MS: number;
+export declare const M1_MS: number;
 declare enum __E_TF {
     S1 = 1,
     S2 = 2,
@@ -30,15 +44,14 @@ declare enum __E_TF {
     H8 = 28,
     H12 = 29,
     D1 = 30,
-    W1 = 31
+    W1 = 31,
+    MN1 = 32,
+    MN2 = 33,
+    MN3 = 34,
+    MN4 = 35,
+    MN6 = 36,
+    Y1 = 37
 }
-export declare const H1_S = 3600;
-export declare const D1_S: number;
-export declare const W1_S: number;
-export declare const W1_MS: number;
-export declare const D1_MS: number;
-export declare const H1_MS: number;
-export declare const M1_MS: number;
 export interface IPeriod {
     readonly msec: number;
     readonly name: string;
@@ -58,6 +71,8 @@ export declare class TIME_UNIT {
     static readonly Hour: TIME_UNIT;
     static readonly Day: TIME_UNIT;
     static readonly Week: TIME_UNIT;
+    static readonly Month: TIME_UNIT;
+    static readonly Year: TIME_UNIT;
     readonly [key: number]: void;
 }
 declare type Nominal<T, Name extends string> = T & {
@@ -75,10 +90,13 @@ export declare class TF implements IPeriod {
     valueOf(): number;
     toString(): string;
     private constructor();
+    private static constructFromSec;
     static get<T extends string>(name: T): TF | (T extends __E_TF_KEY ? never : null);
     static getAsserted(name: string): TF;
-    static fromName<T extends string>(name: T): TF | (T extends "S1" | "S2" | "S3" | "S4" | "S5" | "S6" | "S10" | "S12" | "S15" | "S20" | "S30" | "M1" | "M2" | "M3" | "M4" | "M5" | "M6" | "M10" | "M12" | "M15" | "M20" | "M30" | "H1" | "H2" | "H3" | "H4" | "H6" | "H8" | "H12" | "D1" | "W1" ? never : null);
+    static fromName<T extends string>(name: T): TF | (T extends "S1" | "S2" | "S3" | "S4" | "S5" | "S6" | "S10" | "S12" | "S15" | "S20" | "S30" | "M1" | "M2" | "M3" | "M4" | "M5" | "M6" | "M10" | "M12" | "M15" | "M20" | "M30" | "H1" | "H2" | "H3" | "H4" | "H6" | "H8" | "H12" | "D1" | "W1" | "MN1" | "MN2" | "MN3" | "MN4" | "MN6" | "Y1" ? never : null);
     static fromSec(value: number): TF | null;
+    static createCustomFromSec(sec: number): TF;
+    static createCustom(unit: TIME_UNIT, unitCount: number): TF;
     static readonly all: readonly TF[];
     private static readonly _mapBySec;
     static readonly S1: TF;
@@ -112,6 +130,12 @@ export declare class TF implements IPeriod {
     static readonly H12: TF;
     static readonly D1: TF;
     static readonly W1: TF;
+    static readonly MN1: TF;
+    static readonly MN2: TF;
+    static readonly MN3: TF;
+    static readonly MN4: TF;
+    static readonly MN6: TF;
+    static readonly Y1: TF;
     static min(): never;
     static min(...args: [TF, ...TF[]] | [[TF, ...TF[]]]): TF;
     static min(...args: TF[] | [Iterable<TF>]): TF | null;
@@ -146,9 +170,11 @@ export declare class Period implements IPeriod {
     static Name(tf: TF): string;
     IndexFromTime(time: const_Date): number;
     getStartTime(currentTime: const_Date): MyDate;
-    static StartTimeForIndex(tf: TF, index: number): MyDate;
     private static getW1Shift_ms;
+    static W1Shift_ms: number;
+    static year0: number;
     static IndexFromTime(tf: TF, time: const_Date): number;
+    static StartTimeForIndex(tf: TF, index: number): MyDate;
     static StartTime(tf: TF, currentTime: const_Date, shiftPeriods?: number): MyDate;
     static EndTime(tf: TF, currentTime: const_Date): Date;
 }
@@ -178,4 +204,3 @@ export declare class CDelayer {
 type NullableTime = const_Date | undefined | null;
 export declare function MinTime<T1 extends NullableTime, T2 extends NullableTime>(time1: T1, time2: T2): T1 | NonNullable<T2>;
 export declare function MaxTime<T1 extends NullableTime, T2 extends NullableTime>(time1: T1, time2: T2): T1 | NonNullable<T2>;
-export {};

package/lib/Common/Time.js

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MaxTime = exports.MinTime = exports.CDelayer = exports.durationToStr_h_mm_ss_ms = exports.durationToStr_h_mm_ss = exports.durationToStrNullable = exports.durationToStr = exports.toPrintObject = exports.convertDatesToStrings = exports.timeToString_yyyymmdd_hhmmss_offset = exports.timeToString_yyyymmdd_hhmm_offset = exports.timeLocalToStr_yyyymmdd_hhmmss_ms = exports.timeLocalToStr_yyyymmdd_hhmmss = exports.timeLocalToStr_yyyymmdd_hhmm = exports.timeLocalToStr_yyyymmdd = exports.timeLocalToStr_hhmmss_ms = exports.timeLocalToStr_hhmmss = exports.timeToStr_yyyymmdd_hhmmss_ms = exports.timeToStr_yyyymmdd_hhmmss = exports.timeToStr_yyyymmdd_hhmm = exports.timeToStr_hhmmss = exports.timeToStr_hhmmss_ms = exports.Period = exports.PeriodSpan = exports.TF = exports.TIME_UNIT = exports.M1_MS = exports.H1_MS = exports.D1_MS = exports.W1_MS = exports.W1_S = exports.D1_S = exports.H1_S = void 0;
-const Common_1 = require("./Common");
+const common_1 = require("./common");
 function GetEnumKeys(T) { return Object.keys(T).filter(k => isNaN(k)); }
+{
+    let t1 = "2022-05-01";
+    let t2 = "2022-05-01 01:01";
+    let t3 = "2022-05-01 01:01:10";
+}
+exports.H1_S = 3600;
+exports.D1_S = 3600 * 24;
+exports.W1_S = exports.D1_S * 7;
+exports.W1_MS = exports.W1_S * 1000;
+exports.D1_MS = exports.D1_S * 1000;
+exports.H1_MS = exports.H1_S * 1000;
+exports.M1_MS = 60 * 1000;
 var __E_TF;
 (function (__E_TF) {
     __E_TF[__E_TF["S1"] = 1] = "S1";
@@ -36,16 +48,15 @@ var __E_TF;
     __E_TF[__E_TF["H12"] = 29] = "H12";
     __E_TF[__E_TF["D1"] = 30] = "D1";
     __E_TF[__E_TF["W1"] = 31] = "W1";
+    __E_TF[__E_TF["MN1"] = 32] = "MN1";
+    __E_TF[__E_TF["MN2"] = 33] = "MN2";
+    __E_TF[__E_TF["MN3"] = 34] = "MN3";
+    __E_TF[__E_TF["MN4"] = 35] = "MN4";
+    __E_TF[__E_TF["MN6"] = 36] = "MN6";
+    __E_TF[__E_TF["Y1"] = 37] = "Y1";
 })(__E_TF || (__E_TF = {}));
 ;
-exports.H1_S = 3600;
-exports.D1_S = 3600 * 24;
-exports.W1_S = exports.D1_S * 7;
-exports.W1_MS = exports.W1_S * 1000;
-exports.D1_MS = exports.D1_S * 1000;
-exports.H1_MS = exports.H1_S * 1000;
-exports.M1_MS = 60 * 1000;
-const __Tf_S = [0, 1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60, 120, 180, 240, 300, 360, 600, 720, 900, 1200, 1800, exports.H1_S, exports.H1_S * 2, exports.H1_S * 3, exports.H1_S * 4, exports.H1_S * 6, exports.H1_S * 8, exports.H1_S * 12, exports.D1_S, exports.W1_S];
+const __Tf_S = [0, 1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60, 120, 180, 240, 300, 360, 600, 720, 900, 1200, 1800, exports.H1_S, 2 * exports.H1_S, 3 * exports.H1_S, 4 * exports.H1_S, 6 * exports.H1_S, 8 * exports.H1_S, 12 * exports.H1_S, exports.D1_S, exports.W1_S, 30 * exports.D1_S, 60 * exports.D1_S, 90 * exports.D1_S, 120 * exports.D1_S, 180 * exports.D1_S, 365 * exports.D1_S];
 class TIME_UNIT {
     index;
     msec;
@@ -65,7 +76,9 @@ class TIME_UNIT {
     static Minute = new TIME_UNIT(60 * 1000, "minute", "M");
     static Hour = new TIME_UNIT(exports.H1_S * 1000, "hour", "H");
     static Day = new TIME_UNIT(exports.D1_S * 1000, "day", "D");
-    static Week = new TIME_UNIT(exports.D1_S * 1000 * 7, "week", "W");
+    static Week = new TIME_UNIT(7 * exports.D1_S * 1000, "week", "W");
+    static Month = new TIME_UNIT(30 * exports.D1_S * 1000, "month", "MN");
+    static Year = new TIME_UNIT(365 * exports.D1_S * 1000, "year", "Y");
 }
 exports.TIME_UNIT = TIME_UNIT;
 class TF {
@@ -77,13 +90,21 @@ class TF {
     index;
     valueOf() { return this.msec; }
     toString() { return this.name; }
-    constructor(sec, name) {
-        this.sec = sec;
-        this.name = name;
-        this.msec = sec * 1000;
-        this.index = __Tf_S.indexOf(sec);
-        this.unit = sec % exports.D1_S == 0 ? TIME_UNIT.Day : sec % exports.H1_S == 0 ? TIME_UNIT.Hour : sec % 60 == 0 ? TIME_UNIT.Minute : TIME_UNIT.Second;
-        this.unitCount = sec / this.unit.sec;
+    constructor(unit, unitCount, index, msec, name) {
+        this.unit = unit;
+        this.unitCount = unitCount;
+        this.msec = msec ?? unit.msec * unitCount;
+        this.sec = Math.floor(this.msec / 1000);
+        this.index = index;
+        this.name = name ?? (unit.sign + unitCount);
+    }
+    static constructFromSec(sec, name) {
+        let msec = sec * 1000;
+        let index = __Tf_S.indexOf(sec);
+        let units = [TIME_UNIT.Year, TIME_UNIT.Month, TIME_UNIT.Week, TIME_UNIT.Day, TIME_UNIT.Hour, TIME_UNIT.Minute, TIME_UNIT.Second, TIME_UNIT.MSecond];
+        let unit = units.find((u) => Math.floor(sec % u.sec) == 0);
+        let unitCount = Math.floor(sec / unit.sec);
+        return new TF(unit, unitCount, index, msec, name);
     }
     static get(name) {
         let key = __E_TF[name];
@@ -94,11 +115,13 @@ class TF {
     static getAsserted(name) { return TF.get(name) ?? (() => { throw "Unknown timeframe: " + name; })(); }
     static fromName(name) { return this.get(name); }
     static fromSec(value) { return this._mapBySec[value]; }
+    static createCustomFromSec(sec) { return TF.constructFromSec(sec); }
+    static createCustom(unit, unitCount) { return new TF(unit, unitCount, -1); }
     static all = function () {
         let i = 1;
         let arr = [];
         for (let key of GetEnumKeys(__E_TF)) {
-            arr[__E_TF[key]] = new TF(__Tf_S[i], key);
+            arr[__E_TF[key]] = TF.constructFromSec(__Tf_S[i], key);
             i++;
         }
         return arr;
@@ -140,6 +163,12 @@ class TF {
     static H12 = TF.get("H12");
     static D1 = TF.get("D1");
     static W1 = TF.get("W1");
+    static MN1 = TF.get("MN1");
+    static MN2 = TF.get("MN2");
+    static MN3 = TF.get("MN3");
+    static MN4 = TF.get("MN4");
+    static MN6 = TF.get("MN4");
+    static Y1 = TF.get("Y1");
     static min(...args) {
         let tfs = ((args[0] && !(args[0] instanceof TF)) ? args[0] : args);
         let index = 999;
@@ -182,41 +211,50 @@ class Period {
     get name() { return this.tf.name; }
     valueOf() { return this.msec; }
     span(time) { return new PeriodSpan(this.tf, time); }
-    constructor(tf) { this.tf = tf; return (0, Common_1.CreateArrayProxy)(this, (i) => new PeriodSpan(tf, i)); }
+    constructor(tf) { this.tf = tf; return (0, common_1.CreateArrayProxy)(this, (i) => new PeriodSpan(tf, i)); }
     static Seconds(tf) { return tf.sec; }
     static Name(tf) { return tf.name; }
     IndexFromTime(time) {
         return Period.IndexFromTime(this.tf, time);
     }
     getStartTime(currentTime) { return Period.StartTime(this.tf, currentTime); }
-    static StartTimeForIndex(tf, index) {
-        let tfmsec = Period.Seconds(tf) * 1000;
-        if (tf == TF.W1) {
-            return new MyDate(index * exports.W1_MS - this.getW1Shift_ms());
-        }
-        return new MyDate(index * tfmsec);
-    }
     static getW1Shift_ms() {
         const day0 = new Date(0).getUTCDay();
         const tshift = exports.D1_MS * Math.trunc((day0 + 6) % 7);
         return tshift;
     }
+    static W1Shift_ms = this.getW1Shift_ms();
+    static year0 = new Date(0).getUTCFullYear();
     static IndexFromTime(tf, time) {
-        if (tf == TF.W1) {
-            return Math.floor((time.valueOf() + Period.getW1Shift_ms()) / exports.W1_MS);
+        const tf_msec = tf.msec;
+        if (tf.unit == TIME_UNIT.Week) {
+            return Math.floor((time.valueOf() + Period.W1Shift_ms) / tf_msec);
+        }
+        if (tf.unit == TIME_UNIT.Month) {
+            return Math.floor(((time.getFullYear() - Period.year0) * 12 + time.getMonth()) / tf.unitCount);
         }
-        const tfmsec = Period.Seconds(tf) * 1000;
-        return Math.floor(time.valueOf() / tfmsec);
+        if (tf.unit == TIME_UNIT.Year) {
+            return time.getFullYear() - Period.year0;
+        }
+        return Math.floor(time.valueOf() / tf_msec);
     }
-    static StartTime(tf, currentTime, shiftPeriods = 0) {
-        if (tf == TF.W1) {
-            const tshift = Period.getW1Shift_ms();
-            return new MyDate(Math.floor((currentTime.valueOf() + tshift) / exports.W1_MS + shiftPeriods) * exports.W1_MS - tshift);
+    static StartTimeForIndex(tf, index) {
+        const tf_msec = tf.msec;
+        if (tf.unit == TIME_UNIT.Week) {
+            return new MyDate(index * tf_msec - this.getW1Shift_ms());
         }
-        const tfmsec = Period.Seconds(tf) * 1000;
-        return new MyDate(Math.floor(currentTime.valueOf() / tfmsec + shiftPeriods) * tfmsec);
+        if (tf.unit == TIME_UNIT.Month) {
+            return new MyDate(Period.year0 + Math.floor(index * tf.unitCount / 12), Math.floor(index * tf.unitCount % 12), 1);
+        }
+        if (tf.unit == TIME_UNIT.Year)
+            return new MyDate(Period.year0 + index, 0, 1);
+        return new MyDate(index * tf_msec);
+    }
+    static StartTime(tf, currentTime, shiftPeriods = 0) {
+        let index = this.IndexFromTime(tf, currentTime) + shiftPeriods;
+        return this.StartTimeForIndex(tf, index);
     }
-    static EndTime(tf, currentTime) { return Period.StartTime(tf, currentTime, +1).ToShiftedMsTime(-1); }
+    static EndTime(tf, currentTime) { return this.StartTime(tf, currentTime, +1).ToShiftedMsTime(-1); }
 }
 exports.Period = Period;
 function str2(n) { return n <= 9 ? '0' + n : '' + n; }

package/lib/Common/commonsServer.d.ts

@@ -3,7 +3,11 @@ export type tRequestScreenerT<T> = {
     callbacksId?: string[];
     request: any[];
 };
-export declare function funcPromiseServer<T extends object>(data: screenerSoc<tSocketData<tRequestScreenerT<T>>>, obj: T): void;
+export declare function funcPromiseServer<T extends object>(data: screenerSoc<tSocketData<tRequestScreenerT<T>>>, obj: T, myCatch?: (r: {
+    data: string | any;
+    key: keyof T;
+    arguments: any[];
+}) => void): void;
 export declare function funcPromiseServer2<T extends object>(sendMessage: screenerSoc222<tSocketData<tRequestScreenerT<T>>>, obj: T): (datum: any) => Promise<void>;
 export declare function funcPromiseServerPost<T extends object>(data: screenerPost<tRequestScreenerT<T>>, obj: T): void;
 type tSocketData<T> = ({
@@ -83,10 +87,15 @@ export declare function CreatAPIFacadeClient<T extends object>({ socketKey, sock
     space: tMethodToPromise2<typeNoVoid2<T>>;
     all: tMethodToPromise2<T>;
 };
-export declare function CreatAPIFacadeServer<T extends object>({ object, socket, socketKey }: {
+export declare function CreatAPIFacadeServer<T extends object>({ object, socket, socketKey, myCatch }: {
     socket: any;
     object: T;
     socketKey: string;
+    myCatch?: (r: {
+        data: string | any;
+        key: keyof T;
+        arguments: any[];
+    }) => void;
 }): void;
 export declare function fMiniTest(): void;
 export declare class CTestWeb {

package/lib/Common/commonsServer.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CTestWeb = exports.fMiniTest = exports.CreatAPIFacadeServer = exports.CreatAPIFacadeClient = exports.funcScreenerClient3 = exports.funcScreenerClient2 = exports.FFuncMyF = exports.funcForWebSocket = exports.funcPromiseServerPost = exports.funcPromiseServer2 = exports.funcPromiseServer = void 0;
-const Common_1 = require("./Common");
-function funcPromiseServer(data, obj) {
+const common_1 = require("./common");
+function funcPromiseServer(data, obj, myCatch) {
     const buf = data;
     data.api({
         onMessage: async (datum) => {
@@ -33,13 +33,13 @@ function funcPromiseServer(data, obj) {
                 const a = await (async () => buf(...request))()
                     .catch((e) => {
                     data.sendMessage({ mapId: datum.mapId, error: e });
-                    throw e;
+                    throw { data: e, key: key, arguments: request };
                 });
                 if (datum.wait !== false)
                     data.sendMessage({ mapId: datum.mapId, data: a ?? undefined });
             }
             else
-                throw "это не функция";
+                throw myCatch?.({ data: "это не функция", key: key, arguments: request });
         }
     });
 }
@@ -236,11 +236,14 @@ function CreatAPIFacadeClient({ socketKey, socket }) {
     };
 }
 exports.CreatAPIFacadeClient = CreatAPIFacadeClient;
-function CreatAPIFacadeServer({ object, socket, socketKey }) {
+function CreatAPIFacadeServer({ object, socket, socketKey, myCatch }) {
     funcPromiseServer({
         sendMessage: (data) => socket.emit(socketKey, data),
         api: (api) => {
-            socket.on(socketKey, (d) => api.onMessage(d));
+            socket.on(socketKey, (d) => (async () => api.onMessage(d))()
+                .catch((e) => {
+                myCatch?.(e);
+            }));
         }
     }, object);
 }
@@ -253,7 +256,7 @@ class CTestWeb {
         return a + b;
     }
     async func2(a, b) {
-        await (0, Common_1.sleepAsync)(1000);
+        await (0, common_1.sleepAsync)(1000);
         return a * b;
     }
     fun3(a, b) {

package/lib/Common/inputAutoStep.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetAutoStepForElement = void 0;
-const Common_1 = require("./Common");
+const common_1 = require("./common");
 function SetAutoStepForElement(element, params = { maxStep: 1 }) {
     function parse(valueStr) { let val = parseFloat(valueStr); return isNaN(val) ? null : val; }
     const { minStep, maxStep = 1 } = params;
-    const maxDigits = minStep ? (0, Common_1.GetDblPrecision)(minStep) : undefined;
+    const maxDigits = minStep ? (0, common_1.GetDblPrecision)(minStep) : undefined;
     const stepDefault = parse(element.step);
     const minDefault = parse(element.min);
     const maxDefault = parse(element.max);
@@ -18,12 +18,12 @@ function SetAutoStepForElement(element, params = { maxStep: 1 }) {
         let digits = (dotPos >= 0) ? valueStr.length - dotPos - 1 : 0;
         digits = Math.max(digits, minDigits);
         if (digits > 10)
-            digits = (0, Common_1.GetDblPrecision2)(parseFloat(valueStr), minDigits, 10);
+            digits = (0, common_1.GetDblPrecision2)(parseFloat(valueStr), minDigits, 10);
         if (maxDigits != null)
             digits = Math.min(digits, maxDigits);
-        let step = (0, Common_1.NormalizeDouble)(Math.pow(0.1, digits), digits);
+        let step = (0, common_1.NormalizeDouble)(Math.pow(0.1, digits), digits);
         if (minStep)
-            step = (0, Common_1.NormalizeDouble)(Math.round(step / minStep) * minStep, digits);
+            step = (0, common_1.NormalizeDouble)(Math.round(step / minStep) * minStep, digits);
         if (maxDefault != null && minDefault != null)
             if (maxDefault - minDefault < step * 2)
                 return _step;

package/lib/Common/node_console.d.ts

@@ -1 +1,2 @@
+/// <reference lib="esnext" />
 export {};

package/lib/Common/node_console.js

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 let wrapCallSite;
 if (1)
-    if (1 && typeof self != 'object' && typeof window != "object") {
+    if (typeof self != 'object' && typeof window != "object") {
+        let require = eval('require');
         try {
             require('source-map-support').install();
             wrapCallSite = require('source-map-support').wrapCallSite;
         }
-        catch {
+        catch (e) {
+            console.warn(e);
         }
         for (let methodName of ['debug', 'log', 'warn', 'error']) {
             const originalLoggingMethod = console[methodName];

package/lib/Common/waitRun.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitRun = void 0;
-const Common_1 = require("./Common");
+const common_1 = require("./common");
 function waitRun() {
     let lastTime = Date.now();
     let funcAsync = Promise.resolve();
@@ -26,7 +26,7 @@ function waitRun() {
             if (!busy) {
                 busy = true;
                 funcAsync = funcAsync.then(async () => {
-                    await (0, Common_1.sleepAsync)(ms);
+                    await (0, common_1.sleepAsync)(ms);
                     lastFunc1?.();
                     busy = false;
                     return;

package/lib/Exchange/Bars.d.ts

@@ -1,6 +1,6 @@
 /// <reference path="../Common/BaseTypes.d.ts" />
-import * as lib from "../Common/Common";
-import { IItems, ParsedUrlQueryInputMy, SearchMatchMode } from "../Common/Common";
+import * as lib from "../Common/common";
+import { IItems, ParsedUrlQueryInputMy, SearchMatchMode } from "../Common/common";
 import { TF } from "../Common/Time";
 import { ByteStreamR, ByteStreamW, Nullable, NumericTypes } from "../Common/ByteStream";
 import { const_Date, ReadonlyFull } from "../Common/BaseTypes";

package/lib/Exchange/Bars.js

@@ -10,13 +10,25 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBarsShallow = exports.CTimeSeries = exports.CTimeSeriesBase = exports.CreateRandomBars = exports.CBarsMutableExt = exports.CBarsMutable = exports.CBarsMutableBase = exports.CBars = exports.CBarsBase = exports.IBars = exports.CTick = exports.CBar = exports.CBarBase = exports.OHLC = void 0;
-const lib = require("../Common/Common");
-const Common_1 = require("../Common/Common");
+const lib = __importStar(require("../Common/common"));
+const common_1 = require("../Common/common");
 const Time_1 = require("../Common/Time");
 __exportStar(require("../Common/Time"), exports);
 class OHLC {
@@ -102,7 +114,7 @@ class IBars {
     get firstTime() { return this.count > 0 ? this.data[0].time : null; }
     get lastTime() { return this.count > 0 ? this.data[this.count - 1].time : null; }
     get lastCloseTime() { return this.count > 0 ? this.closeTime(this.count - 1) : null; }
-    Values(getter) { return new Common_1.VirtualItems((i) => getter(this.data[i]), () => this.data.length); }
+    Values(getter) { return new common_1.VirtualItems((i) => getter(this.data[i]), () => this.data.length); }
     get times() { return this.Values((bar) => bar.time); }
     get opens() { return this.Values((bar) => bar.open); }
     get highs() { return this.Values((bar) => bar.high); }
@@ -112,7 +124,7 @@ class IBars {
     entries() { return this.data.entries(); }
     indexOf(time, match) {
         time = Time_1.Period.StartTime(this.Tf, time);
-        return lib.BSearch(this.data, time, (bar, time) => bar.time.valueOf() - time.valueOf(), match ? match : Common_1.BSearch.EQUAL);
+        return lib.BSearch(this.data, time, (bar, time) => bar.time.valueOf() - time.valueOf(), match ? match : common_1.BSearch.EQUAL);
     }
     indexOfLessOrEqual(time) { return this.indexOf(time, "lessOrEqual"); }
     concat(newBars) {
@@ -139,8 +151,8 @@ class IBars {
             yield this.data[i];
     }
     getArray(startTime, lastTime) {
-        let istart = startTime ? this.indexOf(startTime, Common_1.BSearch.GREAT_OR_EQUAL) : 0;
-        let ilast = lastTime ? this.indexOf(lastTime, Common_1.BSearch.LESS_OR_EQUAL) : this.data.length - 1;
+        let istart = startTime ? this.indexOf(startTime, common_1.BSearch.GREAT_OR_EQUAL) : 0;
+        let ilast = lastTime ? this.indexOf(lastTime, common_1.BSearch.LESS_OR_EQUAL) : this.data.length - 1;
         if (istart == -1 || istart > ilast)
             return null;
         return this.data.slice(istart, ilast + 1);
@@ -359,8 +371,8 @@ function CreateRandomBars(tf, startTime, endTimeOrCount, startPrice = 100, volat
     let bars = new Array(count);
     let price = startPrice;
     let periodSpan = period.span(startTime);
-    let digits = (0, Common_1.GetDblPrecision)(tickSizeNum);
-    function norm(value) { return (0, Common_1.NormalizeDouble)(Math.round(value / tickSizeNum) * tickSizeNum, digits); }
+    let digits = (0, common_1.GetDblPrecision)(tickSizeNum);
+    function norm(value) { return (0, common_1.NormalizeDouble)(Math.round(value / tickSizeNum) * tickSizeNum, digits); }
     const [volatFactor, volatNum] = typeof volatility == "string" ? [Number(volatility.slice(0, -1)) / 100, undefined] : [undefined, volatility];
     for (let i = 0; i < count; i++) {
         const volat = volatNum ?? volatFactor * price;
@@ -385,9 +397,9 @@ class CTimeSeriesBase {
     get times() { return new lib.VirtualItems((i) => this.time(i), () => this.length); }
     get values() { return new lib.VirtualItems((i) => this.value(i), () => this.length); }
     get length() { return this.points.length; }
-    indexOf(time, match) { return (0, Common_1.BSearch)(this.times, time, match); }
+    indexOf(time, match) { return (0, common_1.BSearch)(this.times, time, match); }
     constructor() {
-        return (0, Common_1.CreateArrayProxy)(this, (i) => this.points[i]);
+        return (0, common_1.CreateArrayProxy)(this, (i) => this.points[i]);
     }
     [Symbol.iterator]() { return this.points[Symbol.iterator](); }
 }
@@ -428,14 +440,14 @@ function _findBars(srcBars, barsToFind, mode) {
         return -1;
     let start = 0;
     let end = len - 1;
-    let iStart = (0, Common_1.BSearch)(srcBars, barsToFind[start].time, (bar, time) => bar.time.valueOf() - time.valueOf());
-    let iEnd = (0, Common_1.BSearch)(srcBars, barsToFind[end].time, (bar, time) => bar.time.valueOf() - time.valueOf());
+    let iStart = (0, common_1.BSearch)(srcBars, barsToFind[start].time, (bar, time) => bar.time.valueOf() - time.valueOf());
+    let iEnd = (0, common_1.BSearch)(srcBars, barsToFind[end].time, (bar, time) => bar.time.valueOf() - time.valueOf());
     if (iStart < 0 || iEnd < 0 || iEnd - iStart + 1 != len)
         return -1;
     let delta = start - iStart;
     if (mode == "deep") {
         for (let i = iStart; i <= iEnd; i++)
-            if (!(0, Common_1.deepEqual)(srcBars[i], barsToFind[i + delta]))
+            if (!(0, common_1.deepEqual)(srcBars[i], barsToFind[i + delta]))
                 return -1;
     }
     else

package/lib/Exchange/CParams.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeParamValuesToInfos = exports.GetSimpleParams = exports.enableAllParams = exports.iterateParams = exports.isParamGroup = exports.isParamGroupOrArray = exports.CParamsReadonly = exports.CParams = exports.isParamBase = void 0;
-const Common_1 = require("../Common/Common");
-let ts = "2025-06-01 16:25:25";
+const common_1 = require("../Common/common");
+{
+    let ts = "2025-06-01 16:25:25";
+}
 {
     let x = { value: 5, range: [5, 6] };
 }
@@ -32,14 +34,14 @@ function* iterateParams(obj, currentPath = []) {
         if (typeof param == "object") {
             const valKey = "value";
             let value = param[valKey];
-            if (typeof value == "object" && !(0, Common_1.isDate)(value) && !Array.isArray(value))
+            if (typeof value == "object" && !(0, common_1.isDate)(value) && !Array.isArray(value))
                 yield* iterateParams(value, keyPath.concat(valKey));
         }
     }
 }
 exports.iterateParams = iterateParams;
 function enableAllParams(params, enabled = true) {
-    const paramsInfoClone = (0, Common_1.deepCloneMutable)(params);
+    const paramsInfoClone = (0, common_1.deepCloneMutable)(params);
     for (let [key, param] of iterateParams(paramsInfoClone)) {
         if (isParamBase(param) && param.enabled != null)
             param.enabled = enabled;
@@ -104,7 +106,8 @@ class Test extends CParams {
     };
 }
 function GetSimpleParams(params) {
-    let simpleParams = params;
+    const simpleParamsBase = params instanceof Array ? [] : {};
+    let simpleParams = simpleParamsBase;
     for (let key in params) {
         const param = params[key];
         simpleParams[key] =

package/lib/Exchange/LoadBase.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadQuoteBase = void 0;
-const Common_1 = require("../Common/Common");
+const common_1 = require("../Common/common");
 const Time_1 = require("../Common/Time");
 const funcTimeWait_1 = require("../Common/funcTimeWait");
 function LoadQuoteBase(setting, data) {
@@ -16,7 +16,7 @@ function LoadQuoteBase(setting, data) {
         const t1 = funcTimeWait_1.FuncTimeWait.byWeight(keyName, setting.countConnect) - (Date.now() - time) + 1;
         if (t1 > 0) {
             funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() + t1 });
-            await (0, Common_1.sleepAsync)(t1);
+            await (0, common_1.sleepAsync)(t1);
         }
         else {
             funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() });

package/lib/Exchange/MarketData.d.ts

@@ -1,4 +1,4 @@
-import { MyNumMap, ParsedUrlQueryInputMy } from "../Common/Common";
+import { MyNumMap, ParsedUrlQueryInputMy } from "../Common/common";
 import { CBar, CBarsMutableBase, IBars, IBarsImmutable, ITick, TF } from "./Bars";
 import { const_Date } from "../Common/BaseTypes";
 export * from "./Bars";
@@ -75,4 +75,4 @@ export declare class CQuotesHistoryMutable2 extends CQuotesHistory {
     protected _CreateNewBars(tf: TF): CBarsInternal | null;
     Update(other: CQuotesHistory, endTime?: const_Date): void;
 }
-export { deepEqual } from "../Common/Common";
+export { deepEqual } from "../Common/common";

package/lib/Exchange/MarketData.js

@@ -10,13 +10,25 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepEqual = exports.CQuotesHistoryMutable2 = exports.CQuotesHistoryMutable = exports.CQuotesHistory = void 0;
-const lib = require("../Common/Common");
-const Common_1 = require("../Common/Common");
+const lib = __importStar(require("../Common/common"));
+const common_1 = require("../Common/common");
 const Bars_1 = require("./Bars");
 __exportStar(require("./Bars"), exports);
 class CBarsInternal extends Bars_1.CBarsMutableBase {
@@ -30,8 +42,8 @@ class CBarsInternal extends Bars_1.CBarsMutableBase {
 }
 class CQuotesHistory {
     _modifyCounter = 0;
-    barsMainMap = new Common_1.MyNumMap();
-    barsInfoMap = new Common_1.MyNumMap();
+    barsMainMap = new common_1.MyNumMap();
+    barsInfoMap = new common_1.MyNumMap();
     _ticksize;
     _minTf;
     _GetTickSize() { let val = 0; for (let bars of this.barsMainMap.Values)
@@ -39,7 +51,7 @@ class CQuotesHistory {
     name;
     static fromParsedJSON(data) {
         let d = data;
-        let map = Object.assign(new Common_1.MyNumMap(), { ...d.barsMainMap });
+        let map = Object.assign(new common_1.MyNumMap(), { ...d.barsMainMap });
         return new CQuotesHistory(map.Values.map((bars) => Bars_1.CBars.fromParsedJSON(bars)), d.name);
     }
     get stateID() { return this._modifyCounter; }
@@ -103,12 +115,12 @@ class CQuotesHistory {
     _CombineBars(myBars, newBars, startTime, endtime) {
         if (!newBars)
             return myBars;
-        let ibar = myBars.indexOf(startTime, Common_1.E_MATCH.GREAT_OR_EQUAL);
+        let ibar = myBars.indexOf(startTime, common_1.E_MATCH.GREAT_OR_EQUAL);
         if (ibar == -1)
             ibar = myBars.count;
         let lastBars = [];
         if (endtime) {
-            let ilast = myBars.indexOf(endtime, Common_1.E_MATCH.LESS_OR_EQUAL) + 1;
+            let ilast = myBars.indexOf(endtime, common_1.E_MATCH.LESS_OR_EQUAL) + 1;
             lastBars = myBars.data.slice(ilast, myBars.length);
         }
         let resultBars;
@@ -126,7 +138,7 @@ class CQuotesHistory {
         return this._CombineBars(myBars, addedBarsArrConverted, startTime);
     }
     _getLessTf(tf) {
-        let i = lib.BSearch(this.barsInfoMap.sortedKeys, tf.index - 1, Common_1.E_MATCH.LESS_OR_EQUAL);
+        let i = lib.BSearch(this.barsInfoMap.sortedKeys, tf.index - 1, common_1.E_MATCH.LESS_OR_EQUAL);
         return (i >= 0) ? Bars_1.TF.all[this.barsInfoMap.sortedKeys[i]] : null;
     }
     _BuildNewBars(tf) {
@@ -324,7 +336,7 @@ class CQuotesHistoryMutable2 extends CQuotesHistory {
         let srcBars = this._source?.Bars(tf);
         if (!srcBars)
             return null;
-        let istop = this._time ? srcBars.indexOf(this._time, Common_1.E_MATCH.GREAT_OR_EQUAL) : srcBars.length;
+        let istop = this._time ? srcBars.indexOf(this._time, common_1.E_MATCH.GREAT_OR_EQUAL) : srcBars.length;
         let slicedBars = srcBars.data.slice(0, istop);
         return new CBarsInternal(tf, slicedBars);
     }
@@ -338,7 +350,7 @@ class CQuotesHistoryMutable2 extends CQuotesHistory {
             let start = 0;
             if (isUpdate && (endTime && this._time ? endTime >= this._time : endTime == this._time))
                 start = bars.data.length;
-            let stop = endTime ? srcBars.indexOf(endTime, Common_1.E_MATCH.GREAT_OR_EQUAL) : srcBars.length;
+            let stop = endTime ? srcBars.indexOf(endTime, common_1.E_MATCH.GREAT_OR_EQUAL) : srcBars.length;
             let newbarsArr = srcBars.data.slice(start, stop);
             let resultbarsArr = start > 0 ? [...bars.data, ...newbarsArr] : newbarsArr;
             let resultBars = new Bars_1.CBars(bars.Tf, resultbarsArr, bars.tickSize);
@@ -353,5 +365,5 @@ class CQuotesHistoryMutable2 extends CQuotesHistory {
     }
 }
 exports.CQuotesHistoryMutable2 = CQuotesHistoryMutable2;
-var Common_2 = require("../Common/Common");
-Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return Common_2.deepEqual; } });
+var common_2 = require("../Common/common");
+Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return common_2.deepEqual; } });

package/lib/client.d.ts

@@ -1,11 +1,11 @@
 export * from "./Common/Time";
-export * from "./Common/Common";
+export * from "./Common/common";
 export * from "./Common/Color";
 export * from "./Common/ListNodeAnd";
 export * from "./Common/Math";
 export * from "./Exchange/ConnectData/Binance";
 export * as BaseTypes from "./Common/BaseTypes";
-export * as Common from "./Common/Common";
+export * as Common from "./Common/common";
 export * as Time from "./Common/Time";
 export * as Color from "./Common/Color";
 export * as ListNodeAnd from "./Common/ListNodeAnd";

package/lib/client.js

@@ -10,25 +10,37 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = exports.LoadCandles = exports.List = exports.Math = exports.ListNodeAnd = exports.Color = exports.Time = exports.Common = exports.BaseTypes = void 0;
 __exportStar(require("./Common/Time"), exports);
-__exportStar(require("./Common/Common"), exports);
+__exportStar(require("./Common/common"), exports);
 __exportStar(require("./Common/Color"), exports);
 __exportStar(require("./Common/ListNodeAnd"), exports);
 __exportStar(require("./Common/Math"), exports);
 __exportStar(require("./Exchange/ConnectData/Binance"), exports);
-exports.BaseTypes = require("./Common/BaseTypes");
-exports.Common = require("./Common/Common");
-exports.Time = require("./Common/Time");
-exports.Color = require("./Common/Color");
-exports.ListNodeAnd = require("./Common/ListNodeAnd");
-exports.Math = require("./Common/Math");
-exports.List = require("./Common/List");
-exports.LoadCandles = require("./Exchange/ConnectData/Binance");
+exports.BaseTypes = __importStar(require("./Common/BaseTypes"));
+exports.Common = __importStar(require("./Common/common"));
+exports.Time = __importStar(require("./Common/Time"));
+exports.Color = __importStar(require("./Common/Color"));
+exports.ListNodeAnd = __importStar(require("./Common/ListNodeAnd"));
+exports.Math = __importStar(require("./Common/Math"));
+exports.List = __importStar(require("./Common/List"));
+exports.LoadCandles = __importStar(require("./Exchange/ConnectData/Binance"));
 const ListNodeAnd_1 = require("./Common/ListNodeAnd");
 function test() {
     const tt = new ListNodeAnd_1.CListNodeAnd();

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export * from "./Common/BaseTypes";
 export * from "./Common/ByteStream";
 export * from "./Common/Color";
 export * from "./Common/Time";
-export * from "./Common/Common";
+export * from "./Common/common";
 export * from "./Common/commonsServer";
 export * from "./Common/event";
 export * from "./Common/funcTimeWait";
@@ -16,7 +16,7 @@ export * from "./Exchange/Bars";
 export * from "./Exchange/LoadBase";
 export * from "./Exchange/ConnectData/Binance";
 export * as BaseTypes from "./Common/BaseTypes";
-export * as Common from "./Common/Common";
+export * as Common from "./Common/common";
 export * as Time from "./Common/Time";
 export * as Color from "./Common/Color";
 export * as ListNodeAnd from "./Common/ListNodeAnd";

package/lib/index.js

@@ -10,16 +10,28 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = exports.LoadCandles = exports.Params = exports.List = exports.Math = exports.ListNodeAnd = exports.Color = exports.Time = exports.Common = exports.BaseTypes = void 0;
 __exportStar(require("./Common/BaseTypes"), exports);
 __exportStar(require("./Common/ByteStream"), exports);
 __exportStar(require("./Common/Color"), exports);
 __exportStar(require("./Common/Time"), exports);
-__exportStar(require("./Common/Common"), exports);
+__exportStar(require("./Common/common"), exports);
 __exportStar(require("./Common/commonsServer"), exports);
 __exportStar(require("./Common/event"), exports);
 __exportStar(require("./Common/funcTimeWait"), exports);
@@ -32,15 +44,15 @@ __exportStar(require("./Common/waitRun"), exports);
 __exportStar(require("./Exchange/Bars"), exports);
 __exportStar(require("./Exchange/LoadBase"), exports);
 __exportStar(require("./Exchange/ConnectData/Binance"), exports);
-exports.BaseTypes = require("./Common/BaseTypes");
-exports.Common = require("./Common/Common");
-exports.Time = require("./Common/Time");
-exports.Color = require("./Common/Color");
-exports.ListNodeAnd = require("./Common/ListNodeAnd");
-exports.Math = require("./Common/Math");
-exports.List = require("./Common/List");
-exports.Params = require("./Exchange/CParams");
-exports.LoadCandles = require("./Exchange/ConnectData/Binance");
+exports.BaseTypes = __importStar(require("./Common/BaseTypes"));
+exports.Common = __importStar(require("./Common/common"));
+exports.Time = __importStar(require("./Common/Time"));
+exports.Color = __importStar(require("./Common/Color"));
+exports.ListNodeAnd = __importStar(require("./Common/ListNodeAnd"));
+exports.Math = __importStar(require("./Common/Math"));
+exports.List = __importStar(require("./Common/List"));
+exports.Params = __importStar(require("./Exchange/CParams"));
+exports.LoadCandles = __importStar(require("./Exchange/ConnectData/Binance"));
 const ListNodeAnd_1 = require("./Common/ListNodeAnd");
 function test() {
     const tt = new ListNodeAnd_1.CListNodeAnd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.89",
+  "version": "1.0.90",
   "description": "math math math",
   "strict": true,
   "main": "lib/index.js",