@nasl/cli 0.3.0 → 0.3.1

package/dist/index.mjs

@@ -93,7 +93,7 @@ function validateExtensionsFile(file, errors) {
 /**
  * 验证普通文件（枚举、实体、数据结构、逻辑、页面）
  */
-function validateNormalFile(file, nameFromPath, namespace, errors) {
+function validateNormalFile(file, nameFromPath, namespace, errors, options) {
     const matchArr = Array.from(file.content.matchAll(/^(export\s+)?(declare\s+)?(function|class|interface)\s+(\w+)/gm));
     if (matchArr.length === 0)
         errors.push(`${file.path} 必须有一个函数或类，错误代码：${file.content}`);
@@ -105,14 +105,14 @@ function validateNormalFile(file, nameFromPath, namespace, errors) {
         if (!isExport)
             errors.push(`${file.path} 必须使用 export，错误代码：${match[0]}`);
         if (name !== nameFromPath)
-            errors.push(`${file.path} 的函数或类名必须与文件名一致，错误代码：${match[0]}`);
+            errors.push(`${file.path} 的函数或类名必须与${options?.isDocCheck ? ' path 属性' : '文件名'}一致，错误代码：${match[0]}`);
         if (/\.(entities|enums|structures)/.test(namespace) && type !== 'class')
             errors.push(`${file.path} 实体、数据结构和枚举只能使用 class 定义，错误代码：${match[0]}`);
         if (/\.(logics|views)/.test(namespace) && type !== 'function')
             errors.push(`${file.path} 逻辑和页面只能使用 function 定义，错误代码：${match[0]}`);
     }
 }
-function composeToString(files) {
+function composeToString(files, options) {
     files.sort((a, b) => sorter(a.path, b.path));
     const errors = [];
     let currentLine = 1;
@@ -127,7 +127,7 @@ function composeToString(files) {
         const isExtensionsFile = arr[0] === 'extensions';
         const isThemeCss = ext === 'css' && nameFromPath === 'theme';
         const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss;
-        // 特殊文件的 namespace 包含文件名，普通文件不包含
+        // 特殊文件的 namespace ${包含文件名，普通文件不包含
         const namespace = isSpecialFile ? [...arr, nameFromPath].join('.') : arr.join('.');
         let content = file.content;
         if (['ts', 'tsx'].includes(ext)) {
@@ -138,7 +138,7 @@ function composeToString(files) {
                 validateExtensionsFile(file, errors);
             }
             else {
-                validateNormalFile(file, nameFromPath, namespace, errors);
+                validateNormalFile(file, nameFromPath, namespace, errors, options);
             }
         }
         else if (isThemeCss) {
@@ -35163,6 +35163,32 @@ async function checkApi(fullNaturalTS, options) {
     }
     return '';
 }
+/**
+ * 解析 NASL 代码（parse）
+ */
+async function parseApi(fullNaturalTS, options) {
+    const axios = await createAxios(options);
+    try {
+        const res = await axios.post(`/parse/tsx?ideVersion=${options.ideVersion}`, fullNaturalTS, {
+            headers: buildNaslHeaders(options),
+        });
+        const result = res.data.result;
+        const errors = (result.errors || []);
+        if (errors.length > 0) {
+            return truncate(`解析到以下错误（共 ${errors.length} 个）：\n` + result.errorStr, 10000);
+        }
+        return '';
+    }
+    catch (error) {
+        try {
+            const data = JSON.parse(error?.message || '');
+            return truncate(data.message || error?.message || String(error), 10000);
+        }
+        catch {
+            return truncate(error?.message || String(error), 10000);
+        }
+    }
+}
 
 /**
  * 创建应用同步
@@ -35706,6 +35732,188 @@ async function transformJson2FilesApi(json, options) {
     return data.result;
 }
 
+// src/codeBlock.ts
+function extractCodeBlocks(markdown) {
+  const codeBlocks = [];
+  const lines = markdown.split("\n");
+  let inCodeBlock = false;
+  let codeBlockStart = 0;
+  let currLang = "";
+  let currLangExtra = "";
+  let currCode = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (line.startsWith("```")) {
+      if (!inCodeBlock) {
+        inCodeBlock = true;
+        codeBlockStart = i + 1;
+        const langPart = line.slice(3).trim();
+        const spaceIndex = langPart.indexOf(" ");
+        let potentialLang = "";
+        let potentialExtra = "";
+        if (spaceIndex > 0) {
+          potentialLang = langPart.slice(0, spaceIndex);
+          potentialExtra = langPart.slice(spaceIndex + 1).trim();
+        } else {
+          potentialLang = langPart;
+          potentialExtra = "";
+        }
+        const isLikelyLanguage = potentialLang && !potentialLang.includes("=") && !potentialLang.startsWith("/") && !potentialLang.startsWith(".") && potentialLang !== "";
+        if (isLikelyLanguage) {
+          currLang = potentialLang;
+          currLangExtra = potentialExtra;
+        } else {
+          currLang = "text";
+          currLangExtra = langPart;
+        }
+        currCode = [];
+      } else {
+        inCodeBlock = false;
+        codeBlocks.push({
+          lang: currLang,
+          langExtra: currLangExtra || void 0,
+          code: currCode.join("\n"),
+          startLine: codeBlockStart,
+          endLine: i
+        });
+        currLang = "";
+        currLangExtra = "";
+        currCode = [];
+      }
+    } else if (inCodeBlock) {
+      currCode.push(line);
+    }
+  }
+  return codeBlocks;
+}
+
+const DOC_PATTERNS = [
+    /^enums\.md$/,
+    /^entity-.+\.md$/,
+    /^structure-.+\.md$/,
+    /^logic-.+\.md$/,
+    /^view-.+\.md$/,
+];
+// 文档类型前缀 → NASL 文件类型名
+const DOC_TO_NASL_TYPE = {
+    enums: 'enums',
+    entity: 'entities',
+    structure: 'structures',
+    logic: 'logics',
+    view: 'views',
+};
+/**
+ * 从 tsx FileInfo 中解析出所有祖先 view，生成空壳 stub
+ * 例如 path=a.views.dashboard.views.knowledgeAccess.views.accessBrowse.tsx
+ * 会生成 dashboard 和 knowledgeAccess 的 stub
+ */
+function buildViewStubs(files) {
+    const existingPaths = new Set(files.map((f) => f.path));
+    const stubs = [];
+    for (const file of files) {
+        if (!file.path.endsWith('.tsx'))
+            continue;
+        const parts = file.path.split('.').slice(0, -2);
+        for (let i = 0; i < parts.length - 1; i++) {
+            if (parts[i] === 'views') {
+                const viewName = parts[i + 1];
+                if (!viewName)
+                    continue;
+                const stubPath = [...parts.slice(0, i + 2), 'tsx'].join('.');
+                if (!existingPaths.has(stubPath)) {
+                    existingPaths.add(stubPath);
+                    stubs.push({
+                        path: stubPath,
+                        content: `$View({\n    title: "",\n    auth: false,\n    isIndex: false,\n});\nexport function ${viewName}() {\n    return ( <ElRouterView /> );\n}`,
+                    });
+                }
+            }
+        }
+    }
+    return stubs;
+}
+/**
+ * 从 plan markdown 文件中提取并组装 fullNaturalTS，返回字符串或错误信息
+ */
+function extractFullNaturalTS(filePath, logger = defaultLogger) {
+    // 1. 验证路径模式（只检查文件名）
+    const basename = path$1.basename(filePath);
+    if (!DOC_PATTERNS.some((p) => p.test(basename))) {
+        logger.error(`路径不匹配任何支持的文档类型：${basename}\n` +
+            `支持的类型：enums.md, entity-*.md, structure-*.md, logic-*.md, view-*.md`);
+        return { success: false };
+    }
+    // 2. 读取文件
+    if (!libExports.existsSync(filePath)) {
+        logger.error(`文件不存在：${filePath}`);
+        return { success: false };
+    }
+    const content = libExports.readFileSync(filePath, 'utf-8');
+    // 3. 提取 naturalts 代码块，转换为 FileInfo[]
+    const blocks = extractCodeBlocks(content).filter((b) => b.lang === 'naturalts');
+    if (blocks.length === 0) {
+        // logger.warn('未发现 naturalts 代码块');
+        return { fullNaturalTS: '' };
+    }
+    const isViewDoc = /^view-.+\.md$/.test(basename);
+    const expectedExt = isViewDoc ? '.tsx' : '.ts';
+    const docTypePrefix = basename.split(/[-.]/)[0] ?? '';
+    const naslTypeName = DOC_TO_NASL_TYPE[docTypePrefix];
+    const expectedPattern = NASL_FILE_TYPES.find((t) => t.name === naslTypeName)?.fileNamePattern;
+    const errors = [];
+    const files = blocks.map((block) => {
+        const match = block.langExtra?.match(/path="([^"]+)"/);
+        if (!match) {
+            errors.push(`代码块缺少 path 属性（第 ${block.startLine} 行）`);
+            return null;
+        }
+        const blockPath = match[1];
+        if (!blockPath.endsWith(expectedExt)) {
+            errors.push(`代码块 path 扩展名不正确，应为 ${expectedExt}（第 ${block.startLine} 行）：${blockPath}`);
+            return null;
+        }
+        if (!isKnownFileType(blockPath)) {
+            const hint = expectedPattern ? `\n正确格式应匹配：${expectedPattern}` : '';
+            errors.push(`代码块 path 不是合法的 NASL 文件类型（第 ${block.startLine} 行）：${blockPath}${hint}`);
+            return null;
+        }
+        const fileInfo = { path: blockPath, content: block.code };
+        return fileInfo;
+    }).filter((f) => f !== null);
+    if (errors.length > 0) {
+        logger.error(`在 ${filePath} 检测到以下错误：\n` + errors.join('\n'));
+        return { success: false };
+    }
+    // 4. 补充父级 view stub（tsx 文件需要祖先页面定义）
+    const stubs = buildViewStubs(files);
+    // 5. 复用 composeToString 组装（包含排序和 namespace 构建）
+    try {
+        return { fullNaturalTS: composeToString([...files, ...stubs], { isDocCheck: true }) };
+    }
+    catch (err) {
+        logger.error(`在 ${filePath} 检测到以下错误：\n` + err.message);
+        return { success: false };
+    }
+}
+async function docCheck(filePath, options) {
+    const logger = options?.logger || defaultLogger;
+    const extracted = extractFullNaturalTS(filePath, logger);
+    if ('success' in extracted)
+        return extracted;
+    if (!extracted.fullNaturalTS)
+        return { success: true };
+    logger.info(`正在调用 parse 服务，校验文档...`);
+    const config = loadConfig();
+    const rawResult = (await parseApi(extracted.fullNaturalTS, config)).trim();
+    const result = rawResult.replace(/\*\*可能的位置\*\*:.*\n?/g, '').trim();
+    if (result) {
+        logger.error(`\n在 ${filePath} 检测到以下错误：\n` + result);
+        return { success: false, result };
+    }
+    logger.success('发现 0 个错误，检查通过！');
+    return { success: true };
+}
+
 const transformFns = {
     /**
      * 将 src 中的文件组合成 fullNaturalTS
@@ -35732,6 +35940,33 @@ const transformFns = {
         writeFileWithLog(outputPath, fullNaturalTS, logger);
         logger.success(`文件已输出到: ${outputPath}`);
     },
+    /**
+     * 将 plan markdown 文档中的 naturalts 代码块组合成 fullNaturalTS 文件
+     */
+    async doc2full(entry, options) {
+        const logger = options?.logger || defaultLogger;
+        if (!entry) {
+            logger.error('请指定 plan 文档路径');
+            logger.exit(1);
+            return;
+        }
+        const extracted = extractFullNaturalTS(entry, logger);
+        if ('success' in extracted) {
+            logger.exit(1);
+            return;
+        }
+        if (!extracted.fullNaturalTS) {
+            logger.warn('未发现 naturalts 代码块，跳过输出');
+            return;
+        }
+        // 确定输出路径
+        const projectRoot = getProjectRoot();
+        const outputPath = options?.output
+            ? path$1.resolve(projectRoot, options.output)
+            : path$1.join(projectRoot, './full-natural.ts');
+        writeFileWithLog(outputPath, extracted.fullNaturalTS, logger);
+        logger.success(`文件已输出到: ${outputPath}`);
+    },
     /**
      * 将 JSON 文件转换成 src 的 files
      * TODO: 待实现
@@ -37529,5 +37764,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, 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 };
 //# sourceMappingURL=index.mjs.map