@nasl/cli 0.2.3 → 0.3.1

package/dist/bin/nasl.mjs

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
-#!/usr/bin/env node
 import require$$0$1, { EventEmitter } from 'events';
 import require$$1, { spawn, spawnSync } from 'child_process';
-import * as sysPath from 'path';
-import sysPath__default, { join } from 'path';
+import * as path$1 from 'path';
+import path__default, { join } from 'path';
 import require$$0$2, { promises, unwatchFile, watchFile, watch as watch$1, stat as stat$3 } from 'fs';
 import require$$4 from 'process';
 import require$$0$3 from 'constants';
@@ -1171,7 +1170,7 @@ function requireCommand () {
 	hasRequiredCommand = 1;
 	const EventEmitter = require$$0$1.EventEmitter;
 	const childProcess = require$$1;
-	const path = sysPath__default;
+	const path = path__default;
 	const fs = require$$0$2;
 	const process = require$$4;
 
@@ -4581,7 +4580,7 @@ var hasRequiredUtils$5;
 function requireUtils$5 () {
 	if (hasRequiredUtils$5) return utils$7;
 	hasRequiredUtils$5 = 1;
-	const path = sysPath__default;
+	const path = path__default;
 
 	// https://github.com/nodejs/node/issues/8987
 	// https://github.com/libuv/libuv/pull/1088
@@ -4727,7 +4726,7 @@ function requireStat () {
 	hasRequiredStat = 1;
 
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = sysPath__default;
+	const path = path__default;
 	const u = requireUniversalify().fromPromise;
 
 	function getStats (src, dest, opts) {
@@ -4931,7 +4930,7 @@ function requireCopy$1 () {
 	hasRequiredCopy$1 = 1;
 
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = sysPath__default;
+	const path = path__default;
 	const { mkdirs } = /*@__PURE__*/ requireMkdirs();
 	const { pathExists } = /*@__PURE__*/ requirePathExists();
 	const { utimesMillis } = /*@__PURE__*/ requireUtimes();
@@ -5114,7 +5113,7 @@ function requireCopySync () {
 	hasRequiredCopySync = 1;
 
 	const fs = requireGracefulFs();
-	const path = sysPath__default;
+	const path = path__default;
 	const mkdirsSync = /*@__PURE__*/ requireMkdirs().mkdirsSync;
 	const utimesMillisSync = /*@__PURE__*/ requireUtimes().utimesMillisSync;
 	const stat = /*@__PURE__*/ requireStat();
@@ -5334,7 +5333,7 @@ function requireEmpty () {
 
 	const u = requireUniversalify().fromPromise;
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = sysPath__default;
+	const path = path__default;
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 	const remove = /*@__PURE__*/ requireRemove();
 
@@ -5380,7 +5379,7 @@ function requireFile () {
 	hasRequiredFile = 1;
 
 	const u = requireUniversalify().fromPromise;
-	const path = sysPath__default;
+	const path = path__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 
@@ -5454,7 +5453,7 @@ function requireLink () {
 	hasRequiredLink = 1;
 
 	const u = requireUniversalify().fromPromise;
-	const path = sysPath__default;
+	const path = path__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 	const { pathExists } = /*@__PURE__*/ requirePathExists();
@@ -5525,7 +5524,7 @@ function requireSymlinkPaths () {
 	if (hasRequiredSymlinkPaths) return symlinkPaths_1;
 	hasRequiredSymlinkPaths = 1;
 
-	const path = sysPath__default;
+	const path = path__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 	const { pathExists } = /*@__PURE__*/ requirePathExists();
 
@@ -5677,7 +5676,7 @@ function requireSymlink () {
 	hasRequiredSymlink = 1;
 
 	const u = requireUniversalify().fromPromise;
-	const path = sysPath__default;
+	const path = path__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 
 	const { mkdirs, mkdirsSync } = /*@__PURE__*/ requireMkdirs();
@@ -5923,7 +5922,7 @@ function requireOutputFile () {
 
 	const u = requireUniversalify().fromPromise;
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = sysPath__default;
+	const path = path__default;
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 	const pathExists = /*@__PURE__*/ requirePathExists().pathExists;
 
@@ -6025,7 +6024,7 @@ function requireMove$1 () {
 	hasRequiredMove$1 = 1;
 
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = sysPath__default;
+	const path = path__default;
 	const { copy } = /*@__PURE__*/ requireCopy();
 	const { remove } = /*@__PURE__*/ requireRemove();
 	const { mkdirp } = /*@__PURE__*/ requireMkdirs();
@@ -6092,7 +6091,7 @@ function requireMoveSync () {
 	hasRequiredMoveSync = 1;
 
 	const fs = requireGracefulFs();
-	const path = sysPath__default;
+	const path = path__default;
 	const copySync = /*@__PURE__*/ requireCopy().copySync;
 	const removeSync = /*@__PURE__*/ requireRemove().removeSync;
 	const mkdirpSync = /*@__PURE__*/ requireMkdirs().mkdirpSync;
@@ -6198,6 +6197,7 @@ const DEFAULT_CONFIG = {
     ideVersion: '4.4',
     srcDir: 'src',
     outDir: 'out',
+    tenantName: 'defaulttenant',
 };
 /**
  * 配置文件名称
@@ -8192,15 +8192,15 @@ var dayjs = /*@__PURE__*/getDefaultExportFromCjs(dayjs_minExports);
 
 function fastLogToFile(entry, suffix, content) {
     if (process.env.NASL_CLI_LOG_DIR) {
-        const logDir = sysPath.resolve(process.env.NASL_CLI_LOG_DIR);
+        const logDir = path$1.resolve(process.env.NASL_CLI_LOG_DIR);
         libExports.ensureDirSync(logDir);
         const timeInDir = (process.env.NASL_CLI_LOG_DIR.match(/\d{6,8}_(\d{6})-/)?.[1] || '00');
         const now = dayjs();
         const hourInDir = parseInt(timeInDir.slice(0, 2), 10);
         // 跨天则累加 24 小时
         const hourStr = (now.hour() >= hourInDir ? now.hour() : Math.ceil(hourInDir / 24) * 24 + now.hour()).toString().padStart(2, '0');
-        const entryName = sysPath.basename(Array.isArray(entry) ? entry[0] || '*' : entry).replace(/[\[\]\(\)\{\}\+\-\*\?\|\^\$\#\:\,\\\/\s]+/g, '_');
-        const filePath = sysPath.resolve(logDir, `${hourStr}${now.format('mmss_SSS')}-${entryName}-${suffix}`);
+        const entryName = path$1.basename(Array.isArray(entry) ? entry[0] || '*' : entry).replace(/[\[\]\(\)\{\}\+\-\*\?\|\^\$\#\:\,\\\/\s]+/g, '_');
+        const filePath = path$1.resolve(logDir, `${hourStr}${now.format('mmss_SSS')}-${entryName}-${suffix}`);
         libExports.outputFileSync(filePath, content);
     }
 }
@@ -8231,16 +8231,16 @@ class BaseLogger {
     }
     debugToFile(topic, ...args) {
         if (process.env.DEBUG_TO_FILE) {
-            const baseDir = sysPath.join(process.cwd(), '.nasl');
+            const baseDir = path$1.join(process.cwd(), '.nasl');
             const currentHour = dayjs().format('YYYYMMDD_HH');
             const prevHour = dayjs().subtract(1, 'hour').format('YYYYMMDD_HH');
             let subdir = `${topic}_${currentHour}`;
             const prevSubdir = `${topic}_${prevHour}`;
             // 判断如果有上一个小时的 subdir，则自己汇聚到上一个小时的 subdir 中
-            if (libExports.existsSync(sysPath.join(baseDir, prevSubdir)))
+            if (libExports.existsSync(path$1.join(baseDir, prevSubdir)))
                 subdir = prevSubdir;
             const fileName = `${topic}_${dayjs().format('YYYYMMDD_HHmmss')}.log`;
-            const filePath = sysPath.join(baseDir, subdir, fileName);
+            const filePath = path$1.join(baseDir, subdir, fileName);
             libExports.outputFileSync(filePath, args.join(' '));
         }
     }
@@ -8312,11 +8312,11 @@ function findConfigDir(startDir = process.cwd()) {
     let currentDir = startDir;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        const configPath = sysPath.join(currentDir, CONFIG_FILE_NAME);
+        const configPath = path$1.join(currentDir, CONFIG_FILE_NAME);
         if (libExports.existsSync(configPath)) {
             return currentDir;
         }
-        const parentDir = sysPath.dirname(currentDir);
+        const parentDir = path$1.dirname(currentDir);
         // 已经到达根目录
         if (parentDir === currentDir) {
             return null;
@@ -8333,7 +8333,7 @@ function loadConfig(configDir) {
         defaultLogger.error(`未找到配置文件 ${CONFIG_FILE_NAME}，请先运行 nasl-init 初始化配置`);
         return defaultLogger.exit(1);
     }
-    const configPath = sysPath.join(dir, CONFIG_FILE_NAME);
+    const configPath = path$1.join(dir, CONFIG_FILE_NAME);
     try {
         const content = libExports.readFileSync(configPath, 'utf-8');
         const config = JSON.parse(content);
@@ -8364,6 +8364,8 @@ function loadConfig(configDir) {
             config.OPENAPI_AK = process.env.LCAP_OPENAPI_AK;
         if (process.env.LCAP_OPENAPI_SK)
             config.OPENAPI_SK = process.env.LCAP_OPENAPI_SK;
+        if (process.env.LCAP_TENANT_NAME)
+            config.tenantName = process.env.LCAP_TENANT_NAME;
         // 如果启用了 OpenAPI，验证必需的 AK 和 SK
         if (config.useOPENAPI) {
             if (!config.OPENAPI_AK || !config.OPENAPI_SK) {
@@ -8410,7 +8412,7 @@ function readFileWithLog(filePath, logger) {
  */
 function writeFileWithLog(filePath, content, logger) {
     try {
-        const dir = sysPath.dirname(filePath);
+        const dir = path$1.dirname(filePath);
         libExports.ensureDirSync(dir);
         libExports.writeFileSync(filePath, content, 'utf-8');
     }
@@ -8425,7 +8427,7 @@ function writeFileWithLog(filePath, content, logger) {
  */
 function init() {
     const cwd = process.cwd();
-    const configPath = sysPath.join(cwd, CONFIG_FILE_NAME);
+    const configPath = path$1.join(cwd, CONFIG_FILE_NAME);
     // 检查配置文件是否已存在
     if (libExports.existsSync(configPath)) {
         defaultLogger.warn(`配置文件已存在: ${configPath}`);
@@ -8439,7 +8441,7 @@ function init() {
         defaultLogger.info('\n配置内容:');
         defaultLogger.info(JSON.stringify(DEFAULT_CONFIG, null, 2));
         // 创建源代码目录
-        const srcDirPath = sysPath.join(cwd, DEFAULT_CONFIG.srcDir);
+        const srcDirPath = path$1.join(cwd, DEFAULT_CONFIG.srcDir);
         libExports.ensureDirSync(srcDirPath);
         defaultLogger.success(`源代码目录已创建: ${srcDirPath}`);
         defaultLogger.info('\n提示：');
@@ -20431,7 +20433,7 @@ function requireMimeTypes () {
 		 */
 
 		var db = requireMimeDb();
-		var extname = sysPath__default.extname;
+		var extname = path__default.extname;
 
 		/**
 		 * Module variables.
@@ -22172,7 +22174,7 @@ function requireForm_data () {
 
 	var CombinedStream = requireCombined_stream();
 	var util = require$$0$4;
-	var path = sysPath__default;
+	var path = path__default;
 	var http = require$$3;
 	var https = require$$4$1;
 	var parseUrl = require$$0$6.parse;
@@ -29116,6 +29118,20 @@ async function generateCompleteHeaders(options) {
     }
     return headers;
 }
+/**
+ * 构建请求 headers
+ * 如果 ServerOptions.useOPENAPI 为 true, 意味着接口内部是走的集群，反之则需要走 openapi 调用(本地或者server的场景，透传options相关配置)
+ */
+function buildNaslHeaders(options) {
+    return {
+        'Content-Type': 'text/plain',
+        'X-Server-Base-URL': options.serverBaseURL,
+        ...(options.OPENAPI_AK && { 'X-OPENAPI-AK': options.OPENAPI_AK }),
+        ...(options.OPENAPI_SK && { 'X-OPENAPI-SK': options.OPENAPI_SK }),
+        ...(options.tenantName && { 'X-Tenant-Name': options.tenantName }),
+        ...(options.useOPENAPI !== undefined && { 'X-Use-OPENAPI': String(!options.useOPENAPI) }),
+    };
+}
 
 /**
  * 创建 Axios 实例
@@ -29167,7 +29183,7 @@ async function compileApi(fullNaturalTS, options) {
     // 示例实现：
     const axios = await createAxios(options);
     const res = await axios.post(`/compile/tsx?ideVersion=${options.ideVersion}&needAnnotation=true`, fullNaturalTS, {
-        headers: { 'Content-Type': 'text/plain' },
+        headers: buildNaslHeaders(options),
     });
     const data = res.data;
     const { bundle } = data.result;
@@ -29199,7 +29215,7 @@ window.backendApp = app;
 async function checkApi(fullNaturalTS, options) {
     const axios = await createAxios(options);
     const res = await axios.post(`/check/tsx?ideVersion=${options.ideVersion}`, fullNaturalTS, {
-        headers: { 'Content-Type': 'text/plain' },
+        headers: buildNaslHeaders(options),
     });
     const result = res.data.result;
     const errors = (result.errors || []);
@@ -29248,6 +29264,17 @@ async function createAppSyncApi(fullNaturalTS, options) {
     }
 }
 
+async function installDependenciesApi(dependenciesJSON, options) {
+    const axios = await createAxios(options);
+    const res = await axios.post(`/load/dependencies?ideVersion=${options.ideVersion}`, dependenciesJSON, {
+        headers: buildNaslHeaders(options),
+    });
+    const data = res.data;
+    if (data.code !== 200)
+        throw new Error(data.message);
+    return data.result;
+}
+
 function createSorter() {
     const priorityOrder = ['app.dataSources', 'app.enums', 'app.structures', 'app.logics', 'app.frontendTypes'];
     // 获取优先级索引
@@ -29304,7 +29331,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}`);
@@ -29316,14 +29343,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;
@@ -29338,7 +29365,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)) {
@@ -29349,7 +29376,7 @@ function composeToString(files) {
                 validateExtensionsFile(file, errors);
             }
             else {
-                validateNormalFile(file, nameFromPath, namespace, errors);
+                validateNormalFile(file, nameFromPath, namespace, errors, options);
             }
         }
         else if (isThemeCss) {
@@ -29370,6 +29397,25 @@ function composeToString(files) {
     }
     return result;
 }
+/**
+ * 将依赖信息拼接到 fullNaturalTS 顶部
+ * @param fullNaturalTS 组合后的 NASL 代码
+ * @param dependencies mergedDependencies 对象或 JSON 字符串
+ * @returns 拼接后的完整内容
+ */
+function prependDependencies(fullNaturalTS, dependencies) {
+    if (!dependencies)
+        return fullNaturalTS;
+    const jsonStr = JSON.stringify(dependencies, null, 2);
+    const header = `/*
+-----------app.dependencies.json7xdhjutehm.start
+${jsonStr}
+-----------app.dependencies.json7xdhjutehm.end
+*/
+
+`;
+    return header + fullNaturalTS;
+}
 
 var globby$1 = {exports: {}};
 
@@ -29627,7 +29673,7 @@ function requirePath () {
 	Object.defineProperty(path, "__esModule", { value: true });
 	path.convertPosixPathToPattern = path.convertWindowsPathToPattern = path.convertPathToPattern = path.escapePosixPath = path.escapeWindowsPath = path.escape = path.removeLeadingDotSegment = path.makeAbsolute = path.unixify = void 0;
 	const os = require$$0$5;
-	const path$1 = sysPath__default;
+	const path$1 = path__default;
 	const IS_WINDOWS_PLATFORM = os.platform() === 'win32';
 	const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
 	/**
@@ -29892,7 +29938,7 @@ function requireGlobParent () {
 	hasRequiredGlobParent = 1;
 
 	var isGlob = requireIsGlob();
-	var pathPosixDirname = sysPath__default.posix.dirname;
+	var pathPosixDirname = path__default.posix.dirname;
 	var isWin32 = require$$0$5.platform() === 'win32';
 
 	var slash = '/';
@@ -31464,7 +31510,7 @@ function requireConstants$1 () {
 	if (hasRequiredConstants$1) return constants$1;
 	hasRequiredConstants$1 = 1;
 
-	const path = sysPath__default;
+	const path = path__default;
 	const WIN_SLASH = '\\\\/';
 	const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
@@ -31651,7 +31697,7 @@ function requireUtils$2 () {
 	hasRequiredUtils$2 = 1;
 	(function (exports$1) {
 
-		const path = sysPath__default;
+		const path = path__default;
 		const win32 = process.platform === 'win32';
 		const {
 		  REGEX_BACKSLASH,
@@ -33222,7 +33268,7 @@ function requirePicomatch$1 () {
 	if (hasRequiredPicomatch$1) return picomatch_1;
 	hasRequiredPicomatch$1 = 1;
 
-	const path = sysPath__default;
+	const path = path__default;
 	const scan = requireScan();
 	const parse = requireParse();
 	const utils = requireUtils$2();
@@ -34065,7 +34111,7 @@ function requirePattern () {
 	hasRequiredPattern = 1;
 	Object.defineProperty(pattern, "__esModule", { value: true });
 	pattern.isAbsolute = pattern.partitionAbsoluteAndRelative = pattern.removeDuplicateSlashes = pattern.matchAny = pattern.convertPatternsToRe = pattern.makeRe = pattern.getPatternParts = pattern.expandBraceExpansion = pattern.expandPatternsWithBraceExpansion = pattern.isAffectDepthOfReadingPattern = pattern.endsWithSlashGlobStar = pattern.hasGlobStar = pattern.getBaseDirectory = pattern.isPatternRelatedToParentDirectory = pattern.getPatternsOutsideCurrentDirectory = pattern.getPatternsInsideCurrentDirectory = pattern.getPositivePatterns = pattern.getNegativePatterns = pattern.isPositivePattern = pattern.isNegativePattern = pattern.convertToNegativePattern = pattern.convertToPositivePattern = pattern.isDynamicPattern = pattern.isStaticPattern = void 0;
-	const path = sysPath__default;
+	const path = path__default;
 	const globParent = requireGlobParent();
 	const micromatch = requireMicromatch();
 	const GLOBSTAR = '**';
@@ -35019,7 +35065,7 @@ function requireSettings$2 () {
 	if (hasRequiredSettings$2) return settings$2;
 	hasRequiredSettings$2 = 1;
 	Object.defineProperty(settings$2, "__esModule", { value: true });
-	const path = sysPath__default;
+	const path = path__default;
 	const fsStat = requireOut$3();
 	const fs = requireFs();
 	class Settings {
@@ -35781,7 +35827,7 @@ function requireSettings$1 () {
 	if (hasRequiredSettings$1) return settings$1;
 	hasRequiredSettings$1 = 1;
 	Object.defineProperty(settings$1, "__esModule", { value: true });
-	const path = sysPath__default;
+	const path = path__default;
 	const fsScandir = requireOut$2();
 	class Settings {
 	    constructor(_options = {}) {
@@ -35857,7 +35903,7 @@ function requireReader () {
 	if (hasRequiredReader) return reader;
 	hasRequiredReader = 1;
 	Object.defineProperty(reader, "__esModule", { value: true });
-	const path = sysPath__default;
+	const path = path__default;
 	const fsStat = requireOut$3();
 	const utils = requireUtils$1();
 	class Reader {
@@ -36330,7 +36376,7 @@ function requireProvider () {
 	if (hasRequiredProvider) return provider;
 	hasRequiredProvider = 1;
 	Object.defineProperty(provider, "__esModule", { value: true });
-	const path = sysPath__default;
+	const path = path__default;
 	const deep_1 = requireDeep();
 	const entry_1 = requireEntry$1();
 	const error_1 = requireError();
@@ -36770,7 +36816,7 @@ var hasRequiredDirGlob;
 function requireDirGlob () {
 	if (hasRequiredDirGlob) return dirGlob.exports;
 	hasRequiredDirGlob = 1;
-	const path = sysPath__default;
+	const path = path__default;
 	const pathType = requirePathType();
 
 	const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
@@ -37520,7 +37566,7 @@ function requireGitignore () {
 	hasRequiredGitignore = 1;
 	const {promisify} = require$$0$4;
 	const fs = require$$0$2;
-	const path = sysPath__default;
+	const path = path__default;
 	const fastGlob = requireOut();
 	const gitIgnore = requireIgnore();
 	const slash = requireSlash();
@@ -37952,6 +37998,27 @@ const NASL_FILE_TYPES = [
         codeRefPattern: 'extensions\\.\\w+(?:\\.\\w+)*',
         extension: 'ts',
     },
+    {
+        name: 'apis',
+        description: 'API',
+        fileNamePattern: 'apis\\.\\w+\\.ts',
+        codeRefPattern: 'apis\\.\\w+(?:\\.\\w+)*',
+        extension: 'ts',
+    },
+    {
+        name: 'connectors',
+        description: '连接器',
+        fileNamePattern: 'connectors\\.\\w+\\.ts',
+        codeRefPattern: 'connectors\\.\\w+(?:\\.\\w+)*',
+        extension: 'ts',
+    },
+    {
+        name: 'uilibs',
+        description: 'UI 库',
+        fileNamePattern: 'uilibs\\.\\w+\\.ts',
+        codeRefPattern: 'uilibs\\.\\w+(?:\\.\\w+)*',
+        extension: 'ts',
+    },
 ];
 /**
  * 获取用于验证文件名的正则表达式数组
@@ -37984,10 +38051,15 @@ const codeRefPatterns = getCodeRefPatterns();
  */
 function isKnownFileType(filePath) {
     // 提取文件名
-    const fileName = sysPath.basename(filePath);
+    const fileName = path$1.basename(filePath);
     return fileNamePatterns.some((pattern) => pattern.test(fileName));
 }
 
+/** 这些前缀的依赖不再向下递归查找 */
+const EXTERNAL_DEP_PREFIXES = ['extensions.', 'connectors.', 'apis.', 'uilibs.'];
+function shouldSkipDependencyTraversal(depPath) {
+    return EXTERNAL_DEP_PREFIXES.some((prefix) => depPath.startsWith(prefix));
+}
 /**
  * 扫描目录下的所有 NASL 文件
  */
@@ -38053,6 +38125,15 @@ function extractDeps(content) {
             if (/^extensions\.\w+\./.test(dep)) {
                 dep = dep.replace(/^(extensions\.\w+)\..+$/, '$1');
             }
+            if (/^apis\.\w+\./.test(dep)) {
+                dep = dep.replace(/^(apis\.\w+)\..+$/, '$1');
+            }
+            if (/^connectors\.\w+\./.test(dep)) {
+                dep = dep.replace(/^(connectors\.\w+)\..+$/, '$1');
+            }
+            if (/^uilibs\.\w+\./.test(dep)) {
+                dep = dep.replace(/^(uilibs\.\w+)\..+$/, '$1');
+            }
             // 跳过不合法的实体引用（实体后还有字段的情况）
             if (/app\.dataSources\.\w+\.entities\.\w+\.\w+$/.test(dep)) {
                 continue;
@@ -38064,6 +38145,152 @@ function extractDeps(content) {
     }
     return Array.from(deps);
 }
+/**
+ * 从文件内容中提取外部依赖引用（extensions/connectors/apis/uilibs）
+ * 用于构建 externalDependencies
+ */
+function extractExternalRefs(content) {
+    const refs = {
+        extensions: new Set(),
+        connectors: new Set(),
+        uilibs: new Set(),
+        apis: new Map(),
+    };
+    const processedContent = content
+        .replace(/\/\/.*$/gm, '')
+        .replace(/\/\*[\s\S]*?\*\//g, '')
+        .replace(/'(?:[^'\\]|\\.)*'/g, '')
+        .replace(/"(?:[^"\\]|\\.)*"/g, '');
+    // extensions.xxx, connectors.xxx, uilibs.xxx
+    for (const m of processedContent.matchAll(/\b(extensions|connectors|uilibs)\.(\w+)/g)) {
+        const [, kind, name] = m;
+        if (kind === 'extensions')
+            refs.extensions.add(name);
+        else if (kind === 'connectors')
+            refs.connectors.add(name);
+        else
+            refs.uilibs.add(name);
+    }
+    // apis.xxx.interfaces.yyy
+    for (const m of processedContent.matchAll(/\bapis\.(\w+)\.interfaces\.(\w+)/g)) {
+        const [, apiName, ifaceName] = m;
+        if (!refs.apis.has(apiName))
+            refs.apis.set(apiName, new Set());
+        refs.apis.get(apiName).add(ifaceName);
+    }
+    return refs;
+}
+function mergeExternalRefs(into, from) {
+    from.extensions.forEach((x) => into.extensions.add(x));
+    from.connectors.forEach((x) => into.connectors.add(x));
+    from.uilibs.forEach((x) => into.uilibs.add(x));
+    from.apis.forEach((interfaces, apiName) => {
+        if (!into.apis.has(apiName))
+            into.apis.set(apiName, new Set());
+        interfaces.forEach((i) => into.apis.get(apiName).add(i));
+    });
+}
+/**
+ * 加载 app.dependencies.json（不存在则返回空对象）
+ */
+function loadAppDependencies(srcDir) {
+    const p = path$1.join(srcDir, 'app.dependencies.json');
+    if (!libExports.existsSync(p))
+        return {};
+    try {
+        return libExports.readJsonSync(p);
+    }
+    catch {
+        return {};
+    }
+}
+/**
+ * 加载并合并 app.dependencies.json 与 potential.dependencies.json
+ * 用于版本号查找：先查 app，再查 potential
+ */
+function loadMergedDependencies(srcDir) {
+    const load = (file) => {
+        const p = path$1.join(srcDir, file);
+        if (!libExports.existsSync(p))
+            return null;
+        try {
+            return libExports.readJsonSync(p);
+        }
+        catch {
+            return null;
+        }
+    };
+    const app = load('app.dependencies.json') ?? {};
+    const potential = load('potential.dependencies.json') ?? {};
+    const merged = {};
+    for (const key of ['extensions', 'uilibs', 'connectors', 'apis']) {
+        merged[key] = { ...(potential[key] ?? {}), ...(app[key] ?? {}) };
+    }
+    return merged;
+}
+/**
+ * 将 externalDependencies 补充到 app.dependencies.json（只增不减）
+ */
+function mergeDependenciesIntoApp(existing, incoming) {
+    const result = {};
+    for (const key of ['extensions', 'uilibs', 'connectors']) {
+        const existingRecord = existing[key] ?? {};
+        const incomingRecord = incoming[key] ?? {};
+        result[key] = { ...incomingRecord, ...existingRecord };
+    }
+    result.apis = {};
+    if (existing.apis || incoming.apis) {
+        const allApiNames = new Set([...Object.keys(existing.apis ?? {}), ...Object.keys(incoming.apis ?? {})]);
+        for (const apiName of allApiNames) {
+            const existingInterfaces = existing.apis?.[apiName] ?? [];
+            const incomingInterfaces = incoming.apis?.[apiName] ?? [];
+            result.apis[apiName] = [...new Set([...existingInterfaces, ...incomingInterfaces])].sort();
+        }
+    }
+    return result;
+}
+/**
+ * 根据收集的外部引用和版本配置，构建 DependenciesJSON
+ * extensions/connectors/uilibs 需要版本号，apis 只需 interfaces 数组
+ */
+function buildExternalDependencies(refs, mergedDeps, logger) {
+    const result = {};
+    const errors = [];
+    for (const name of refs.extensions) {
+        const ver = mergedDeps.extensions?.[name];
+        if (!ver) {
+            errors.push(`extensions.${name} 未在 app.dependencies.json 或 potential.dependencies.json 中找到版本号`);
+        }
+        else {
+            (result.extensions ?? (result.extensions = {}))[name] = ver;
+        }
+    }
+    for (const name of refs.connectors) {
+        const ver = mergedDeps.connectors?.[name];
+        if (!ver) {
+            errors.push(`connectors.${name} 未在 app.dependencies.json 或 potential.dependencies.json 中找到版本号`);
+        }
+        else {
+            (result.connectors ?? (result.connectors = {}))[name] = ver;
+        }
+    }
+    for (const name of refs.uilibs) {
+        const ver = mergedDeps.uilibs?.[name];
+        if (!ver) {
+            errors.push(`uilibs.${name} 未在 app.dependencies.json 或 potential.dependencies.json 中找到版本号`);
+        }
+        else {
+            (result.uilibs ?? (result.uilibs = {}))[name] = ver;
+        }
+    }
+    // result.uilibs = mergedDeps.uilibs; // 临时先都加上去
+    refs.apis.forEach((interfaces, apiName) => {
+        (result.apis ?? (result.apis = {}))[apiName] = Array.from(interfaces).sort();
+    });
+    if (errors.length > 0)
+        throw new Error(errors.join('\n'));
+    return result;
+}
 /**
  * 提取页面文件的签名，移除函数体
  * @param content 页面文件内容
@@ -38086,7 +38313,7 @@ function replaceViewAsSignature(content, hasSubViews = false) {
  * @returns 文件信息和新发现的依赖文件列表
  */
 function processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFileMap, depNotFoundList, logger, verbose) {
-    const absoluteFilePath = sysPath.join(srcDir, pathRelativeToSrc);
+    const absoluteFilePath = path$1.join(srcDir, pathRelativeToSrc);
     const fileInfo = { path: pathRelativeToSrc, content: '' };
     try {
         fileInfo.content = readFileWithLog(absoluteFilePath, logger);
@@ -38116,7 +38343,9 @@ function processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFil
     }
     processedFileMap.set(pathRelativeToSrc, fileInfo);
     // 提取依赖
-    const deps = extractDeps(fileInfo.content);
+    // extensions/connectors/apis/uilibs 作为叶子节点，不再向下递归查找依赖
+    const isExternalDep = shouldSkipDependencyTraversal(pathRelativeToSrc);
+    const deps = isExternalDep ? [] : extractDeps(fileInfo.content);
     // 查找依赖文件
     if (isView) {
         const pathArr = pathRelativeToSrc.split('.');
@@ -38131,24 +38360,30 @@ function processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFil
         } while (true);
     }
     if (verbose || process.env.DEBUG) {
-        console.log(`${isEntryFile ? chalk.magenta('[Entry]') : chalk.green('[ Dep ]')} ${pathRelativeToSrc}${deps.map((dep) => `\n├── ${dep}`).join('')}`);
+        console.log(`${isEntryFile ? chalk.magenta('[Entry]') : isExternalDep ? chalk.blue('[ External Dep ]') : chalk.green('[ Dep ]')} ${pathRelativeToSrc}${deps.map((dep) => `\n├── ${dep}`).join('')}`);
     }
     return {
         fileInfo,
         newDeps: deps.filter((dep) => !processedFileMap.has(dep)),
+        isExternalDep,
     };
 }
 /**
  * 收集入口文件及其依赖
  * @param patterns 入口文件的 glob 模式数组
  * @param srcDir 源代码目录绝对路径
- * @param representation NASL 表示形式
- * @returns 文件信息列表
+ * @returns 文件信息列表和外部依赖引用
  */
 async function collectDeps(patterns, projectRoot, srcDir, logger, verbose) {
     const processedFileMap = new Map(); // 已处理的文件（相对路径）
     const filesToProcess = []; // 待处理的文件队列
     const result = [];
+    const externalRefs = {
+        extensions: new Set(),
+        connectors: new Set(),
+        uilibs: new Set(),
+        apis: new Map(),
+    };
     // 1. 使用 glob 匹配入口文件
     logger.newLine();
     logger.info(`匹配入口文件: ${patterns.join(', ')}`);
@@ -38158,15 +38393,15 @@ async function collectDeps(patterns, projectRoot, srcDir, logger, verbose) {
         throw new Error('未找到匹配的入口文件');
     }
     logger.info(`找到 ${matchedFiles.length} 个入口文件`);
-    const absoluteSrcDir = sysPath.resolve(srcDir);
+    const absoluteSrcDir = path$1.resolve(srcDir);
     const matchedFileSet = new Set();
     matchedFiles.forEach((pathRelativeToRoot) => {
         // 统一使用相对于 src 的路径
-        const absoluteFilePath = sysPath.resolve(projectRoot, pathRelativeToRoot);
+        const absoluteFilePath = path$1.resolve(projectRoot, pathRelativeToRoot);
         // 判断 file 是否超出 srcDir 目录（支持相对路径和绝对路径）
         if (!absoluteFilePath.startsWith(absoluteSrcDir))
             throw new Error(`入口文件 ${absoluteFilePath} 超出了源代码目录 ${srcDir}`);
-        const pathRelativeToSrc = sysPath.relative(srcDir, absoluteFilePath);
+        const pathRelativeToSrc = path$1.relative(srcDir, absoluteFilePath);
         filesToProcess.push(pathRelativeToSrc);
         matchedFileSet.add(pathRelativeToSrc);
     });
@@ -38184,8 +38419,9 @@ async function collectDeps(patterns, projectRoot, srcDir, logger, verbose) {
             continue;
         }
         try {
-            const { fileInfo, newDeps } = processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFileMap, depNotFoundList, logger, verbose);
-            result.push(fileInfo);
+            const { fileInfo, newDeps, isExternalDep } = processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFileMap, depNotFoundList, logger, verbose);
+            !isExternalDep && result.push(fileInfo);
+            mergeExternalRefs(externalRefs, extractExternalRefs(fileInfo.content));
             filesToProcess.push(...newDeps);
         }
         catch (error) {
@@ -38207,7 +38443,7 @@ ${depNotFoundList.map((dep) => `- ${dep}\n`).join('')}
     }
     if (errorMessage)
         throw new Error(errorMessage);
-    return result;
+    return { files: result, externalRefs };
 }
 /**
  * 解析需要处理的文件（包含配置加载和目录设置）
@@ -38215,12 +38451,13 @@ ${depNotFoundList.map((dep) => `- ${dep}\n`).join('')}
  * @returns 文件信息、配置和目录信息
  */
 async function resolveNASLFiles(entry, logger, depMode, verbose) {
+    depMode = true; // !!ensure depMode is true
     // 加载配置
     const config = loadConfig();
     const projectRoot = getProjectRoot();
     logger.info(`项目根目录: ${projectRoot}`);
     logger.info(`源代码目录: ${config.srcDir}`);
-    const srcDir = sysPath.join(projectRoot, config.srcDir);
+    const srcDir = path$1.join(projectRoot, config.srcDir);
     // 收集需要处理的文件
     let collectedFiles = [];
     if (Array.isArray(entry) && !entry.length) {
@@ -38229,10 +38466,12 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
             config,
             projectRoot,
             srcDir,
+            externalDependencies: undefined,
         };
     }
+    let externalRefs = null;
     if (!entry && depMode)
-        entry = 'src/**/*.{ts,tsx}';
+        entry = 'src/**/app.*.{ts,tsx,css}';
     if (entry) {
         // 检查入口路径是否在源代码目录外面
         // if (entry.startsWith('..')) throw new Error('入口路径不能在源代码目录外面');
@@ -38240,7 +38479,9 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
         // 具体路径也转换为 glob 模式统一处理
         // 使用依赖分析收集文件
         try {
-            collectedFiles = await collectDeps(Array.isArray(entry) ? entry : [entry], projectRoot, srcDir, logger, depMode || verbose);
+            const { files, externalRefs: refs } = await collectDeps(Array.isArray(entry) ? entry : [entry], projectRoot, srcDir, logger, depMode || verbose);
+            collectedFiles = files;
+            externalRefs = refs;
         }
         catch (error) {
             logger.error(`依赖分析失败:\n${error.message}`);
@@ -38254,13 +38495,21 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
         filePaths.sort(sorter);
         collectedFiles = filePaths.map((filePath) => ({
             path: filePath,
-            content: readFileWithLog(sysPath.join(srcDir, filePath), logger),
+            content: readFileWithLog(path$1.join(srcDir, filePath), logger),
         }));
         if (collectedFiles.length === 0) {
             logger.warn('未找到 NASL 文件');
             logger.exit(1);
         }
         logger.info(`找到 ${collectedFiles.length} 个 NASL 文件`);
+        // 全量扫描时也从文件中提取外部依赖引用
+        externalRefs = {
+            extensions: new Set(),
+            connectors: new Set(),
+            uilibs: new Set(),
+            apis: new Map(),
+        };
+        collectedFiles.forEach((f) => mergeExternalRefs(externalRefs, extractExternalRefs(f.content)));
     }
     // 统一过滤掉不支持的文件类型
     const filteredFiles = [];
@@ -38272,11 +38521,24 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
             logger.warn(`跳过不支持的文件类型: ${file.path}`);
         }
     });
+    // 从分析中构建 externalDependencies（版本号从 app.dependencies.json / potential.dependencies.json 获取）
+    let externalDependencies;
+    let mergedDependencies;
+    if (externalRefs && (externalRefs.extensions.size > 0 || externalRefs.connectors.size > 0 || externalRefs.uilibs.size > 0 || externalRefs.apis.size > 0)) {
+        const mergedDeps = loadMergedDependencies(srcDir);
+        externalDependencies = buildExternalDependencies(externalRefs, mergedDeps);
+        const appDeps = loadAppDependencies(srcDir);
+        mergedDependencies = mergeDependenciesIntoApp(appDeps, externalDependencies);
+        logger.debug('已从分析构建 externalDependencies', externalDependencies);
+        logger.debug('已从分析构建 mergedDependencies', mergedDependencies);
+    }
     return {
         collectedFiles: filteredFiles,
         config,
         projectRoot,
         srcDir,
+        externalDependencies,
+        mergedDependencies,
     };
 }
 
@@ -38287,19 +38549,20 @@ async function compile(entry, options) {
     const logger = options?.logger || defaultLogger;
     logger.info('开始编译 NASL 代码...');
     // 收集需要编译的文件
-    const { collectedFiles, config, projectRoot } = await resolveNASLFiles(entry, logger, false, options?.verbose);
+    const { collectedFiles, config, projectRoot, mergedDependencies } = await resolveNASLFiles(entry, logger, false, options?.verbose);
     logger.info(`输出目录: ${config.outDir}`);
-    const outDir = sysPath.join(projectRoot, config.outDir);
+    const outDir = path$1.join(projectRoot, config.outDir);
     // 调用编译 API
     logger.newLine();
     logger.info('正在调用编译服务...');
     try {
-        const fullNaturalTS = composeToString(collectedFiles);
+        let fullNaturalTS = composeToString(collectedFiles);
+        fullNaturalTS = prependDependencies(fullNaturalTS, mergedDependencies);
         const outputFiles = await compileApi(fullNaturalTS, config);
         logger.success('编译成功！');
         // 写入输出文件
         for (const file of outputFiles) {
-            const outputPath = sysPath.join(outDir, file.path);
+            const outputPath = path$1.join(outDir, file.path);
             writeFileWithLog(outputPath, file.content, logger);
         }
         logger.info(`输出 ${outputFiles.length} 个文件`);
@@ -38386,7 +38649,7 @@ async function check(entry, options) {
     const logger = options?.logger || defaultLogger;
     logger.info('开始检查 NASL 代码...');
     // 收集需要检查的文件
-    const { collectedFiles, config } = await resolveNASLFiles(entry, logger, false, options?.verbose);
+    const { collectedFiles, config, mergedDependencies } = await resolveNASLFiles(entry, logger, false, options?.verbose);
     // 调用检查 API
     logger.newLine();
     logger.info('正在调用检查服务，对语法和语义进行检查...');
@@ -38394,6 +38657,7 @@ async function check(entry, options) {
     let result = '';
     try {
         fullNaturalTS = composeToString(collectedFiles);
+        fullNaturalTS = prependDependencies(fullNaturalTS, mergedDependencies);
     }
     catch (error) {
         result = error.message.trim();
@@ -38422,12 +38686,19 @@ async function check(entry, options) {
 }
 
 /**
- * 检查命令 - 检查 NASL 代码的语法和语义
+ * 依赖分析命令 - 从入口文件开始进行依赖分析
  */
 async function dep(entry, options) {
-    const logger = defaultLogger;
+    const logger = options?.logger || defaultLogger;
     logger.info('开始进行依赖分析...');
-    return resolveNASLFiles(entry, logger, true, true);
+    const result = await resolveNASLFiles(entry, logger, true, options?.verbose ?? true);
+    if (options?.save && result.mergedDependencies) {
+        const srcDir = path$1.join(result.projectRoot, result.config.srcDir);
+        const appDepsPath = path$1.join(srcDir, 'app.dependencies.json');
+        await libExports.writeJson(appDepsPath, result.mergedDependencies, { spaces: 2 });
+        logger.success(`已将 externalDependencies 补充到 ${appDepsPath}`);
+    }
+    return result;
 }
 
 /**
@@ -38437,15 +38708,15 @@ async function dev(entry, options) {
     const logger = options?.logger || new ConsoleLoggerWithoutExit();
     // 获取项目根目录和配置
     const projectRoot = process.cwd();
-    const configPath = sysPath.join(projectRoot, 'nasl.config.json');
+    const configPath = path$1.join(projectRoot, 'nasl.config.json');
     if (!libExports.existsSync(configPath)) {
         logger.error('未找到 nasl.config.json 配置文件，请先初始化项目');
         process.exit(1);
     }
     const configContent = libExports.readFileSync(configPath, 'utf-8');
     const config = JSON.parse(configContent);
-    const srcDir = sysPath.join(projectRoot, config.srcDir);
-    const outDir = sysPath.join(projectRoot, config.outDir);
+    const srcDir = path$1.join(projectRoot, config.srcDir);
+    const outDir = path$1.join(projectRoot, config.outDir);
     // 检查是否存在 src 目录
     const hasSrcDir = libExports.existsSync(srcDir) && libExports.statSync(srcDir).isDirectory();
     let lastCompileSuccess = false;
@@ -38495,7 +38766,7 @@ async function dev(entry, options) {
         // 过滤非目标文件类型
         if (!shouldHandleFile(filePath))
             return;
-        logger.info(`检测到文件变化: ${sysPath.relative(projectRoot, filePath)}`);
+        logger.info(`检测到文件变化: ${path$1.relative(projectRoot, filePath)}`);
         if (isCompiling) {
             pendingCompile = true;
             return;
@@ -38612,7 +38883,7 @@ async function dev(entry, options) {
 async function startWebpackDevServer(outDir, options, logger) {
     logger?.newLine();
     logger?.info('正在启动开发服务...');
-    const configRelativePath = sysPath.relative(outDir, sysPath.resolve(__dirname, '../../build/webpack.config.js'));
+    const configRelativePath = path$1.relative(outDir, path$1.resolve(__dirname, '../../build/webpack.config.js'));
     // 构建 webpack-cli 参数
     let webpackArgs = `${require.resolve('.bin/webpack-cli')} serve --config ${configRelativePath}`;
     if (options?.port)
@@ -38656,7 +38927,7 @@ async function build(entry, options) {
     const { outDir } = await compile(entry);
     logger.newLine();
     logger.info('正在构建项目...');
-    const configRelativePath = sysPath.relative(outDir, sysPath.resolve(__dirname, '../../build/webpack.config.js'));
+    const configRelativePath = path$1.relative(outDir, path$1.resolve(__dirname, '../../build/webpack.config.js'));
     const mode = options?.mode || 'production';
     // 构建 webpack-cli 参数
     let webpackArgs = `${require.resolve('.bin/webpack-cli')} build --config ${configRelativePath} --mode ${mode}`;
@@ -38667,8 +38938,8 @@ async function build(entry, options) {
  * 获取 specs 下第1个文件夹的名字
  */
 function getFirstSpecFolderName(projectRoot) {
-    const dirname = sysPath.basename(projectRoot);
-    const specsDir = sysPath.join(projectRoot, 'specs');
+    const dirname = path$1.basename(projectRoot);
+    const specsDir = path$1.join(projectRoot, 'specs');
     if (!libExports.existsSync(specsDir))
         return dirname;
     const entries = libExports.readdirSync(specsDir, { withFileTypes: true });
@@ -38759,9 +39030,175 @@ async function transformJson2FilesApi(json, options) {
         headers: { 'Content-Type': 'application/json' },
     });
     const data = res.data;
+    if (data.code !== 200)
+        throw new Error(data.message);
     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 };
+    }
+}
+
 const transformFns = {
     /**
      * 将 src 中的文件组合成 fullNaturalTS
@@ -38769,7 +39206,7 @@ const transformFns = {
     async files2full(entry, options) {
         const logger = options?.logger || defaultLogger;
         // 收集需要处理的文件
-        const { collectedFiles, projectRoot } = await resolveNASLFiles(entry, logger, false, options?.verbose);
+        const { collectedFiles, projectRoot, mergedDependencies } = await resolveNASLFiles(entry, logger, false, options?.verbose);
         if (collectedFiles.length === 0) {
             logger.error('未找到需要转换的文件');
             logger.exit(1);
@@ -38778,15 +39215,43 @@ const transformFns = {
         // 组合成 fullNaturalTS
         logger.newLine();
         logger.info('正在组合文件...');
-        const fullNaturalTS = composeToString(collectedFiles);
+        let fullNaturalTS = composeToString(collectedFiles);
+        fullNaturalTS = prependDependencies(fullNaturalTS, mergedDependencies);
         // 确定输出路径
         const outputPath = options?.output
-            ? sysPath.resolve(projectRoot, options.output)
-            : sysPath.join(projectRoot, './full-natural.ts');
+            ? path$1.resolve(projectRoot, options.output)
+            : path$1.join(projectRoot, './full-natural.ts');
         // 写入文件
         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: 待实现
@@ -38812,7 +39277,7 @@ const transformFns = {
         }
         const files = await transformJson2FilesApi(jsonContent ? JSON.parse(jsonContent) : {}, config);
         await Promise.all(files.map(async (file) => {
-            const outputPath = sysPath.join(projectRoot, config.srcDir, file.path);
+            const outputPath = path$1.join(projectRoot, config.srcDir, file.path);
             await libExports.writeFile(outputPath, file.content);
         }));
         logger.success(`JSON 文件已转换为 ${files.length} 个文件，输出到 ${config.srcDir}`);
@@ -38839,7 +39304,87 @@ async function transform(transformType, entry, options) {
     await transformFn(entry, options);
 }
 
-var version = "0.2.3";
+async function installAuto(options) {
+    const logger = options?.logger || defaultLogger;
+    const config = loadConfig();
+    const projectRoot = getProjectRoot();
+    const srcDir = path$1.join(projectRoot, config.srcDir);
+    const appDependenciesJsonPath = path$1.join(srcDir, 'app.dependencies.json');
+    const appDependenciesJson = libExports.readJsonSync(appDependenciesJsonPath);
+    logger.info(`开始按照 ${appDependenciesJsonPath} 安装依赖`);
+    return installByJSON(appDependenciesJson, options);
+}
+async function installByKind(kind, deps, options) {
+    const logger = options?.logger || defaultLogger;
+    if (!deps || deps.length === 0) {
+        logger.error(`请至少指定一个要安装的 ${kind}，例如：nasl install ${kind} aaa@0.1.0`);
+        return logger.exit(1);
+    }
+    const dependencyMap = {};
+    for (const dep of deps) {
+        if (kind === 'api') {
+            const [service, interfaces] = dep.split(':');
+            if (!service || !interfaces) {
+                logger.error(`无效的依赖格式：${dep}，请使用 service:api1,api2 格式，例如：some_service:api1,api2`);
+                return logger.exit(1);
+            }
+            dependencyMap[service] = interfaces.split(',');
+        }
+        else {
+            const [name, version] = dep.split('@');
+            if (!name || !version) {
+                logger.error(`无效的依赖格式：${dep}，请使用 name@version 格式，例如：aaa@0.1.0`);
+                return logger.exit(1);
+            }
+            dependencyMap[name] = version;
+        }
+    }
+    return installByJSON({ [kind + 's']: dependencyMap }, options);
+}
+async function installByJSON(json, options) {
+    const logger = options?.logger || defaultLogger;
+    if (!Object.keys(json).length) {
+        logger.error('没有需要安装的依赖');
+        return;
+    }
+    const config = loadConfig();
+    const projectRoot = getProjectRoot();
+    const srcDir = path$1.join(projectRoot, config.srcDir);
+    const result = await installDependenciesApi(json, config);
+    if (!result.files || result.files.length <= 1)
+        throw new Error(`安装依赖失败，没有生成任何文件：\n${JSON.stringify(result)}`);
+    if (result.errors.length > 0) {
+        logger.error(`某些依赖安装失败：`);
+        for (const error of result.errors)
+            logger.error(error);
+    }
+    // const appDepsFile = result.files.find((f) => f.path === 'app.dependencies.json');
+    const otherFiles = result.files.filter((f) => f.path !== 'app.dependencies.json');
+    const jsonToSave = JSON.parse(JSON.stringify(json));
+    for (const err of result.errors) {
+        const { name, category } = err;
+        const record = jsonToSave[category];
+        if (record && typeof record === 'object') {
+            delete record[name];
+            if (Object.keys(record).length === 0)
+                delete jsonToSave[category];
+        }
+    }
+    if (options?.savePotential) {
+        const potentialPath = path$1.join(srcDir, 'potential.dependencies.json');
+        await libExports.writeJson(potentialPath, jsonToSave, { spaces: 2 });
+        logger.success(`依赖信息已写入: ${path$1.relative(projectRoot, potentialPath)}`);
+    }
+    await Promise.all(otherFiles.map(async (file) => {
+        const filePath = path$1.join(srcDir, file.path);
+        await libExports.outputFile(filePath, file.content, 'utf-8');
+        logger.success(`依赖文件已写入: ${path$1.relative(projectRoot, filePath)}`);
+    }));
+    const writtenCount = otherFiles.length;
+    logger.success(`成功写入 ${writtenCount} 个依赖文件到 ${config.srcDir} 目录`);
+}
+
+var version = "0.3.1";
 var pkg = {
 	version: version};
 
@@ -38899,15 +39444,51 @@ program
 program
     .command('dep [entry]')
     .description('从入口文件开始进行依赖分析')
-    .action(async (entry) => {
+    .option('--save', '将计算出的 externalDependencies 补充到 src/app.dependencies.json')
+    .action(async (entry, options) => {
     try {
-        await dep(entry);
+        await dep(entry, options);
     }
     catch (error) {
         defaultLogger.error(`查找依赖过程发生错误：${error.message}`);
         process.exit(1);
     }
 });
+program
+    .command('install [kind|by-json] [deps...]')
+    .option('--save-potential', '将 app.dependencies.json 写入 potential.dependencies.json')
+    .description(`安装一个或多个 uilib, extension, api 或 connector 依赖，例如：
+  - nasl install uilib some_component@0.1.0 some_component@0.2.0
+  - nasl install extension some_encryption@0.1.0 some_interceptor@0.2.0
+  - nasl install api some_service:api1,api2 some_service:api3,api4
+  - nasl install connector some_connector@0.1.0 some_connector@0.2.0
+  - nasl install by-json '{"uilibs": {"some_component": "0.1.0"}, "extensions": {"some_encryption": "0.1.0", "some_interceptor": "0.2.0"}}'
+`)
+    .action(async (kind, deps, options) => {
+    try {
+        if (kind === 'by-json') {
+            if (deps.length < 1)
+                throw new Error('请提供一个 JSON 字符串');
+            else if (deps.length > 1)
+                throw new Error('参数过多，JSON 字符串只能有一个');
+            const jsonStr = deps[0];
+            await installByJSON(JSON.parse(jsonStr), options);
+        }
+        else if (kind) {
+            if (!['uilib', 'extension', 'api', 'connector'].includes(kind)) {
+                throw new Error(`无效的依赖类型: ${kind}。\n支持的类型有: uilib, extension, api, connector`);
+            }
+            await installByKind(kind, deps, options);
+        }
+        else {
+            await installAuto(options);
+        }
+    }
+    catch (error) {
+        defaultLogger.error(`安装过程发生错误：${error.message}`);
+        process.exit(1);
+    }
+});
 program
     .command('dev [entry]')
     .description('启动开发服务')
@@ -38965,12 +39546,12 @@ program
 });
 program
     .command('transform <transformType> [entry]')
-    .description('转换文件格式\n  transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件), files2json (将 src 文件转换为 JSON)')
+    .description('转换文件格式\n  transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件), files2json (将 src 文件转换为 JSON), doc2full (将 plan markdown 文档组合成 fullNaturalTS)')
     .option('-o, --output <outputPath>', '指定输出路径')
     .option('-v, --verbose', '显示详细信息，如依赖分析树')
     .action(async (transformType, entry, options) => {
     try {
-        const validTypes = ['files2full', 'json2files', 'files2json'];
+        const validTypes = ['files2full', 'json2files', 'files2json', 'doc2full'];
         if (!validTypes.includes(transformType)) {
             defaultLogger.error(`无效的转换类型: ${transformType}。支持的类型: ${validTypes.join(', ')}`);
             process.exit(1);
@@ -39291,7 +39872,7 @@ const binaryExtensions = new Set([
     'xmind', 'xpi', 'xpm', 'xwd', 'xz',
     'z', 'zip', 'zipx',
 ]);
-const isBinaryPath = (filePath) => binaryExtensions.has(sysPath.extname(filePath).slice(1).toLowerCase());
+const isBinaryPath = (filePath) => binaryExtensions.has(path$1.extname(filePath).slice(1).toLowerCase());
 // TODO: emit errors properly. Example: EMFILE on Macos.
 const foreach = (val, fn) => {
     if (val instanceof Set) {
@@ -39344,7 +39925,7 @@ function createFsWatchInstance(path, options, listener, errHandler, emitRaw) {
         // emit based on events occurring for files from a directory's watcher in
         // case the file's watcher misses it (and rely on throttling to de-dupe)
         if (evPath && path !== evPath) {
-            fsWatchBroadcast(sysPath.resolve(path, evPath), KEY_LISTENERS, sysPath.join(path, evPath));
+            fsWatchBroadcast(path$1.resolve(path, evPath), KEY_LISTENERS, path$1.join(path, evPath));
         }
     };
     try {
@@ -39527,11 +40108,11 @@ class NodeFsHandler {
      */
     _watchWithNodeFs(path, listener) {
         const opts = this.fsw.options;
-        const directory = sysPath.dirname(path);
-        const basename = sysPath.basename(path);
+        const directory = path$1.dirname(path);
+        const basename = path$1.basename(path);
         const parent = this.fsw._getWatchedDir(directory);
         parent.add(basename);
-        const absolutePath = sysPath.resolve(path);
+        const absolutePath = path$1.resolve(path);
         const options = {
             persistent: opts.persistent,
         };
@@ -39563,8 +40144,8 @@ class NodeFsHandler {
         if (this.fsw.closed) {
             return;
         }
-        const dirname = sysPath.dirname(file);
-        const basename = sysPath.basename(file);
+        const dirname = path$1.dirname(file);
+        const basename = path$1.basename(file);
         const parent = this.fsw._getWatchedDir(dirname);
         // stats is always present
         let prevStats = stats;
@@ -39671,7 +40252,7 @@ class NodeFsHandler {
     }
     _handleRead(directory, initialAdd, wh, target, dir, depth, throttler) {
         // Normalize the directory name on Windows
-        directory = sysPath.join(directory, '');
+        directory = path$1.join(directory, '');
         throttler = this.fsw._throttle('readdir', directory, 1000);
         if (!throttler)
             return;
@@ -39690,7 +40271,7 @@ class NodeFsHandler {
                 return;
             }
             const item = entry.path;
-            let path = sysPath.join(directory, item);
+            let path = path$1.join(directory, item);
             current.add(item);
             if (entry.stats.isSymbolicLink() &&
                 (await this._handleSymlink(entry, directory, path, item))) {
@@ -39706,7 +40287,7 @@ class NodeFsHandler {
             if (item === target || (!target && !previous.has(item))) {
                 this.fsw._incrReadyCount();
                 // ensure relativeness of path is preserved in case of watcher reuse
-                path = sysPath.join(dir, sysPath.relative(dir, path));
+                path = path$1.join(dir, path$1.relative(dir, path));
                 this._addToNodeFs(path, initialAdd, wh, depth + 1);
             }
         })
@@ -39751,13 +40332,13 @@ class NodeFsHandler {
      * @returns closer for the watcher instance.
      */
     async _handleDir(dir, stats, initialAdd, depth, target, wh, realpath) {
-        const parentDir = this.fsw._getWatchedDir(sysPath.dirname(dir));
-        const tracked = parentDir.has(sysPath.basename(dir));
+        const parentDir = this.fsw._getWatchedDir(path$1.dirname(dir));
+        const tracked = parentDir.has(path$1.basename(dir));
         if (!(initialAdd && this.fsw.options.ignoreInitial) && !target && !tracked) {
             this.fsw._emit(EV.ADD_DIR, dir, stats);
         }
         // ensure dir is tracked (harmless if redundant)
-        parentDir.add(sysPath.basename(dir));
+        parentDir.add(path$1.basename(dir));
         this.fsw._getWatchedDir(dir);
         let throttler;
         let closer;
@@ -39809,7 +40390,7 @@ class NodeFsHandler {
             const follow = this.fsw.options.followSymlinks;
             let closer;
             if (stats.isDirectory()) {
-                const absPath = sysPath.resolve(path);
+                const absPath = path$1.resolve(path);
                 const targetPath = follow ? await realpath$1(path) : path;
                 if (this.fsw.closed)
                     return;
@@ -39825,7 +40406,7 @@ class NodeFsHandler {
                 const targetPath = follow ? await realpath$1(path) : path;
                 if (this.fsw.closed)
                     return;
-                const parent = sysPath.dirname(wh.watchPath);
+                const parent = path$1.dirname(wh.watchPath);
                 this.fsw._getWatchedDir(parent).add(wh.watchPath);
                 this.fsw._emit(EV.ADD, wh.watchPath, stats);
                 closer = await this._handleDir(parent, stats, initialAdd, depth, path, wh, targetPath);
@@ -39833,7 +40414,7 @@ class NodeFsHandler {
                     return;
                 // preserve this symlink's target path
                 if (targetPath !== undefined) {
-                    this.fsw._symlinkPaths.set(sysPath.resolve(path), targetPath);
+                    this.fsw._symlinkPaths.set(path$1.resolve(path), targetPath);
                 }
             }
             else {
@@ -39879,11 +40460,11 @@ function createPattern(matcher) {
             if (matcher.path === string)
                 return true;
             if (matcher.recursive) {
-                const relative = sysPath.relative(matcher.path, string);
+                const relative = path$1.relative(matcher.path, string);
                 if (!relative) {
                     return false;
                 }
-                return !relative.startsWith('..') && !sysPath.isAbsolute(relative);
+                return !relative.startsWith('..') && !path$1.isAbsolute(relative);
             }
             return false;
         };
@@ -39893,7 +40474,7 @@ function createPattern(matcher) {
 function normalizePath(path) {
     if (typeof path !== 'string')
         throw new Error('string expected');
-    path = sysPath.normalize(path);
+    path = path$1.normalize(path);
     path = path.replace(/\\/g, '/');
     let prepend = false;
     if (path.startsWith('//'))
@@ -39953,21 +40534,21 @@ const toUnix = (string) => {
 };
 // Our version of upath.normalize
 // TODO: this is not equal to path-normalize module - investigate why
-const normalizePathToUnix = (path) => toUnix(sysPath.normalize(toUnix(path)));
+const normalizePathToUnix = (path) => toUnix(path$1.normalize(toUnix(path)));
 // TODO: refactor
 const normalizeIgnored = (cwd = '') => (path) => {
     if (typeof path === 'string') {
-        return normalizePathToUnix(sysPath.isAbsolute(path) ? path : sysPath.join(cwd, path));
+        return normalizePathToUnix(path$1.isAbsolute(path) ? path : path$1.join(cwd, path));
     }
     else {
         return path;
     }
 };
 const getAbsolutePath = (path, cwd) => {
-    if (sysPath.isAbsolute(path)) {
+    if (path$1.isAbsolute(path)) {
         return path;
     }
-    return sysPath.join(cwd, path);
+    return path$1.join(cwd, path);
 };
 const EMPTY_SET = Object.freeze(new Set());
 /**
@@ -39999,7 +40580,7 @@ class DirEntry {
         }
         catch (err) {
             if (this._removeWatcher) {
-                this._removeWatcher(sysPath.dirname(dir), sysPath.basename(dir));
+                this._removeWatcher(path$1.dirname(dir), path$1.basename(dir));
             }
         }
     }
@@ -40031,7 +40612,7 @@ class WatchHelper {
         const watchPath = path;
         this.path = path = path.replace(REPLACER_RE, '');
         this.watchPath = watchPath;
-        this.fullWatchPath = sysPath.resolve(watchPath);
+        this.fullWatchPath = path$1.resolve(watchPath);
         this.dirParts = [];
         this.dirParts.forEach((parts) => {
             if (parts.length > 1)
@@ -40041,7 +40622,7 @@ class WatchHelper {
         this.statMethod = follow ? STAT_METHOD_F : STAT_METHOD_L;
     }
     entryPath(entry) {
-        return sysPath.join(this.watchPath, sysPath.relative(this.watchPath, entry.fullPath));
+        return path$1.join(this.watchPath, path$1.relative(this.watchPath, entry.fullPath));
     }
     filterPath(entry) {
         const { stats } = entry;
@@ -40197,7 +40778,7 @@ class FSWatcher extends EventEmitter {
                 return;
             results.forEach((item) => {
                 if (item)
-                    this.add(sysPath.dirname(item), sysPath.basename(_origAdd || item));
+                    this.add(path$1.dirname(item), path$1.basename(_origAdd || item));
             });
         });
         return this;
@@ -40212,10 +40793,10 @@ class FSWatcher extends EventEmitter {
         const { cwd } = this.options;
         paths.forEach((path) => {
             // convert to absolute path unless relative path already matches
-            if (!sysPath.isAbsolute(path) && !this._closers.has(path)) {
+            if (!path$1.isAbsolute(path) && !this._closers.has(path)) {
                 if (cwd)
-                    path = sysPath.join(cwd, path);
-                path = sysPath.resolve(path);
+                    path = path$1.join(cwd, path);
+                path = path$1.resolve(path);
             }
             this._closePath(path);
             this._addIgnoredPath(path);
@@ -40269,7 +40850,7 @@ class FSWatcher extends EventEmitter {
     getWatched() {
         const watchList = {};
         this._watched.forEach((entry, dir) => {
-            const key = this.options.cwd ? sysPath.relative(this.options.cwd, dir) : dir;
+            const key = this.options.cwd ? path$1.relative(this.options.cwd, dir) : dir;
             const index = key || ONE_DOT;
             watchList[index] = entry.getChildren().sort();
         });
@@ -40295,9 +40876,9 @@ class FSWatcher extends EventEmitter {
             return;
         const opts = this.options;
         if (isWindows)
-            path = sysPath.normalize(path);
+            path = path$1.normalize(path);
         if (opts.cwd)
-            path = sysPath.relative(opts.cwd, path);
+            path = path$1.relative(opts.cwd, path);
         const args = [path];
         if (stats != null)
             args.push(stats);
@@ -40353,7 +40934,7 @@ class FSWatcher extends EventEmitter {
         if (opts.alwaysStat &&
             stats === undefined &&
             (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-            const fullPath = opts.cwd ? sysPath.join(opts.cwd, path) : path;
+            const fullPath = opts.cwd ? path$1.join(opts.cwd, path) : path;
             let stats;
             try {
                 stats = await stat$2(fullPath);
@@ -40436,8 +41017,8 @@ class FSWatcher extends EventEmitter {
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
         let fullPath = path;
-        if (this.options.cwd && !sysPath.isAbsolute(path)) {
-            fullPath = sysPath.join(this.options.cwd, path);
+        if (this.options.cwd && !path$1.isAbsolute(path)) {
+            fullPath = path$1.join(this.options.cwd, path);
         }
         const now = new Date();
         const writes = this._pendingWrites;
@@ -40508,7 +41089,7 @@ class FSWatcher extends EventEmitter {
      * @param directory path of the directory
      */
     _getWatchedDir(directory) {
-        const dir = sysPath.resolve(directory);
+        const dir = path$1.resolve(directory);
         if (!this._watched.has(dir))
             this._watched.set(dir, new DirEntry(dir, this._boundRemove));
         return this._watched.get(dir);
@@ -40534,8 +41115,8 @@ class FSWatcher extends EventEmitter {
         // if what is being deleted is a directory, get that directory's paths
         // for recursive deleting and cleaning of watched object
         // if it is not a directory, nestedDirectoryChildren will be empty array
-        const path = sysPath.join(directory, item);
-        const fullPath = sysPath.resolve(path);
+        const path = path$1.join(directory, item);
+        const fullPath = path$1.resolve(path);
         isDirectory =
             isDirectory != null ? isDirectory : this._watched.has(path) || this._watched.has(fullPath);
         // prevent duplicate handling in case of arriving here nearly simultaneously
@@ -40567,7 +41148,7 @@ class FSWatcher extends EventEmitter {
         // If we wait for this file to be fully written, cancel the wait.
         let relPath = path;
         if (this.options.cwd)
-            relPath = sysPath.relative(this.options.cwd, path);
+            relPath = path$1.relative(this.options.cwd, path);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
             const event = this._pendingWrites.get(relPath).cancelWait();
             if (event === EVENTS.ADD)
@@ -40588,8 +41169,8 @@ class FSWatcher extends EventEmitter {
      */
     _closePath(path) {
         this._closeFile(path);
-        const dir = sysPath.dirname(path);
-        this._getWatchedDir(dir).remove(sysPath.basename(path));
+        const dir = path$1.dirname(path);
+        this._getWatchedDir(dir).remove(path$1.basename(path));
     }
     /**
      * Closes only file-specific watchers