electron-forge-maker-innosetup 0.3.3 → 1.0.0

package/dist/parser.js

@@ -35,70 +35,199 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InnoScriptParser = void 0;
 const fs = __importStar(require("fs"));
+const errors_1 = require("./errors");
+const logger_1 = require("./logger");
 /**
  * Inno Setup 脚本解析器
  * 将 .iss 文件解析为 InnoSetupConfig 对象
  */
 class InnoScriptParser {
     /**
-     * 从文件路径解析 ISS 脚本
+     * 解析 ISS 文件
+     * @param filePath .iss 文件路径
+     * @returns 解析后的配置
+     * @throws ParseError 如果文件无法读取
      */
-    static parseFile(issFilePath) {
-        const content = fs.readFileSync(issFilePath, "utf-8");
+    static parseFile(filePath) {
+        (0, logger_1.logParser)("解析文件: %s", filePath);
+        if (!fs.existsSync(filePath)) {
+            throw new errors_1.ParseError(`文件不存在: ${filePath}`);
+        }
+        const content = fs.readFileSync(filePath, "utf-8");
         return this.parse(content);
     }
     /**
      * 解析 ISS 脚本内容
      * @param content ISS 脚本内容
-     * @param preserveDefineReferences 是否保留 {#...} 引用（不替换为实际值）
+     * @param options 解析选项
+     * @returns 解析后的配置
      */
-    static parse(content, preserveDefineReferences = true) {
-        const config = {};
-        const defines = {};
+    static parse(content, options = {}) {
+        const { preserveDefineReferences = true } = options;
+        (0, logger_1.logParser)("解析内容, preserveDefineReferences: %s", preserveDefineReferences);
         const lines = content.split(/\r?\n/);
-        let currentSection = null;
-        let codeSection = "";
-        let inCodeSection = false;
-        // 第一次扫描：提取所有 #define 定义
-        for (let i = 0; i < lines.length; i++) {
-            let line = lines[i].trim();
+        const defines = new Map();
+        const result = {
+            config: {},
+            errors: [],
+        };
+        // 第一遍扫描：提取所有 #define 指令
+        this.extractDefines(lines, defines);
+        if (defines.size > 0) {
+            result.config.Defines = Object.fromEntries(defines);
+        }
+        // 第二遍扫描：解析段落
+        this.parseSections(lines, result, defines, preserveDefineReferences);
+        // 验证必需的字段
+        if (!result.config.Setup?.AppName || !result.config.Setup?.AppVersion) {
+            result.errors.push(new errors_1.ParseError("缺少必需的 Setup 部分属性: AppName 和 AppVersion 是必需的"));
+        }
+        if (result.errors.length > 0) {
+            throw result.errors[0];
+        }
+        // 构建最终配置（包含必需字段）
+        const setup = {
+            AppName: result.config.Setup?.AppName ?? "",
+            AppVersion: result.config.Setup?.AppVersion ?? "",
+            DefaultDirName: result.config.Setup?.DefaultDirName ?? "{autopf}\\App",
+            OutputDir: result.config.Setup?.OutputDir ?? "output",
+            ...result.config.Setup,
+        };
+        return {
+            ...result.config,
+            Setup: setup,
+        };
+    }
+    /**
+     * 从行中提取 #define 指令
+     */
+    static extractDefines(lines, defines) {
+        for (const line of lines) {
+            const trimmed = line.trim();
             // 跳过空行和注释
-            if (!line || line.startsWith(";") || line.startsWith("//")) {
+            if (!trimmed || trimmed.startsWith(";") || trimmed.startsWith("//")) {
                 continue;
             }
             // 解析 #define 指令
-            const defineMatch = line.match(/^#define\s+(\w+)\s+(.+)$/);
+            const defineMatch = trimmed.match(/^#define\s+(\w+)\s+(.+)$/);
             if (defineMatch) {
                 const [, varName, varValue] = defineMatch;
-                // 如果保留引用，则保存原始表达式；否则计算值
-                defines[varName] = preserveDefineReferences
-                    ? this.preserveDefineExpression(varValue)
-                    : this.parseDefineValue(varValue, defines);
+                if (varName && varValue) {
+                    defines.set(varName, this.parseDefineValue(varValue.trim(), defines));
+                }
             }
         }
-        // 如果有 defines，添加到配置中
-        if (Object.keys(defines).length > 0) {
-            config.Defines = defines;
+    }
+    /**
+     * 解析 #define 的值
+     */
+    static parseDefineValue(value, defines) {
+        // 移除外层引号
+        if (value.startsWith('"') && value.endsWith('"')) {
+            return value.slice(1, -1);
+        }
+        // 处理字符串拼接
+        if (value.includes("+")) {
+            return this.parseConcatenation(value, defines);
+        }
+        // 处理 StringChange 函数
+        if (value.includes("StringChange(")) {
+            return this.parseStringChange(value, defines);
+        }
+        // 检查是否是对其他定义的引用
+        const existingDefine = defines.get(value);
+        if (existingDefine !== undefined) {
+            return existingDefine;
+        }
+        // 检查是否为数字
+        const numValue = Number(value);
+        if (!isNaN(numValue)) {
+            return numValue;
+        }
+        return value;
+    }
+    /**
+     * 解析字符串拼接表达式
+     */
+    static parseConcatenation(value, defines) {
+        const parts = value.split("+").map((p) => p.trim());
+        let result = "";
+        for (const part of parts) {
+            if (part.startsWith('"') && part.endsWith('"')) {
+                result += part.slice(1, -1);
+            }
+            else {
+                const defineValue = defines.get(part);
+                result += defineValue !== undefined ? String(defineValue) : part;
+            }
+        }
+        return result;
+    }
+    /**
+     * 解析 StringChange 函数调用
+     */
+    static parseStringChange(value, defines) {
+        const match = value.match(/StringChange\(([^,]+),\s*"([^"]*)",\s*"([^"]*)"\)/);
+        if (!match) {
+            return value;
+        }
+        const [, varRef, searchStr, replaceStr] = match;
+        if (!varRef) {
+            return value;
+        }
+        const varName = varRef.trim();
+        const sourceValue = defines.get(varName);
+        let result = typeof sourceValue === "string" ? sourceValue : varName;
+        result = result.replace(new RegExp(searchStr ?? "", "g"), replaceStr ?? "");
+        // 处理后缀拼接
+        const suffixMatch = value.match(/StringChange\([^)]+\)(.*)$/);
+        if (suffixMatch?.[1]) {
+            const suffix = suffixMatch[1].trim();
+            if (suffix.startsWith("+")) {
+                const suffixPart = suffix.substring(1).trim();
+                if (suffixPart.startsWith('"') && suffixPart.endsWith('"')) {
+                    result += suffixPart.slice(1, -1);
+                }
+            }
         }
-        // 第二次扫描：解析配置段落
+        return result;
+    }
+    /**
+     * 替换 {#ConstantName} 引用为实际值
+     */
+    static replaceDefines(text, defines) {
+        return text.replace(/\{#(\w+)\}/g, (match, varName) => {
+            const value = defines.get(varName);
+            return value !== undefined ? String(value) : match;
+        });
+    }
+    /**
+     * 解析所有段落
+     */
+    static parseSections(lines, result, defines, preserveDefineReferences) {
+        let currentSection = null;
+        let codeSection = "";
+        let inCodeSection = false;
         for (let i = 0; i < lines.length; i++) {
-            let line = lines[i].trim();
+            const rawLine = lines[i];
+            if (rawLine === undefined)
+                continue;
+            let line = rawLine.trim();
             // 跳过空行、注释和 #define 指令
-            if (!line ||
-                line.startsWith(";") ||
-                line.startsWith("//") ||
-                line.startsWith("#define")) {
+            if (!line || line.startsWith(";") || line.startsWith("//") || line.startsWith("#define")) {
                 continue;
             }
-            // 如果不保留引用，则替换常量引用 {#ConstantName}
+            // 如果不保留引用，则替换常量
             if (!preserveDefineReferences) {
                 line = this.replaceDefines(line, defines);
             }
-            // 检测段落
+            // 检查段落头
             const sectionMatch = line.match(/^\[(\w+)\]$/);
             if (sectionMatch) {
-                currentSection = sectionMatch[1];
-                // 处理 Code 段落
+                const sectionName = sectionMatch[1];
+                if (sectionName) {
+                    currentSection = sectionName;
+                }
                 if (currentSection === "Code") {
                     inCodeSection = true;
                     codeSection = "";
@@ -108,162 +237,106 @@ class InnoScriptParser {
                 }
                 continue;
             }
-            // 如果在 Code 段落中，收集所有代码
+            // 单独处理 Code 段落（收集原始行）
             if (inCodeSection) {
-                // 对于 Code 段落，使用原始行（带缩进）
                 const processedLine = preserveDefineReferences
-                    ? lines[i]
-                    : this.replaceDefines(lines[i], defines);
+                    ? rawLine
+                    : this.replaceDefines(rawLine, defines);
                 codeSection += processedLine + "\n";
                 continue;
             }
-            // 解析不同段落
-            if (currentSection === "Setup") {
-                this.parseSetupLine(line, config);
-            }
-            else if (currentSection === "Languages") {
-                this.parseLanguagesLine(line, config);
-            }
-            else if (currentSection === "Tasks") {
-                this.parseTasksLine(line, config);
-            }
-            else if (currentSection === "Types") {
-                this.parseTypesLine(line, config);
-            }
-            else if (currentSection === "Components") {
-                this.parseComponentsLine(line, config);
-            }
-            else if (currentSection === "Files") {
-                this.parseFilesLine(line, config);
-            }
-            else if (currentSection === "Dirs") {
-                this.parseDirsLine(line, config);
-            }
-            else if (currentSection === "Icons") {
-                this.parseIconsLine(line, config);
-            }
-            else if (currentSection === "INI") {
-                this.parseINILine(line, config);
-            }
-            else if (currentSection === "InstallDelete") {
-                this.parseInstallDeleteLine(line, config);
-            }
-            else if (currentSection === "UninstallDelete") {
-                this.parseUninstallDeleteLine(line, config);
-            }
-            else if (currentSection === "Registry") {
-                this.parseRegistryLine(line, config);
-            }
-            else if (currentSection === "Run") {
-                this.parseRunLine(line, config);
-            }
-            else if (currentSection === "UninstallRun") {
-                this.parseUninstallRunLine(line, config);
-            }
-            else if (currentSection === "Messages") {
-                this.parseMessagesLine(line, config);
-            }
-            else if (currentSection === "CustomMessages") {
-                this.parseCustomMessagesLine(line, config);
-            }
+            // 根据当前段落解析行
+            this.parseSectionLine(currentSection, line, result, i + 1);
         }
-        // 添加 Code 段落
+        // 添加收集的代码段落
         if (codeSection.trim()) {
-            config.Code = codeSection.trim();
+            result.config.Code = codeSection.trim();
         }
-        return config;
     }
     /**
-     * 保留 #define 的原始表达式
+     * 解析段落中的单行
      */
-    static preserveDefineExpression(value) {
-        value = value.trim();
-        // 移除外层引号（如果有）
-        if (value.startsWith('"') && value.endsWith('"')) {
-            return value.slice(1, -1);
+    static parseSectionLine(section, line, result, lineNumber) {
+        if (!section) {
+            return;
         }
-        return value;
-    }
-    /**
-     * 解析 #define 的值，支持字符串拼接和函数调用
-     */
-    static parseDefineValue(value, defines) {
-        value = value.trim();
-        // 处理字符串拼接 (e.g., MyAppName + " File")
-        if (value.includes("+")) {
-            const parts = value.split("+").map((p) => p.trim());
-            let result = "";
-            for (const part of parts) {
-                if (part.startsWith('"') && part.endsWith('"')) {
-                    // 直接的字符串字面量
-                    result += part.slice(1, -1);
-                }
-                else if (defines[part]) {
-                    // 引用已定义的常量
-                    result += defines[part];
-                }
-                else {
-                    // 未知引用，保持原样
-                    result += part;
-                }
-            }
-            return result;
-        }
-        // 处理 StringChange 函数 (e.g., StringChange(MyAppAssocName, " ", ""))
-        const stringChangeMatch = value.match(/StringChange\(([^,]+),\s*"([^"]*)",\s*"([^"]*)"\)/);
-        if (stringChangeMatch) {
-            const [, varRef, searchStr, replaceStr] = stringChangeMatch;
-            const varName = varRef.trim();
-            const sourceValue = defines[varName] ? String(defines[varName]) : varName;
-            let result = sourceValue.replace(new RegExp(searchStr, "g"), replaceStr);
-            // 处理后续的拼接，例如 StringChange(...) + ".myp"
-            const fullMatch = value.match(/StringChange\([^)]+\)(.*)$/);
-            if (fullMatch && fullMatch[1]) {
-                const suffix = fullMatch[1].trim();
-                if (suffix.startsWith("+")) {
-                    const suffixPart = suffix.substring(1).trim();
-                    if (suffixPart.startsWith('"') && suffixPart.endsWith('"')) {
-                        result += suffixPart.slice(1, -1);
-                    }
-                    else {
-                        result += suffixPart;
-                    }
-                }
+        try {
+            switch (section) {
+                case "Setup":
+                    this.parseSetupLine(line, result);
+                    break;
+                case "Languages":
+                    this.parseLanguagesLine(line, result);
+                    break;
+                case "Tasks":
+                    this.parseTasksLine(line, result);
+                    break;
+                case "Types":
+                    this.parseTypesLine(line, result);
+                    break;
+                case "Components":
+                    this.parseComponentsLine(line, result);
+                    break;
+                case "Files":
+                    this.parseFilesLine(line, result);
+                    break;
+                case "Dirs":
+                    this.parseDirsLine(line, result);
+                    break;
+                case "Icons":
+                    this.parseIconsLine(line, result);
+                    break;
+                case "INI":
+                    this.parseINILine(line, result);
+                    break;
+                case "InstallDelete":
+                    this.parseInstallDeleteLine(line, result);
+                    break;
+                case "UninstallDelete":
+                    this.parseUninstallDeleteLine(line, result);
+                    break;
+                case "Registry":
+                    this.parseRegistryLine(line, result);
+                    break;
+                case "Run":
+                    this.parseRunLine(line, result);
+                    break;
+                case "UninstallRun":
+                    this.parseUninstallRunLine(line, result);
+                    break;
+                case "Messages":
+                    this.parseMessagesLine(line, result);
+                    break;
+                case "CustomMessages":
+                    this.parseCustomMessagesLine(line, result);
+                    break;
             }
-            return result;
         }
-        // 处理常量引用 (e.g., MyAppName)
-        if (defines[value]) {
-            return String(defines[value]);
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            result.errors.push(new errors_1.ParseError(`解析失败: ${message}`, lineNumber));
         }
-        // 移除外层引号
-        if (value.startsWith('"') && value.endsWith('"')) {
-            return value.slice(1, -1);
-        }
-        return value;
     }
     /**
-     * 替换字符串中的常量引用 {#ConstantName}
+     * 解析 Setup 段落行
      */
-    static replaceDefines(text, defines) {
-        return text.replace(/\{#(\w+)\}/g, (match, varName) => {
-            return defines[varName] !== undefined ? String(defines[varName]) : match;
-        });
-    }
-    /**
-     * 解析 Setup 段落的一行
-     */
-    static parseSetupLine(line, config) {
+    static parseSetupLine(line, result) {
         const match = line.match(/^(\w+)\s*=\s*(.+)$/);
-        if (!match)
+        if (!match) {
             return;
+        }
         const [, key, value] = match;
-        if (!config.Setup) {
-            config.Setup = {};
+        if (!key || !value) {
+            return;
+        }
+        if (!result.config.Setup) {
+            result.config.Setup = {};
         }
-        // 移除引号
         let parsedValue = value.trim();
-        if (parsedValue.startsWith('"') && parsedValue.endsWith('"')) {
+        // 移除引号
+        if (typeof parsedValue === "string" &&
+            parsedValue.startsWith('"') &&
+            parsedValue.endsWith('"')) {
             parsedValue = parsedValue.slice(1, -1);
         }
         // 转换布尔值
@@ -274,13 +347,14 @@ class InnoScriptParser {
             parsedValue = false;
         }
         // 转换数字
-        if (/^\d+$/.test(parsedValue)) {
+        if (typeof parsedValue === "string" && /^\d+$/.test(parsedValue)) {
             parsedValue = parseInt(parsedValue, 10);
         }
-        config.Setup[key] = parsedValue;
+        // 使用 Object.assign 设置属性以正确处理类型
+        Object.assign(result.config.Setup, { [key]: parsedValue });
     }
     /**
-     * 解析参数行（用于 Languages, Files, Icons 等段落）
+     * 从行中解析参数（Name: "value"; Param: "value"）
      */
     static parseParams(line) {
         const params = {};
@@ -289,321 +363,437 @@ class InnoScriptParser {
             const match = part.match(/^(\w+):\s*(.+)$/);
             if (match) {
                 const [, key, value] = match;
-                // 移除引号
-                let parsedValue = value.trim();
-                if (parsedValue.startsWith('"') && parsedValue.endsWith('"')) {
-                    parsedValue = parsedValue.slice(1, -1);
+                if (key && value) {
+                    let parsedValue = value.trim();
+                    // 移除引号
+                    if (parsedValue.startsWith('"') && parsedValue.endsWith('"')) {
+                        parsedValue = parsedValue.slice(1, -1);
+                    }
+                    params[key] = parsedValue;
                 }
-                params[key] = parsedValue;
             }
         }
         return params;
     }
     /**
-     * 解析 Languages 段落
+     * 解析 Languages 段落行
      */
-    static parseLanguagesLine(line, config) {
-        if (!config.Languages) {
-            config.Languages = [];
-        }
+    static parseLanguagesLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Name && params.MessagesFile) {
-            config.Languages.push({
-                Name: params.Name,
-                MessagesFile: params.MessagesFile,
-                LicenseFile: params.LicenseFile,
-                InfoBeforeFile: params.InfoBeforeFile,
-                InfoAfterFile: params.InfoAfterFile,
-            });
+        if (!params.Name || !params.MessagesFile) {
+            return;
         }
+        const lang = {
+            Name: params.Name,
+            MessagesFile: params.MessagesFile,
+        };
+        if (params.LicenseFile)
+            lang.LicenseFile = params.LicenseFile;
+        if (params.InfoBeforeFile)
+            lang.InfoBeforeFile = params.InfoBeforeFile;
+        if (params.InfoAfterFile)
+            lang.InfoAfterFile = params.InfoAfterFile;
+        if (!result.config.Languages) {
+            result.config.Languages = [];
+        }
+        result.config.Languages = [...result.config.Languages, lang];
     }
     /**
-     * 解析 Tasks 段落
+     * 解析 Tasks 段落行
      */
-    static parseTasksLine(line, config) {
-        if (!config.Tasks) {
-            config.Tasks = [];
-        }
+    static parseTasksLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Name && params.Description) {
-            config.Tasks.push({
-                Name: params.Name,
-                Description: params.Description,
-                GroupDescription: params.GroupDescription,
-                Flags: params.Flags,
-                Components: params.Components,
-                Check: params.Check,
-            });
+        if (!params.Name || !params.Description) {
+            return;
         }
+        const task = {
+            Name: params.Name,
+            Description: params.Description,
+        };
+        if (params.GroupDescription)
+            task.GroupDescription = params.GroupDescription;
+        if (params.Flags)
+            task.Flags = params.Flags;
+        if (params.Components)
+            task.Components = params.Components;
+        if (params.Check)
+            task.Check = params.Check;
+        if (!result.config.Tasks) {
+            result.config.Tasks = [];
+        }
+        result.config.Tasks = [...result.config.Tasks, task];
     }
     /**
-     * 解析 Types 段落
+     * 解析 Types 段落行
      */
-    static parseTypesLine(line, config) {
-        if (!config.Types) {
-            config.Types = [];
-        }
+    static parseTypesLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Name && params.Description) {
-            config.Types.push({
-                Name: params.Name,
-                Description: params.Description,
-                Flags: params.Flags,
-            });
+        if (!params.Name || !params.Description) {
+            return;
         }
+        const type = {
+            Name: params.Name,
+            Description: params.Description,
+        };
+        if (params.Flags)
+            type.Flags = params.Flags;
+        if (!result.config.Types) {
+            result.config.Types = [];
+        }
+        result.config.Types = [...result.config.Types, type];
     }
     /**
-     * 解析 Components 段落
+     * 解析 Components 段落行
      */
-    static parseComponentsLine(line, config) {
-        if (!config.Components) {
-            config.Components = [];
-        }
+    static parseComponentsLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Name && params.Description) {
-            config.Components.push({
-                Name: params.Name,
-                Description: params.Description,
-                Types: params.Types,
-                Flags: params.Flags,
-                ExtraDiskSpaceRequired: params.ExtraDiskSpaceRequired
-                    ? parseInt(params.ExtraDiskSpaceRequired)
-                    : undefined,
-            });
+        if (!params.Name || !params.Description) {
+            return;
         }
+        const component = {
+            Name: params.Name,
+            Description: params.Description,
+        };
+        if (params.Types)
+            component.Types = params.Types;
+        if (params.Flags)
+            component.Flags = params.Flags;
+        if (params.ExtraDiskSpaceRequired) {
+            component.ExtraDiskSpaceRequired = parseInt(params.ExtraDiskSpaceRequired, 10);
+        }
+        if (!result.config.Components) {
+            result.config.Components = [];
+        }
+        result.config.Components = [...result.config.Components, component];
     }
     /**
-     * 解析 Files 段落
+     * 解析 Files 段落行
      */
-    static parseFilesLine(line, config) {
-        if (!config.Files) {
-            config.Files = [];
-        }
+    static parseFilesLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Source && params.DestDir) {
-            config.Files.push({
-                Source: params.Source,
-                DestDir: params.DestDir,
-                DestName: params.DestName,
-                Flags: params.Flags,
-                Permissions: params.Permissions,
-                StrongAssemblyName: params.StrongAssemblyName,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Languages: params.Languages,
-                Check: params.Check,
-                BeforeInstall: params.BeforeInstall,
-                AfterInstall: params.AfterInstall,
-                Attribs: params.Attribs,
-                FontInstall: params.FontInstall,
-            });
+        if (!params.Source || !params.DestDir) {
+            return;
         }
+        const file = {
+            Source: params.Source,
+            DestDir: params.DestDir,
+        };
+        if (params.DestName)
+            file.DestName = params.DestName;
+        if (params.Flags)
+            file.Flags = params.Flags;
+        if (params.Permissions)
+            file.Permissions = params.Permissions;
+        if (params.StrongAssemblyName)
+            file.StrongAssemblyName = params.StrongAssemblyName;
+        if (params.Components)
+            file.Components = params.Components;
+        if (params.Tasks)
+            file.Tasks = params.Tasks;
+        if (params.Languages)
+            file.Languages = params.Languages;
+        if (params.Check)
+            file.Check = params.Check;
+        if (params.BeforeInstall)
+            file.BeforeInstall = params.BeforeInstall;
+        if (params.AfterInstall)
+            file.AfterInstall = params.AfterInstall;
+        if (params.Attribs)
+            file.Attribs = params.Attribs;
+        if (params.FontInstall)
+            file.FontInstall = params.FontInstall;
+        if (!result.config.Files) {
+            result.config.Files = [];
+        }
+        result.config.Files = [...result.config.Files, file];
     }
     /**
-     * 解析 Dirs 段落
+     * 解析 Dirs 段落行
      */
-    static parseDirsLine(line, config) {
-        if (!config.Dirs) {
-            config.Dirs = [];
-        }
+    static parseDirsLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Name) {
-            config.Dirs.push({
-                Name: params.Name,
-                Permissions: params.Permissions,
-                Attribs: params.Attribs,
-                Flags: params.Flags,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Check: params.Check,
-            });
+        if (!params.Name) {
+            return;
         }
+        const dir = {
+            Name: params.Name,
+        };
+        if (params.Permissions)
+            dir.Permissions = params.Permissions;
+        if (params.Attribs)
+            dir.Attribs = params.Attribs;
+        if (params.Flags)
+            dir.Flags = params.Flags;
+        if (params.Components)
+            dir.Components = params.Components;
+        if (params.Tasks)
+            dir.Tasks = params.Tasks;
+        if (params.Check)
+            dir.Check = params.Check;
+        if (!result.config.Dirs) {
+            result.config.Dirs = [];
+        }
+        result.config.Dirs = [...result.config.Dirs, dir];
     }
     /**
-     * 解析 Icons 段落
+     * 解析 Icons 段落行
      */
-    static parseIconsLine(line, config) {
-        if (!config.Icons) {
-            config.Icons = [];
-        }
+    static parseIconsLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Name && params.Filename) {
-            config.Icons.push({
-                Name: params.Name,
-                Filename: params.Filename,
-                Parameters: params.Parameters,
-                WorkingDir: params.WorkingDir,
-                HotKey: params.HotKey,
-                Comment: params.Comment,
-                IconFilename: params.IconFilename,
-                IconIndex: params.IconIndex ? parseInt(params.IconIndex) : undefined,
-                AppUserModelID: params.AppUserModelID,
-                Flags: params.Flags,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Languages: params.Languages,
-                Check: params.Check,
-            });
+        if (!params.Name || !params.Filename) {
+            return;
         }
+        const icon = {
+            Name: params.Name,
+            Filename: params.Filename,
+        };
+        if (params.Parameters)
+            icon.Parameters = params.Parameters;
+        if (params.WorkingDir)
+            icon.WorkingDir = params.WorkingDir;
+        if (params.HotKey)
+            icon.HotKey = params.HotKey;
+        if (params.Comment)
+            icon.Comment = params.Comment;
+        if (params.IconFilename)
+            icon.IconFilename = params.IconFilename;
+        if (params.IconIndex)
+            icon.IconIndex = parseInt(params.IconIndex, 10);
+        if (params.AppUserModelID)
+            icon.AppUserModelID = params.AppUserModelID;
+        if (params.Flags)
+            icon.Flags = params.Flags;
+        if (params.Components)
+            icon.Components = params.Components;
+        if (params.Tasks)
+            icon.Tasks = params.Tasks;
+        if (params.Languages)
+            icon.Languages = params.Languages;
+        if (params.Check)
+            icon.Check = params.Check;
+        if (!result.config.Icons) {
+            result.config.Icons = [];
+        }
+        result.config.Icons = [...result.config.Icons, icon];
     }
     /**
-     * 解析 INI 段落
+     * 解析 INI 段落行
      */
-    static parseINILine(line, config) {
-        if (!config.INI) {
-            config.INI = [];
-        }
+    static parseINILine(line, result) {
         const params = this.parseParams(line);
-        if (params.Filename && params.Section) {
-            config.INI.push({
-                Filename: params.Filename,
-                Section: params.Section,
-                Key: params.Key,
-                String: params.String,
-                Flags: params.Flags,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Check: params.Check,
-            });
+        if (!params.Filename || !params.Section) {
+            return;
         }
+        const ini = {
+            Filename: params.Filename,
+            Section: params.Section,
+        };
+        if (params.Key)
+            ini.Key = params.Key;
+        if (params.String)
+            ini.String = params.String;
+        if (params.Flags)
+            ini.Flags = params.Flags;
+        if (params.Components)
+            ini.Components = params.Components;
+        if (params.Tasks)
+            ini.Tasks = params.Tasks;
+        if (params.Check)
+            ini.Check = params.Check;
+        if (!result.config.INI) {
+            result.config.INI = [];
+        }
+        result.config.INI = [...result.config.INI, ini];
     }
     /**
-     * 解析 InstallDelete 段落
+     * 解析 InstallDelete 段落行
      */
-    static parseInstallDeleteLine(line, config) {
-        if (!config.InstallDelete) {
-            config.InstallDelete = [];
-        }
+    static parseInstallDeleteLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Type && params.Name) {
-            config.InstallDelete.push({
-                Type: params.Type,
-                Name: params.Name,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Check: params.Check,
-            });
+        if (!params.Type || !params.Name) {
+            return;
         }
+        const item = {
+            Type: params.Type,
+            Name: params.Name,
+        };
+        if (params.Components)
+            item.Components = params.Components;
+        if (params.Tasks)
+            item.Tasks = params.Tasks;
+        if (params.Check)
+            item.Check = params.Check;
+        if (!result.config.InstallDelete) {
+            result.config.InstallDelete = [];
+        }
+        result.config.InstallDelete = [...result.config.InstallDelete, item];
     }
     /**
-     * 解析 UninstallDelete 段落
+     * 解析 UninstallDelete 段落行
      */
-    static parseUninstallDeleteLine(line, config) {
-        if (!config.UninstallDelete) {
-            config.UninstallDelete = [];
-        }
+    static parseUninstallDeleteLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Type && params.Name) {
-            config.UninstallDelete.push({
-                Type: params.Type,
-                Name: params.Name,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Check: params.Check,
-            });
+        if (!params.Type || !params.Name) {
+            return;
         }
+        const item = {
+            Type: params.Type,
+            Name: params.Name,
+        };
+        if (params.Components)
+            item.Components = params.Components;
+        if (params.Tasks)
+            item.Tasks = params.Tasks;
+        if (params.Check)
+            item.Check = params.Check;
+        if (!result.config.UninstallDelete) {
+            result.config.UninstallDelete = [];
+        }
+        result.config.UninstallDelete = [...result.config.UninstallDelete, item];
     }
     /**
-     * 解析 Registry 段落
+     * 解析 Registry 段落行
      */
-    static parseRegistryLine(line, config) {
-        if (!config.Registry) {
-            config.Registry = [];
-        }
+    static parseRegistryLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Root && params.Subkey) {
-            let valueData = params.ValueData;
-            // 尝试转换为数字
-            if (valueData && /^\d+$/.test(valueData)) {
-                valueData = parseInt(valueData, 10);
-            }
-            config.Registry.push({
-                Root: params.Root,
-                Subkey: params.Subkey,
-                ValueType: params.ValueType,
-                ValueName: params.ValueName,
-                ValueData: valueData,
-                Permissions: params.Permissions,
-                Flags: params.Flags,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Check: params.Check,
-            });
+        if (!params.Root || !params.Subkey) {
+            return;
         }
+        let valueData = params.ValueData;
+        if (valueData && /^\d+$/.test(valueData)) {
+            valueData = parseInt(valueData, 10);
+        }
+        const reg = {
+            Root: params.Root,
+            Subkey: params.Subkey,
+        };
+        if (params.ValueType)
+            reg.ValueType = params.ValueType;
+        if (params.ValueName)
+            reg.ValueName = params.ValueName;
+        if (valueData !== undefined)
+            reg.ValueData = valueData;
+        if (params.Permissions)
+            reg.Permissions = params.Permissions;
+        if (params.Flags)
+            reg.Flags = params.Flags;
+        if (params.Components)
+            reg.Components = params.Components;
+        if (params.Tasks)
+            reg.Tasks = params.Tasks;
+        if (params.Check)
+            reg.Check = params.Check;
+        if (!result.config.Registry) {
+            result.config.Registry = [];
+        }
+        result.config.Registry = [...result.config.Registry, reg];
     }
     /**
-     * 解析 Run 段落
+     * 解析 Run 段落行
      */
-    static parseRunLine(line, config) {
-        if (!config.Run) {
-            config.Run = [];
-        }
+    static parseRunLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Filename) {
-            config.Run.push({
-                Filename: params.Filename,
-                Parameters: params.Parameters,
-                WorkingDir: params.WorkingDir,
-                StatusMsg: params.StatusMsg,
-                Description: params.Description,
-                Flags: params.Flags,
-                RunOnceId: params.RunOnceId,
-                Verb: params.Verb,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Languages: params.Languages,
-                Check: params.Check,
-            });
+        if (!params.Filename) {
+            return;
         }
+        const run = {
+            Filename: params.Filename,
+        };
+        if (params.Parameters)
+            run.Parameters = params.Parameters;
+        if (params.WorkingDir)
+            run.WorkingDir = params.WorkingDir;
+        if (params.StatusMsg)
+            run.StatusMsg = params.StatusMsg;
+        if (params.Description)
+            run.Description = params.Description;
+        if (params.Flags)
+            run.Flags = params.Flags;
+        if (params.RunOnceId)
+            run.RunOnceId = params.RunOnceId;
+        if (params.Verb)
+            run.Verb = params.Verb;
+        if (params.Components)
+            run.Components = params.Components;
+        if (params.Tasks)
+            run.Tasks = params.Tasks;
+        if (params.Languages)
+            run.Languages = params.Languages;
+        if (params.Check)
+            run.Check = params.Check;
+        if (!result.config.Run) {
+            result.config.Run = [];
+        }
+        result.config.Run = [...result.config.Run, run];
     }
     /**
-     * 解析 UninstallRun 段落
+     * 解析 UninstallRun 段落行
      */
-    static parseUninstallRunLine(line, config) {
-        if (!config.UninstallRun) {
-            config.UninstallRun = [];
-        }
+    static parseUninstallRunLine(line, result) {
         const params = this.parseParams(line);
-        if (params.Filename) {
-            config.UninstallRun.push({
-                Filename: params.Filename,
-                Parameters: params.Parameters,
-                WorkingDir: params.WorkingDir,
-                StatusMsg: params.StatusMsg,
-                Description: params.Description,
-                Flags: params.Flags,
-                RunOnceId: params.RunOnceId,
-                Components: params.Components,
-                Tasks: params.Tasks,
-                Check: params.Check,
-            });
+        if (!params.Filename) {
+            return;
         }
+        const run = {
+            Filename: params.Filename,
+        };
+        if (params.Parameters)
+            run.Parameters = params.Parameters;
+        if (params.WorkingDir)
+            run.WorkingDir = params.WorkingDir;
+        if (params.StatusMsg)
+            run.StatusMsg = params.StatusMsg;
+        if (params.Description)
+            run.Description = params.Description;
+        if (params.Flags)
+            run.Flags = params.Flags;
+        if (params.RunOnceId)
+            run.RunOnceId = params.RunOnceId;
+        if (params.Components)
+            run.Components = params.Components;
+        if (params.Tasks)
+            run.Tasks = params.Tasks;
+        if (params.Check)
+            run.Check = params.Check;
+        if (!result.config.UninstallRun) {
+            result.config.UninstallRun = [];
+        }
+        result.config.UninstallRun = [...result.config.UninstallRun, run];
     }
     /**
-     * 解析 Messages 段落
+     * 解析 Messages 段落行
      */
-    static parseMessagesLine(line, config) {
+    static parseMessagesLine(line, result) {
         const match = line.match(/^(\w+)\s*=\s*(.+)$/);
-        if (!match)
+        if (!match) {
             return;
+        }
         const [, key, value] = match;
-        if (!config.Messages) {
-            config.Messages = {};
+        if (!key || !value) {
+            return;
         }
-        config.Messages[key] = value;
+        if (!result.config.Messages) {
+            result.config.Messages = {};
+        }
+        result.config.Messages = { ...result.config.Messages, [key]: value };
     }
     /**
-     * 解析 CustomMessages 段落
+     * 解析 CustomMessages 段落行
      */
-    static parseCustomMessagesLine(line, config) {
+    static parseCustomMessagesLine(line, result) {
         const match = line.match(/^(\w+)\s*=\s*(.+)$/);
-        if (!match)
+        if (!match) {
             return;
+        }
         const [, key, value] = match;
-        if (!config.CustomMessages) {
-            config.CustomMessages = {};
+        if (!key || !value) {
+            return;
+        }
+        if (!result.config.CustomMessages) {
+            result.config.CustomMessages = {};
         }
-        config.CustomMessages[key] = value;
+        result.config.CustomMessages = { ...result.config.CustomMessages, [key]: value };
     }
 }
 exports.InnoScriptParser = InnoScriptParser;
+//# sourceMappingURL=parser.js.map