Merge pull request #8 from ariflogs/dev

added support for >, <, >=, <= operators

Author: ariflogs

.npmignore

@@ -2,3 +2,4 @@ src
 test
 .github
 .gitignore
+TODO.md

README.md

@@ -1,18 +1,20 @@
-### SQL-to-NOSQL
+## SQL-to-NOSQL
 
 As the name suggests, **sql-to-nosql** lets you run SQL scripts on your NoSQL database.
 
 ### Status
 
 The project is under active development and is not yet ready to use in production. I'm aiming to launch _v-1.0_ by November 2023 with some of the most common sql operations. 🤞
 
-### Installation
+---
+
+## Installation
 
 ```bash
 npm insall sql-to-nosql
 ```
 
-### Usage
+## Usage
 
 ```js
 import { SqlToNoSql } from "sql-to-nosql";
@@ -39,7 +41,7 @@ console.log(resp);
 
 ---
 
-### Roadmap
+## Roadmap
 
 - [ ] Database
   - [x] MongoDB
@@ -67,11 +69,11 @@ console.log(resp);
   - [ ] MAX
 - [ ] Operators
   - [x] =
-  - [ ] !=
-  - [ ] >
-  - [ ] <
-  - [ ] > =
-  - [ ] <=
+  - [x] !=
+  - [x] >
+  - [x] <
+  - [x] > =
+  - [x] <=
   - [ ] AND
   - [ ] OR
   - [ ] NOT

package.json

@@ -1,16 +1,19 @@
 {
   "name": "sql-to-nosql",
-  "version": "0.1.0",
+  "version": "0.1.01",
   "description": "Run SQL quries on your Mongodb database.",
+  "publishConfig": {
+    "registry": "https://www.npmjs.com/package/sql-to-nosql"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/ariflogs/SQL-to-NoSQL"
   },
   "homepage": "https://github.com/ariflogs/SQL-to-NoSQL",
-  "main": "dist/index.js",
+  "main": "dist/index.mjs",
   "scripts": {
     "dev": "tsc -w",
-    "start": "tsc && node dist/index.js",
+    "start": "tsc && node dist/index.mjs",
     "build": "npx prettier . --check && tsc",
     "test": "echo \"Error: no test specified\" && exit 1",
     "pretty": "npx prettier . --write"
@@ -33,6 +36,5 @@
   },
   "dependencies": {
     "mongodb": "^6.1.0"
-  },
-  "type": "module"
+  }
 }

src/config/mapping.ts renamed to src/config/mapping.mts

@@ -1,12 +1,13 @@
 export const sqlToMongoDBcommandsMapping = {
-  select: "find",
+  select: "find", // s!
   insert: "insertMany",
   update: "updateMany",
   delete: "deleteMany",
 } as const;
 
 export const sqlToMongoDBoperatorsMapping = {
-  "=": "$eq",
+  "=": "$eq", // s!
+  "!=": "$ne", // s!
   ">": "$gt",
   "<": "$lt",
   ">=": "$gte",

src/index.ts renamed to src/index.mts

@@ -1,9 +1,9 @@
 import { MongoClient } from "mongodb";
 
-import { mappings } from "./config/mapping.js";
-import { parseQuery } from "./utils/parser.js";
-import { connect } from "./utils/database.js";
-import { SqlToNoSqlType } from "./types/index.js";
+import { mappings } from "./config/mapping.mjs";
+import { parseQuery } from "./utils/parser.mjs";
+import { connect } from "./utils/database.mjs";
+import { SqlToNoSqlType } from "./types/index.mjs";
 
 export class SqlToNoSql {
   client: MongoClient | undefined;
@@ -15,13 +15,12 @@ export class SqlToNoSql {
       throw new Error("missing query!");
     }
 
-    // TODO: add better validation!
-    if ([";", "(", ")"].some((char) => query.includes(char))) {
-      throw new Error("Invalid query, your query contains invalid characters!");
-    }
+    // // TODO: add better validation!
+    // if ([";", "(", ")"].some((char) => query.includes(char))) {
+    //   throw new Error("Invalid query, your query contains invalid characters!");
+    // }
 
     const q = parseQuery(query);
-    this.client = await connect(this.config.connection);
 
     const filters: {
       [key: string]: {
@@ -47,9 +46,14 @@ export class SqlToNoSql {
     };
 
     try {
-      await this.client.connect();
+      if (!this.client) {
+        this.client = await connect(this.config.connection);
+        await this.client.connect();
+      }
+
       const db = this.client.db();
       const collection = db.collection(mongoQuery.collection);
+
       const data = await collection[mongoQuery[q.command]](
         mongoQuery.query,
       ).toArray();

src/types/index.ts renamed to src/types/index.mts

@@ -1,6 +1,6 @@
 // select * from users where id = 1;
 
-import { ParsedSqlType } from "types/sql";
+import { ParsedSqlType } from "types/sql.mjs";
 
 export const parseQuery = (query: string): ParsedSqlType => {
   const parsedQuery: ParsedSqlType = {
@@ -10,28 +10,32 @@ export const parseQuery = (query: string): ParsedSqlType => {
     filters: null,
   };
 
-  const [command, ...rest] = query.toLocaleLowerCase().split(" ");
+  const [command, ...rest] = query.split(" ");
 
-  if (command !== "select") {
+  const lowerCaseCommand = command.toLowerCase();
+  if (lowerCaseCommand !== "select") {
     throw new Error("Only select queries are supported");
   }
-  parsedQuery.command = command;
+  // parsedQuery.command = command;
 
-  const fromIndex = rest.indexOf("from");
+  const fromIndex = rest.findIndex((word) => word.toLowerCase() === "from");
   if (fromIndex === -1) {
     throw new Error("Invalid query, missing FROM keyword");
   }
   parsedQuery.table = rest[fromIndex + 1];
   parsedQuery.columns = rest.slice(0, fromIndex);
 
-  const whereIndex = rest.indexOf("where");
+  const whereIndex = rest.findIndex((word) => word.toLowerCase() === "where");
   if (whereIndex !== -1) {
     parsedQuery.filters = [
       {
         column: rest[whereIndex + 1],
-        // FIXME: you know what to do here!
         operator: rest[whereIndex + 2] as "=",
-        value: rest[whereIndex + 3],
+        // to handle string and number values
+        value:
+          Number(rest[whereIndex + 3]) ||
+          // remove quotes from string values
+          String(rest[whereIndex + 3]).replace(/^'(.*)'$/, "$1"),
       },
     ];
   }