ddan-js 2.0.6 → 2.0.7

package/bin/lib/class/task.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_1 = require("../util/is");
 class DTask {
-    source;
+    __source__;
     constructor(source) {
-        this.source = source;
+        this.__source__ = source;
     }
     run() {
         let promise;
         try {
             let temp;
-            if (is_1.default.isFunction(this.source)) {
-                temp = this.source();
+            if (is_1.default.isFunction(this.__source__)) {
+                temp = this.__source__();
             }
             else {
-                temp = this.source;
+                temp = this.__source__;
             }
             promise = is_1.default.isPromise(temp) ? temp : Promise.resolve(temp);
             return promise.then(data => [null, data]).catch(err => [err, undefined]);

package/bin/lib/class/tracker.js

@@ -48,12 +48,12 @@ class DTrack {
 }
 exports.DTrack = DTrack;
 class DTracker {
-    _map = new Map();
-    _trackList = [];
+    __map__ = new Map();
+    __trackList__ = [];
     can = true;
     clear() {
-        this._map.clear();
-        this._trackList = [];
+        this.__map__.clear();
+        this.__trackList__ = [];
         return this;
     }
     add(name, { desc = "", type = "" } = {}) {
@@ -63,13 +63,13 @@ class DTracker {
         _track.name = name;
         _track.type = type;
         _track.desc = desc;
-        this._trackList.push(_track);
+        this.__trackList__.push(_track);
         return _track.id;
     }
     done(id) {
         if (!id || !this.can)
             return;
-        const _track = this._trackList.find(e => e.id === id);
+        const _track = this.__trackList__.find(e => e.id === id);
         if (!_track || _track.isDone)
             return;
         _track.done();
@@ -77,38 +77,38 @@ class DTracker {
         endTrack.id = this._endId(id);
         endTrack.flag = 1;
         endTrack.desc = `${_track.desc} | end`;
-        this._trackList.push(endTrack);
+        this.__trackList__.push(endTrack);
     }
     getTrack(id) {
-        return this._trackList.find(e => e.id === id);
+        return this.__trackList__.find(e => e.id === id);
     }
     getLine(id) {
         if (!id || id.endsWith("-end"))
             return [];
-        const idx_s = this._trackList.findIndex(e => e.id === id);
+        const idx_s = this.__trackList__.findIndex(e => e.id === id);
         if (idx_s < 0)
             return [];
         const endid = this._endId(id);
-        const idx_e = this._trackList.findIndex(e => e.id === endid);
-        const count = idx_e < 0 ? this._trackList.length - idx_s : idx_e - idx_s + 1;
-        return list_1.default.take(this._trackList, count, idx_s);
+        const idx_e = this.__trackList__.findIndex(e => e.id === endid);
+        const count = idx_e < 0 ? this.__trackList__.length - idx_s : idx_e - idx_s + 1;
+        return list_1.default.take(this.__trackList__, count, idx_s);
     }
     getListByName(name, id = "") {
         if (!name)
             return [];
-        const _nameList = this._trackList.filter(e => e.name === name);
+        const _nameList = this.__trackList__.filter(e => e.name === name);
         if (_nameList.length <= 0)
             return [];
         if (!id)
             return _nameList;
         const endid = this._endId(id);
-        return this._trackList.filter(e => e.id === id || e.id === endid);
+        return this.__trackList__.filter(e => e.id === id || e.id === endid);
     }
     getList() {
-        return this._trackList;
+        return this.__trackList__;
     }
     size() {
-        return this._trackList.length;
+        return this.__trackList__.length;
     }
     _endId = (id) => `${id}-end`;
 }

package/bin/lib/modules/time/{timeFormat.js → dtime.js}

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const const_1 = require("./const");
-class DTimeFormat {
+class DTime {
     date;
-    countdown = 0;
-    countdownS = 0;
     timestamp = 0;
     yyyy = 0;
     yy = "";
@@ -52,47 +50,70 @@ class DTimeFormat {
         this.SSS = this.S.toString().padStart(3, "0");
         return this;
     }
-    toCountdown() {
+    toCountdown(reg = "") {
+        const result = {
+            countdown: 0,
+            timestamp: 0,
+            seconds: 0,
+            d: 0,
+            dd: "",
+            h: 0,
+            hh: "",
+            m: 0,
+            mm: "",
+            s: 0,
+            ss: "",
+            S: 0,
+            SS: "",
+            SSS: "",
+            desc: "",
+        };
         if (!this.timestamp)
-            return this;
-        this.countdown = Math.max(this.timestamp - Date.now(), 0);
-        this.countdownS = Math.floor(this.countdown / const_1.default.oneSecond);
-        let amount = this.countdown;
-        this.d = Math.floor(amount / const_1.default.oneDay);
-        this.dd = (this.d < 10 ? "0" : "") + this.d;
+            return result;
+        result.timestamp = this.timestamp;
+        result.countdown = Math.max(result.timestamp - Date.now(), 0);
+        result.seconds = Math.floor(result.countdown / const_1.default.oneSecond);
+        let amount = result.countdown;
+        result.d = Math.floor(amount / const_1.default.oneDay);
+        result.dd = (result.d < 10 ? "0" : "") + result.d;
         amount = amount % const_1.default.oneDay;
-        this.h = Math.floor(amount / const_1.default.oneHour);
-        this.hh = (this.h < 10 ? "0" : "") + this.h;
+        result.h = Math.floor(amount / const_1.default.oneHour);
+        result.hh = (result.h < 10 ? "0" : "") + result.h;
         amount = amount % const_1.default.oneHour;
-        this.m = Math.floor(amount / const_1.default.oneMinute);
-        this.mm = (this.m < 10 ? "0" : "") + this.m;
+        result.m = Math.floor(amount / const_1.default.oneMinute);
+        result.mm = (result.m < 10 ? "0" : "") + result.m;
         amount = amount % const_1.default.oneMinute;
-        this.s = Math.floor(amount / const_1.default.oneSecond);
-        this.ss = (this.s < 10 ? "0" : "") + this.s;
+        result.s = Math.floor(amount / const_1.default.oneSecond);
+        result.ss = (result.s < 10 ? "0" : "") + result.s;
         amount = amount % const_1.default.oneSecond;
-        this.S = amount;
-        this.SS = (this.S < 10 ? "0" : "") + this.S;
-        this.SSS = this.S.toString().padStart(3, "0");
-        return this;
-    }
-    format(reg = "yyyy-MM-dd hh:mm:ss") {
-        return reg.replace(/\byyyy|yy|MM|M|dd|d|hh|h|mm|m|ss|s|SSS|SS|S\b/g, ($1) => this[$1]);
-    }
-    countdownFormat(reg = "") {
+        result.S = amount;
+        result.SS = (result.S < 10 ? "0" : "") + result.S;
+        result.SSS = result.S.toString().padStart(3, "0");
         let _reg = reg;
         if (!_reg) {
-            if (this.countdown > const_1.default.oneHour) {
+            if (result.countdown > const_1.default.oneHour) {
                 _reg = "hh:mm:ss";
             }
-            else if (this.countdown > const_1.default.oneMinute) {
+            else if (result.countdown > const_1.default.oneMinute) {
                 _reg = "mm:ss";
             }
             else {
                 _reg = "ss";
             }
         }
-        return _reg.replace(/\bdd|d|hh|h|mm|m|ss|s|SSS|SS|S\b/g, ($1) => this[$1]);
+        result.desc = _reg.replace(/\bdd|d|hh|h|mm|m|ss|s|SSS|SS|S\b/g, ($1) => result[$1]);
+        return result;
+    }
+    add(ms = 0) {
+        if (!ms)
+            return this;
+        this.timestamp = this.timestamp + ms;
+        this.date = new Date(this.timestamp);
+        this.toDate();
+        return this;
+    }
+    format(reg = "yyyy-MM-dd hh:mm:ss") {
+        return reg.replace(/\byyyy|yy|MM|M|dd|d|hh|h|mm|m|ss|s|SSS|SS|S\b/g, ($1) => this[$1]);
     }
-    ;
 }
-exports.default = DTimeFormat;
+exports.default = DTime;

package/bin/lib/modules/time/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const frame_1 = require("./frame");
-const timeFormat_1 = require("./timeFormat");
+const dtime_1 = require("./dtime");
 const const_1 = require("./const");
 /**
  * 是否是今天
@@ -23,18 +23,18 @@ const format = (time, reg = "yyyy-MM-dd hh:mm:ss") => {
     const date = typeof time === "string" || typeof time === "number" ? new Date(time) : time;
     if (!date)
         return "";
-    return timeformat(date).format(reg);
+    return dtime(date).format(reg);
 };
 /**
  *
  * @param time 时间戳|日期时间字符串|Date
  * @returns
  */
-const timeformat = (time) => {
+const dtime = (time) => {
     const date = typeof time === "string" || typeof time === "number" ? new Date(time) : time;
     if (!date)
-        return new timeFormat_1.default(0);
-    return new timeFormat_1.default(date);
+        return new dtime_1.default(0);
+    return new dtime_1.default(date);
 };
 /**
  * 解析时间
@@ -50,7 +50,7 @@ function parseTimestamp({ year = 0, month = 0, date = 0, hour = 0, minute = 0, s
  * @returns
  */
 function now() {
-    return timeformat(Date.now());
+    return dtime(new Date());
 }
 ;
 /**
@@ -64,10 +64,10 @@ const countdown = (endTime, reg = "") => {
     const date = typeof endTime === "string" || typeof endTime === "number" ? new Date(endTime) : endTime;
     if (!date)
         return "";
-    const map = timeformat(date);
-    return map.toCountdown().countdownFormat(reg);
+    const map = dtime(date);
+    return map.toCountdown(reg);
 };
 const loopFrame = (interval = 500) => {
     return new frame_1.default(interval);
 };
-exports.default = { ...const_1.default, now, isToday, parseTimestamp, todayZero, format, countdown, timeformat, loopFrame };
+exports.default = { ...const_1.default, now, isToday, parseTimestamp, todayZero, format, countdown, dtime, loopFrame };

package/bin/types/class/event.d.ts

@@ -4,9 +4,9 @@ export interface IDEvent {
     tag: string;
 }
 export default class DEvent {
-    _map: Map<string, Set<Function | any>>;
-    _tagList: IDEvent[];
-    _event_id_: string;
+    __map__: Map<string, Set<Function | any>>;
+    __tagList__: IDEvent[];
+    __eventId__: string;
     constructor();
     clear(): this;
     /**

package/bin/types/class/icon.d.ts

@@ -1,7 +1,7 @@
 export type TSVG = "back" | "right" | "home" | "close" | "close_circle" | "close_circle_fill" | "warning" | "play" | "lock" | "lock_fill" | "plus" | "plus_circle" | "plus_circle_fill" | "star" | "star_fill" | "share" | "love" | "love_fill";
 export declare class DIcon {
-    _defStyle: string;
-    _map: Record<TSVG, string>;
+    __defStyle__: string;
+    __map__: Record<TSVG, string>;
     getBase64: (svgType: TSVG) => string;
     getSVG: (svgType: TSVG) => {
         url: string;

package/bin/types/class/pipeTask.d.ts

@@ -1,5 +1,5 @@
 export default class DPipeTask {
-    _list: any[];
+    __list__: any[];
     constructor(_task?: any);
     push(_task?: any): this;
     clear(): this;

package/bin/types/class/pipeline.d.ts

@@ -1,7 +1,7 @@
 export default class DPipeline {
-    _list: any[];
-    _running: boolean;
-    _waitting: boolean;
+    __list__: any[];
+    __running__: boolean;
+    __waitting__: boolean;
     constructor();
     pipe(_task?: any): this;
     delay(t?: number): this;

package/bin/types/class/pipeparallel.d.ts

@@ -1,5 +1,5 @@
 export default class DPipeparallel {
-    _list: any[];
+    __list__: any[];
     constructor();
     add(_task?: any): this;
     clear(): this;

package/bin/types/class/task.d.ts

@@ -1,5 +1,5 @@
 export default class DTask {
-    source: any;
+    __source__: any;
     constructor(source?: any);
     run(): Promise<any[]>;
     static _lockedMap: Map<string, Promise<any[]>>;

package/bin/types/class/tracker.d.ts

@@ -25,8 +25,8 @@ export declare class DTrack {
     done: (t?: number) => void;
 }
 export declare class DTracker {
-    _map: Map<string, DTrack>;
-    _trackList: DTrack[];
+    __map__: Map<string, DTrack>;
+    __trackList__: DTrack[];
     can: boolean;
     clear(): this;
     add(name: string, { desc, type }?: {

package/bin/types/index.d.ts

@@ -8,7 +8,7 @@ declare const _default: {
         gbkCut: (source: string, len: number) => string;
     };
     time: {
-        now: () => import("./modules/time/timeFormat").default;
+        now: () => import("./modules/time/dtime").default;
         isToday: (date: any) => any;
         parseTimestamp: ({ year, month, date, hour, minute, second }: {
             year?: number | undefined;
@@ -20,8 +20,8 @@ declare const _default: {
         }) => number;
         todayZero: () => number;
         format: (time: string | number | Date, reg?: string) => string;
-        countdown: (endTime: string | number | Date, reg?: string) => string;
-        timeformat: (time: string | number | Date) => import("./modules/time/timeFormat").default;
+        countdown: (endTime: string | number | Date, reg?: string) => "" | import("./modules/time/dtime").IDCountdownFormat;
+        dtime: (time: string | number | Date) => import("./modules/time/dtime").default;
         loopFrame: (interval?: number) => import("./modules/time/frame").default;
         oneDay: number;
         oneHour: number;

package/bin/types/modules/time/{timeFormat.d.ts → dtime.d.ts}

@@ -1,7 +1,22 @@
-export default class DTimeFormat {
-    date?: Date;
+export interface IDCountdownFormat {
     countdown: number;
-    countdownS: number;
+    timestamp: number;
+    seconds: number;
+    d: number;
+    dd: string;
+    h: number;
+    hh: string;
+    m: number;
+    mm: string;
+    s: number;
+    ss: string;
+    S: number;
+    SS: string;
+    SSS: string;
+    desc: string;
+}
+export default class DTime {
+    date?: Date;
     timestamp: number;
     yyyy?: number;
     yy?: string;
@@ -20,7 +35,7 @@ export default class DTimeFormat {
     SSS: string;
     constructor(time: string | number | Date);
     toDate(): this;
-    toCountdown(): this;
+    toCountdown(reg?: string): IDCountdownFormat;
+    add(ms?: number): this;
     format(reg?: string): string;
-    countdownFormat(reg?: string): string;
 }

package/bin/types/modules/time/index.d.ts

@@ -1,5 +1,5 @@
 import LoopFrame from "./frame";
-import TimeFormat from "./timeFormat";
+import DTime from "./dtime";
 /**
  * 解析时间
  * @param param0
@@ -17,15 +17,15 @@ declare function parseTimestamp({ year, month, date, hour, minute, second }: {
  * 当前时间格式类
  * @returns
  */
-declare function now(): TimeFormat;
+declare function now(): DTime;
 declare const _default: {
     now: typeof now;
     isToday: (date: any) => any;
     parseTimestamp: typeof parseTimestamp;
     todayZero: () => number;
     format: (time: string | number | Date, reg?: string) => string;
-    countdown: (endTime: string | number | Date, reg?: string) => string;
-    timeformat: (time: string | number | Date) => TimeFormat;
+    countdown: (endTime: string | number | Date, reg?: string) => "" | import("./dtime").IDCountdownFormat;
+    dtime: (time: string | number | Date) => DTime;
     loopFrame: (interval?: number) => LoopFrame;
     oneDay: number;
     oneHour: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "",
   "keywords": [],
   "main": "bin/ddan-js.js",