lyb-js 1.6.29 → 1.6.31

package/Base/LibIsNull.d.ts

@@ -0,0 +1,2 @@
+/** @description 判断是否为空值 */
+export declare const libIsNull: (value: any) => boolean;

package/Base/LibIsNull.js

@@ -0,0 +1,2 @@
+/** @description 判断是否为空值 */
+export const libIsNull = (value) => value === null || value === undefined || value === "";

package/Base/LibJsPromiseTimeout.js

@@ -26,7 +26,7 @@ export const libJsPromiseTimeout = (delay = 1, fn) => {
         };
         const startTimeout = (resolve) => {
             timeoutId = setTimeout(() => {
-                fn === null || fn === void 0 ? void 0 : fn();
+                fn?.();
                 resolve();
                 document.removeEventListener("visibilitychange", handleVisibilityChange);
             }, remainingTime);

package/Base/LibJsResizeWatcher.js

@@ -1,24 +1,12 @@
 /** @description 监听窗口变化，内部只注册一次resize事件，调用监听自身可取消监听 */
 export class LibJsResizeWatcher {
+    /** 存储所有监听器及其是否需要立即执行的标志 */
+    _listeners = [];
+    /** 按id存储监听器 */
+    _listenerMap = new Map();
+    /** 当前适配模式 */
+    _mode;
     constructor(mode = "hv") {
-        /** 存储所有监听器及其是否需要立即执行的标志 */
-        this._listeners = [];
-        /** 按id存储监听器 */
-        this._listenerMap = new Map();
-        /** @description 内部 resize 回调函数，调用所有注册的监听器 */
-        this._handleResize = () => {
-            const w = window.innerWidth;
-            const h = window.innerHeight;
-            let s;
-            const orientation = w > h ? "h" : "v";
-            if (orientation === "h") {
-                s = Math.min(w / 1920, h / 1080);
-            }
-            else {
-                s = Math.min(w / 1080, h / 1920);
-            }
-            this._listeners.forEach(({ cb }) => cb(w, h, s));
-        };
         this._mode = mode;
         if (mode === "h" || mode === "v")
             return;
@@ -73,4 +61,18 @@ export class LibJsResizeWatcher {
             this._listenerMap.delete(`${id}_remove`);
         }
     }
+    /** @description 内部 resize 回调函数，调用所有注册的监听器 */
+    _handleResize = () => {
+        const w = window.innerWidth;
+        const h = window.innerHeight;
+        let s;
+        const orientation = w > h ? "h" : "v";
+        if (orientation === "h") {
+            s = Math.min(w / 1920, h / 1080);
+        }
+        else {
+            s = Math.min(w / 1080, h / 1920);
+        }
+        this._listeners.forEach(({ cb }) => cb(w, h, s));
+    };
 }

package/Data/LibJsDeepJSONParse.js

@@ -11,7 +11,7 @@ export const libJsDeepJSONParse = (data) => {
             try {
                 return libJsDeepJSONParse(JSON.parse(trimmed));
             }
-            catch (_a) {
+            catch {
                 return data; // 如果解析失败，返回原始字符串
             }
         }

package/Formatter/LibJsFormatterByte.js

@@ -10,6 +10,6 @@ export const libJsFormatterByte = (bytes) => {
     const k = 1024;
     const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
     const i = Math.min(Math.floor(Math.log(bytes) / Math.log(k)), sizes.length - 1);
-    const size = (bytes / Math.pow(k, i)).toFixed(2);
+    const size = (bytes / k ** i).toFixed(2);
     return [size, sizes[i], `${size} ${sizes[i]}`];
 };

package/Misc/LibJsClassObservable.js

@@ -3,19 +3,21 @@ import { libJsDecimal } from "../Math/LibJsDecimal";
  * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsClassObservable-类属性监听器
  */
 export class LibJsClassObservable {
+    /** 可监听的对象 */
+    data;
+    /** 监听器 */
+    listeners = new Map();
+    /** 全局监听器（监听所有键的更改） */
+    globalListeners = new Map();
+    /** 按id映射监听索引 */
+    listenerIds = new Map();
+    /** 监听函数索引ID */
+    index = 0;
     /**
      * @param initialData 监听的数据
      */
     constructor(initialData) {
-        /** 监听器 */
-        this.listeners = new Map();
-        /** 全局监听器（监听所有键的更改） */
-        this.globalListeners = new Map();
-        /** 按id映射监听索引 */
-        this.listenerIds = new Map();
-        /** 监听函数索引ID */
-        this.index = 0;
-        this.data = Object.assign({}, initialData);
+        this.data = { ...initialData };
     }
     /** @description 获取所有数据 */
     getData() {
@@ -35,13 +37,12 @@ export class LibJsClassObservable {
      * @returns 设置后的值
      */
     setValue(key, value, immediately = true) {
-        var _a;
         const oldValue = this.data[key];
         if (oldValue === value)
             return value;
         this.data[key] = value;
         if (immediately) {
-            (_a = this.listeners.get(key)) === null || _a === void 0 ? void 0 : _a.forEach((fn) => fn(value, oldValue));
+            this.listeners.get(key)?.forEach((fn) => fn(value, oldValue));
             this.globalListeners.forEach((fn) => fn(key, value, oldValue));
         }
         return value;
@@ -95,9 +96,8 @@ export class LibJsClassObservable {
      * @returns 触发的键值
      */
     updateFake(key) {
-        var _a;
         const value = this.data[key];
-        (_a = this.listeners.get(key)) === null || _a === void 0 ? void 0 : _a.forEach((fn) => fn(value, value));
+        this.listeners.get(key)?.forEach((fn) => fn(value, value));
         return value;
     }
     /** @description 数字类型的键值累加或累减

package/Misc/LibJsEmitter.js

@@ -10,8 +10,7 @@ export const LibJsEmitter = () => {
         _eventMap.get(event).push(listener);
     };
     const emit = (event, ...args) => {
-        var _a;
-        (_a = _eventMap.get(event)) === null || _a === void 0 ? void 0 : _a.forEach((listener) => listener(...args));
+        _eventMap.get(event)?.forEach((listener) => listener(...args));
     };
     const off = (event, listener) => {
         if (!listener) {

package/Misc/LibJsEmitterClose.js

@@ -1,5 +1,6 @@
 /** @description 关闭监听 */
 export class LibJsEmitterClose {
+    static listeners = new Map();
     static on(eventName, listener) {
         if (!this.listeners.has(eventName))
             this.listeners.set(eventName, new Set());
@@ -14,4 +15,3 @@ export class LibJsEmitterClose {
         this.listeners.delete(eventName);
     }
 }
-LibJsEmitterClose.listeners = new Map();

package/Misc/LibJsNumberStepper.js

@@ -2,13 +2,19 @@
  * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsNumberStepper-数字步进器
  */
 export class LibJsNumberStepper {
+    /** 当前按下状态 */
+    _isDown = false;
+    /** 定时器ID */
+    _timerId;
+    /** 计时器ID */
+    _intervalId;
+    /** 数字变动时触发 */
+    _onChange;
     /**
      * @param numsLength 数字长度
      * @param onChange 数字变动时触发
      */
     constructor(onChange) {
-        /** 当前按下状态 */
-        this._isDown = false;
         this._onChange = onChange;
         window.addEventListener("pointerup", () => {
             this._isDown && this._up();

package/Misc/LibJsPruneEmpty.d.ts

@@ -0,0 +1,2 @@
+/** @description 去掉对象内的空值 */
+export declare const libJsPruneEmpty: (obj: Record<string, any>) => Record<string, any> | undefined;

package/Misc/LibJsPruneEmpty.js

@@ -0,0 +1,22 @@
+import { libIsNull } from "../Base/LibIsNull";
+/** @description 去掉对象内的空值 */
+export const libJsPruneEmpty = (obj) => {
+    const result = Object.entries(obj).reduce((acc, [key, value]) => {
+        if (Array.isArray(value)) {
+            if (value.length)
+                acc[key] = value;
+            return acc;
+        }
+        if (value && typeof value === "object" && !Array.isArray(value)) {
+            const next = libJsPruneEmpty(value);
+            if (next)
+                acc[key] = next;
+            return acc;
+        }
+        if (!libIsNull(value)) {
+            acc[key] = value;
+        }
+        return acc;
+    }, {});
+    return Object.keys(result).length ? result : undefined;
+};

package/README.md

@@ -53,6 +53,8 @@ conosle.log(v); //0.6
 
 \- [LibJsResizeWatcher-窗口监听](#LibJsResizeWatcher-窗口监听)
 
+\- [LibIsNull-是否为空值](#LibIsNull-是否为空值)
+
 
 ### Browser-浏览器
 
@@ -207,6 +209,10 @@ const off = libJsResizeWatcher.on((w,h)=>{})
 off()
 ```
 
+### LibIsNull-是否为空值
+
+> 判断是否为空值
+
 ## Browser-浏览器
 
 ### LibJsColorConsole-有色打印
@@ -675,6 +681,10 @@ setTimeout(()=>{
 
 > 需要传递当前游戏的适配模式
 
+### LibJsPruneEmpty-对象属性去空值
+
+> 递归对象并去掉对象内的 `undefined`、`null`、`""`
+
 ## Random-随机
 
 ### LibJsProbabilityResult-概率触发

package/Time/LibJsCountdown.d.ts

@@ -1,4 +1,5 @@
-export declare const libJsCountdown: (endTime: number) => {
+/** @description 倒计时，keepUnit 为保留单位，不再使用其上的进制 */
+export declare const libJsCountdown: (endTime: number, keepUnit: "year" | "month" | "day" | "hour" | "minute" | "second") => {
     years: string;
     months: string;
     days: string;

package/Time/LibJsCountdown.js

@@ -1,18 +1,49 @@
 import dayjs from "dayjs";
 import duration from "dayjs/plugin/duration";
 dayjs.extend(duration);
-export const libJsCountdown = (endTime) => {
+/** @description 倒计时，keepUnit 为保留单位，不再使用其上的进制 */
+export const libJsCountdown = (endTime, keepUnit) => {
     const startTime = dayjs();
     const diff = dayjs(endTime).diff(startTime);
     const time = dayjs.duration(diff);
     const pad = (n) => n.toString().padStart(2, "0");
+    if (diff <= 0) {
+        return {
+            years: "00",
+            months: "00",
+            days: "00",
+            hours: "00",
+            minutes: "00",
+            seconds: "00",
+            ended: true,
+        };
+    }
+    // 先获取原始值
+    const years = time.years();
+    const months = time.months();
+    const days = time.days();
+    let hours = time.hours();
+    let minutes = time.minutes();
+    let seconds = time.seconds();
+    // 将整个时长打平成秒
+    const totalSec = time.asSeconds();
+    // 根据保留单位展开
+    if (keepUnit === "hour") {
+        hours = Math.floor(totalSec / 3600); // total hours
+        minutes = Math.floor((totalSec % 3600) / 60);
+        seconds = Math.floor(totalSec % 60);
+    }
+    else if (keepUnit === "minute") {
+        minutes = Math.floor(totalSec / 60); // total minutes
+        seconds = Math.floor(totalSec % 60);
+    }
     return {
-        years: diff <= 0 ? "00" : pad(time.years()),
-        months: diff <= 0 ? "00" : pad(time.months()),
-        days: diff <= 0 ? "00" : pad(time.days()),
-        hours: diff <= 0 ? "00" : pad(time.hours()),
-        minutes: diff <= 0 ? "00" : pad(time.minutes()),
-        seconds: diff <= 0 ? "00" : pad(time.seconds()),
-        ended: diff <= 0,
+        years: pad(years),
+        months: pad(months),
+        days: pad(days),
+        hours: pad(hours),
+        minutes: pad(minutes),
+        seconds: pad(seconds),
+        ended: false,
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-js",
-  "version": "1.6.29",
+  "version": "1.6.31",
   "description": "自用JS方法库",
   "license": "ISC",
   "type": "module",
@@ -37,4 +37,4 @@
     "decimal.js": "^10.4.3",
     "vite": "^4.5.5"
   }
-}
+}