@minecraft-docker/mcctl 2.3.4 → 2.4.0

package/dist/lib/env-diff.js

@@ -0,0 +1,219 @@
+/**
+ * .env template diffing library for upgrade command.
+ * Compares a template .env.example with a user's .env file
+ * and identifies new variables that need to be added.
+ *
+ * Key principle: NEVER modify existing user values (append-only).
+ */
+/**
+ * Check if a comment line is a section header.
+ * Section headers are lines like "# Section Name" that describe groups of variables.
+ * Excludes lines that are commented-out variables (# VAR=value),
+ * delimiter lines (# ====), and multi-line description comments.
+ */
+function isSectionHeader(line) {
+    const trimmed = line.trim();
+    // Must start with # but not be a delimiter line
+    if (!trimmed.startsWith('#'))
+        return false;
+    const content = trimmed.slice(1).trim();
+    // Skip empty comments
+    if (!content)
+        return false;
+    // Skip delimiter lines
+    if (/^[=\-*]+$/.test(content))
+        return false;
+    // Skip commented-out variables
+    if (/^[A-Z_][A-Z0-9_]*=/.test(content))
+        return false;
+    // Skip description-like lines (start with lowercase, or contain typical description patterns)
+    if (/^[a-z]/.test(content))
+        return false;
+    if (content.startsWith('Setup:') || content.startsWith('Create') || content.startsWith('Token') || content.startsWith('Start') || content.startsWith('Or ') || content.startsWith('docker '))
+        return false;
+    // Skip lines that reference URLs or are instructions
+    if (content.includes('http://') || content.includes('https://'))
+        return false;
+    // Skip numbered list items
+    if (/^\d+\./.test(content))
+        return false;
+    // Skip lines starting with "e.g." or containing example patterns
+    if (content.startsWith('e.g.') || content.includes('e.g.'))
+        return false;
+    // Skip "Copy this", "Use pre-built", "Generate with", etc. instructional lines
+    if (/^(Copy |Use |Generate |Backup |Web-|Allowed |Public |JWT |NextAuth |Access |API |Or |Enables |If )/.test(content))
+        return false;
+    // Accept if it looks like a section title (capitalized words, short-ish)
+    if (/^[A-Z]/.test(content) && content.length < 80)
+        return true;
+    return false;
+}
+/**
+ * Check if a comment line is a commented-out variable definition.
+ * Pattern: # KEY=value (where KEY is uppercase with underscores/numbers)
+ */
+function isCommentedVar(line) {
+    const trimmed = line.trim();
+    const match = trimmed.match(/^#\s*([A-Z_][A-Z0-9_]*)=(.*)$/);
+    if (match) {
+        return { key: match[1], value: match[2] };
+    }
+    return null;
+}
+/**
+ * Parse a .env template file into structured format.
+ * Preserves section headers and distinguishes between
+ * active variables and commented-out variables.
+ */
+export function parseEnvTemplate(content) {
+    const lines = content.split('\n');
+    const vars = [];
+    let currentSection = '';
+    for (const line of lines) {
+        const trimmed = line.trim();
+        // Empty line - skip
+        if (!trimmed)
+            continue;
+        // Check for section header
+        if (isSectionHeader(trimmed)) {
+            currentSection = trimmed.slice(1).trim();
+            continue;
+        }
+        // Check for commented-out variable
+        const commentedVar = isCommentedVar(trimmed);
+        if (commentedVar) {
+            vars.push({
+                key: commentedVar.key,
+                defaultValue: commentedVar.value,
+                commented: true,
+                section: currentSection,
+            });
+            continue;
+        }
+        // Check for active variable
+        if (!trimmed.startsWith('#')) {
+            const eqIndex = trimmed.indexOf('=');
+            if (eqIndex > 0) {
+                const key = trimmed.slice(0, eqIndex).trim();
+                // Validate key is a valid env var name
+                if (/^[A-Z_][A-Z0-9_]*$/.test(key)) {
+                    const value = trimmed.slice(eqIndex + 1);
+                    vars.push({
+                        key,
+                        defaultValue: value,
+                        commented: false,
+                        section: currentSection,
+                    });
+                }
+            }
+        }
+    }
+    return { vars };
+}
+/**
+ * Extract all variable keys from user .env file content.
+ * Returns a Set of keys that exist in the user's file,
+ * whether active or commented out.
+ */
+function extractUserKeys(userEnv) {
+    const keys = new Set();
+    const lines = userEnv.split('\n');
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        // Active variable
+        if (!trimmed.startsWith('#')) {
+            const eqIndex = trimmed.indexOf('=');
+            if (eqIndex > 0) {
+                const key = trimmed.slice(0, eqIndex).trim();
+                keys.add(key);
+            }
+            continue;
+        }
+        // Commented-out variable
+        const commentedVar = isCommentedVar(trimmed);
+        if (commentedVar) {
+            keys.add(commentedVar.key);
+        }
+    }
+    return keys;
+}
+/**
+ * Diff template .env against user .env to find new variables.
+ * Returns variables that exist in the template but not in the user's file.
+ */
+export function diffEnvFiles(template, userEnv) {
+    const parsed = parseEnvTemplate(template);
+    const userKeys = extractUserKeys(userEnv);
+    const newVars = [];
+    const newCommentedVars = [];
+    for (const v of parsed.vars) {
+        if (userKeys.has(v.key))
+            continue;
+        if (v.commented) {
+            newCommentedVars.push({
+                key: v.key,
+                defaultValue: v.defaultValue,
+                section: v.section,
+            });
+        }
+        else {
+            newVars.push({
+                key: v.key,
+                defaultValue: v.defaultValue,
+                section: v.section,
+            });
+        }
+    }
+    return { newVars, newCommentedVars };
+}
+/**
+ * Apply env diff to user's .env file content.
+ * Appends new variables at the end, grouped by section.
+ * Uses values from the `values` map when available, otherwise uses defaults.
+ *
+ * @param userEnv - Current user .env file content
+ * @param diff - Diff result from diffEnvFiles
+ * @param values - User-provided values for new variables
+ * @returns Updated .env file content
+ */
+export function applyEnvDiff(userEnv, diff, values) {
+    const allItems = [
+        ...diff.newVars.map((v) => ({ ...v, commented: false })),
+        ...diff.newCommentedVars.map((v) => ({ ...v, commented: true })),
+    ];
+    if (allItems.length === 0) {
+        return userEnv;
+    }
+    // Group by section
+    const sections = new Map();
+    for (const item of allItems) {
+        const section = item.section;
+        if (!sections.has(section)) {
+            sections.set(section, []);
+        }
+        sections.get(section).push(item);
+    }
+    const lines = [];
+    // Add separator
+    lines.push('');
+    lines.push('# --- Added by mcctl upgrade ---');
+    for (const [section, items] of sections) {
+        if (section) {
+            lines.push('');
+            lines.push(`# ${section}`);
+        }
+        for (const item of items) {
+            const value = values.get(item.key) ?? item.defaultValue;
+            if (item.commented) {
+                lines.push(`# ${item.key}=${item.defaultValue}`);
+            }
+            else {
+                lines.push(`${item.key}=${value}`);
+            }
+        }
+    }
+    return userEnv + lines.join('\n');
+}
+//# sourceMappingURL=env-diff.js.map

package/dist/lib/env-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env-diff.js","sourceRoot":"","sources":["../../src/lib/env-diff.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minecraft-docker/mcctl",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "CLI tool for managing Docker Minecraft servers with mc-router",
   "type": "module",
   "bin": {
@@ -55,8 +55,8 @@
   ],
   "dependencies": {
     "@clack/prompts": "^0.8.0",
-    "@minecraft-docker/mod-source-modrinth": "^2.3.4",
-    "@minecraft-docker/shared": "^2.3.4",
+    "@minecraft-docker/mod-source-modrinth": "^2.4.0",
+    "@minecraft-docker/shared": "^2.4.0",
     "better-sqlite3": "^12.6.2",
     "commander": "^12.0.0",
     "js-yaml": "^4.1.0",