@wxn0brp/db-string-query 0.0.12 → 0.0.13

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.13](https://github.com/wxn0brP/ValtheraDB-string-query/compare/v0.0.12...v0.0.13) (2026-02-01)
+
 ### [0.0.12](https://github.com/wxn0brP/ValtheraDB-string-query/compare/v0.0.11...v0.0.12) (2025-12-06)
 
 

package/bun.lock

@@ -7,13 +7,13 @@
       "devDependencies": {
         "@types/bun": "*",
         "@types/node": "*",
-        "@wxn0brp/db-core": "^0.2.7",
+        "@wxn0brp/db-core": "^0.4.0",
         "json5": "^2.2.3",
         "tsc-alias": "*",
         "typescript": "*",
       },
       "peerDependencies": {
-        "@wxn0brp/db-core": ">=0.2.7",
+        "@wxn0brp/db-core": ">=0.4.0",
         "json5": "^2.2.3",
       },
       "optionalPeers": [
@@ -29,13 +29,13 @@
 
     "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="],
 
-    "@types/bun": ["@types/bun@1.3.3", "", { "dependencies": { "bun-types": "1.3.3" } }, "sha512-ogrKbJ2X5N0kWLLFKeytG0eHDleBYtngtlbu9cyBKFtNL3cnpDZkNdQj8flVf6WTZUX5ulI9AY1oa7ljhSrp+g=="],
+    "@types/bun": ["@types/bun@1.3.8", "", { "dependencies": { "bun-types": "1.3.8" } }, "sha512-3LvWJ2q5GerAXYxO2mffLTqOzEu5qnhEAlh48Vnu8WQfnmSwbgagjGZV6BoHKJztENYEDn6QmVd949W4uESRJA=="],
 
-    "@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
+    "@types/node": ["@types/node@25.1.0", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-t7frlewr6+cbx+9Ohpl0NOTKXZNV9xHRmNOvql47BFJKcEG1CxtxlPEEe+gR9uhVWM4DwhnvTF110mIL4yP9RA=="],
 
-    "@wxn0brp/db-core": ["@wxn0brp/db-core@0.2.12", "", { "dependencies": { "@wxn0brp/event-emitter": "^0.0.3" } }, "sha512-DQuYBDnC+XdouqS6aUwPqWW/2KIB4t6YqtGg5BDo7Ti8afHSukH3tj7IneVv/Aquhc6I9C8lUQVkindPG7H2wA=="],
+    "@wxn0brp/db-core": ["@wxn0brp/db-core@0.4.0", "", { "dependencies": { "@wxn0brp/event-emitter": "^0.0.4" } }, "sha512-BDteuLKygKT1+jq5zR8RpO+YrvwSBDT9rM8/zNT1QtumA1cHTGR9pmDoHMTePF3JyVpXzxtqviGVVGWM59Pkgw=="],
 
-    "@wxn0brp/event-emitter": ["@wxn0brp/event-emitter@0.0.3", "", {}, "sha512-OYkyDJphUDlWSOArLs3kdXWsacQ/1AtLNQl23ffrSoIiUPpcTxTzvlFGE3Y5M50j9lstYH4Dtvbx7edOQnK2qA=="],
+    "@wxn0brp/event-emitter": ["@wxn0brp/event-emitter@0.0.4", "", {}, "sha512-C1Os4hEw13NDysPEFHZ6PDV2WRSGp6Q75rtfIAJHuZTl/gMPy+8ndD4dZDMgGglE+EnVYt2F4BU+/zswfOqcKQ=="],
 
     "anymatch": ["anymatch@3.1.3", "", { "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="],
 
@@ -45,7 +45,7 @@
 
     "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
 
-    "bun-types": ["bun-types@1.3.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ=="],
+    "bun-types": ["bun-types@1.3.8", "", { "dependencies": { "@types/node": "*" } }, "sha512-fL99nxdOWvV4LqjmC+8Q9kW3M4QTtTR1eePs94v5ctGqU8OeceWrSUaRw3JYb7tU3FkMIAjkueehrHPPPGKi5Q=="],
 
     "chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],
 
@@ -55,13 +55,13 @@
 
     "fast-glob": ["fast-glob@3.3.3", "", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.8" } }, "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg=="],
 
-    "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="],
+    "fastq": ["fastq@1.20.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw=="],
 
     "fill-range": ["fill-range@7.1.1", "", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="],
 
     "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
 
-    "get-tsconfig": ["get-tsconfig@4.13.0", "", { "dependencies": { "resolve-pkg-maps": "^1.0.0" } }, "sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ=="],
+    "get-tsconfig": ["get-tsconfig@4.13.1", "", { "dependencies": { "resolve-pkg-maps": "^1.0.0" } }, "sha512-EoY1N2xCn44xU6750Sx7OjOIT59FkmstNc3X6y5xpz7D5cBtZRe/3pSlTkDJgqsOk3WwZPkWfonhhUJfttQo3w=="],
 
     "glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 

package/dist/sql/where.js

@@ -1,3 +1,5 @@
+// It’s cheap - it’s cheap
+// It’s good - it’s cheap
 const operators = {
     "=": null,
     "<": "$lt",
@@ -6,8 +8,19 @@ const operators = {
     ">=": "$gte",
     "!=": "$not",
     "IN": "$in",
-    "NOT IN": "$nin"
+    "NOT IN": "$nin",
+    "NOT ANY": "$nin",
+    "IS": null,
+    "IS NOT": "$not"
 };
+function escapeRegex(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function likeToRegex(pattern, caseInsensitive = false) {
+    const escaped = escapeRegex(pattern);
+    const converted = escaped.replace(/%/g, '.*').replace(/_/g, '.');
+    return `${caseInsensitive ? '(?i)' : ''}^${converted}$`;
+}
 function mergeQueries(target, source) {
     for (const key in source) {
         if (key.startsWith('$')) {
@@ -40,7 +53,7 @@ export function parseWhere(where) {
     // Tokenize the input string, handling parentheses and quoted values
     const tokens = where
         .replace(/\s+(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/g, " ")
-        .match(/(?:\(|\)|'[^']*'|"[^"]*"|[^\s()'"]+)/g) || [];
+        .match(/(?:\(|\)|'[^']*'|"[^"]*"|>=|<=|!=|<>|=|<|>|[^\s()=<>!]+)/g) || [];
     let frames = [];
     let current = {};
     let operatorStack = [];
@@ -112,20 +125,54 @@ export function parseWhere(where) {
                 key = key.split(".").pop();
             }
             let opToken = tokens[++i]?.trim();
+            // Handle multi-word operators
+            if (opToken) {
+                const upperOp = opToken.toUpperCase();
+                const nextToken = tokens[i + 1]?.trim().toUpperCase();
+                if (upperOp === "NOT" && (nextToken === "IN" || nextToken === "LIKE" || nextToken === "ILIKE" || nextToken === "ANY" || nextToken === "BETWEEN")) {
+                    opToken = `NOT ${nextToken}`;
+                    i++;
+                }
+                else if (upperOp === "IS") {
+                    if (nextToken === "NOT") {
+                        opToken = "IS NOT";
+                        i++;
+                        // Check for NULL
+                        if (tokens[i + 1]?.trim().toUpperCase() === "NULL") {
+                            // Correctly consume NULL as value
+                        }
+                    }
+                }
+            }
             let value = tokens[++i]?.trim();
             if (!key || !opToken || value === undefined) {
                 throw new Error(`Invalid condition near '${key} ${opToken} ${value}'`);
             }
             // Handle quoted values
-            if ((value.startsWith("'") && value.endsWith("'")) || (value.startsWith('"') && value.endsWith('"'))) {
+            if (typeof value === 'string' && ((value.startsWith("'") && value.endsWith("'")) || (value.startsWith('"') && value.endsWith('"')))) {
                 value = value.slice(1, -1);
             }
+            // Handle NULL value
+            if (typeof value === 'string' && value.toUpperCase() === "NULL") {
+                value = null;
+            }
             // Parse numeric values
-            if (!isNaN(Number(value))) {
+            if (value !== null && !isNaN(Number(value))) {
                 value = Number(value);
             }
-            // Handle IN and NOT IN operations
-            if (opToken.toUpperCase() === "IN" || opToken.toUpperCase() === "NOT IN") {
+            // Handle IN, NOT IN, NOT ANY operations
+            if (opToken.toUpperCase() === "IN" || opToken.toUpperCase() === "NOT IN" || opToken.toUpperCase() === "NOT ANY") {
+                // If the value is just "(", we need to consume tokens until we find the closing ")"
+                if (value === "(") {
+                    let collected = "(";
+                    while (i < tokens.length - 1) {
+                        const next = tokens[++i];
+                        collected += next;
+                        if (next === ")")
+                            break;
+                    }
+                    value = collected;
+                }
                 if (!value.startsWith("(") || !value.endsWith(")")) {
                     throw new Error(`Invalid syntax for '${opToken}' near '${value}'`);
                 }
@@ -137,6 +184,60 @@ export function parseWhere(where) {
                     return isNaN(Number(v)) ? v : Number(v);
                 });
             }
+            // Handle LIKE/NOT LIKE/ILIKE/NOT ILIKE specially to convert to regex
+            if (opToken.toUpperCase() === "LIKE" || opToken.toUpperCase() === "NOT LIKE" || opToken.toUpperCase() === "ILIKE" || opToken.toUpperCase() === "NOT ILIKE") {
+                if (typeof value !== 'string') {
+                    throw new Error(`LIKE value must be a string, got ${value}`);
+                }
+                const isCaseInsensitive = opToken.toUpperCase().includes("ILIKE");
+                const regex = likeToRegex(value, isCaseInsensitive);
+                const isNot = opToken.toUpperCase().startsWith("NOT");
+                if (isNot) {
+                    // NOT LIKE -> {$not: {$regex: {key: regex}}}
+                    if (!current["$not"])
+                        current["$not"] = {};
+                    if (!current["$not"]["$regex"])
+                        current["$not"]["$regex"] = {};
+                    current["$not"]["$regex"][key] = regex;
+                }
+                else {
+                    // LIKE -> {$regex: {key: regex}}
+                    if (!current["$regex"])
+                        current["$regex"] = {};
+                    current["$regex"][key] = regex;
+                }
+                continue; // processing done for this token
+            }
+            // Handle BETWEEN/NOT BETWEEN
+            if (opToken.toUpperCase() === "BETWEEN" || opToken.toUpperCase() === "NOT BETWEEN") {
+                const andToken = tokens[++i]?.trim();
+                if (!andToken || andToken.toUpperCase() !== "AND") {
+                    throw new Error("BETWEEN expects AND, got " + andToken);
+                }
+                let val2 = tokens[++i]?.trim();
+                // Handle quoted values for val2
+                if (typeof val2 === 'string' && ((val2.startsWith("'") && val2.endsWith("'")) || (val2.startsWith('"') && val2.endsWith('"')))) {
+                    val2 = val2.slice(1, -1);
+                }
+                // Handle numerics for val2
+                if (val2 !== null && !isNaN(Number(val2))) {
+                    val2 = Number(val2);
+                }
+                if (opToken.toUpperCase() === "NOT BETWEEN") {
+                    if (!current["$not"])
+                        current["$not"] = {};
+                    if (!current["$not"]["$between"])
+                        current["$not"]["$between"] = {};
+                    current["$not"]["$between"][key] = [value, val2];
+                }
+                else {
+                    // BETWEEN -> {$between: {key: [val1, val2]}}
+                    if (!current["$between"])
+                        current["$between"] = {};
+                    current["$between"][key] = [value, val2];
+                }
+                continue;
+            }
             // Map the operator to the query operators
             const mappedOp = operators[opToken.toUpperCase()];
             if (mappedOp !== undefined) {

package/dist/sql/where.js.map

@@ -1 +1 @@
-{"version":3,"file":"where.js","sourceRoot":"","sources":["../../src/sql/where.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"where.js","sourceRoot":"","sources":["../../src/sql/where.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-string-query",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {
@@ -14,13 +14,13 @@
   "devDependencies": {
     "@types/bun": "*",
     "@types/node": "*",
-    "@wxn0brp/db-core": "^0.2.7",
+    "@wxn0brp/db-core": "^0.4.0",
     "json5": "^2.2.3",
     "tsc-alias": "*",
     "typescript": "*"
   },
   "peerDependencies": {
-    "@wxn0brp/db-core": ">=0.2.7",
+    "@wxn0brp/db-core": ">=0.4.0",
     "json5": "^2.2.3"
   },
   "peerDependenciesMeta": {

package/src/sql/where.ts

@@ -1,3 +1,6 @@
+// It’s cheap - it’s cheap
+// It’s good - it’s cheap
+
 type QueryObject = Record<string, any>;
 
 const operators: Record<string, string> = {
@@ -8,9 +11,22 @@ const operators: Record<string, string> = {
     ">=": "$gte",
     "!=": "$not",
     "IN": "$in",
-    "NOT IN": "$nin"
+    "NOT IN": "$nin",
+    "NOT ANY": "$nin",
+    "IS": null,
+    "IS NOT": "$not"
 };
 
+function escapeRegex(string: string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function likeToRegex(pattern: string, caseInsensitive: boolean = false) {
+    const escaped = escapeRegex(pattern);
+    const converted = escaped.replace(/%/g, '.*').replace(/_/g, '.');
+    return `${caseInsensitive ? '(?i)' : ''}^${converted}$`;
+}
+
 function mergeQueries(target: QueryObject, source: QueryObject) {
     for (const key in source) {
         if (key.startsWith('$')) {
@@ -40,7 +56,7 @@ export function parseWhere(where: string): QueryObject {
     // Tokenize the input string, handling parentheses and quoted values
     const tokens = where
         .replace(/\s+(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/g, " ")
-        .match(/(?:\(|\)|'[^']*'|"[^"]*"|[^\s()'"]+)/g) || [];
+        .match(/(?:\(|\)|'[^']*'|"[^"]*"|>=|<=|!=|<>|=|<|>|[^\s()=<>!]+)/g) || [];
 
     let frames: Array<{ current: QueryObject, operatorStack: string[], stack: any[] }> = [];
     let current: QueryObject = {};
@@ -113,6 +129,26 @@ export function parseWhere(where: string): QueryObject {
                 key = key.split(".").pop()!;
             }
             let opToken = tokens[++i]?.trim();
+            // Handle multi-word operators
+            if (opToken) {
+                const upperOp = opToken.toUpperCase();
+                const nextToken = tokens[i + 1]?.trim().toUpperCase();
+
+                if (upperOp === "NOT" && (nextToken === "IN" || nextToken === "LIKE" || nextToken === "ILIKE" || nextToken === "ANY" || nextToken === "BETWEEN")) {
+                    opToken = `NOT ${nextToken}`;
+                    i++;
+                } else if (upperOp === "IS") {
+                    if (nextToken === "NOT") {
+                        opToken = "IS NOT";
+                        i++;
+                        // Check for NULL
+                        if (tokens[i + 1]?.trim().toUpperCase() === "NULL") {
+                            // Correctly consume NULL as value
+                        }
+                    }
+                }
+            }
+
             let value: any = tokens[++i]?.trim();
 
             if (!key || !opToken || value === undefined) {
@@ -120,17 +156,33 @@ export function parseWhere(where: string): QueryObject {
             }
 
             // Handle quoted values
-            if ((value.startsWith("'") && value.endsWith("'")) || (value.startsWith('"') && value.endsWith('"'))) {
+            if (typeof value === 'string' && ((value.startsWith("'") && value.endsWith("'")) || (value.startsWith('"') && value.endsWith('"')))) {
                 value = value.slice(1, -1);
             }
 
+            // Handle NULL value
+            if (typeof value === 'string' && value.toUpperCase() === "NULL") {
+                value = null;
+            }
+
             // Parse numeric values
-            if (!isNaN(Number(value))) {
+            if (value !== null && !isNaN(Number(value))) {
                 value = Number(value);
             }
 
-            // Handle IN and NOT IN operations
-            if (opToken.toUpperCase() === "IN" || opToken.toUpperCase() === "NOT IN") {
+            // Handle IN, NOT IN, NOT ANY operations
+            if (opToken.toUpperCase() === "IN" || opToken.toUpperCase() === "NOT IN" || opToken.toUpperCase() === "NOT ANY") {
+                // If the value is just "(", we need to consume tokens until we find the closing ")"
+                if (value === "(") {
+                    let collected = "(";
+                    while (i < tokens.length - 1) {
+                        const next = tokens[++i];
+                        collected += next;
+                        if (next === ")") break;
+                    }
+                    value = collected;
+                }
+
                 if (!value.startsWith("(") || !value.endsWith(")")) {
                     throw new Error(`Invalid syntax for '${opToken}' near '${value}'`);
                 }
@@ -143,6 +195,57 @@ export function parseWhere(where: string): QueryObject {
                 });
             }
 
+            // Handle LIKE/NOT LIKE/ILIKE/NOT ILIKE specially to convert to regex
+            if (opToken.toUpperCase() === "LIKE" || opToken.toUpperCase() === "NOT LIKE" || opToken.toUpperCase() === "ILIKE" || opToken.toUpperCase() === "NOT ILIKE") {
+                if (typeof value !== 'string') {
+                    throw new Error(`LIKE value must be a string, got ${value}`);
+                }
+                const isCaseInsensitive = opToken.toUpperCase().includes("ILIKE");
+                const regex = likeToRegex(value, isCaseInsensitive);
+                const isNot = opToken.toUpperCase().startsWith("NOT");
+
+                if (isNot) {
+                    // NOT LIKE -> {$not: {$regex: {key: regex}}}
+                    if (!current["$not"]) current["$not"] = {};
+                    if (!current["$not"]["$regex"]) current["$not"]["$regex"] = {};
+                    current["$not"]["$regex"][key] = regex;
+                } else {
+                    // LIKE -> {$regex: {key: regex}}
+                    if (!current["$regex"]) current["$regex"] = {};
+                    current["$regex"][key] = regex;
+                }
+                continue; // processing done for this token
+            }
+
+            // Handle BETWEEN/NOT BETWEEN
+            if (opToken.toUpperCase() === "BETWEEN" || opToken.toUpperCase() === "NOT BETWEEN") {
+                const andToken = tokens[++i]?.trim();
+                if (!andToken || andToken.toUpperCase() !== "AND") {
+                    throw new Error("BETWEEN expects AND, got " + andToken);
+                }
+                let val2: any = tokens[++i]?.trim();
+
+                // Handle quoted values for val2
+                if (typeof val2 === 'string' && ((val2.startsWith("'") && val2.endsWith("'")) || (val2.startsWith('"') && val2.endsWith('"')))) {
+                    val2 = val2.slice(1, -1);
+                }
+                // Handle numerics for val2
+                if (val2 !== null && !isNaN(Number(val2))) {
+                    val2 = Number(val2);
+                }
+
+                if (opToken.toUpperCase() === "NOT BETWEEN") {
+                    if (!current["$not"]) current["$not"] = {};
+                    if (!current["$not"]["$between"]) current["$not"]["$between"] = {};
+                    current["$not"]["$between"][key] = [value, val2];
+                } else {
+                    // BETWEEN -> {$between: {key: [val1, val2]}}
+                    if (!current["$between"]) current["$between"] = {};
+                    current["$between"][key] = [value, val2];
+                }
+                continue;
+            }
+
             // Map the operator to the query operators
             const mappedOp = operators[opToken.toUpperCase()];
 

package/test/sql/select.test.ts

@@ -15,6 +15,17 @@ describe("SQL Parser - SELECT", () => {
         expect(parsedQuery.args[1]).toEqual({ id: 1 }); // where clause
     });
 
+    test("1b. should parse a simple SELECT query without spaces", () => {
+        const query = "SELECT * FROM users WHERE id=1";
+        const parsedQuery = sqlParser.parse(query);
+
+        expect(parsedQuery).toBeDefined();
+        expect(parsedQuery.method).toBe("find");
+        expect(parsedQuery.args).toHaveLength(4);
+        expect(parsedQuery.args[0]).toBe("users"); // collection name
+        expect(parsedQuery.args[1]).toEqual({ id: 1 }); // where clause
+    });
+
     test("2. should parse a SELECT query with specific columns", () => {
         const query = "SELECT name, email FROM users WHERE active = 1";
         const parsedQuery = sqlParser.parse(query);
@@ -24,9 +35,21 @@ describe("SQL Parser - SELECT", () => {
         expect(parsedQuery.args).toHaveLength(4);
         expect(parsedQuery.args[0]).toBe("users"); // collection name
         expect(parsedQuery.args[1]).toEqual({ active: 1 }); // where clause
+        expect(parsedQuery.args[1]).toEqual({ active: 1 }); // where clause
         expect(parsedQuery.args[3]).toEqual({ select: ["name", "email"] }); // select options
     });
 
+    test("2b. should parse a SELECT query with NOT IN", () => {
+        const query = "SELECT * FROM users WHERE status NOT IN (1, 2)";
+        const parsedQuery = sqlParser.parse(query);
+
+        expect(parsedQuery).toBeDefined();
+        expect(parsedQuery.method).toBe("find");
+        expect(parsedQuery.args).toHaveLength(4);
+        expect(parsedQuery.args[0]).toBe("users");
+        expect(parsedQuery.args[1]).toEqual({ $nin: { status: [1, 2] } });
+    });
+
     test("3. should parse a SELECT query without WHERE clause", () => {
         const query = "SELECT * FROM users";
         const parsedQuery = sqlParser.parse(query);
@@ -89,4 +112,58 @@ describe("SQL Parser - SELECT", () => {
             sqlParser.parse(query);
         }).toThrow();
     });
+
+    test("8. should parse LIKE operator", () => {
+        const query = "SELECT * FROM users WHERE name LIKE '%John%'";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $regex: { name: "^.*John.*$" } });
+    });
+
+    test("8b. should parse NOT LIKE operator", () => {
+        const query = "SELECT * FROM users WHERE name NOT LIKE '%John%'";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $not: { $regex: { name: "^.*John.*$" } } });
+    });
+
+    test("9. should parse IS NULL operator", () => {
+        const query = "SELECT * FROM users WHERE deletedAt IS NULL";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ deletedAt: null });
+    });
+
+    test("9b. should parse IS NOT NULL operator", () => {
+        const query = "SELECT * FROM users WHERE deletedAt IS NOT NULL";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $not: { deletedAt: null } });
+    });
+
+    test("10. should parse NOT ANY operator (alias for NOT IN)", () => {
+        const query = "SELECT * FROM users WHERE status NOT ANY (1, 2)";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $nin: { status: [1, 2] } });
+    });
+
+    test("11. should parse ILIKE operator (case insensitive LIKE)", () => {
+        const query = "SELECT * FROM users WHERE name ILIKE '%john%'";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $regex: { name: "(?i)^.*john.*$" } });
+    });
+
+    test("11b. should parse NOT ILIKE operator", () => {
+        const query = "SELECT * FROM users WHERE name NOT ILIKE '%john%'";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $not: { $regex: { name: "(?i)^.*john.*$" } } });
+    });
+
+    test("12. should parse BETWEEN operator", () => {
+        const query = "SELECT * FROM users WHERE age BETWEEN 18 AND 30";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $between: { age: [18, 30] } });
+    });
+
+    test("12b. should parse NOT BETWEEN operator", () => {
+        const query = "SELECT * FROM users WHERE age NOT BETWEEN 18 AND 30";
+        const parsedQuery = sqlParser.parse(query);
+        expect(parsedQuery.args[1]).toEqual({ $not: { $between: { age: [18, 30] } } });
+    });
 });