@maiyunnet/kebab 2.0.2 → 2.0.3

package/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOD_CWD = exports.FTMP_CWD = exports.IND_CWD = exports.WWW_CWD = exports.LOG_CWD = exports.LIB_CWD = exports.VHOST_CWD = exports.CERT_CWD = exports.CONF_CWD = exports.ROOT_CWD = exports.SYS_PATH = exports.LIB_PATH = exports.ROOT_PATH = exports.VER = void 0;
-exports.VER = '2.0.2';
+exports.VER = '2.0.3';
 const dirname = __dirname.replace(/\\/g, '/');
 exports.ROOT_PATH = dirname + '/';
 exports.LIB_PATH = exports.ROOT_PATH + 'lib/';

package/index.ts

@@ -6,7 +6,7 @@
  */
 
 /** --- 当前系统版本号 --- */
-export const VER = '2.0.2';
+export const VER = '2.0.3';
 
 // --- 服务端用的路径 ---
 

package/lib/sql.js

@@ -477,9 +477,7 @@ class Sql {
         return this;
     }
     _whereSub(s, data) {
-        if (!data) {
-            data = this._data;
-        }
+        data ??= this._data;
         s = aoMix(s);
         let sql = '';
         for (const k in s) {

package/lib/sql.ts

@@ -664,9 +664,7 @@ export class Sql {
     }
 
     private _whereSub(s: types.Json, data?: any[]): string {
-        if (!data) {
-            data = this._data;
-        }
+        data ??= this._data;
         s = aoMix(s);
         let sql = '';
         for (const k in s) {

package/lib/text.js

@@ -57,6 +57,7 @@ exports.stringifyResult = stringifyResult;
 exports.parseJson = parseJson;
 exports.stringifyJson = stringifyJson;
 exports.isFalsy = isFalsy;
+exports.logicalOr = logicalOr;
 exports.str2int = str2int;
 exports.int2str = int2str;
 const kebab = __importStar(require("~/index"));
@@ -429,7 +430,10 @@ function stringifyJson(obj, space) {
     }, space).replace(/"-mybigint-([-+0-9]+?)"/g, '$1');
 }
 function isFalsy(val) {
-    return (val === null || val === undefined || val === '' || val === false || val === 0) ? true : false;
+    return (val === null) || (val === undefined) || (val === '') || (val === false) || (val === 0);
+}
+function logicalOr(v1, v2) {
+    return (isFalsy(v1) ? v2 : v1);
 }
 function str2int(str, digits = 3) {
     const num = parseFloat(str);

package/lib/text.ts

@@ -551,12 +551,23 @@ export function stringifyJson(obj: types.Json, space?: string | number): string
     }, space).replace(/"-mybigint-([-+0-9]+?)"/g, '$1');
 }
 
+type TFalsy = false | '' | 0 | null | undefined | typeof NaN;
+
 /**
- * --- 判断一个值是否是虚假的（为 null/undefined/空字符串/false/0 等） ---
+ * --- 判断一个值是否是虚假的（为 null/undefined/空字符串/false/0） ---
  * @param val 要判断的值
  */
-export function isFalsy(val: any): boolean {
-    return (val === null || val === undefined || val === '' || val === false || val === 0) ? true : false;
+export function isFalsy(val: any): val is TFalsy {
+    return (val === null) || (val === undefined) || (val === '') || (val === false) || (val === 0);
+}
+
+/**
+ * --- 类似 || 运算符的效果 ---
+ * @param v1 比对值
+ * @param v2 比对值
+ */
+export function logicalOr<T, T2>(v1: T, v2: T2): [T] extends [TFalsy] ? T2 : T {
+    return (isFalsy(v1) ? v2 : v1) as any;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "keywords": [
     "kebab",