baja-lite 1.3.26 → 1.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.26",
+  "version": "1.3.28",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -38,7 +38,7 @@
     "@msgpack/msgpack": "3.1.1",
     "@types/request-promise": "4.1.51",
     "axios": "1.8.4",
-    "baja-lite-field": "1.3.21",
+    "baja-lite-field": "1.3.27",
     "decimal.js": "10.5.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",

package/sql.d.ts

@@ -1517,6 +1517,15 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfSkip?: boolean | undefined;
     }): this;
+    in2(key: (keyof T)[], value: string | number, { paramName, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
+    }): this;
+    notIn2(key: (keyof T)[], value: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfSkip?: boolean | undefined;
+    }): this;
     isNULL(key: keyof T): this;
     isNotNULL(key: keyof T): this;
     between(key: keyof T, value1: string | number, value2: string | number, { paramName, skipEmptyString, breakExcuteIfSkip }?: {
@@ -1710,6 +1719,7 @@ declare class StreamQuery<T extends object> {
     private _key;
     private _between;
     private _in;
+    private _in2;
     private _shift;
     private _match;
     private _pow;

package/sql.js

@@ -3464,6 +3464,8 @@ class StreamQuery {
     notPreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
     in(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._in(key, value, { paramName, breakExcuteIfSkip }); }
     notIn(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._in(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
+    in2(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._in2(key, value, { paramName, breakExcuteIfSkip }); }
+    notIn2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._in2(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     isNULL(key) { return this._null(key); }
     isNotNULL(key) { return this._null(key, 'NOT'); }
     between(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, breakExcuteIfSkip }); }
@@ -3833,6 +3835,9 @@ class StreamQuery {
         return this;
     }
     _in(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value && value.length > 0 && skipEmptyString === true) {
+            value = value.filter(v => !emptyString(`${v ?? ''}`));
+        }
         if (value && value.length > 0) {
             if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
                 this._param[this._paramKeys[paramName]] = value;
@@ -3851,6 +3856,26 @@ class StreamQuery {
         }
         return this;
     }
+    _in2(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        const skip = emptyString(`${value ?? ''}`) && skipEmptyString === true;
+        if (!skip) {
+            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 :${pkey} ${not} IN (${key.map(k => this[_fields][String(k)]?.C2()).join(',')}) `);
+                this._param[pkey] = value;
+                if (paramName) {
+                    this._paramKeys[paramName] = pkey;
+                }
+            }
+        }
+        else if (breakExcuteIfSkip !== true) {
+            this.if_exec = false;
+        }
+        return this;
+    }
     _shift(key1, key2, value, op, { not = '', paramName = '', breakExcuteIfSkip = false } = {}) {
         if (value === null
             || value === undefined
@@ -4184,6 +4209,18 @@ __decorate([
     __metadata("design:paramtypes", [Object, Array, Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "notIn", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "in2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notIn2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),