@nasl/cli 0.3.3 → 0.3.5

package/dist/index.mjs

@@ -15,6 +15,7 @@ import crypto$1, { createHash } from 'crypto';
 import http2 from 'http2';
 import zlib from 'zlib';
 import { spawn, spawnSync } from 'child_process';
+import * as readline from 'readline';
 import { realpath as realpath$1, stat as stat$2, lstat as lstat$1, open, readdir as readdir$1 } from 'fs/promises';
 import { lstat, stat as stat$1, readdir, realpath } from 'node:fs/promises';
 import { Readable as Readable$1 } from 'node:stream';
@@ -38,7 +39,18 @@ const DEFAULT_CONFIG = {
 const CONFIG_FILE_NAME = 'nasl.config.json';
 
 function createSorter() {
-    const priorityOrder = ['app.dataSources', 'app.enums', 'app.structures', 'app.logics', 'app.frontendTypes'];
+    const priorityOrder = [
+        'extensions',
+        'apis',
+        'connectors',
+        'app.backend.variables',
+        'app.roles',
+        'app.enums',
+        'app.dataSources',
+        'app.structures',
+        'app.logics',
+        'app.frontendTypes',
+    ];
     // 获取优先级索引
     const getPriority = (str) => {
         const prefixIndex = priorityOrder.findIndex((p) => str.startsWith(p));
@@ -52,13 +64,11 @@ function createSorter() {
             return aPriority - bPriority;
         }
         // 如果是frontendTypes，按字母顺序排序
-        if (aPriority === 4) {
+        if (a.startsWith('app.frontendTypes') && b.startsWith('app.frontendTypes')) {
             return a.localeCompare(b);
         }
-        else {
-            // 其他情况保持原顺序
-            return 0;
-        }
+        // 其他情况保持原顺序
+        return 0;
     };
 }
 const sorter = createSorter();
@@ -126,11 +136,15 @@ function composeToString(files, options) {
         const isVariablesFile = nameFromPath === 'variables';
         const isExtensionsFile = arr[0] === 'extensions';
         const isThemeCss = ext === 'css' && nameFromPath === 'theme';
-        const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss;
+        const isRolesJson = file.path === 'app.roles.json';
+        const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss || isRolesJson;
         // 特殊文件的 namespace ${包含文件名，普通文件不包含
         const namespace = isSpecialFile ? [...arr, nameFromPath].join('.') : arr.join('.');
         let content = file.content;
-        if (['ts', 'tsx'].includes(ext)) {
+        if (isRolesJson) {
+            content = `  $roles(${content});`;
+        }
+        else if (['ts', 'tsx'].includes(ext)) {
             if (isVariablesFile) {
                 validateVariablesFile(file, errors);
             }
@@ -13753,6 +13767,13 @@ function writeFileWithLog(filePath, content, logger) {
  * NASL 支持的所有文件类型配置
  */
 const NASL_FILE_TYPES = [
+    {
+        name: 'roles',
+        description: '角色',
+        fileNamePattern: 'app\\.roles\\.json',
+        codeRefPattern: '',
+        extension: 'json',
+    },
     {
         name: 'theme-css',
         description: '主题样式',
@@ -13849,7 +13870,7 @@ const fileNamePatterns = getFileNamePatterns();
  * 获取用于提取代码引用的正则表达式数组
  */
 function getCodeRefPatterns() {
-    return NASL_FILE_TYPES.map((type) => new RegExp(type.codeRefPattern, 'g'));
+    return NASL_FILE_TYPES.filter((type) => type.codeRefPattern).map((type) => new RegExp(type.codeRefPattern, 'g'));
 }
 const codeRefPatterns = getCodeRefPatterns();
 /**
@@ -13884,7 +13905,7 @@ function shouldSkipDependencyTraversal(depPath) {
 async function scanNASLFiles(srcDir, representation, logger) {
     try {
         const pattern = representation === 'NaturalTS' ? '**/*.{ts,tsx}' : '**/*.nasl';
-        const files = await globby([pattern, '**/app.frontendTypes.pc.frontends.pc.theme.css'], {
+        const files = await globby([pattern, 'app.frontendTypes.pc.frontends.pc.theme.css', 'app.roles.json'], {
             cwd: srcDir,
             onlyFiles: true,
             absolute: false,
@@ -14118,9 +14139,9 @@ function buildExternalDependencies(refs, mergedDeps, logger) {
 function replaceViewAsSignature(content, hasSubViews = false) {
     if (hasSubViews) {
         // 如果有子页面，替换为返回 ElRouterView 的函数
-        return content.replace(/export function ((\w+)\([^)]*\)) \{[\s\S]+$/, 'export function $1 {\n    return <ElRouterView />\n}');
+        return content.replace(/export function ((\w+)\([\s\S]*?\)) \{[\s\S]+$/, 'export function $1 {\n    return <ElRouterView />\n}');
     }
-    return content.replace(/export function ((\w+)\([^)]*\)) \{[\s\S]+$/, 'export declare function $1;');
+    return content.replace(/export function ((\w+)\([\s\S]*?\)) \{[\s\S]+$/, 'export declare function $1;');
 }
 /**
  * 处理单个文件的依赖
@@ -14162,8 +14183,10 @@ function processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFil
     processedFileMap.set(pathRelativeToSrc, fileInfo);
     // 提取依赖
     // extensions/connectors/apis/uilibs 作为叶子节点，不再向下递归查找依赖
+    // JSON 文件（如 app.roles.json）无代码引用，跳过依赖分析
     const isExternalDep = shouldSkipDependencyTraversal(pathRelativeToSrc);
-    const deps = isExternalDep ? [] : extractDeps(fileInfo.content);
+    const isRolesJson = pathRelativeToSrc === 'app.roles.json';
+    const deps = isExternalDep || isRolesJson ? [] : extractDeps(fileInfo.content);
     // 查找依赖文件
     if (isView) {
         const pathArr = pathRelativeToSrc.split('.');
@@ -14289,7 +14312,7 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
     }
     let externalRefs = null;
     if (!entry && depMode)
-        entry = 'src/**/app.*.{ts,tsx,css}';
+        entry = ['src/**/app.*.{ts,tsx,css}', 'src/app.roles.json'];
     if (entry) {
         // 检查入口路径是否在源代码目录外面
         // if (entry.startsWith('..')) throw new Error('入口路径不能在源代码目录外面');
@@ -35191,41 +35214,33 @@ async function parseApi(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) {
@@ -35632,78 +35647,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);
+}
+/**
+ * 从项目目录推导出合法的应用名称和包名
+ */
+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}`,
+    };
 }
+
 /**
- * 创建应用在 IDE 中
+ * 使用 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 || '未知错误'}`);
@@ -35716,6 +35747,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 调用逻辑
@@ -37764,5 +37846,5 @@ var index$1 = /*#__PURE__*/Object.freeze({
     watch: watch
 });
 
-export { BaseLogger, CONFIG_FILE_NAME, ConsoleLogger, ConsoleLoggerWithoutExit, DEFAULT_CONFIG, MemoryLogger, build, check, compile, composeToString, createAppInIde, createSorter, defaultLogger, dep, dev, docCheck, extractFullNaturalTS, fastAppendLogToFile, fastLogToFile, init, installAuto, installByJSON, installByKind, loadAppDependencies, loadMergedDependencies, mergeDependenciesIntoApp, prependDependencies, resolveNASLFiles, scanEntryFiles, scanNASLFiles, sorter, transform, tryCompile };
+export { BaseLogger, CONFIG_FILE_NAME, ConsoleLogger, ConsoleLoggerWithoutExit, DEFAULT_CONFIG, MemoryLogger, build, check, compile, composeToString, createAppInIde, createSorter, defaultLogger, dep, dev, docCheck, extractFullNaturalTS, fastAppendLogToFile, fastLogToFile, init, installAuto, installByJSON, installByKind, loadAppDependencies, loadMergedDependencies, mergeDependenciesIntoApp, prependDependencies, resolveNASLFiles, scanEntryFiles, scanNASLFiles, sorter, transform, tryCompile, updateAppInIde };
 //# sourceMappingURL=index.mjs.map