webide-cli 0.0.1-alpha.8 → 0.0.1-beta.0

package/index.js

@@ -4,6 +4,9 @@ const { version } = require('./package.json');
 const { createClient } = require('@supabase/supabase-js');
 const fs = require('fs');
 const path = require('path');
+const readline = require('readline');
+
+const termCols = process.stdout.columns;
 
 const SUPABASE_URL = "https://dbmp-xbgmorqeur6oh81z.database.nocode.cn";
 const SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlzcyI6InN1cGFiYXNlIiwiaWF0IjoxNzQ2OTc5MjAwLCJleHAiOjE5MDQ3NDU2MDB9.11QbQ5OW_m10vblDXAlw1Qq7Dve5Swzn12ILo7-9IXY";
@@ -37,60 +40,66 @@ program
     .command('add <name>')
     .description('Add a new library.')
     .action(async (libname) => {
-        fs.access(workdir + "/webapp.json", fs.constants.F_OK, (err) => {
+        fs.access(workdir + "/webapp.json", fs.constants.F_OK, async (err) => {
             if (err) {
                 console.error("webapp.json not found in current directory. Please make sure you are in a WebIDE project directory.");
                 process.exit(114514);
             }
-        });
-        fs.mkdirSync(path.join(workdir, 'libs', libname), { recursive: true });
-        try {
-            const load = loading(`Checking if library "${libname}" exists...`);
-            if (await checkFileExists(libname + "/lib.json")) {
-                load();
-                console.log(`Library "${libname}" already exists.`);
-                console.log(`Start downloading...`);
-                const downloadingTip = `Downloading library "${libname}" ...`;
-                let load2 = loading(downloadingTip);
-                const libJsonData = await getFile(libname + "/lib.json");
-                const libJson = JSON.parse(await libJsonData.text());
-                const { name, author, description, version } = libJson;
-                load2();
-                console.log(`Library info: `);
-                console.log(`    Name: ${name}`);
-                console.log(`    Version: ${version}`);
-                console.log(`    Author: ${author || 'Unknown'}`);
-                console.log(`    Description: ${description || 'No description'}`);
-                load2 = loading(downloadingTip);
-                await download(libname, path.join(workdir, 'libs', libname));
-                load2();
-                console.log(`Library "${libname}" downloaded successfully.`);
-            } else {
-                load();
-                console.error(`Library "${libname}" does not exist in the database.`);
+            fs.mkdirSync(path.join(workdir, 'libs', libname), { recursive: true });
+            try {
+                const load = loading(`Checking if library "${libname}" exists...`);
+                if (await checkFileExists(libname + "/lib.json")) {
+                    load();
+                    console.log(`Library "${libname}" already exists.`);
+                    console.log(`Start downloading...`);
+                    const downloadingTip = `Downloading library "${libname}" ...`;
+                    let load2 = loading(downloadingTip);
+                    const libJsonData = await getFile(libname + "/lib.json");
+                    const libJson = JSON.parse(await libJsonData.text());
+                    const { name, author, description, version } = libJson;
+                    load2();
+                    console.log(`Library info: `);
+                    console.log(`    Name: ${name}`);
+                    console.log(`    Version: ${version}`);
+                    console.log(`    Author: ${author || 'Unknown'}`);
+                    console.log(`    Description: ${description || 'No description'}`);
+                    load2 = loading(downloadingTip);
+                    await download(libname, path.join(workdir, 'libs', libname));
+                    load2();
+                    console.log(`Library "${libname}" downloaded successfully.`);
+                } else {
+                    load();
+                    console.error(`Library "${libname}" does not exist in the database.`);
+                    process.exit(114514);
+                }
+            } catch (error) {
+                fs.rmSync(path.join(workdir, 'libs', libname), { recursive: true, force: true });
+                console.error("\r\nAn error occurred:", error.stack);
                 process.exit(114514);
             }
-        } catch (error) {
-            fs.rmSync(path.join(workdir, 'libs', libname), { recursive: true, force: true });
-            console.error("\r\nAn error occurred:", error.stack);
-            process.exit(114514);
-        }
+        });
     });
 
 program
     .command('remove <name>')
     .description('Remove a library')
     .action(function (libname) {
-        const libPath = path.join(workdir, 'libs', libname);
-        if (fs.existsSync(libPath)) {
-            fs.rmSync(libPath, { recursive: true, force: true });
-            console.log(`Library "${libname}" removed.`);
-        } else {
-            console.error(`Library "${libname}" does not exist.`);
-        }
+        fs.access(workdir + "/webapp.json", fs.constants.F_OK, (err) => {
+            if (err) {
+                console.error("webapp.json not found in current directory. Please make sure you are in a WebIDE project directory.");
+                process.exit(114514);
+            }
+            const libPath = path.join(workdir, 'libs', libname);
+            if (fs.existsSync(libPath)) {
+                fs.rmSync(libPath, { recursive: true, force: true });
+                console.log(`Library "${libname}" removed.`);
+            } else {
+                console.error(`Library "${libname}" does not exist.`);
+            }
+        });
     });
 
-function truncateMessage(msg, maxLength = 50) {
+function truncateMessage(msg, maxLength = termCols) {
     if (msg.length <= maxLength) return msg;
     return msg.substring(0, maxLength - 3) + '...';
 }
@@ -121,20 +130,18 @@ async function getFile(path) {
     return data;
 }
 
-function loading(msg) {
+async function loading(msg) {
     const spinnerChars = ['⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-    const terminalWidth = process.stdout.columns || 80; // 获取终端宽度
+    const terminalWidth = process.stdout.columns;
     let i = 0;
     let linesUsed = Math.ceil((spinnerChars[0].length + msg.length + 1) / terminalWidth);
-    
+    if (termCols < msg.length + 14 + workdir.length) process.stdout.write('\n');
     const interval = setInterval(() => {
         const displayText = `${spinnerChars[i++]} ${msg}`;
         linesUsed = Math.ceil(displayText.length / terminalWidth);
-        
-        // 清除之前占用的行
         let clearLines = '';
         for (let j = 0; j < linesUsed - 1; j++) {
-            clearLines += '\x1b[1F\x1b[K'; // 移动到上一行并清除
+            clearLines += '\x1b[1F\x1b[K';
         }
         clearLines += '\r\x1b[K';
         process.stdout.write(clearLines + displayText);
@@ -175,4 +182,30 @@ async function search(keyword) {
     const { data, error } = await bucket.list('');
     if (error) throw error;
     return data.filter(file => file.name.includes(keyword));
+}
+
+function getCursorPosition() {
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        // 发送查询光标位置的ANSI序列
+        process.stdout.write('\x1B[6n');
+
+        process.stdin.once('data', (data) => {
+            // 解析响应 \x1B[row;colR
+            const match = data.toString().match(/\[(\d+);(\d+)R/);
+            if (match) {
+                const row = parseInt(match[1]);
+                const col = parseInt(match[2]);
+                resolve({ row, col });
+            } else {
+                resolve(null);
+            }
+
+            rl.close();
+        });
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webide-cli",
-  "version": "0.0.1-alpha.8",
+  "version": "0.0.1-beta.0",
   "description": "A CLI for NEW WebIDE",
   "keywords": [
     "WebIDE",