dff-util 1.3.4 → 1.3.6

package/README.md

@@ -341,20 +341,14 @@ export type KeyValueType = {
   [key: string]: any;
 }
 
-export type SearchByType = {
-  orderBy?: string;
-  order?: "ASC" | "DESC";
-  searchTerm?: string;
-  [key: string]: any;
-};
-
-export type SearchByLimitType = {
-  limit: number;
-  skip: number;
+export type SearchType = {
+  limit?: number;
+  skip?: number;
   orderBy?: string;
-  order?: "ASC" | "DESC";
+  order?: 'ASC' | 'DESC';
   searchTerm?: string;
-  [key: string]: any;
+  active?: boolean;
+  filters?: string;
 };
 
 ```
@@ -601,12 +595,12 @@ const original = "Hello World! @#$% 😊";
 
 // Encode
 const safe = safeEncode(original);
-console.log(safe); 
+console.log(safe);
 // Output: "U0dWc2JHOGdWMjl5YkdRPQ%3D%3D"
 
 // Decode
 const decoded = safeDecode(safe);
-console.log(decoded); 
+console.log(decoded);
 // Output: "Hello World! @#$% 😊"
 
 // Multiple encode/decode calls (idempotent)
@@ -936,4 +930,190 @@ toSchemaMapper(viewObj)  -->
   }
 }
 
-```
+```
+
+```
+ const got = QueryCond(input);
+
+ example:
+QueryCond input: isApproved=true,status!=false,age>18,score<100,height>=170,weight<=80,type=["accept","inprogress"],type!=["accept","inprogress"],role in ["admin","editor"],role not in ["admin","editor"],role notin ["admin","editor"],deletedAt is null,deletedAt is not null,deletedAt isnull,updatedAt isnotnull,deletedAt=null,deletedAt!=null,age between [18,30],createdAt between 2020-01-01..2020-01-31,name like "Jo%",email ilike "%@gmail.com",title contains "hello",code startswith "AB",code endswith "99",path regex "^/api/.*$",archivedAt,!archivedAt,name="a,b",meta={"a":1,"b":true},tags=["x,y","z"]
+QueryCond output: [
+  {
+    "key": "isApproved",
+    "opt": "=",
+    "value": true
+  },
+  {
+    "key": "status",
+    "opt": "!=",
+    "value": false
+  },
+  {
+    "key": "age",
+    "opt": ">",
+    "value": 18
+  },
+  {
+    "key": "score",
+    "opt": "<",
+    "value": 100
+  },
+  {
+    "key": "height",
+    "opt": ">=",
+    "value": 170
+  },
+  {
+    "key": "weight",
+    "opt": "<=",
+    "value": 80
+  },
+  {
+    "key": "type",
+    "opt": "in",
+    "value": [
+      "accept",
+      "inprogress"
+    ]
+  },
+  {
+    "key": "type",
+    "opt": "not in",
+    "value": [
+      "accept",
+      "inprogress"
+    ]
+  },
+  {
+    "key": "role",
+    "opt": "in",
+    "value": [
+      "admin",
+      "editor"
+    ]
+  },
+  {
+    "key": "role",
+    "opt": "not in",
+    "value": [
+      "admin",
+      "editor"
+    ]
+  },
+  {
+    "key": "role",
+    "opt": "not in",
+    "value": [
+      "admin",
+      "editor"
+    ]
+  },
+  {
+    "key": "deletedAt",
+    "opt": "is null",
+    "value": null
+  },
+  {
+    "key": "deletedAt",
+    "opt": "is not null",
+    "value": null
+  },
+  {
+    "key": "deletedAt",
+    "opt": "is null",
+    "value": null
+  },
+  {
+    "key": "updatedAt",
+    "opt": "is not null",
+    "value": null
+  },
+  {
+    "key": "deletedAt",
+    "opt": "is null",
+    "value": null
+  },
+  {
+    "key": "deletedAt",
+    "opt": "is not null",
+    "value": null
+  },
+  {
+    "key": "age",
+    "opt": "between",
+    "value": [
+      18,
+      30
+    ]
+  },
+  {
+    "key": "createdAt",
+    "opt": "between",
+    "value": [
+      "2020-01-01",
+      "2020-01-31"
+    ]
+  },
+  {
+    "key": "name",
+    "opt": "like",
+    "value": "Jo%"
+  },
+  {
+    "key": "email",
+    "opt": "ilike",
+    "value": "%@gmail.com"
+  },
+  {
+    "key": "title",
+    "opt": "contains",
+    "value": "hello"
+  },
+  {
+    "key": "code",
+    "opt": "startswith",
+    "value": "AB"
+  },
+  {
+    "key": "code",
+    "opt": "endswith",
+    "value": "99"
+  },
+  {
+    "key": "path",
+    "opt": "regex",
+    "value": "^/api/.*$"
+  },
+  {
+    "key": "archivedAt",
+    "opt": "exists",
+    "value": true
+  },
+  {
+    "key": "archivedAt",
+    "opt": "exists",
+    "value": false
+  },
+  {
+    "key": "name",
+    "opt": "=",
+    "value": "a,b"
+  },
+  {
+    "key": "meta",
+    "opt": "=",
+    "value": {
+      "a": 1,
+      "b": true
+    }
+  },
+  {
+    "key": "tags",
+    "opt": "in",
+    "value": [
+      "x,y",
+      "z"
+    ]
+  }
+]
+ ```

package/dist/main/const-type.d.ts

@@ -27,19 +27,14 @@ export type ResponseType = {
     skip?: number;
     limit?: number;
 };
-export type SearchByType = {
-    orderBy?: string;
-    order?: "ASC" | "DESC";
-    searchTerm?: string;
-    [key: string]: any;
-};
-export type SearchByLimitType = {
-    limit: number;
-    skip: number;
+export type SearchType = {
+    limit?: number;
+    skip?: number;
     orderBy?: string;
-    order?: "ASC" | "DESC";
+    order?: 'ASC' | 'DESC';
     searchTerm?: string;
-    [key: string]: any;
+    active?: boolean;
+    filters?: string;
 };
 export type KeyValueType = {
     [key: string]: any;

package/dist/main/http.d.ts

@@ -32,4 +32,5 @@ export declare class Http {
     static FormUpload(url: string, file: File, isHeadersAddMultiForm?: boolean, data?: Record<string, any>, headers?: any, method?: 'POST' | 'PUT', type?: RespType): Promise<any>;
     static CloudUpload(fullUrl: string, file: File, headers?: any, method?: 'POST' | 'PUT'): Promise<Response>;
     static FileDownload(fullUrl: string, params: any, headers?: any, method?: string): Promise<Blob>;
+    static ErrorWrapper(errorData: any): any;
 }

package/dist/main/http.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Http = exports.HttpMethods = exports.BaseHeaders = exports.HttpHeaders = exports.RespType = void 0;
 const util_1 = require("./util");
+const const_keys_1 = require("./const-keys");
 var RespType;
 (function (RespType) {
     RespType["JSON"] = "json";
@@ -76,7 +77,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -91,7 +92,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: url, requestId: headers['request-id'], body: data, error: error };
+                throw { url: url, requestId: headers['request-id'], body: data, error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -106,7 +107,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: url, requestId: headers['request-id'], body: data, error: error };
+                throw { url: url, requestId: headers['request-id'], body: data, error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -122,7 +123,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -139,7 +140,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -167,7 +168,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: url, requestId: headers['request-id'], error: error };
+                throw { url: url, requestId: headers['request-id'], error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -187,7 +188,7 @@ class Http {
                 return response;
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: Http.ErrorWrapper(error) };
             }
         });
     }
@@ -203,10 +204,13 @@ class Http {
                 return blob;
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: Http.ErrorWrapper(error) };
             }
         });
     }
+    static ErrorWrapper(errorData) {
+        return Object.assign(Object.assign({}, errorData), { message: errorData.internal_message || errorData.message || const_keys_1.ConstKeys.INVALID_DATA, main_message: errorData.message || const_keys_1.ConstKeys.INVALID_DATA });
+    }
 }
 exports.Http = Http;
 Http.API_BASE_URL = "";

package/dist/main/query-cond.d.ts

@@ -0,0 +1,6 @@
+export type QueryCondItem = {
+    key: string;
+    opt: '=' | '!=' | '>' | '<' | '>=' | '<=' | 'in' | 'not in' | 'notin' | 'between' | 'isnull' | 'isnotnull' | 'is null' | 'is not null' | 'like' | 'ilike' | 'contains' | 'startswith' | 'endswith' | 'regex' | 'exists';
+    value: any;
+};
+export declare function QueryCond(input: string): QueryCondItem[];

package/dist/main/query-cond.js

@@ -0,0 +1,306 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryCond = QueryCond;
+function splitTopLevel(input, delimiter) {
+    const parts = [];
+    let buf = '';
+    let quote = null;
+    let escape = false;
+    let square = 0;
+    let curly = 0;
+    let paren = 0;
+    for (let i = 0; i < input.length; i++) {
+        const ch = input[i];
+        if (escape) {
+            buf += ch;
+            escape = false;
+            continue;
+        }
+        if (quote) {
+            if (ch === '\\') {
+                buf += ch;
+                escape = true;
+                continue;
+            }
+            buf += ch;
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            buf += ch;
+            continue;
+        }
+        if (ch === '[')
+            square++;
+        if (ch === ']')
+            square = Math.max(0, square - 1);
+        if (ch === '{')
+            curly++;
+        if (ch === '}')
+            curly = Math.max(0, curly - 1);
+        if (ch === '(')
+            paren++;
+        if (ch === ')')
+            paren = Math.max(0, paren - 1);
+        if (ch === delimiter && square === 0 && curly === 0 && paren === 0) {
+            const seg = buf.trim();
+            if (seg)
+                parts.push(seg);
+            buf = '';
+            continue;
+        }
+        buf += ch;
+    }
+    const last = buf.trim();
+    if (last)
+        parts.push(last);
+    return parts;
+}
+function parseMaybeJson(raw) {
+    const s = raw.trim();
+    if (!s)
+        return '';
+    if (s === 'null')
+        return null;
+    if (s === 'true')
+        return true;
+    if (s === 'false')
+        return false;
+    if (/^-?\d+(\.\d+)?$/.test(s))
+        return Number(s);
+    const first = s[0];
+    const last = s[s.length - 1];
+    if ((first === '"' && last === '"') || (first === "'" && last === "'")) {
+        if (first === '"') {
+            try {
+                return JSON.parse(s);
+            }
+            catch (_a) {
+                return s.slice(1, -1);
+            }
+        }
+        const inner = s.slice(1, -1);
+        return inner.replace(/\\'/g, "'").replace(/\\\\/g, '\\');
+    }
+    if ((first === '[' && last === ']') || (first === '{' && last === '}')) {
+        try {
+            return JSON.parse(s);
+        }
+        catch (_b) {
+            if (s.includes("'") && !s.includes('"')) {
+                try {
+                    return JSON.parse(s.replace(/'/g, '"'));
+                }
+                catch (_c) {
+                    return s;
+                }
+            }
+            return s;
+        }
+    }
+    return s;
+}
+function findTopLevelOpIndex(expr, ops) {
+    let quote = null;
+    let escape = false;
+    let square = 0;
+    let curly = 0;
+    let paren = 0;
+    for (let i = 0; i < expr.length; i++) {
+        const ch = expr[i];
+        if (escape) {
+            escape = false;
+            continue;
+        }
+        if (quote) {
+            if (ch === '\\') {
+                escape = true;
+                continue;
+            }
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            continue;
+        }
+        if (ch === '[')
+            square++;
+        else if (ch === ']')
+            square = Math.max(0, square - 1);
+        else if (ch === '{')
+            curly++;
+        else if (ch === '}')
+            curly = Math.max(0, curly - 1);
+        else if (ch === '(')
+            paren++;
+        else if (ch === ')')
+            paren = Math.max(0, paren - 1);
+        if (square !== 0 || curly !== 0 || paren !== 0)
+            continue;
+        for (const op of ops) {
+            if (expr.startsWith(op, i)) {
+                return { op, idx: i };
+            }
+        }
+    }
+    return null;
+}
+function findTopLevelTokenIndex(expr, token) {
+    let quote = null;
+    let escape = false;
+    let square = 0;
+    let curly = 0;
+    let paren = 0;
+    for (let i = 0; i < expr.length; i++) {
+        const ch = expr[i];
+        if (escape) {
+            escape = false;
+            continue;
+        }
+        if (quote) {
+            if (ch === '\\') {
+                escape = true;
+                continue;
+            }
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            continue;
+        }
+        if (ch === '[')
+            square++;
+        else if (ch === ']')
+            square = Math.max(0, square - 1);
+        else if (ch === '{')
+            curly++;
+        else if (ch === '}')
+            curly = Math.max(0, curly - 1);
+        else if (ch === '(')
+            paren++;
+        else if (ch === ')')
+            paren = Math.max(0, paren - 1);
+        if (square !== 0 || curly !== 0 || paren !== 0)
+            continue;
+        if (expr.startsWith(token, i))
+            return i;
+    }
+    return -1;
+}
+function parseBetweenValue(raw) {
+    const s = raw.trim();
+    if (!s)
+        return [];
+    if (s.startsWith('[') && s.endsWith(']')) {
+        const parsed = parseMaybeJson(s);
+        if (Array.isArray(parsed))
+            return parsed.slice(0, 2);
+    }
+    const idx = findTopLevelTokenIndex(s, '..');
+    if (idx >= 0) {
+        const left = s.slice(0, idx).trim();
+        const right = s.slice(idx + 2).trim();
+        return [parseMaybeJson(left), parseMaybeJson(right)];
+    }
+    return [parseMaybeJson(s)];
+}
+function normalizeOpt(opt) {
+    const o = opt.trim().toLowerCase();
+    if (o === '==')
+        return '=';
+    if (o === 'notin')
+        return 'not in';
+    if (o === 'is null')
+        return 'is null';
+    if (o === 'is not null')
+        return 'is not null';
+    if (o === 'isnull')
+        return 'is null';
+    if (o === 'isnotnull')
+        return 'is not null';
+    if (o === 'in')
+        return 'in';
+    if (o === 'not in')
+        return 'not in';
+    if (o === 'notin')
+        return 'not in';
+    if (o === 'between')
+        return 'between';
+    if (o === 'like')
+        return 'like';
+    if (o === 'ilike')
+        return 'ilike';
+    if (o === 'contains')
+        return 'contains';
+    if (o === 'startswith')
+        return 'startswith';
+    if (o === 'endswith')
+        return 'endswith';
+    if (o === 'regex')
+        return 'regex';
+    if (o === 'exists')
+        return 'exists';
+    if (opt === '>=')
+        return '>=';
+    if (opt === '<=')
+        return '<=';
+    if (opt === '!=')
+        return '!=';
+    if (opt === '>')
+        return '>';
+    if (opt === '<')
+        return '<';
+    return '=';
+}
+function parseOneCond(segment) {
+    const s = segment.trim();
+    if (!s)
+        return null;
+    const unaryMatch = s.match(/^(.+?)\s+(isnull|isnotnull|is\s+null|is\s+not\s+null)\s*$/i);
+    if (unaryMatch) {
+        const key = unaryMatch[1].trim();
+        const opt = normalizeOpt(unaryMatch[2]);
+        return { key, opt, value: null };
+    }
+    const keywordMatch = s.match(/^(.+?)\s+(not\s+in|notin|in|between|ilike|like|contains|startswith|endswith|regex)\s+([\s\S]+)$/i);
+    if (keywordMatch) {
+        const key = keywordMatch[1].trim();
+        const opt = normalizeOpt(keywordMatch[2]);
+        const rawVal = keywordMatch[3].trim();
+        const value = opt === 'between' ? parseBetweenValue(rawVal) : parseMaybeJson(rawVal);
+        return { key, opt, value };
+    }
+    const opInfo = findTopLevelOpIndex(s, ['>=', '<=', '!=', '==', '>', '<', '=']);
+    if (opInfo) {
+        const key = s.slice(0, opInfo.idx).trim();
+        const rhs = s.slice(opInfo.idx + opInfo.op.length).trim();
+        let opt = normalizeOpt(opInfo.op);
+        let value = rhs ? parseMaybeJson(rhs) : null;
+        if (opt === '=' && Array.isArray(value))
+            opt = 'in';
+        if (opt === '!=' && Array.isArray(value))
+            opt = 'not in';
+        if (opt === '=' && value === null)
+            opt = 'is null';
+        if (opt === '!=' && value === null)
+            opt = 'is not null';
+        return { key, opt, value };
+    }
+    if (/^!\s*\w/.test(s)) {
+        const key = s.replace(/^!\s*/, '').trim();
+        return { key, opt: 'exists', value: false };
+    }
+    return { key: s, opt: 'exists', value: true };
+}
+function QueryCond(input) {
+    if (!input)
+        return [];
+    const segments = splitTopLevel(input, ',');
+    return segments.map(parseOneCond).filter((x) => Boolean(x));
+}

package/dist/main/util.d.ts

@@ -1,4 +1,4 @@
-import { LangCountryType } from "./const-type";
+import { LangCountryType } from './const-type';
 export declare const AppRandomString: (length: number, charset: string) => string;
 export declare const AppUniqueCode: () => string;
 export declare const AppCodeByType: (name: string, type?: null) => string;
@@ -20,3 +20,4 @@ export declare function EncodeURL(input: string): string;
 export declare function DecodeURL(input: string): string;
 export declare function SafeEncode(input: string): string;
 export declare function SafeDecode(encoded: string): string;
+export { QueryCond, type QueryCondItem } from './query-cond';

package/dist/main/util.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CurrencyConvert = exports.LangCountryCode = exports.LangText = exports.TimeAgo = exports.DateAndTime = exports.DateTime12HrFormat = exports.DateTime24HrFormat = exports.TruncateText = exports.AppUUID4 = exports.AppAddDays = exports.AppDaysBack = exports.AppCode = exports.AppCodeByType = exports.AppUniqueCode = exports.AppRandomString = void 0;
+exports.QueryCond = exports.CurrencyConvert = exports.LangCountryCode = exports.LangText = exports.TimeAgo = exports.DateAndTime = exports.DateTime12HrFormat = exports.DateTime24HrFormat = exports.TruncateText = exports.AppUUID4 = exports.AppAddDays = exports.AppDaysBack = exports.AppCode = exports.AppCodeByType = exports.AppUniqueCode = exports.AppRandomString = void 0;
 exports.EncodeBase64 = EncodeBase64;
 exports.DecodeBase64 = DecodeBase64;
 exports.EncodeURL = EncodeURL;
@@ -17,10 +17,10 @@ exports.DecodeURL = DecodeURL;
 exports.SafeEncode = SafeEncode;
 exports.SafeDecode = SafeDecode;
 const randomstring_1 = require("randomstring");
-const reg_exr_1 = require("./reg-exr");
+const const_value_1 = require("./const-value");
 const countries_1 = require("./countries");
 const languages_1 = require("./languages");
-const const_value_1 = require("./const-value");
+const reg_exr_1 = require("./reg-exr");
 const AppRandomString = (length, charset) => {
     return (0, randomstring_1.generate)({ length: length, charset: charset });
 };
@@ -37,15 +37,15 @@ const AppUniqueCode = () => {
 };
 exports.AppUniqueCode = AppUniqueCode;
 const AppCodeByType = (name, type = null) => {
-    let str = "";
+    let str = '';
     if (type) {
-        str = type + "_" + name;
+        str = type + '_' + name;
     }
     else {
-        str = name + "_" + (0, exports.AppUniqueCode)();
+        str = name + '_' + (0, exports.AppUniqueCode)();
     }
-    str = str.replace(reg_exr_1.RegExp.NON_ALPHA_NUMERIC, "_");
-    str = str.replace(/\s/g, "_");
+    str = str.replace(reg_exr_1.RegExp.NON_ALPHA_NUMERIC, '_');
+    str = str.replace(/\s/g, '_');
     str = str.substr(0, 128);
     return str.toUpperCase();
 };
@@ -53,10 +53,10 @@ exports.AppCodeByType = AppCodeByType;
 const AppCode = (name) => {
     if (name == null)
         return null;
-    let str = "";
+    let str = '';
     str = name.trim();
-    str = str.replace(reg_exr_1.RegExp.NON_ALPHA_NUMERIC, "_");
-    str = str.replace(/\s/g, "_");
+    str = str.replace(reg_exr_1.RegExp.NON_ALPHA_NUMERIC, '_');
+    str = str.replace(/\s/g, '_');
     return str.toUpperCase();
 };
 exports.AppCode = AppCode;
@@ -85,54 +85,54 @@ const AppAddDays = (date, addDays, isDays = true) => {
 };
 exports.AppAddDays = AppAddDays;
 const AppUUID4 = () => {
-    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         const r = (Math.random() * 16) | 0;
-        const v = c == "x" ? r : (r & 0x3) | 0x8;
+        const v = c == 'x' ? r : (r & 0x3) | 0x8;
         return v.toString(16);
     });
 };
 exports.AppUUID4 = AppUUID4;
 const TruncateText = (input, maxLength) => {
     if ((input === null || input === void 0 ? void 0 : input.length) > maxLength) {
-        return input.substring(0, maxLength) + "...";
+        return input.substring(0, maxLength) + '...';
     }
     return input;
 };
 exports.TruncateText = TruncateText;
 const DateTime24HrFormat = (time) => {
-    const [timeStr, modifier] = time.split(" ");
-    let [hours, minutes] = timeStr.split(":").map(Number);
-    if (modifier === "AM") {
+    const [timeStr, modifier] = time.split(' ');
+    let [hours, minutes] = timeStr.split(':').map(Number);
+    if (modifier === 'AM') {
         if (hours === 12)
             hours = 0;
     }
-    else if (modifier === "PM") {
+    else if (modifier === 'PM') {
         if (hours !== 12)
             hours += 12;
     }
-    return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:00`;
+    return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
 };
 exports.DateTime24HrFormat = DateTime24HrFormat;
 const DateTime12HrFormat = (timestamp, showDate = true, showTime) => {
     const newDate = new Date(timestamp);
     const months = const_value_1.ConstValue.MonthNames;
-    const day = String(newDate.getDate()).padStart(2, "0");
+    const day = String(newDate.getDate()).padStart(2, '0');
     const month = months[newDate.getMonth()];
     const year = newDate.getFullYear();
     let hours = newDate.getHours();
-    const minutes = String(newDate.getMinutes()).padStart(2, "0");
-    const ampm = hours >= 12 ? "PM" : "AM";
+    const minutes = String(newDate.getMinutes()).padStart(2, '0');
+    const ampm = hours >= 12 ? 'PM' : 'AM';
     hours = hours % 12;
     hours = hours ? hours : 12;
-    const date = showDate ? `${day} ${month} ${year}` : "";
-    const time = showTime ? `${hours}:${minutes} ${ampm}` : "";
+    const date = showDate ? `${day} ${month} ${year}` : '';
+    const time = showTime ? `${hours}:${minutes} ${ampm}` : '';
     return `${date} ${time}`;
 };
 exports.DateTime12HrFormat = DateTime12HrFormat;
 const DateAndTime = (dateString, timeString) => {
     if (!dateString)
         return null;
-    const validTimeString = timeString || "00:00:00";
+    const validTimeString = timeString || '00:00:00';
     const combined = new Date(`${dateString}T${validTimeString}Z`);
     return isNaN(combined.getTime()) ? null : combined;
 };
@@ -146,31 +146,31 @@ const TimeAgo = (date) => {
     if (days > 1)
         return `${days} days ago`;
     if (days === 1)
-        return "1 day ago";
+        return '1 day ago';
     if (hours > 1)
         return `${hours} hours ago`;
     if (hours === 1)
-        return "1 hour ago";
+        return '1 hour ago';
     if (minutes > 1)
         return `${minutes} minutes ago`;
     if (minutes === 1)
-        return "1 minute ago";
-    return "Just now";
+        return '1 minute ago';
+    return 'Just now';
 };
 exports.TimeAgo = TimeAgo;
 const LangText = (data, source, target) => __awaiter(void 0, void 0, void 0, function* () {
     if (!data || !source || !target) {
-        throw new Error("Invalid input: data, source, or target is missing");
+        throw new Error('Invalid input: data, source, or target is missing');
     }
-    const src = source.split("-")[0]; // e.g., "en-US" -> "en"
-    const tgt = target.split("-")[0]; // e.g., "te-IN" -> "te"
+    const src = source.split('-')[0]; // e.g., "en-US" -> "en"
+    const tgt = target.split('-')[0]; // e.g., "te-IN" -> "te"
     if (!/^[a-zA-Z]{2}$/.test(src) || !/^[a-zA-Z]{2}$/.test(tgt)) {
-        throw new Error("Invalid language code format");
+        throw new Error('Invalid language code format');
     }
     const encodedData = encodeURIComponent(data);
     const url = `https://lingva.ml/api/v1/${src}/${tgt}/${encodedData}`;
     const res = yield fetch(url, {
-        method: "GET",
+        method: 'GET',
     });
     if (!res.ok) {
         throw new Error(`Translation failed: ${res.status} ${res.statusText}`);
@@ -179,11 +179,11 @@ const LangText = (data, source, target) => __awaiter(void 0, void 0, void 0, fun
     if (json.error) {
         throw new Error(`API error: ${json.error}`);
     }
-    return json.translation || "";
+    return json.translation || '';
 });
 exports.LangText = LangText;
 const LangCountryCode = (lang) => {
-    const countryCode = lang.split("-")[1];
+    const countryCode = lang.split('-')[1];
     const country = countries_1.countries.find((c) => c.code === countryCode) || {};
     const language = languages_1.languages.find((l) => l.lang === lang) || {};
     return {
@@ -201,7 +201,7 @@ const LangCountryCode = (lang) => {
 exports.LangCountryCode = LangCountryCode;
 const CurrencyConvert = (from, to) => __awaiter(void 0, void 0, void 0, function* () {
     if (!from || !to) {
-        throw new Error("Invalid input: from or to is missing");
+        throw new Error('Invalid input: from or to is missing');
     }
     if (from === to) {
         return 1;
@@ -209,7 +209,7 @@ const CurrencyConvert = (from, to) => __awaiter(void 0, void 0, void 0, function
     try {
         const url = `https://api.frankfurter.app/latest?from=${from}&to=${to}`;
         const res = yield fetch(url, {
-            method: "GET",
+            method: 'GET',
         });
         if (!res.ok) {
             throw new Error(`Currency conversion failed: ${res.status} ${res.statusText}`);
@@ -251,3 +251,5 @@ function SafeEncode(input) {
 function SafeDecode(encoded) {
     return DecodeBase64(DecodeURL(encoded));
 }
+var query_cond_1 = require("./query-cond");
+Object.defineProperty(exports, "QueryCond", { enumerable: true, get: function () { return query_cond_1.QueryCond; } });

package/dist/tests/http.js

@@ -11,16 +11,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("../index");
-const url = '/auth/partner/signin';
-const reqBody = { language: 'en-US', mobile: '111111111', provider: 'mobile', telCode: '+91' };
-const runHttpExample = () => __awaiter(void 0, void 0, void 0, function* () {
+index_1.Http.API_BASE_URL = 'http://localhost:4000';
+const signinRun = () => __awaiter(void 0, void 0, void 0, function* () {
+    const payload = {
+        userid: 'aaa@anymail.com',
+        password: '11111',
+        type: 'admin',
+        provider: 'email',
+    };
     try {
-        const res = yield index_1.Http.Post(url, reqBody, null);
+        const res = yield index_1.Http.Post("/auth/signin", payload, {});
         console.log(res);
-        return res;
     }
-    catch (error) {
-        console.log(error);
+    catch (e) {
+        console.error(e);
     }
 });
-runHttpExample();
+signinRun();

package/dist/tests/util.js

@@ -11,23 +11,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../main/util");
-const CallLangCountry = () => {
-    const lang = "en-US";
-    const country = (0, util_1.LangCountryCode)(lang);
-    console.log("LangCountryCode:: ", country);
-};
-const CallLangText = () => __awaiter(void 0, void 0, void 0, function* () {
-    const resp = yield (0, util_2.LangText)("Hello, how are you?", "en-US", "hi-IN");
-    console.log("Resp Kannada:: ", resp);
-});
-const CallCurrencyConvert = () => __awaiter(void 0, void 0, void 0, function* () {
-    const resp = yield (0, util_1.CurrencyConvert)("USD", "INR");
-    console.log("Resp Currency:: ", resp);
-});
-const util_2 = require("../main/util");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    // await CallLangCountry();
-    // await CallLangText();
-    yield CallCurrencyConvert();
+    const input = [
+        'isApproved=true',
+        'status!=false',
+        'age>18',
+        'score<100',
+        'height>=170',
+        'weight<=80',
+        'type=["accept","inprogress"]',
+        'type!=["accept","inprogress"]',
+        'role in ["admin","editor"]',
+        'role not in ["admin","editor"]',
+        'role notin ["admin","editor"]',
+        'deletedAt is null',
+        'deletedAt is not null',
+        'deletedAt isnull',
+        'updatedAt isnotnull',
+        'deletedAt=null',
+        'deletedAt!=null',
+        'age between [18,30]',
+        'createdAt between 2020-01-01..2020-01-31',
+        'name like "Jo%"',
+        'email ilike "%@gmail.com"',
+        'title contains "hello"',
+        'code startswith "AB"',
+        'code endswith "99"',
+        'path regex "^/api/.*$"',
+        'archivedAt',
+        '!archivedAt',
+        'name="a,b"',
+        'meta={"a":1,"b":true}',
+        'tags=["x,y","z"]',
+    ].join(',');
+    const got = (0, util_1.QueryCond)(input);
+    console.log('QueryCond input:', input);
+    console.log('QueryCond output:', JSON.stringify(got, null, 2));
 });
 run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dff-util",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -28,4 +28,4 @@
     "jwt-encode": "^1.0.1",
     "randomstring": "1.3.0"
   }
-}
+}