@liorandb/db 1.0.4 → 1.0.5

package/dist/cli/index.js

@@ -8,44 +8,59 @@ const readline_1 = __importDefault(require("readline"));
 const util_1 = __importDefault(require("util"));
 const bcryptjs_1 = __importDefault(require("bcryptjs"));
 const database_1 = require("../config/database");
-/* -------------------------------- INTERACTIVE MODE -------------------------------- */
+/* -------------------------------- INIT -------------------------------- */
+console.clear();
 console.log("🚀 LioranDB Interactive Shell");
 console.log("Type: help   to see commands\n");
 const rl = readline_1.default.createInterface({
     input: process.stdin,
     output: process.stdout,
-    prompt: "liorandb> ",
     historySize: 1000,
 });
 let currentDB = "default";
+let currentCollection = null;
+/* -------------------------------- PROMPT -------------------------------- */
+function updatePrompt() {
+    let p = `liorandb:${currentDB}`;
+    if (currentCollection)
+        p += `.${currentCollection}`;
+    rl.setPrompt(`${p}> `);
+}
 /* -------------------------------- HELP -------------------------------- */
 async function printHelp() {
     console.log(`
-Database:
+📦 Database:   ( current: ${currentDB} )
   show dbs
   use <dbname>
   show collections
+
+📁 Collection:   ( current: ${currentCollection ?? "none"} )
+  use collection <name>
   db.createCollection("<name>")
   db.dropCollection("<name>")
   db.renameCollection("<old>", "<new>")
 
-CRUD:
-  db.<collection>.insert({...})
-  db.<collection>.insertMany([...])
+🧠 CRUD:
   db.<collection>.find({...})
-  db.<collection>.findOne({...})
-  db.<collection>.update({...filter}, {...update})
-  db.<collection>.updateMany({...filter}, {...update})
-  db.<collection>.delete({...filter})
-  db.<collection>.deleteMany({...filter})
-  db.<collection>.count({...})
+  db.<collection>.insert({...})
+
+  When collection selected:
+    find({...})
+    findOne({...})
+    insert({...})
+    insertMany([...])
+    update({...filter},{...update})
+    updateMany({...filter},{...update})
+    delete({...})
+    deleteMany({...})
+    count({...})
 
-User Management:
+👤 User:
   user.create("username","password")
   user.delete("username")
   user.list()
 
-System:
+⚙ System:
   clear
   exit
 `);
@@ -59,17 +74,17 @@ function safeParse(obj) {
         return null;
     }
 }
-/* -------------------------------- USER COMMAND HANDLER -------------------------------- */
+/* -------------------------------- USER COMMANDS -------------------------------- */
 async function handleUserCommand(cmd) {
     const users = await (0, database_1.getAuthCollection)();
     if (cmd.startsWith("user.create")) {
         const args = cmd.match(/\("(.+?)","(.+?)"\)/);
         if (!args)
-            return console.error("Invalid syntax");
+            return console.error("❌ Invalid syntax");
         const [, username, password] = args;
         const existing = await users.findOne({ username });
         if (existing)
-            return console.error("User already exists");
+            return console.error("❌ User already exists");
         const hashed = await bcryptjs_1.default.hash(password, 10);
         await users.insertOne({
             username,
@@ -81,10 +96,10 @@ async function handleUserCommand(cmd) {
     if (cmd.startsWith("user.delete")) {
         const args = cmd.match(/\("(.+?)"\)/);
         if (!args)
-            return console.error("Invalid syntax");
+            return console.error("❌ Invalid syntax");
         const [, username] = args;
         const r = await users.deleteOne({ username });
-        return console.log(`Deleted: ${r}`);
+        return console.log(`✔ Deleted: ${r}`);
     }
     if (cmd === "user.list()") {
         const list = await users.find({});
@@ -94,7 +109,48 @@ async function handleUserCommand(cmd) {
         })));
     }
 }
-/* -------------------------------- MAIN COMMAND HANDLER -------------------------------- */
+/* -------------------------------- CRUD EXEC -------------------------------- */
+async function runCollectionCommand(colName, action) {
+    const db = await database_1.manager.db(currentDB);
+    const col = db.collection(colName);
+    if (action.startsWith("insertMany")) {
+        const data = JSON.parse(action.match(/^insertMany\((.*)\)$/)[1]);
+        return console.log(util_1.default.inspect(await col.insertMany(data), false, 10, true));
+    }
+    if (action.startsWith("insert")) {
+        const data = JSON.parse(action.match(/^insert\((.*)\)$/)[1]);
+        return console.log(util_1.default.inspect(await col.insertOne(data), false, 10, true));
+    }
+    if (action.startsWith("findOne")) {
+        const q = safeParse(action.slice(8));
+        return console.log(util_1.default.inspect(await col.findOne(q || {}), false, 10, true));
+    }
+    if (action.startsWith("find")) {
+        const q = safeParse(action.slice(4));
+        return console.log(util_1.default.inspect(await col.find(q || {}), false, 10, true));
+    }
+    if (action.startsWith("updateMany")) {
+        const args = safeParse(`[${action.match(/^updateMany\((.*)\)$/)[1]}]`);
+        return console.log(util_1.default.inspect(await col.updateMany(args[0], args[1]), false, 10, true));
+    }
+    if (action.startsWith("update")) {
+        const args = safeParse(`[${action.slice(6)}]`);
+        return console.log(util_1.default.inspect(await col.updateOne(args[0], args[1]), false, 10, true));
+    }
+    if (action.startsWith("deleteMany")) {
+        const q = safeParse(action.slice(10));
+        return console.log(`✔ Deleted: ${await col.deleteMany(q)}`);
+    }
+    if (action.startsWith("delete")) {
+        const q = safeParse(action.slice(6));
+        return console.log(`✔ Deleted: ${await col.deleteOne(q)}`);
+    }
+    if (action.startsWith("count")) {
+        const q = safeParse(action.slice(5));
+        return console.log(`✔ Count: ${await col.countDocuments(q)}`);
+    }
+}
+/* -------------------------------- MAIN HANDLER -------------------------------- */
 async function handleCommand(input) {
     const cmd = input.trim();
     if (!cmd)
@@ -106,23 +162,26 @@ async function handleCommand(input) {
     if (cmd === "help")
         return printHelp();
     if (cmd === "show dbs") {
-        const list = await database_1.manager.listDatabases();
-        return console.table(list);
+        return console.table(await database_1.manager.listDatabases());
+    }
+    if (cmd.startsWith("use collection ")) {
+        currentCollection = cmd.split(" ")[2];
+        return updatePrompt();
     }
     if (cmd.startsWith("use ")) {
         currentDB = cmd.split(" ")[1];
+        currentCollection = null;
         await database_1.manager.db(currentDB);
-        return console.log(`✔ Switched to database: ${currentDB}`);
+        return updatePrompt();
     }
     if (cmd === "show collections") {
         const db = await database_1.manager.db(currentDB);
-        const cols = await db.listCollections();
-        return console.table(cols);
+        return console.table(await db.listCollections());
     }
     if (cmd.startsWith("db.createCollection")) {
         const name = cmd.match(/\("(.+)"\)/)?.[1];
         if (!name)
-            return console.error("Invalid syntax");
+            return console.error("❌ Invalid syntax");
         const db = await database_1.manager.db(currentDB);
         await db.createCollection(name);
         return console.log("✔ Collection created");
@@ -130,7 +189,7 @@ async function handleCommand(input) {
     if (cmd.startsWith("db.dropCollection")) {
         const name = cmd.match(/\("(.+)"\)/)?.[1];
         if (!name)
-            return console.error("Invalid syntax");
+            return console.error("❌ Invalid syntax");
         const db = await database_1.manager.db(currentDB);
         await db.deleteCollection(name);
         return console.log("✔ Collection deleted");
@@ -138,85 +197,34 @@ async function handleCommand(input) {
     if (cmd.startsWith("db.renameCollection")) {
         const args = cmd.match(/\("(.+)",\s*"(.+)"\)/);
         if (!args)
-            return console.error("Invalid syntax");
+            return console.error("❌ Invalid syntax");
         const db = await database_1.manager.db(currentDB);
         await db.renameCollection(args[1], args[2]);
         return console.log("✔ Collection renamed");
     }
-    /* -------- USER COMMANDS -------- */
-    if (cmd.startsWith("user.")) {
+    if (cmd.startsWith("user."))
         return handleUserCommand(cmd);
-    }
-    /* -------- DATABASE CRUD -------- */
     if (cmd.startsWith("db.")) {
         const match = cmd.match(/^db\.([^.]+)\.(.+)$/);
         if (!match)
-            return console.error("Invalid syntax");
-        const [, colName, action] = match;
-        const db = await database_1.manager.db(currentDB);
-        const col = db.collection(colName);
-        if (action.startsWith("insertMany")) {
-            const match = action.match(/^insertMany\((.*)\)$/);
-            const data = JSON.parse(match[1]);
-            const r = await col.insertMany(data);
-            return console.log(util_1.default.inspect(r, false, 10, true));
-        }
-        if (action.startsWith("insert")) {
-            const match = action.match(/^insert\((.*)\)$/);
-            const data = JSON.parse(match[1]);
-            const r = await col.insertOne(data);
-            return console.log(util_1.default.inspect(r, false, 10, true));
-        }
-        if (action.startsWith("findOne")) {
-            const q = safeParse(action.slice(8));
-            const r = await col.findOne(q || {});
-            return console.log(util_1.default.inspect(r, false, 10, true));
-        }
-        if (action.startsWith("find")) {
-            const q = safeParse(action.slice(4));
-            const r = await col.find(q || {});
-            return console.log(util_1.default.inspect(r, false, 10, true));
-        }
-        if (action.startsWith("updateMany")) {
-            const match = action.match(/^updateMany\((.*)\)$/);
-            const args = safeParse(`[${match[1]}]`);
-            const r = await col.updateMany(args[0], args[1]);
-            return console.log(util_1.default.inspect(r, false, 10, true));
-        }
-        if (action.startsWith("update")) {
-            const args = safeParse(`[${action.slice(6)}]`);
-            const r = await col.updateOne(args[0], args[1]);
-            return console.log(util_1.default.inspect(r, false, 10, true));
-        }
-        if (action.startsWith("deleteMany")) {
-            const q = safeParse(action.slice(10));
-            const r = await col.deleteMany(q);
-            return console.log(`Deleted: ${r}`);
-        }
-        if (action.startsWith("delete")) {
-            const q = safeParse(action.slice(6));
-            const r = await col.deleteOne(q);
-            return console.log(`Deleted: ${r}`);
-        }
-        if (action.startsWith("count")) {
-            const q = safeParse(action.slice(5));
-            const r = await col.countDocuments(q);
-            return console.log(`Count: ${r}`);
-        }
-    }
-    console.log("Unknown command. Type: help");
+            return console.error("❌ Invalid syntax");
+        return runCollectionCommand(match[1], match[2]);
+    }
+    if (currentCollection) {
+        return runCollectionCommand(currentCollection, cmd);
+    }
+    console.log("❓ Unknown command. Type: help");
 }
-/* -------------------------------- START REPL -------------------------------- */
+/* -------------------------------- START -------------------------------- */
+updatePrompt();
 rl.prompt();
 rl.on("line", async (line) => {
     try {
         await handleCommand(line);
     }
     catch (err) {
-        console.error("Error:", err);
+        console.error("❌ Error:", err);
     }
     rl.prompt();
 });
-rl.on("close", () => {
-    process.exit(0);
-});
+rl.on("close", () => process.exit(0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liorandb/db",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "LioranDB server and CLI",
   "main": "dist/server.js",
   "bin": {