baja-lite 1.5.19 → 1.5.21

package/sql.d.ts

@@ -1516,26 +1516,6 @@ declare class StreamQuery<T extends object> {
     eqWith(key1: keyof T, key2: keyof T): this;
     /** AND key1 <> key2 */
     notEqWith(key1: keyof T, key2: keyof T): this;
-    /** AND key REGEXP :regexp */
-    regexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
-    /** AND key NOT REGEXP :regexp */
-    notRegexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
-    /** AND (key1 << 8) + key2 = value */
-    shiftEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
-    /** AND (key1 << 8) + key2 <> value */
-    shiftNotEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
     /** AND key > :value */
     grate(key: keyof T, value: string | number, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1564,6 +1544,36 @@ declare class StreamQuery<T extends object> {
     lessWith(key1: keyof T, key2: keyof T): this;
     /** AND key1 <= key2 */
     lessEqWith(key1: keyof T, key2: keyof T): this;
+    /** AND key REGEXP :regexp */
+    regexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND key NOT REGEXP :regexp */
+    notRegexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :regexp REGEXP key */
+    regexp2(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :regexp NOT REGEXP key */
+    notRegexp2(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND (key1 << 8) + key2 = value */
+    shiftEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND (key1 << 8) + key2 <> value */
+    shiftNotEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     /** AND key LIKE CONCAT('%', :value, '%') */
     like(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1649,7 +1659,7 @@ declare class StreamQuery<T extends object> {
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
     /** AND key GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
-    PreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+    preciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
@@ -1660,6 +1670,102 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND :value LIKE CONCAT('%', key, '%') */
+    like2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE CONCAT('%', key, '%') */
+    notLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE CONCAT('%', key) */
+    leftLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value LIKE CONCAT('%', key) */
+    notLeftLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value LIKE CONCAT(key, '%') */
+    rightLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE CONCAT(key, '%') */
+    notRightLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value LIKE key 注意：不会拼接% */
+    PreciseLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE key 注意：不会拼接%*/
+    notPreciseLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB CONCAT('%', key, '%') 注意：GLOB是大小写敏感like */
+    glob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB CONCAT('%', key, '%') 注意：GLOB是大小写敏感like*/
+    notGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB CONCAT('%', key) 注意：GLOB是大小写敏感like*/
+    leftGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB CONCAT('%', key) 注意：GLOB是大小写敏感like*/
+    notLeftGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB CONCAT(key, '%') 注意：GLOB是大小写敏感like*/
+    rightGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB CONCAT(key, '%') 注意：GLOB是大小写敏感like*/
+    notRightGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB key 注意：GLOB是大小写敏感like,这里不拼接%*/
+    preciseGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB key 注意：GLOB是大小写敏感like,这里不拼接%*/
+    notPreciseGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     /** AND key IN (:value) */
     in(key: keyof T, value: Array<string | number>, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1712,6 +1818,16 @@ declare class StreamQuery<T extends object> {
         paramName?: string | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND POW(2, :value) & key */
+    pow2(key: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND NOT POW(2, :value) & key */
+    notPow2(key: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     /** AND POW(2, key1) & key2 */
     powWith(key: keyof T, values: Array<number | string>, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1722,43 +1838,43 @@ declare class StreamQuery<T extends object> {
         paramName?: string | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) */
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) */
     match(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) */
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) */
     notMatch(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE*/
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) IN BOOLEAN MODE*/
     matchBoolean(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE */
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) IN BOOLEAN MODE */
     notMatchBoolean(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) WITH QUERY EXPANSION*/
     matchQuery(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) WITH QUERY EXPANSION*/
     notMatchQuery(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT LOCATE(key, :value) > 0 */
+    /** AND LOCATE(key, :value) > 0 */
     includes(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
@@ -1770,6 +1886,18 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND LOCATE(:value, key) > 0 */
+    includes2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND NOT LOCATE(:value, key) = 0 */
+    notIncludes2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        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;
@@ -1784,6 +1912,14 @@ declare class StreamQuery<T extends object> {
     }): this;
     and(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     or(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
+    /**
+     * sql WHERE 查询语句拼接：注意若有JOIN，需要写明别名。本表别名为t.例如:
+     * ```
+     * where('t.name > :name', {name: 1});
+     * where('(t.name > :name OR t.name <> :name)', {name: 1});
+     * ```
+     */
+    where(sql: string, param?: Record<string, any>): this;
     /** SET key = IFNULL(key, 0) + :value */
     incr(key: keyof T, value?: number): this;
     /** GROUP BY key1, key2, ... */
@@ -1819,8 +1955,16 @@ declare class StreamQuery<T extends object> {
         groupName?: string;
     }): this;
     select(...key: (keyof T)[]): this;
+    /**
+     * sql查询语句拼接：注意若有JOIN，需要写明别名。本表别名为t.例如:
+     * ```
+     * select2('t.name, t.age, ISNULL(t.type, :type)', {type: 1});
+     * select2('MAX(t.age) MAXAge');
+     * ```
+     */
     select2(sql: string, param?: Record<string, any>): this;
     update(key: keyof T, value: T[keyof T]): this;
+    /** update语句拼接：注意若有JOIN，需要写明别名。本表别名为t */
     update2(sql: string, param?: Record<string, any>): this;
     updateT(t: Partial<T>): this;
     /** SET key = REPLACE(key, :valueToFind,  :valueToReplace) */
@@ -1904,6 +2048,7 @@ declare class StreamQuery<T extends object> {
     }): number;
     private _where;
     private _;
+    private _2;
     private __;
     private _null;
     private _key;
@@ -1913,8 +2058,11 @@ declare class StreamQuery<T extends object> {
     private _shift;
     private _match;
     private _pow;
+    private _pow2;
     private _like;
+    private _like2;
     private _includes;
+    private _includes2;
 }
 /**
  获取REDIS客户端，