baja-lite 1.8.1 → 1.8.2

package/boot-remote.js

@@ -8,9 +8,6 @@ export const BootRomote = async function (options) {
     if (options.skipNull !== undefined) {
         globalThis[_GlobalSqlOption].skipNull = options.skipNull;
     }
-    if (options.skipEmptyString !== undefined) {
-        globalThis[_GlobalSqlOption].skipEmptyString = options.skipEmptyString;
-    }
     if (options.maxDeal !== undefined) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }

package/boot.js

@@ -9,9 +9,6 @@ export const Boot = async function (options) {
     if (options.skipNull !== undefined) {
         globalThis[_GlobalSqlOption].skipNull = options.skipNull;
     }
-    if (options.skipEmptyString !== undefined) {
-        globalThis[_GlobalSqlOption].skipEmptyString = options.skipEmptyString;
-    }
     if (options.maxDeal !== undefined) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }

package/math.js

@@ -85,8 +85,8 @@ export const div = (...args) => {
 export const divDef = (def, ...args) => {
     const arr = filterNumber2(args);
     if (arr.length > 1) {
-        const zeros = arr.slice(1).findIndex(i => i.equals(ZERO));
-        if (zeros > -1) {
+        const hasZeroDivisor = arr.slice(1).some(i => i.equals(ZERO));
+        if (hasZeroDivisor) {
             return new Decimal(def).toNumber();
         }
         return arr.reduce((a, b) => a.div(b)).toNumber();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {

package/snowflake.js

@@ -84,15 +84,25 @@ export class Snowflake {
      */
     generate() {
         let time = Date.now();
-        // 基础保护：如果系统时间回拨，强制同步到最后一次生成时间以防止 ID 重复
+        // 时钟回拨处理
         if (time < this.lastTime) {
-            time = this.lastTime;
+            const offset = this.lastTime - time;
+            // 如果回拨超过 5 秒，拒绝生成 ID
+            if (offset > 5000) {
+                console.error(`Clock moved backwards by ${offset}ms. Refusing to generate id`);
+                return null;
+            }
+            // 小幅回拨，等待追上上次时间
+            while (Date.now() <= this.lastTime) {
+                // 忙等待
+            }
+            time = Date.now();
         }
         if (this.lastTime === time) {
             this.seq++;
             if (this.seq > 4095) {
                 this.seq = 0;
-                // 方案2：不再忙等待，直接预支进入下一毫秒
+                // 序列号溢出，进入下一毫秒
                 time++;
             }
         }

package/sql.js

@@ -1874,7 +1874,11 @@ function P(skipConn = false) {
                     return result;
                 }
                 catch (error) {
-                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
+                    let args = '';
+                    if (args.length > 0 && args[0].params) {
+                        args = JSON.stringify(args[0].params);
+                    }
+                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
                     throw error;
                 }
                 finally {

package/string.d.ts

@@ -18,7 +18,10 @@ export declare const emptyString: (source: any, skipEmptyString?: boolean) => bo
  */
 export declare const notEmptyString: (source: any, skipEmptyString?: boolean) => boolean;
 /**
- * 安全字符串处理（移除单引号，防止简单 SQL 注入）
+ * 安全字符串处理（移除单引号）
+ * @deprecated 不推荐用于 SQL 注入防护，请使用参数化查询
+ * @param source 源字符串
+ * @returns 移除单引号后的字符串
  */
 export declare const safeString: (source?: string) => string;
 /**

package/string.js

@@ -30,7 +30,10 @@ export const notEmptyString = (source, skipEmptyString = true) => {
     return emptyString(source, skipEmptyString) === false;
 };
 /**
- * 安全字符串处理（移除单引号，防止简单 SQL 注入）
+ * 安全字符串处理（移除单引号）
+ * @deprecated 不推荐用于 SQL 注入防护，请使用参数化查询
+ * @param source 源字符串
+ * @returns 移除单引号后的字符串
  */
 export const safeString = (source) => {
     if (source) {