@gadmin2n/cli 0.0.91 → 0.0.93

package/actions/template.action.js

@@ -1,570 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemplateAction = void 0;
-const chalk = require("chalk");
-const fs = require("fs");
-const path = require("path");
-const inquirer = require("inquirer");
-const child_process_1 = require("child_process");
-const abstract_action_1 = require("./abstract.action");
-const DEFAULT_EXCLUDES = [
-    'node_modules',
-    '.git',
-    'dist',
-    'generated',
-    '.DS_Store',
-    '.env.local',
-    'readme.md'
-];
-/**
- * Convert a glob pattern to a RegExp.
- * Supports: * (any chars except /), ** (any path segments), ? (single char)
- */
-function globToRegex(pattern) {
-    let regexStr = '^';
-    let i = 0;
-    while (i < pattern.length) {
-        const c = pattern[i];
-        if (c === '*') {
-            if (pattern[i + 1] === '*') {
-                // ** matches any path segments
-                if (pattern[i + 2] === '/') {
-                    regexStr += '(?:.+/)?';
-                    i += 3;
-                }
-                else {
-                    regexStr += '.*';
-                    i += 2;
-                }
-            }
-            else {
-                // * matches anything except /
-                regexStr += '[^/]*';
-                i++;
-            }
-        }
-        else if (c === '?') {
-            regexStr += '[^/]';
-            i++;
-        }
-        else if (c === '.' || c === '(' || c === ')' || c === '[' || c === ']' || c === '{' || c === '}' || c === '+' || c === '^' || c === '$' || c === '|' || c === '\\') {
-            regexStr += '\\' + c;
-            i++;
-        }
-        else {
-            regexStr += c;
-            i++;
-        }
-    }
-    regexStr += '$';
-    return new RegExp(regexStr);
-}
-function matchesPattern(filePath, pattern) {
-    // Exact match or directory prefix match
-    if (filePath === pattern)
-        return true;
-    if (filePath.startsWith(pattern + '/'))
-        return true;
-    // Check each path segment for exact match (e.g. "node_modules" matches "a/node_modules/b")
-    const parts = filePath.split('/');
-    if (!pattern.includes('/') && !pattern.includes('*') && !pattern.includes('?')) {
-        if (parts.includes(pattern))
-            return true;
-    }
-    // Glob pattern matching
-    if (pattern.includes('*') || pattern.includes('?')) {
-        const regex = globToRegex(pattern);
-        return regex.test(filePath);
-    }
-    return false;
-}
-function loadTemplateConfig() {
-    const configPaths = [
-        path.join(process.cwd(), 'server/gadmin-cli.json'),
-        path.join(process.cwd(), 'gadmin-cli.json'),
-    ];
-    let templateName;
-    let userExcludes = [];
-    for (const configPath of configPaths) {
-        if (fs.existsSync(configPath)) {
-            const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-            templateName = config.template;
-            if (Array.isArray(config.templateExcludes)) {
-                userExcludes = config.templateExcludes;
-            }
-            break;
-        }
-    }
-    if (!templateName) {
-        throw new Error('Cannot find "template" field in gadmin-cli.json. ' +
-            'Make sure you are in a gadmin2 project root directory.');
-    }
-    return {
-        templateName,
-        excludes: [...DEFAULT_EXCLUDES, ...userExcludes],
-    };
-}
-function shouldExclude(filePath, excludes) {
-    for (const pattern of excludes) {
-        if (matchesPattern(filePath, pattern))
-            return true;
-    }
-    return false;
-}
-function collectFiles(dir, excludes, base = '') {
-    const results = [];
-    const entries = fs.readdirSync(path.join(dir, base), { withFileTypes: true });
-    for (const entry of entries) {
-        const rel = base ? `${base}/${entry.name}` : entry.name;
-        if (shouldExclude(rel, excludes))
-            continue;
-        if (entry.isDirectory()) {
-            results.push(...collectFiles(dir, excludes, rel));
-        }
-        else if (entry.isFile()) {
-            results.push(rel);
-        }
-    }
-    return results.sort();
-}
-function resolveTemplatePath(templateName) {
-    // Resolve @gadmin2n/schematics package path
-    // Try multiple locations: project's node_modules, CLI's own node_modules
-    let schematicsRoot;
-    const searchPaths = [
-        process.cwd(),
-        path.join(process.cwd(), 'server'),
-        path.resolve(__dirname, '..'), // CLI package root
-    ];
-    for (const searchPath of searchPaths) {
-        try {
-            const pkgPath = require.resolve('@gadmin2n/schematics/package.json', {
-                paths: [searchPath],
-            });
-            schematicsRoot = path.dirname(pkgPath);
-            break;
-        }
-        catch (_a) {
-            // continue trying next path
-        }
-    }
-    if (!schematicsRoot) {
-        throw new Error('Cannot resolve @gadmin2n/schematics package. ' +
-            'Make sure it is installed.');
-    }
-    // Check dist path first (published package), then src path (yalc/dev link)
-    // Also try with name variants (gadmin2n → gadmin2) for backward compatibility
-    const nameVariants = [templateName];
-    if (templateName.startsWith('gadmin2n-')) {
-        nameVariants.push(templateName.replace('gadmin2n-', 'gadmin2-'));
-    }
-    else if (templateName.startsWith('gadmin2-')) {
-        nameVariants.push(templateName.replace('gadmin2-', 'gadmin2n-'));
-    }
-    for (const name of nameVariants) {
-        const distPath = path.join(schematicsRoot, 'dist/lib/application/files', name);
-        const srcPath = path.join(schematicsRoot, 'src/lib/application/files', name);
-        if (fs.existsSync(distPath))
-            return distPath;
-        if (fs.existsSync(srcPath))
-            return srcPath;
-    }
-    throw new Error(`Template directory not found for "${templateName}" in ${schematicsRoot}`);
-}
-function createUnifiedDiff(filePath, instanceContent, templateContent) {
-    const instanceLines = instanceContent.split('\n');
-    const templateLines = templateContent.split('\n');
-    // Simple line-by-line diff output
-    const lines = [];
-    lines.push(chalk.bold(`--- a/${filePath} (instance)`));
-    lines.push(chalk.bold(`+++ b/${filePath} (template)`));
-    // Find differing regions using a simple approach
-    const maxLen = Math.max(instanceLines.length, templateLines.length);
-    const hunks = [];
-    let currentHunk = null;
-    for (let i = 0; i < maxLen; i++) {
-        const a = i < instanceLines.length ? instanceLines[i] : undefined;
-        const b = i < templateLines.length ? templateLines[i] : undefined;
-        if (a !== b) {
-            if (!currentHunk) {
-                currentHunk = { start: i, instanceLines: [], templateLines: [] };
-            }
-            if (a !== undefined)
-                currentHunk.instanceLines.push(a);
-            if (b !== undefined)
-                currentHunk.templateLines.push(b);
-        }
-        else {
-            if (currentHunk) {
-                hunks.push(currentHunk);
-                currentHunk = null;
-            }
-        }
-    }
-    if (currentHunk)
-        hunks.push(currentHunk);
-    // Output hunks with context
-    for (const hunk of hunks.slice(0, 10)) { // Limit to first 10 hunks
-        const contextStart = Math.max(0, hunk.start - 2);
-        lines.push(chalk.cyan(`@@ -${hunk.start + 1},${hunk.instanceLines.length} +${hunk.start + 1},${hunk.templateLines.length} @@`));
-        // Context before
-        for (let i = contextStart; i < hunk.start; i++) {
-            if (i < instanceLines.length) {
-                lines.push(` ${instanceLines[i]}`);
-            }
-        }
-        // Removed lines (instance)
-        for (const line of hunk.instanceLines) {
-            lines.push(chalk.red(`-${line}`));
-        }
-        // Added lines (template)
-        for (const line of hunk.templateLines) {
-            lines.push(chalk.green(`+${line}`));
-        }
-        // Context after
-        const afterStart = hunk.start + Math.max(hunk.instanceLines.length, hunk.templateLines.length);
-        for (let i = afterStart; i < Math.min(afterStart + 2, instanceLines.length); i++) {
-            lines.push(` ${instanceLines[i]}`);
-        }
-    }
-    if (hunks.length > 10) {
-        lines.push(chalk.yellow(`  ... and ${hunks.length - 10} more hunks`));
-    }
-    return lines.join('\n');
-}
-function createConflictContent(instanceContent, templateContent) {
-    return [
-        '<<<<<<< INSTANCE',
-        instanceContent,
-        '=======',
-        templateContent,
-        '>>>>>>> TEMPLATE',
-    ].join('\n');
-}
-/**
- * Attempt a 3-way merge using git merge-file with an empty base.
- * Both instance and template are treated as "additions from nothing".
- * Identical sections pass through cleanly; differing sections produce conflicts.
- */
-function tryAutoMerge(instanceContent, templateContent) {
-    const tmpDir = fs.mkdtempSync(path.join(require('os').tmpdir(), 'gadmin-merge-'));
-    const basePath = path.join(tmpDir, 'base');
-    const oursPath = path.join(tmpDir, 'ours');
-    const theirsPath = path.join(tmpDir, 'theirs');
-    try {
-        fs.writeFileSync(basePath, '', 'utf-8');
-        fs.writeFileSync(oursPath, instanceContent, 'utf-8');
-        fs.writeFileSync(theirsPath, templateContent, 'utf-8');
-        try {
-            (0, child_process_1.execSync)(`git merge-file -L "INSTANCE" -L "BASE" -L "TEMPLATE" "${oursPath}" "${basePath}" "${theirsPath}"`, { stdio: 'pipe' });
-            const merged = fs.readFileSync(oursPath, 'utf-8');
-            return { merged, hasConflicts: false };
-        }
-        catch (err) {
-            if (err.status > 0) {
-                const merged = fs.readFileSync(oursPath, 'utf-8');
-                return { merged, hasConflicts: true };
-            }
-            return { merged: createConflictContent(instanceContent, templateContent), hasConflicts: true };
-        }
-    }
-    finally {
-        fs.rmSync(tmpDir, { recursive: true, force: true });
-    }
-}
-class TemplateAction extends abstract_action_1.AbstractAction {
-    handle(inputs, options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const subcommand = (_a = inputs.find((i) => i.name === 'subcommand')) === null || _a === void 0 ? void 0 : _a.value;
-            if (subcommand === 'diff') {
-                yield this.handleDiff(options);
-            }
-            else if (subcommand === 'update') {
-                yield this.handleUpdate(options);
-            }
-        });
-    }
-    handleDiff(options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const noContent = (_a = options.find((o) => o.name === 'no-content')) === null || _a === void 0 ? void 0 : _a.value;
-            let templateDir;
-            let excludes;
-            try {
-                const config = loadTemplateConfig();
-                templateDir = resolveTemplatePath(config.templateName);
-                excludes = config.excludes;
-            }
-            catch (err) {
-                console.error(chalk.red(err.message));
-                process.exit(1);
-            }
-            const instanceDir = process.cwd();
-            console.info(`\n${chalk.gray('Template:')} ${templateDir}`);
-            console.info(`${chalk.gray('Instance:')} ${instanceDir}\n`);
-            const templateFiles = collectFiles(templateDir, excludes);
-            const instanceFiles = collectFiles(instanceDir, excludes);
-            const templateSet = new Set(templateFiles);
-            const instanceSet = new Set(instanceFiles);
-            // Modified: both have, content differs
-            const modified = [];
-            // Only in template (would be added on update)
-            const onlyInTemplate = [];
-            // Only in instance (instance-specific)
-            const onlyInInstance = [];
-            for (const file of templateFiles) {
-                if (instanceSet.has(file)) {
-                    const tContent = fs.readFileSync(path.join(templateDir, file), 'utf-8');
-                    const iContent = fs.readFileSync(path.join(instanceDir, file), 'utf-8');
-                    if (tContent !== iContent) {
-                        modified.push(file);
-                    }
-                }
-                else {
-                    onlyInTemplate.push(file);
-                }
-            }
-            for (const file of instanceFiles) {
-                if (!templateSet.has(file)) {
-                    onlyInInstance.push(file);
-                }
-            }
-            // Summary
-            console.info(chalk.bold('═══════════════════════════════════════════════════'));
-            console.info(chalk.bold('  Template Diff Summary'));
-            console.info(chalk.bold('═══════════════════════════════════════════════════\n'));
-            if (modified.length > 0) {
-                console.info(chalk.yellow(`📝 Modified (${modified.length} files)`));
-                for (const f of modified) {
-                    console.info(`   ${f}`);
-                }
-                console.info();
-            }
-            if (onlyInTemplate.length > 0) {
-                console.info(chalk.green(`➕ Only in template (${onlyInTemplate.length} files)`));
-                for (const f of onlyInTemplate) {
-                    console.info(`   ${f}`);
-                }
-                console.info();
-            }
-            if (onlyInInstance.length > 0) {
-                console.info(chalk.cyan(`📄 Only in instance (${onlyInInstance.length} files)`));
-                for (const f of onlyInInstance) {
-                    console.info(`   ${f}`);
-                }
-                console.info();
-            }
-            if (modified.length === 0 && onlyInTemplate.length === 0 && onlyInInstance.length === 0) {
-                console.info(chalk.green('✅ No differences found. Instance matches template.\n'));
-                return;
-            }
-            // Show diff content for modified files
-            if (!noContent && modified.length > 0) {
-                console.info(chalk.bold('───────────────────────────────────────────────────'));
-                console.info(chalk.bold('  File Diffs (instance vs template)'));
-                console.info(chalk.bold('───────────────────────────────────────────────────\n'));
-                for (const file of modified) {
-                    const tContent = fs.readFileSync(path.join(templateDir, file), 'utf-8');
-                    const iContent = fs.readFileSync(path.join(instanceDir, file), 'utf-8');
-                    const diff = createUnifiedDiff(file, iContent, tContent);
-                    console.info(diff);
-                    console.info();
-                }
-            }
-        });
-    }
-    handleUpdate(options) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const dryRun = (_a = options.find((o) => o.name === 'dry-run')) === null || _a === void 0 ? void 0 : _a.value;
-            const autoYes = (_b = options.find((o) => o.name === 'yes')) === null || _b === void 0 ? void 0 : _b.value;
-            let templateDir;
-            let excludes;
-            try {
-                const config = loadTemplateConfig();
-                templateDir = resolveTemplatePath(config.templateName);
-                excludes = config.excludes;
-            }
-            catch (err) {
-                console.error(chalk.red(err.message));
-                process.exit(1);
-            }
-            const instanceDir = process.cwd();
-            console.info(`\n${chalk.gray('Template:')} ${templateDir}`);
-            console.info(`${chalk.gray('Instance:')} ${instanceDir}\n`);
-            const templateFiles = collectFiles(templateDir, excludes);
-            const instanceFiles = collectFiles(instanceDir, excludes);
-            const instanceSet = new Set(instanceFiles);
-            // Categorize changes (template → instance direction)
-            const toUpdate = []; // exists in both, content differs
-            const toAdd = []; // only in template
-            for (const file of templateFiles) {
-                if (instanceSet.has(file)) {
-                    const tContent = fs.readFileSync(path.join(templateDir, file), 'utf-8');
-                    const iContent = fs.readFileSync(path.join(instanceDir, file), 'utf-8');
-                    if (tContent !== iContent) {
-                        toUpdate.push(file);
-                    }
-                }
-                else {
-                    toAdd.push(file);
-                }
-            }
-            if (toUpdate.length === 0 && toAdd.length === 0) {
-                console.info(chalk.green('✅ Instance is up to date with template.\n'));
-                return;
-            }
-            // Summary
-            console.info(chalk.bold('═══════════════════════════════════════════════════'));
-            console.info(chalk.bold('  Template Update Summary'));
-            console.info(chalk.bold('═══════════════════════════════════════════════════\n'));
-            if (toUpdate.length > 0) {
-                console.info(chalk.yellow(`📝 To update (${toUpdate.length} files)`));
-                for (const f of toUpdate) {
-                    console.info(`   ${f}`);
-                }
-                console.info();
-            }
-            if (toAdd.length > 0) {
-                console.info(chalk.green(`➕ To add (${toAdd.length} files)`));
-                for (const f of toAdd) {
-                    console.info(`   ${f}`);
-                }
-                console.info();
-            }
-            console.info(chalk.gray('───────────────────────────────────────────────────'));
-            console.info(chalk.gray(`  Total: ${toUpdate.length} update | ${toAdd.length} add`));
-            console.info(chalk.gray('───────────────────────────────────────────────────\n'));
-            if (dryRun) {
-                console.info(chalk.gray('(dry-run mode, no changes made)\n'));
-                return;
-            }
-            // Confirm proceed
-            if (!autoYes) {
-                const { confirm } = yield inquirer.prompt([
-                    {
-                        type: 'confirm',
-                        name: 'confirm',
-                        message: 'Proceed with update?',
-                        default: false,
-                    },
-                ]);
-                if (!confirm) {
-                    console.info('Cancelled.\n');
-                    return;
-                }
-            }
-            // Process modified files — per-file strategy selection
-            let skippedCount = 0;
-            let overwrittenCount = 0;
-            let mergedCount = 0;
-            let conflictCount = 0;
-            // Track "apply to all" choice
-            let applyAll = null;
-            for (let i = 0; i < toUpdate.length; i++) {
-                const file = toUpdate[i];
-                const tContent = fs.readFileSync(path.join(templateDir, file), 'utf-8');
-                const iContent = fs.readFileSync(path.join(instanceDir, file), 'utf-8');
-                let strategy = applyAll;
-                if (!strategy && !autoYes) {
-                    // Show brief diff summary
-                    const diff = createUnifiedDiff(file, iContent, tContent);
-                    console.info(`\n${chalk.bold(`[${i + 1}/${toUpdate.length}]`)} ${chalk.yellow(file)}`);
-                    console.info(diff);
-                    console.info();
-                    const { action } = yield inquirer.prompt([
-                        {
-                            type: 'list',
-                            name: 'action',
-                            message: `How to handle ${file}?`,
-                            choices: [
-                                { name: 'Skip — keep instance as-is', value: 'skip', short: 'skip' },
-                                { name: 'Overwrite — use template version', value: 'overwrite', short: 'overwrite' },
-                                { name: 'Auto merge — attempt git merge', value: 'merge', short: 'merge' },
-                                { name: 'Conflict markers — write both versions for manual resolve', value: 'conflict', short: 'conflict' },
-                                new inquirer.Separator(),
-                                { name: 'Skip ALL remaining', value: 'skip-all', short: 'skip all' },
-                                { name: 'Overwrite ALL remaining', value: 'overwrite-all', short: 'overwrite all' },
-                                { name: 'Conflict markers ALL remaining', value: 'conflict-all', short: 'conflict all' },
-                            ],
-                        },
-                    ]);
-                    if (action.endsWith('-all')) {
-                        applyAll = action.replace('-all', '');
-                        strategy = applyAll;
-                    }
-                    else {
-                        strategy = action;
-                    }
-                }
-                else if (autoYes) {
-                    strategy = 'conflict';
-                }
-                // Execute strategy
-                const destPath = path.join(instanceDir, file);
-                switch (strategy) {
-                    case 'skip':
-                        skippedCount++;
-                        break;
-                    case 'overwrite':
-                        fs.writeFileSync(destPath, tContent, 'utf-8');
-                        overwrittenCount++;
-                        break;
-                    case 'merge': {
-                        const result = tryAutoMerge(iContent, tContent);
-                        fs.writeFileSync(destPath, result.merged, 'utf-8');
-                        if (result.hasConflicts) {
-                            conflictCount++;
-                            console.info(chalk.yellow(`   ⚠️  ${file} — merge has conflicts`));
-                        }
-                        else {
-                            mergedCount++;
-                            console.info(chalk.green(`   ✓  ${file} — merged cleanly`));
-                        }
-                        break;
-                    }
-                    case 'conflict':
-                    default:
-                        fs.writeFileSync(destPath, createConflictContent(iContent, tContent), 'utf-8');
-                        conflictCount++;
-                        break;
-                }
-            }
-            // Process new files (always add)
-            for (const file of toAdd) {
-                const destPath = path.join(instanceDir, file);
-                fs.mkdirSync(path.dirname(destPath), { recursive: true });
-                fs.copyFileSync(path.join(templateDir, file), destPath);
-            }
-            // Final summary
-            console.info(chalk.bold('\n✅ Update complete!\n'));
-            const stats = [];
-            if (overwrittenCount > 0)
-                stats.push(`${overwrittenCount} overwritten`);
-            if (mergedCount > 0)
-                stats.push(`${mergedCount} merged`);
-            if (conflictCount > 0)
-                stats.push(`${conflictCount} with conflicts`);
-            if (skippedCount > 0)
-                stats.push(`${skippedCount} skipped`);
-            if (toAdd.length > 0)
-                stats.push(`${toAdd.length} added`);
-            console.info(`   ${stats.join(' | ')}\n`);
-            if (conflictCount > 0) {
-                console.info(chalk.yellow(`⚠️  ${conflictCount} files have conflict markers. ` +
-                    `Search for "<<<<<<< INSTANCE" to resolve them.\n`));
-            }
-        });
-    }
-}
-exports.TemplateAction = TemplateAction;

package/commands/template.command.js

@@ -1,42 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemplateCommand = void 0;
-const abstract_command_1 = require("./abstract.command");
-class TemplateCommand extends abstract_command_1.AbstractCommand {
-    load(program) {
-        program
-            .command('template <subcommand>')
-            .alias('tpl')
-            .description('Compare or sync with the project template.\n\n' +
-            '  Subcommands:\n' +
-            '    diff      Show differences between instance and template\n' +
-            '    update    Pull updates from template into instance\n\n' +
-            '  Update strategies (per-file interactive prompt):\n' +
-            '    skip        Keep instance file as-is\n' +
-            '    overwrite   Replace with template version\n' +
-            '    merge       Attempt auto merge via git merge-file\n' +
-            '    conflict    Write conflict markers for manual resolve\n')
-            .option('--no-content', '[diff] Only show file list, skip inline diff content.')
-            .option('-d, --dry-run', '[update] Show what would be updated without making changes.')
-            .option('-y, --yes', '[update] Skip per-file prompt, use conflict markers for all.')
-            .action((subcommand, command) => __awaiter(this, void 0, void 0, function* () {
-            const inputs = [];
-            inputs.push({ name: 'subcommand', value: subcommand });
-            const options = [];
-            options.push({ name: 'no-content', value: !command.content });
-            options.push({ name: 'dry-run', value: !!command.dryRun });
-            options.push({ name: 'yes', value: !!command.yes });
-            yield this.action.handle(inputs, options);
-        }));
-    }
-}
-exports.TemplateCommand = TemplateCommand;