baja-lite 1.5.15 → 1.5.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -57,11 +57,11 @@
     "@types/better-sqlite3": "7.6.13",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.6",
-    "@types/node": "24.0.10",
+    "@types/node": "24.0.12",
     "@types/shelljs": "0.8.17",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.35.1",
-    "@typescript-eslint/parser": "8.35.1",
+    "@typescript-eslint/eslint-plugin": "8.36.0",
+    "@typescript-eslint/parser": "8.36.0",
     "better-sqlite3": "12.2.0",
     "ioredis": "5.6.1",
     "mongodb": "6.17.0",

package/sql.d.ts

@@ -1641,6 +1641,10 @@ declare class StreamQuery<T extends object> {
     isNULL(key: keyof T): this;
     /** AND key IS NOT NULL */
     isNotNULL(key: keyof T): this;
+    /** AND (key IS NULL OR key = '') */
+    isEmpty(key: keyof T): this;
+    /** AND key IS NOT NULL AND key <> ''*/
+    isNotEmpty(key: keyof T): this;
     /** AND key BETWEEN :value1 AND :value2 */
     between(key: keyof T, value1: string | number, value2: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1721,6 +1725,18 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND FIND_IN_SET(:value, key) */
+    findInSet(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND FIND_IN_SET(key, :value) */
+    findInSet2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     and(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     or(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     /** SET key = IFNULL(key, 0) + :value */

package/sql.js

@@ -3601,6 +3601,16 @@ class StreamQuery {
     isNULL(key) { return this._null(key); }
     /** AND key IS NOT NULL */
     isNotNULL(key) { return this._null(key, 'NOT'); }
+    /** AND (key IS NULL OR key = '') */
+    isEmpty(key) {
+        this._wheres.push(`AND (${this[_fields][String(key)]?.C2()} IS NULL OR ${this[_fields][String(key)]?.C2()} = '')`);
+        return this;
+    }
+    /** AND key IS NOT NULL AND key <> ''*/
+    isNotEmpty(key) {
+        this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS NOT NULL AND ${this[_fields][String(key)]?.C2()} <> ''`);
+        return this;
+    }
     /** AND key BETWEEN :value1 AND :value2 */
     between(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
     /** AND key NOT BETWEEN :value1 AND :value2 */
@@ -3629,6 +3639,52 @@ class StreamQuery {
     includes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
     /** AND NOT LOCATE(key, :value) = 0 */
     notIncludes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND FIND_IN_SET(:value, key) */
+    findInSet(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND FIND_IN_SET(:${pkey}, ${this[_fields][String(key)]?.C2()})`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
+    /** AND FIND_IN_SET(key, :value) */
+    findInSet2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND FIND_IN_SET(${this[_fields][String(key)]?.C2()}, :${pkey})`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
     and(fn) {
         if (fn instanceof StreamQuery) {
             this._andQuerys.push(fn);
@@ -4393,6 +4449,18 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "isNotNULL", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "isEmpty", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "isNotEmpty", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
@@ -4477,6 +4545,18 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "notIncludes", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "findInSet", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "findInSet2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),