@nasl/cli 0.1.6 → 0.1.8

package/dist/bin/naslc.mjs

@@ -2,8 +2,8 @@
 #!/usr/bin/env node
 import require$$0$1, { EventEmitter } from 'events';
 import require$$1 from 'child_process';
-import * as path$1 from 'path';
-import path__default from 'path';
+import * as sysPath from 'path';
+import sysPath__default from 'path';
 import require$$0$2 from 'fs';
 import require$$4 from 'process';
 import require$$0$5 from 'os';
@@ -1166,7 +1166,7 @@ function requireCommand () {
 	hasRequiredCommand = 1;
 	const EventEmitter = require$$0$1.EventEmitter;
 	const childProcess = require$$1;
-	const path = path__default;
+	const path = sysPath__default;
 	const fs = require$$0$2;
 	const process = require$$4;
 
@@ -4576,7 +4576,7 @@ var hasRequiredUtils$5;
 function requireUtils$5 () {
 	if (hasRequiredUtils$5) return utils$7;
 	hasRequiredUtils$5 = 1;
-	const path = path__default;
+	const path = sysPath__default;
 
 	// https://github.com/nodejs/node/issues/8987
 	// https://github.com/libuv/libuv/pull/1088
@@ -4722,7 +4722,7 @@ function requireStat () {
 	hasRequiredStat = 1;
 
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = path__default;
+	const path = sysPath__default;
 	const u = requireUniversalify().fromPromise;
 
 	function getStats (src, dest, opts) {
@@ -4926,7 +4926,7 @@ function requireCopy$1 () {
 	hasRequiredCopy$1 = 1;
 
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = path__default;
+	const path = sysPath__default;
 	const { mkdirs } = /*@__PURE__*/ requireMkdirs();
 	const { pathExists } = /*@__PURE__*/ requirePathExists();
 	const { utimesMillis } = /*@__PURE__*/ requireUtimes();
@@ -5109,7 +5109,7 @@ function requireCopySync () {
 	hasRequiredCopySync = 1;
 
 	const fs = requireGracefulFs();
-	const path = path__default;
+	const path = sysPath__default;
 	const mkdirsSync = /*@__PURE__*/ requireMkdirs().mkdirsSync;
 	const utimesMillisSync = /*@__PURE__*/ requireUtimes().utimesMillisSync;
 	const stat = /*@__PURE__*/ requireStat();
@@ -5329,7 +5329,7 @@ function requireEmpty () {
 
 	const u = requireUniversalify().fromPromise;
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = path__default;
+	const path = sysPath__default;
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 	const remove = /*@__PURE__*/ requireRemove();
 
@@ -5375,7 +5375,7 @@ function requireFile () {
 	hasRequiredFile = 1;
 
 	const u = requireUniversalify().fromPromise;
-	const path = path__default;
+	const path = sysPath__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 
@@ -5449,7 +5449,7 @@ function requireLink () {
 	hasRequiredLink = 1;
 
 	const u = requireUniversalify().fromPromise;
-	const path = path__default;
+	const path = sysPath__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 	const { pathExists } = /*@__PURE__*/ requirePathExists();
@@ -5520,7 +5520,7 @@ function requireSymlinkPaths () {
 	if (hasRequiredSymlinkPaths) return symlinkPaths_1;
 	hasRequiredSymlinkPaths = 1;
 
-	const path = path__default;
+	const path = sysPath__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 	const { pathExists } = /*@__PURE__*/ requirePathExists();
 
@@ -5672,7 +5672,7 @@ function requireSymlink () {
 	hasRequiredSymlink = 1;
 
 	const u = requireUniversalify().fromPromise;
-	const path = path__default;
+	const path = sysPath__default;
 	const fs = /*@__PURE__*/ requireFs$4();
 
 	const { mkdirs, mkdirsSync } = /*@__PURE__*/ requireMkdirs();
@@ -5918,7 +5918,7 @@ function requireOutputFile () {
 
 	const u = requireUniversalify().fromPromise;
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = path__default;
+	const path = sysPath__default;
 	const mkdir = /*@__PURE__*/ requireMkdirs();
 	const pathExists = /*@__PURE__*/ requirePathExists().pathExists;
 
@@ -6020,7 +6020,7 @@ function requireMove$1 () {
 	hasRequiredMove$1 = 1;
 
 	const fs = /*@__PURE__*/ requireFs$4();
-	const path = path__default;
+	const path = sysPath__default;
 	const { copy } = /*@__PURE__*/ requireCopy();
 	const { remove } = /*@__PURE__*/ requireRemove();
 	const { mkdirp } = /*@__PURE__*/ requireMkdirs();
@@ -6087,7 +6087,7 @@ function requireMoveSync () {
 	hasRequiredMoveSync = 1;
 
 	const fs = requireGracefulFs();
-	const path = path__default;
+	const path = sysPath__default;
 	const copySync = /*@__PURE__*/ requireCopy().copySync;
 	const removeSync = /*@__PURE__*/ requireRemove().removeSync;
 	const mkdirpSync = /*@__PURE__*/ requireMkdirs().mkdirpSync;
@@ -8204,16 +8204,16 @@ class BaseLogger {
     }
     debugToFile(topic, ...args) {
         if (process.env.DEBUG_TO_FILE) {
-            const baseDir = path$1.join(process.cwd(), '.nasl');
+            const baseDir = sysPath.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(path$1.join(baseDir, prevSubdir)))
+            if (libExports.existsSync(sysPath.join(baseDir, prevSubdir)))
                 subdir = prevSubdir;
             const fileName = `${topic}_${dayjs().format('YYYYMMDD_HHmmss')}.log`;
-            const filePath = path$1.join(baseDir, subdir, fileName);
+            const filePath = sysPath.join(baseDir, subdir, fileName);
             libExports.outputFileSync(filePath, args.join(' '));
         }
     }
@@ -8271,11 +8271,11 @@ function findConfigDir(startDir = process.cwd()) {
     let currentDir = startDir;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        const configPath = path$1.join(currentDir, CONFIG_FILE_NAME);
+        const configPath = sysPath.join(currentDir, CONFIG_FILE_NAME);
         if (libExports.existsSync(configPath)) {
             return currentDir;
         }
-        const parentDir = path$1.dirname(currentDir);
+        const parentDir = sysPath.dirname(currentDir);
         // 已经到达根目录
         if (parentDir === currentDir) {
             return null;
@@ -8292,7 +8292,7 @@ function loadConfig(configDir) {
         defaultLogger.error(`未找到配置文件 ${CONFIG_FILE_NAME}，请先运行 nasl-init 初始化配置`);
         return defaultLogger.exit(1);
     }
-    const configPath = path$1.join(dir, CONFIG_FILE_NAME);
+    const configPath = sysPath.join(dir, CONFIG_FILE_NAME);
     try {
         const content = libExports.readFileSync(configPath, 'utf-8');
         const config = JSON.parse(content);
@@ -8337,7 +8337,7 @@ function readFileWithLog(filePath, logger) {
  */
 function writeFileWithLog(filePath, content, logger) {
     try {
-        const dir = path$1.dirname(filePath);
+        const dir = sysPath.dirname(filePath);
         libExports.ensureDirSync(dir);
         libExports.writeFileSync(filePath, content, 'utf-8');
     }
@@ -20323,7 +20323,7 @@ function requireMimeTypes () {
 		 */
 
 		var db = requireMimeDb();
-		var extname = path__default.extname;
+		var extname = sysPath__default.extname;
 
 		/**
 		 * Module variables.
@@ -22064,7 +22064,7 @@ function requireForm_data () {
 
 	var CombinedStream = requireCombined_stream();
 	var util = require$$0$4;
-	var path = path__default;
+	var path = sysPath__default;
 	var http = require$$3;
 	var https = require$$4$1;
 	var parseUrl = require$$0$6.parse;
@@ -26831,7 +26831,7 @@ var httpAdapter = isHttpAdapterSupported && function httpAdapter(config) {
     } else {
       options.hostname = parsed.hostname.startsWith("[") ? parsed.hostname.slice(1, -1) : parsed.hostname;
       options.port = parsed.port;
-      setProxy(options, config.proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path);
+      setProxy(options, config.proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : parsed.protocol === 'https:' ? '443' : '') + options.path);
     }
 
     let transport;
@@ -29127,7 +29127,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 = path__default;
+	const path$1 = sysPath__default;
 	const IS_WINDOWS_PLATFORM = os.platform() === 'win32';
 	const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
 	/**
@@ -29392,7 +29392,7 @@ function requireGlobParent () {
 	hasRequiredGlobParent = 1;
 
 	var isGlob = requireIsGlob();
-	var pathPosixDirname = path__default.posix.dirname;
+	var pathPosixDirname = sysPath__default.posix.dirname;
 	var isWin32 = require$$0$5.platform() === 'win32';
 
 	var slash = '/';
@@ -30964,7 +30964,7 @@ function requireConstants$1 () {
 	if (hasRequiredConstants$1) return constants$1;
 	hasRequiredConstants$1 = 1;
 
-	const path = path__default;
+	const path = sysPath__default;
 	const WIN_SLASH = '\\\\/';
 	const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
@@ -31151,7 +31151,7 @@ function requireUtils$2 () {
 	hasRequiredUtils$2 = 1;
 	(function (exports$1) {
 
-		const path = path__default;
+		const path = sysPath__default;
 		const win32 = process.platform === 'win32';
 		const {
 		  REGEX_BACKSLASH,
@@ -32722,7 +32722,7 @@ function requirePicomatch$1 () {
 	if (hasRequiredPicomatch$1) return picomatch_1;
 	hasRequiredPicomatch$1 = 1;
 
-	const path = path__default;
+	const path = sysPath__default;
 	const scan = requireScan();
 	const parse = requireParse();
 	const utils = requireUtils$2();
@@ -33565,7 +33565,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 = path__default;
+	const path = sysPath__default;
 	const globParent = requireGlobParent();
 	const micromatch = requireMicromatch();
 	const GLOBSTAR = '**';
@@ -34519,7 +34519,7 @@ function requireSettings$2 () {
 	if (hasRequiredSettings$2) return settings$2;
 	hasRequiredSettings$2 = 1;
 	Object.defineProperty(settings$2, "__esModule", { value: true });
-	const path = path__default;
+	const path = sysPath__default;
 	const fsStat = requireOut$3();
 	const fs = requireFs();
 	class Settings {
@@ -35281,7 +35281,7 @@ function requireSettings$1 () {
 	if (hasRequiredSettings$1) return settings$1;
 	hasRequiredSettings$1 = 1;
 	Object.defineProperty(settings$1, "__esModule", { value: true });
-	const path = path__default;
+	const path = sysPath__default;
 	const fsScandir = requireOut$2();
 	class Settings {
 	    constructor(_options = {}) {
@@ -35357,7 +35357,7 @@ function requireReader () {
 	if (hasRequiredReader) return reader;
 	hasRequiredReader = 1;
 	Object.defineProperty(reader, "__esModule", { value: true });
-	const path = path__default;
+	const path = sysPath__default;
 	const fsStat = requireOut$3();
 	const utils = requireUtils$1();
 	class Reader {
@@ -35830,7 +35830,7 @@ function requireProvider () {
 	if (hasRequiredProvider) return provider;
 	hasRequiredProvider = 1;
 	Object.defineProperty(provider, "__esModule", { value: true });
-	const path = path__default;
+	const path = sysPath__default;
 	const deep_1 = requireDeep();
 	const entry_1 = requireEntry$1();
 	const error_1 = requireError();
@@ -36270,7 +36270,7 @@ var hasRequiredDirGlob;
 function requireDirGlob () {
 	if (hasRequiredDirGlob) return dirGlob.exports;
 	hasRequiredDirGlob = 1;
-	const path = path__default;
+	const path = sysPath__default;
 	const pathType = requirePathType();
 
 	const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
@@ -37020,7 +37020,7 @@ function requireGitignore () {
 	hasRequiredGitignore = 1;
 	const {promisify} = require$$0$4;
 	const fs = require$$0$2;
-	const path = path__default;
+	const path = sysPath__default;
 	const fastGlob = requireOut();
 	const gitIgnore = requireIgnore();
 	const slash = requireSlash();
@@ -37456,7 +37456,7 @@ function replaceViewAsSignature(content) {
  * @returns 文件信息和新发现的依赖文件列表
  */
 function processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFileMap, depNotFoundList, logger, verbose) {
-    const absoluteFilePath = path$1.join(srcDir, pathRelativeToSrc);
+    const absoluteFilePath = sysPath.join(srcDir, pathRelativeToSrc);
     const fileInfo = { path: pathRelativeToSrc, content: '' };
     try {
         fileInfo.content = readFileWithLog(absoluteFilePath, logger);
@@ -37520,15 +37520,15 @@ async function collectDeps(patterns, projectRoot, srcDir, logger, verbose) {
         throw new Error('未找到匹配的入口文件');
     }
     logger.info(`找到 ${matchedFiles.length} 个入口文件`);
-    const absoluteSrcDir = path$1.resolve(srcDir);
+    const absoluteSrcDir = sysPath.resolve(srcDir);
     const matchedFileSet = new Set();
     matchedFiles.forEach((pathRelativeToRoot) => {
         // 统一使用相对于 src 的路径
-        const absoluteFilePath = path$1.resolve(projectRoot, pathRelativeToRoot);
+        const absoluteFilePath = sysPath.resolve(projectRoot, pathRelativeToRoot);
         // 判断 file 是否超出 srcDir 目录（支持相对路径和绝对路径）
         if (!absoluteFilePath.startsWith(absoluteSrcDir))
             throw new Error(`入口文件 ${absoluteFilePath} 超出了源代码目录 ${srcDir}`);
-        const pathRelativeToSrc = path$1.relative(srcDir, absoluteFilePath);
+        const pathRelativeToSrc = sysPath.relative(srcDir, absoluteFilePath);
         filesToProcess.push(pathRelativeToSrc);
         matchedFileSet.add(pathRelativeToSrc);
     });
@@ -37577,7 +37577,7 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
     const projectRoot = getProjectRoot();
     logger.info(`项目根目录: ${projectRoot}`);
     logger.info(`源代码目录: ${config.srcDir}`);
-    const srcDir = path$1.join(projectRoot, config.srcDir);
+    const srcDir = sysPath.join(projectRoot, config.srcDir);
     // 收集需要处理的文件
     let collectedFiles = [];
     if (Array.isArray(entry) && !entry.length) {
@@ -37609,7 +37609,7 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
         filePaths.sort(sorter);
         collectedFiles = filePaths.map((filePath) => ({
             path: filePath,
-            content: readFileWithLog(path$1.join(srcDir, filePath), logger),
+            content: readFileWithLog(sysPath.join(srcDir, filePath), logger),
         }));
         if (collectedFiles.length === 0) {
             logger.warn('未找到 NASL 文件');
@@ -37634,7 +37634,7 @@ async function compile(entry, options) {
     // 收集需要编译的文件
     const { collectedFiles, config, projectRoot } = await resolveNASLFiles(entry, logger, false, options?.verbose);
     logger.info(`输出目录: ${config.outDir}`);
-    const outDir = path$1.join(projectRoot, config.outDir);
+    const outDir = sysPath.join(projectRoot, config.outDir);
     // 调用编译 API
     logger.newLine();
     logger.info('正在调用编译服务...');
@@ -37647,7 +37647,7 @@ async function compile(entry, options) {
         logger.success('编译成功！');
         // 写入输出文件
         for (const file of outputFiles) {
-            const outputPath = path$1.join(outDir, file.path);
+            const outputPath = sysPath.join(outDir, file.path);
             writeFileWithLog(outputPath, file.content, logger);
         }
         logger.info(`输出 ${outputFiles.length} 个文件`);
@@ -37660,17 +37660,17 @@ async function compile(entry, options) {
     return { config, outDir };
 }
 async function tryCompile(entry, options) {
-    const logger = options?.logger || defaultLogger;
     try {
         await compile(entry, options);
     }
     catch (error) {
+        const logger = options?.logger || defaultLogger;
         logger.error(`编译过程发生错误：${error.message}`);
         logger.exit(1);
     }
 }
 
-var version = "0.1.6";
+var version = "0.1.8";
 var pkg = {
 	version: version};