@nasl/cli 0.3.3 → 0.3.4

package/dist/bin/nasl.mjs

@@ -29227,41 +29227,33 @@ async function checkApi(fullNaturalTS, options) {
 }
 
 /**
- * 创建应用同步
+ * 创建应用（POST /nasl/app/create）
  */
-async function createAppSyncApi(fullNaturalTS, options) {
-    const url = new URL(options.serverBaseURL);
-    const origin = url.origin + '/app-ai-creator';
-    const axios = await createAxios({ serverBaseURL: origin, ideVersion: options.ideVersion });
-    try {
-        const res = await axios.post('/api/createAppSync', {
-            fullNaturalTS,
-            packageName: options.packageName,
-            appName: options.appName,
-            hostname: url.hostname,
-            enableAuthTemplate: false,
-            ideVersion: options.ideVersion,
-            fullVersion: `${options.ideVersion}.0`,
-        });
-        if (res.data.success) {
-            return {
-                success: true,
-                appId: res.data.data?.appId,
-                appURL: res.data.data?.appURL,
-                message: res.data.data?.message,
-            };
-        }
-        else {
-            return {
-                success: false,
-                error: res.data.message || '应用创建失败',
-            };
-        }
-    }
-    catch (error) {
-        console.log(error);
-        throw error;
-    }
+async function createApp(fullNaturalTS, options, appName, packageName) {
+    const axiosInstance = await createAxios(options);
+    const res = await axiosInstance.post('/app/create', {
+        fullNaturalTS,
+        packageName,
+        appName,
+        ideVersion: options.ideVersion,
+    }, {
+        headers: { ...buildNaslHeaders(options), 'Content-Type': 'application/json' },
+    });
+    return res.data.result;
+}
+/**
+ * 更新应用（POST /nasl/app/update）
+ */
+async function updateApp(fullNaturalTS, options, appId) {
+    const axiosInstance = await createAxios(options);
+    const res = await axiosInstance.post('/app/update', {
+        fullNaturalTS,
+        appId,
+        ideVersion: options.ideVersion,
+    }, {
+        headers: { ...buildNaslHeaders(options), 'Content-Type': 'application/json' },
+    });
+    return res.data.result;
 }
 
 async function installDependenciesApi(dependenciesJSON, options) {
@@ -38935,78 +38927,94 @@ async function build(entry, options) {
 }
 
 /**
- * 获取 specs 下第1个文件夹的名字
+ * 从 specs/ 目录取第一个子文件夹名；若无则退回项目根目录名
  */
-function getFirstSpecFolderName(projectRoot) {
-    const dirname = path$1.basename(projectRoot);
+function getSpecBaseName(projectRoot) {
     const specsDir = path$1.join(projectRoot, 'specs');
-    if (!libExports.existsSync(specsDir))
-        return dirname;
-    const entries = libExports.readdirSync(specsDir, { withFileTypes: true });
-    const folders = entries
-        .filter(entry => entry.isDirectory())
-        .map(entry => entry.name);
-    if (folders.length === 0)
-        return dirname;
-    return folders[0];
+    if (libExports.existsSync(specsDir)) {
+        const folders = libExports.readdirSync(specsDir, { withFileTypes: true })
+            .filter(e => e.isDirectory())
+            .map(e => e.name);
+        if (folders.length > 0)
+            return folders[0];
+    }
+    return path$1.basename(projectRoot);
 }
 /**
- * 创建应用在 IDE 中
+ * 从项目目录推导出合法的应用名称和包名
+ */
+function deriveAppNames(projectRoot) {
+    const baseName = getSpecBaseName(projectRoot);
+    const suffix = dayjs().format('MMDDHHmmss');
+    let cleaned = baseName.replace(/[^a-zA-Z0-9]/g, '').replace(/^\d+/, '').slice(0, 12);
+    if (!cleaned)
+        cleaned = 'app';
+    return {
+        appName: `${cleaned}_${suffix}`,
+        packageName: `${cleaned}${suffix}`,
+    };
+}
+
+/**
+ * 使用 readline 询问用户确认
  */
+function askForConfirmation(question) {
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question(question, (answer) => {
+            rl.close();
+            const a = answer.trim().toLowerCase();
+            resolve(!a || a === 'y' || a === 'yes' || a === '是');
+        });
+    });
+}
+
 async function createAppInIde(entry, options) {
     const logger = options?.logger || defaultLogger;
-    logger.info('开始创建应用在 IDE 中...');
-    // 收集需要处理的文件
-    const { collectedFiles, config } = await resolveNASLFiles(entry, logger, false, options?.verbose);
-    if (config.useOPENAPI) {
-        logger.error('create-app-in-ide 暂不支持 useOPENAPI 模式');
-        logger.exit(1);
+    // ── 扫描 ─────────────────────────────────────────────
+    const { collectedFiles, config, mergedDependencies } = await resolveNASLFiles(entry, logger, false, options?.verbose);
+    // ── 展示参数 ──────────────────────────────────────────
+    const { appName, packageName } = deriveAppNames(getProjectRoot());
+    logger.newLine();
+    logger.info(`应用名称: ${appName}`);
+    logger.info(`包名: ${packageName}`);
+    logger.info(`IDE 版本: ${config.ideVersion}`);
+    logger.info(`租户名称: ${config.tenantName || 'defaulttenant'}`);
+    // ── 确认 ──────────────────────────────────────────────
+    if (!options?.quiet) {
+        logger.newLine();
+        const confirmed = await askForConfirmation('即将在 IDE 中创建新的应用，请确认是否继续？(Y/n): ');
+        if (!confirmed) {
+            logger.info('已取消操作');
+            process.exit(0);
+        }
     }
-    // 生成 fullNaturalTS
+    // ── 执行 ──────────────────────────────────────────────
     logger.newLine();
     logger.info('正在生成 NaturalTS 代码...');
-    let fullNaturalTS = '';
+    let fullNaturalTS;
     try {
         fullNaturalTS = composeToString(collectedFiles);
+        fullNaturalTS = prependDependencies(fullNaturalTS, mergedDependencies);
     }
     catch (error) {
         logger.error(`生成 NaturalTS 代码失败: ${error.message}`);
         throw error;
     }
-    // 获取 specs 下第1个文件夹
-    const projectRoot = getProjectRoot();
-    const firstSpecFolderName = getFirstSpecFolderName(projectRoot);
-    const suffix = dayjs().format('MMDDHHmmss');
-    let cleaned = firstSpecFolderName.replace(/[^a-zA-Z0-9]/g, '').replace(/^\d+/, '').slice(0, 12);
-    if (!cleaned)
-        cleaned = 'app';
-    const appName = `${cleaned}_${suffix}`;
-    const packageName = `${cleaned}${suffix}`;
-    logger.info(`应用名称: ${appName}`);
-    logger.info(`包名: ${packageName}`);
-    logger.info(`IDE 版本: ${config.ideVersion}`);
-    logger.info(`完整版本: ${config.ideVersion}.0`);
-    // 调用创建应用 API
-    logger.newLine();
     logger.info('正在调用创建应用服务...');
     try {
-        const result = await createAppSyncApi(fullNaturalTS, {
-            packageName: packageName,
-            appName: appName,
-            serverBaseURL: config.serverBaseURL,
-            ideVersion: config.ideVersion,
-        });
+        const result = await createApp(fullNaturalTS, config, appName, packageName);
         if (result.success) {
             logger.success('应用创建成功！');
-            if (result.appURL) {
+            if (result.appURL)
                 logger.info(`应用 URL: ${result.appURL}`);
-            }
-            if (result.appId) {
+            if (result.appId)
                 logger.info(`应用 ID: ${result.appId}`);
-            }
-            if (result.message) {
+            if (result.message)
                 logger.info(result.message);
-            }
         }
         else {
             logger.error(`应用创建失败: ${result.error || '未知错误'}`);
@@ -39019,6 +39027,57 @@ async function createAppInIde(entry, options) {
     }
 }
 
+async function updateAppInIde(appId, entry, options) {
+    const logger = options?.logger || defaultLogger;
+    // ── 扫描 ─────────────────────────────────────────────
+    const { collectedFiles, config, mergedDependencies } = await resolveNASLFiles(entry, logger, false, options?.verbose);
+    // ── 展示参数 ──────────────────────────────────────────
+    logger.newLine();
+    logger.info(`应用 ID: ${appId}`);
+    logger.info(`IDE 版本: ${config.ideVersion}`);
+    logger.info(`租户名称: ${config.tenantName || 'defaulttenant'}`);
+    // ── 确认 ──────────────────────────────────────────────
+    if (!options?.quiet) {
+        logger.newLine();
+        const confirmed = await askForConfirmation(`即将更新应用 ${appId}，请确认是否继续？(Y/n): `);
+        if (!confirmed) {
+            logger.info('已取消操作');
+            process.exit(0);
+        }
+    }
+    // ── 执行 ──────────────────────────────────────────────
+    logger.newLine();
+    logger.info('正在生成 NaturalTS 代码...');
+    let fullNaturalTS;
+    try {
+        fullNaturalTS = composeToString(collectedFiles);
+        fullNaturalTS = prependDependencies(fullNaturalTS, mergedDependencies);
+    }
+    catch (error) {
+        logger.error(`生成 NaturalTS 代码失败: ${error.message}`);
+        throw error;
+    }
+    logger.info('正在调用更新应用服务...');
+    try {
+        const result = await updateApp(fullNaturalTS, config, appId);
+        if (result.success) {
+            logger.success('应用更新成功！');
+            if (result.appURL)
+                logger.info(`应用 URL: ${result.appURL}`);
+            if (result.message)
+                logger.info(result.message);
+        }
+        else {
+            logger.error(`应用更新失败: ${result.error || '未知错误'}`);
+            throw new Error(result.error || '应用更新失败');
+        }
+    }
+    catch (error) {
+        logger.error(`调用更新应用服务失败: ${error.message}`);
+        throw error;
+    }
+}
+
 /**
  * 编译 NASL 代码
  * TODO: 实现具体的 API 调用逻辑
@@ -39384,27 +39443,11 @@ async function installByJSON(json, options) {
     logger.success(`成功写入 ${writtenCount} 个依赖文件到 ${config.srcDir} 目录`);
 }
 
-var version = "0.3.3";
+var version = "0.3.4";
 var pkg = {
 	version: version};
 
 const program = new Command();
-/**
- * 使用 readline 询问用户确认
- */
-function askForConfirmation(question) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            const normalizedAnswer = answer.trim().toLowerCase();
-            resolve(!normalizedAnswer || normalizedAnswer === 'y' || normalizedAnswer === 'yes' || normalizedAnswer === '是');
-        });
-    });
-}
 const entryDescription = `是相对于项目根目录的路径，支持 glob 模式（注意要用引号包裹），例如：
   - src/app.enums.Status.ts 支持具体文件
   - "src/app.enums.*.ts" 表示所有枚举
@@ -39526,17 +39569,6 @@ program
     .option('-q, --quiet', '不询问问题')
     .action(async (entry, options) => {
     try {
-        // 如果不是 quiet 模式，询问用户确认
-        if (!options?.quiet) {
-            defaultLogger.newLine();
-            defaultLogger.info('即将在 IDE 中创建新的应用，此操作将调用远程接口。');
-            const confirmed = await askForConfirmation('请确认是否继续？(Y/n): ');
-            if (!confirmed) {
-                defaultLogger.info('已取消操作');
-                process.exit(0);
-            }
-            defaultLogger.newLine();
-        }
         await createAppInIde(entry, options);
     }
     catch (error) {
@@ -39544,6 +39576,20 @@ program
         process.exit(1);
     }
 });
+program
+    .command('update-app-in-ide <appId> [entry]')
+    .description('在 IDE 中更新已有应用')
+    .option('-v, --verbose', '显示详细信息，如依赖分析树')
+    .option('-q, --quiet', '不询问问题')
+    .action(async (appId, entry, options) => {
+    try {
+        await updateAppInIde(appId, entry, options);
+    }
+    catch (error) {
+        defaultLogger.error(`更新应用过程发生错误：${error.message}`);
+        process.exit(1);
+    }
+});
 program
     .command('transform <transformType> [entry]')
     .description('转换文件格式\n  transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件), files2json (将 src 文件转换为 JSON), doc2full (将 plan markdown 文档组合成 fullNaturalTS)')