fcuni 1.0.9 → 1.1.0

package/bin/index.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+import process from 'node:process'
+
+// 导入主程序
+import('../dist/index.js').catch((err) => {
+    console.error('Failed to load CLI:', err)
+    process.exit(1)
+})

package/dist/index.js

@@ -0,0 +1,117 @@
+#!/usr/bin/env node
+import minimist from 'minimist';
+import { pkg } from './info.js';
+import { createFilesFromResponse, deleteModules } from './request.js';
+
+// 显示帮助信息
+function logHelp() {
+    console.log('\n-----fcuni命令-----\n');
+    console.log('创建模块:');
+    console.log('  网络请求  :  fcuni c request');
+    console.log('  网络上传  :  fcuni c upload');
+    console.log('  网络下载  :  fcuni c download');
+    console.log('  WebSocket :  fcuni c websocket');
+    console.log('  国际化    :  fcuni c locale');
+    console.log('  权限申请  :  fcuni c authorize');
+    console.log('  应用更新  :  fcuni c updated');
+    console.log('  极光推送  :  fcuni c jgPush');
+    console.log('  实用工具  :  fcuni c utils\n');
+    console.log('更新模块:');
+    console.log('  网络请求  :  fcuni u request');
+    console.log('  网络上传  :  fcuni u upload');
+    console.log('  网络下载  :  fcuni u download');
+    console.log('  WebSocket :  fcuni u websocket');
+    console.log('  国际化    :  fcuni u locale');
+    console.log('  权限申请  :  fcuni u authorize');
+    console.log('  应用更新  :  fcuni u updated');
+    console.log('  极光推送  :  fcuni u jgPush');
+    console.log('  实用工具  :  fcuni u utils\n');
+    console.log('移除模块:');
+    console.log('  网络请求  :  fcuni d request');
+    console.log('  网络上传  :  fcuni d upload');
+    console.log('  网络下载  :  fcuni d download');
+    console.log('  WebSocket :  fcuni d websocket');
+    console.log('  国际化    :  fcuni d locale');
+    console.log('  权限申请  :  fcuni d authorize');
+    console.log('  应用更新  :  fcuni d updated');
+    console.log('  极光推送  :  fcuni d jgPush');
+    console.log('  实用工具  :  fcuni d utils\n');
+    console.log('自动生成代码:');
+    console.log('  生成api代码（本地文件）  :  fcuni api [文件路径]');
+    console.log('  生成api代码（网络接口）  :  fcuni api [project_id] [api-token]\n');
+}
+
+// 安装模块
+async function installModules(modules) {
+    try {
+
+        const result = await createFilesFromResponse(modules);
+
+        if (result.success) {
+            return true;
+        } else {
+            const failedModules = Object.entries(result.failures)
+                .filter(([_, failed]) => failed)
+                .map(([module]) => module);
+
+            return failedModules;
+        }
+    } catch (error) {
+        throw new Error(`模块安装失败: ${error.message}`);
+    }
+}
+
+// 主函数
+async function main() {
+    const args = minimist(process.argv.slice(2));
+    // 显示版本或帮助
+    if (args.v || args.version) {
+        console.log(pkg.version);
+        return;
+    }
+    if (args.h || args.help) {
+        logHelp();
+        return;
+    }
+
+    // 获取输入参数
+    const command = args._[0];
+    const subCommands = args._.slice(1); // 获取从第二个参数开始的所有参数
+    if (!command || subCommands.length === 0) {
+        console.error('❌ 命令行错误，可以输入 fcuni -h 查看帮助');
+        return;
+    }
+
+    // 解析子命令
+    if (command === 'c' || command === 'create' || command === 'u' || command === 'update') {
+        const failedModules = await installModules(subCommands);
+        if (failedModules.length > 0) {
+            console.error(`❌ 以下模块安装失败: ${failedModules.join(', ')}`);
+        } else {
+            console.log(`✅ ${subCommands.join(', ')} 模块安装成功`);
+        }
+    } else if (command === 'd' || command === 'delete') {
+        const failedModules = deleteModules(subCommands);
+        if (failedModules.length !== 0) {
+            console.error(`❌ ${failedModules.join(', ')} 模块移除失败`);
+        } else {
+            console.log(`✅ ${subCommands.join(', ')} 模块移除成功`);
+        }
+    } else {
+        console.error('❌ 命令行错误');
+        logHelp();
+        return;
+    }
+}
+
+// 错误处理
+process.on('unhandledRejection', (reason) => {
+    console.log(`致命错误: ${reason.message || reason}`);
+    process.exit(1);
+});
+
+// 执行主函数
+main().catch(err => {
+    console.log(err.message);
+    process.exit(1);
+});

package/dist/info.js

@@ -0,0 +1,10 @@
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const pkgPath = path.join(__dirname, '../package.json');
+const pkgContent = readFileSync(pkgPath, 'utf8');
+export const pkg = JSON.parse(pkgContent);

package/dist/request.js

@@ -0,0 +1,139 @@
+import { promises as fs } from 'fs';
+import { existsSync, lstatSync, rmSync, unlinkSync } from 'fs';
+import { dirname, resolve, join } from 'path';
+
+// 网络请求URL
+const apiUrl = "https://mock.apipost.net/mock/570d229f6088000/?apipost_id=2fd1a15d3c950f";
+
+// 模块注释配置
+const MODULE_COMMENTS = {
+    request: [7, 33],
+    upload: [8, 35],
+    download: [9, 37],
+    websocket: [10, 39],
+    locale: [4, 27],
+    updated: [5, 29],
+    utils: [6, 31],
+    authorize: [12, 42],
+    jgpush: [13, 44]
+};
+
+// 网络请求
+async function httpRequest(module) {
+    try {
+        const response = await fetch(apiUrl, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ modules: module })
+        });
+
+        if (!response.ok) throw new Error(`请求失败，状态码: ${response.status}`);
+        return await response.json();
+    } catch (error) {
+        console.error(`模块 ${module} 请求失败:`, error.message);
+        return null;
+    }
+}
+
+// 创建文件
+async function createFile(projectDir, filePath, content) {
+    const fullPath = resolve(projectDir, filePath);
+
+    // 如果文件路径以 src 开头，则检查文件是否存在
+    if (filePath.startsWith('src')) {
+        try {
+            await fs.access(fullPath);
+            // 文件已存在，不创建
+            return;
+        } catch {
+            // 文件不存在，继续创建流程
+        }
+    }
+
+    await fs.mkdir(dirname(fullPath), { recursive: true });
+    await fs.writeFile(fullPath, content || '');
+}
+
+// 修改注释
+async function toggleComments(projectDir, indices) {
+    const indexPath = resolve(projectDir, 'fcuni/index.ts');
+    if (!(await fs.stat(indexPath).catch(() => false))) return;
+
+    const content = await fs.readFile(indexPath, 'utf8');
+    const lines = content.split('\n');
+
+    for (const index of indices) {
+        const lineNum = index - 1;
+        if (!lines[lineNum]) continue;
+
+        // 移除行首注释
+        lines[lineNum] = lines[lineNum].replace(/^\s*\/\//, '').trim();
+    }
+
+    await fs.writeFile(indexPath, lines.join('\n'));
+}
+
+// 主函数
+export async function createFilesFromResponse(modules) {
+
+    const projectDir = join(process.cwd(), '');
+
+    const results = { success: true, failures: {} };
+
+    for (const module of modules) {
+        try {
+            const response = await httpRequest(module);
+            if (!response) throw new Error('无响应数据');
+
+            // 创建文件
+            await Promise.all(
+                Object.entries(response).map(([file, content]) =>
+                    createFile(projectDir, file, content)
+                )
+            );
+
+            // 处理注释
+            if (MODULE_COMMENTS[module]) {
+                await toggleComments(projectDir, MODULE_COMMENTS[module]);
+            }
+        } catch (error) {
+            console.error(`模块 ${module} 处理失败:`, error.message);
+            results.failures[module] = true;
+            results.success = false;
+        }
+    }
+
+    return results;
+}
+
+// 安全删除（文件/目录）
+export function deleteModules(modules) {
+
+    const projectDir = join(process.cwd(), 'fcuni');
+
+    let failureModules = [];    // 记录删除失败的模块
+
+    for (const module of modules) {
+        const resolvedPath = join(projectDir, module);
+
+        try {
+            if (existsSync(resolvedPath)) {
+                const stats = lstatSync(resolvedPath);
+
+                if (stats.isDirectory()) {
+                    // 递归删除目录
+                    rmSync(resolvedPath, { recursive: true, force: true });
+                } else {
+                    // 删除文件
+                    unlinkSync(resolvedPath);
+                }
+            } else {
+                failureModules.push(module);
+            }
+        } catch (err) {
+            failureModules.push(module);
+        }
+    }
+
+    return failureModules;
+}

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "fcuni",
-    "version": "1.0.9",
+    "version": "1.1.0",
     "description": "配合fc-uniapp项目使用的命令行工具",
     "bin": {
-        "fcuni": "./os.js"
+        "fcuni": "bin/index.js"
     },
     "preferGlobal": true,
     "keywords": [
@@ -17,5 +17,12 @@
     "license": "Apache-2.0",
     "main": "lib/index.ts",
     "module": "lib/index.ts",
-    "types": "lib/type.d.ts"
+    "types": "lib/type.d.ts",
+    "type": "module",
+    "dependencies": {
+        "minimist": "^1.2.8"
+    },
+    "devDependencies": {
+        "@types/minimist": "^1.2.5"
+    }
 }

package/os.js

@@ -1,298 +0,0 @@
-#!/usr/bin/env node
-
-// 文件操作
-const fs = require('fs');
-const path = require('path');
-// 使用当前工作目
-const libPath = path.join(process.cwd(), 'fcuni');
-const indexTsPath = path.join(libPath, 'index.ts');
-// 命令参数解析
-const [command, target] = process.argv.slice(2);
-const apiUrl = "https://mock.apipost.net/mock/570d229f6088000/?apipost_id=bb72a593c9089";
-const modules = ['request', 'upload', 'download', 'websocket', 'locale', 'authorize', 'updated', 'jgpush', 'utils'];
-
-// 网络请求，确保 Node.js 版本是 18 或更高
-async function makeRequest() {
-    try {
-        const fetchOptions = {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'Access-Control-Allow-Origin': '*'
-            },
-            body: JSON.stringify({
-                "modules": target
-            })
-        };
-
-        const response = await fetch(apiUrl, fetchOptions);
-
-        if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status}`);
-        }
-
-        const data = await response.json();
-        return data;
-    } catch (error) {
-        console.error('请求失败:', error.message);
-        return null;
-    }
-}
-
-// 创建文件（自动创建父目录）
-const createFile = (filePath, content = '') => {
-    const resolvedPath = path.resolve(filePath);
-    const dir = path.dirname(resolvedPath);
-
-    // 确保父目录存在
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-    }
-
-    fs.writeFileSync(resolvedPath, content);
-    console.log(`✅ ${target} 模块创建成功`);
-    return true;
-};
-
-// 安全删除（文件/目录）
-const deleteItem = (itemPath) => {
-    const resolvedPath = path.resolve(itemPath);
-
-    if (!fs.existsSync(resolvedPath)) {
-        console.warn(`⚠️ ${target} 模块不存在`);
-        return false;
-    }
-
-    // 预防删除关键目录（根据项目调整）
-    const protectedPaths = [
-        process.cwd(), // 项目根目录
-        path.join(process.cwd(), 'node_modules'),
-        path.join(process.cwd(), '.git')
-    ];
-
-    if (protectedPaths.includes(resolvedPath)) {
-        throw new Error(`❌ 禁止移除受保护模块`);
-    }
-
-    try {
-        const stats = fs.lstatSync(resolvedPath);
-
-        if (stats.isDirectory()) {
-            // 递归删除目录
-            fs.rmSync(resolvedPath, { recursive: true, force: true });
-        } else {
-            // 删除文件
-            fs.unlinkSync(resolvedPath);
-        }
-        console.log(`✅ 模块已移除: ${target}`);
-        return true;
-    } catch (err) {
-        console.error(`❌ 模块移除失败: ${err.message}`);
-        return false;
-    }
-};
-
-// 命令解析
-if (
-    command == "help"
-    || !command
-    || !['c', 'cre', 'create', 'd', 'dle', 'delete', 'u', 'upd', 'update', 'help'].includes(command)
-    || !modules.includes(target)
-) {
-    console.log('\n-----fcuni命令-----\n');
-    console.log('创建模块:');
-    console.log('  网络请求  :  fcuni c request');
-    console.log('  网络上传  :  fcuni c upload');
-    console.log('  网络下载  :  fcuni c download');
-    console.log('  WebSocket :  fcuni c websocket');
-    console.log('  国际化    :  fcuni c locale');
-    console.log('  权限申请  :  fcuni c authorize');
-    console.log('  应用更新  :  fcuni c updated');
-    console.log('  极光推送  :  fcuni c jgPush');
-    console.log('  实用工具  :  fcuni c utils\n');
-    console.log('更新模块:');
-    console.log('  网络请求  :  fcuni u request');
-    console.log('  网络上传  :  fcuni u upload');
-    console.log('  网络下载  :  fcuni u download');
-    console.log('  WebSocket :  fcuni u websocket');
-    console.log('  国际化    :  fcuni u locale');
-    console.log('  权限申请  :  fcuni u authorize');
-    console.log('  应用更新  :  fcuni u updated');
-    console.log('  极光推送  :  fcuni u jgPush');
-    console.log('  实用工具  :  fcuni u utils\n');
-    console.log('删除模块:');
-    console.log('  网络请求  :  fcuni d request');
-    console.log('  网络上传  :  fcuni d upload');
-    console.log('  网络下载  :  fcuni d download');
-    console.log('  WebSocket :  fcuni d websocket');
-    console.log('  国际化    :  fcuni d locale');
-    console.log('  权限申请  :  fcuni d authorize');
-    console.log('  应用更新  :  fcuni d updated');
-    console.log('  极光推送  :  fcuni d jgPush');
-    console.log('  实用工具  :  fcuni d utils\n');
-    process.exit(1);
-}
-
-// 根据 API 响应数据动态创建文件的函数
-async function createFilesFromResponse() {
-    try {
-        const response = await makeRequest();
-
-        if (response && typeof response === 'object') {
-            // 遍历响应对象的键值对，为每个键值对创建一个文件
-            for (const [filePath, content] of Object.entries(response)) {
-                createFile(path.join(libPath, target, filePath), content);
-            }
-        } else {
-            console.error(`❌ network：${target} 模块创建失败，请重试`);
-        }
-    } catch (error) {
-        console.error(`❌ network：${target} 模块创建失败: ${error.message}`);
-    }
-}
-
-// 为index.ts添加或移除模块和注释
-function addOrRemoveComment(indices) {
-    if (command === 'c' || command === 'cre' || command === 'create') {
-        try {
-            // 调用 API 并根据返回结果创建文件
-            createFilesFromResponse();
-
-            if (!indices || indices.length === 0) {
-                console.log(`✅  已添加 ${target} 模块`);
-                return;
-            }
-
-            const content = fs.readFileSync(indexTsPath, 'utf8');
-            const lines = content.split('\n');
-            let successCount = 0;
-            let alreadyExistsCount = 0;
-
-            for (const index of indices) {
-                const line = index - 1;
-                if (lines[line]) {
-                    // 使用正则表达式保持缩进结构
-                    const lineContent = lines[line];
-                    const match = lineContent.match(/^(\s*)(\/\/)?(.*)$/);
-                    if (match) {
-                        const [full, indent, comment, rest] = match;
-                        if (comment) {
-                            // 删除注释符号和后面的空格，保持缩进
-                            lines[line] = indent + rest.trim();
-                            successCount++;
-                        } else {
-                            alreadyExistsCount++;
-                        }
-                    }
-                } else {
-                    alreadyExistsCount++;
-                }
-            }
-
-            if (successCount > 0) {
-                fs.writeFileSync(indexTsPath, lines.join('\n'));
-                console.log(`✅  已添加 ${target} 模块`);
-            }
-
-            if (alreadyExistsCount > 0) {
-                console.warn(`⚠️   ${target} 模块已经存在`);
-            }
-
-        } catch (err) {
-            console.error(`❌ 操作${target} 模块失败: ${err.message}`);
-        }
-    } else if (command === 'd' || command === 'dle' || command === 'delete') {
-        try {
-            // 删除 lib 目录下的模块文件
-            deleteItem(path.join(libPath, target));
-
-            if (!indices || indices.length === 0) {
-                console.log(`✅  已移除 ${target} 模块`);
-                return;
-            }
-
-            const content = fs.readFileSync(indexTsPath, 'utf8');
-            const lines = content.split('\n');
-            let successCount = 0;
-            let alreadyRemovedCount = 0;
-
-            for (const index of indices) {
-                const line = index - 1;
-                if (lines[line]) {
-                    // 使用正则表达式保持缩进结构
-                    const lineContent = lines[line];
-                    const match = lineContent.match(/^(\s*)(\/\/)?(.*)$/);
-                    if (match) {
-                        const [full, indent, comment, rest] = match;
-                        if (!comment) {
-                            // 添加注释符号，保持缩进
-                            lines[line] = indent + '// ' + rest;
-                            successCount++;
-                        } else {
-                            alreadyRemovedCount++;
-                        }
-                    }
-                } else {
-                    alreadyRemovedCount++;
-                }
-            }
-
-            if (successCount > 0) {
-                fs.writeFileSync(indexTsPath, lines.join('\n'));
-                console.log(`✅ 已移除 ${target} 模块`);
-            }
-
-            if (alreadyRemovedCount > 0) {
-                console.warn(`⚠️   ${target} 模块已经移除`);
-            }
-
-        } catch (err) {
-            console.error(`❌ 操作${target} 模块失败: ${err.message}`);
-        }
-    } else if (command === 'u' || command === 'upd' || command === 'update') {
-        createFilesFromResponse();
-    } else {
-        console.error(`❌ 命令行错误，可以输入 fcuni help 查看帮助`);
-    }
-}
-
-try {
-    if (!target) throw new Error('缺少目标路径参数');
-    console.log(`✅  执行 ${target} 模块操作`);
-
-    switch (target) {
-        case 'request':
-            addOrRemoveComment([7, 33]);
-            break;
-        case 'upload':
-            addOrRemoveComment([8, 35]);
-            break;
-        case 'download':
-            addOrRemoveComment([9, 37]);
-            break;
-        case 'websocket':
-            addOrRemoveComment([10, 39]);
-            break;
-        case 'locale':
-            addOrRemoveComment([4, 27]);
-            break;
-        case 'updated':
-            addOrRemoveComment([5, 29]);
-            break;
-        case 'utils':
-            addOrRemoveComment([6, 31]);
-            break;
-        case 'authorize':
-            addOrRemoveComment([12, 42]);
-            break;
-        case 'jgpush':
-            addOrRemoveComment([13, 44]);
-            break;
-
-        default:
-            break;
-    }
-} catch (err) {
-    console.error(`❌ 错误: ${err.message}`);
-    process.exit(1);
-}