@memberjunction/cli 2.67.0 → 2.69.0

package/dist/commands/sync/pull.d.ts

@@ -9,7 +9,16 @@ export default class Pull extends Command {
         'multi-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'no-validate': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'update-existing': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'create-new': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'backup-before-update': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'merge-strategy': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'backup-directory': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'preserve-fields': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'exclude-fields': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'target-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
     private findEntityDirectories;
+    private findAllEntityDirectoriesRecursive;
 }

package/dist/commands/sync/pull.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -36,6 +13,10 @@ class Pull extends core_1.Command {
     static examples = [
         `<%= config.bin %> <%= command.id %> --entity="AI Prompts"`,
         `<%= config.bin %> <%= command.id %> --entity="AI Prompts" --filter="CategoryID='customer-service-id'"`,
+        `<%= config.bin %> <%= command.id %> --entity="AI Agents" --merge-strategy=overwrite`,
+        `<%= config.bin %> <%= command.id %> --entity="Actions" --target-dir=./custom-actions --no-validate`,
+        `<%= config.bin %> <%= command.id %> --entity="Templates" --dry-run --verbose`,
+        `<%= config.bin %> <%= command.id %> --entity="AI Prompts" --exclude-fields=InternalNotes,DebugInfo`,
     ];
     static flags = {
         entity: core_1.Flags.string({ description: 'Entity name to pull', required: true }),
@@ -44,10 +25,23 @@ class Pull extends core_1.Command {
         'multi-file': core_1.Flags.string({ description: 'Create a single file with multiple records (provide filename)' }),
         verbose: core_1.Flags.boolean({ char: 'v', description: 'Show detailed output' }),
         'no-validate': core_1.Flags.boolean({ description: 'Skip validation before pull' }),
+        'update-existing': core_1.Flags.boolean({ description: 'Update existing records during pull', default: true }),
+        'create-new': core_1.Flags.boolean({ description: 'Create new files for records not found locally', default: true }),
+        'backup-before-update': core_1.Flags.boolean({ description: 'Create backups before updating files', default: true }),
+        'merge-strategy': core_1.Flags.string({
+            description: 'Merge strategy for updates',
+            options: ['merge', 'overwrite', 'skip'],
+            default: 'merge'
+        }),
+        'backup-directory': core_1.Flags.string({ description: 'Custom backup directory (default: .backups)' }),
+        'preserve-fields': core_1.Flags.string({ description: 'Comma-separated list of fields to preserve during updates', multiple: true }),
+        'exclude-fields': core_1.Flags.string({ description: 'Comma-separated list of fields to exclude from pull', multiple: true }),
+        'target-dir': core_1.Flags.string({ description: 'Specific target directory (overrides auto-discovery)' })
     };
     async run() {
         const { flags } = await this.parse(Pull);
         const spinner = (0, ora_classic_1.default)();
+        let backupManager = null;
         try {
             // Load MJ config first
             spinner.start('Loading configuration');
@@ -68,12 +62,30 @@ class Pull extends core_1.Command {
             else {
                 spinner.stop();
             }
-            // Run validation unless disabled
+            // Find entity directories
+            const entityDirectories = await this.findEntityDirectories(flags.entity);
+            if (entityDirectories.length === 0) {
+                this.error(`No directories found for entity "${flags.entity}". Make sure the entity configuration exists in a .mj-sync.json file.`);
+            }
+            // Select target directory
+            let targetDir = flags['target-dir'];
+            if (!targetDir) {
+                if (entityDirectories.length === 1) {
+                    targetDir = entityDirectories[0];
+                }
+                else {
+                    targetDir = await (0, prompts_1.select)({
+                        message: `Multiple directories found for entity "${flags.entity}". Which one to use?`,
+                        choices: entityDirectories.map(dir => ({ name: dir, value: dir }))
+                    });
+                }
+            }
+            // Run validation on target directory unless disabled
             if (!flags['no-validate']) {
-                spinner.start('Validating metadata...');
+                spinner.start('Validating target directory...');
                 const validator = new metadata_sync_1.ValidationService({ verbose: flags.verbose });
                 const formatter = new metadata_sync_1.FormattingService();
-                const validationResult = await validator.validateDirectory(metadata_sync_1.configManager.getOriginalCwd());
+                const validationResult = await validator.validateDirectory(targetDir);
                 spinner.stop();
                 if (!validationResult.isValid || validationResult.warnings.length > 0) {
                     // Show validation results
@@ -97,62 +109,94 @@ class Pull extends core_1.Command {
                     this.log(chalk_1.default.green('✓ Validation passed'));
                 }
             }
-            // Set target directory if specified via environment
-            const envTargetDir = process.env.METADATA_SYNC_TARGET_DIR;
+            // Initialize backup manager if backups are enabled
+            if (flags['backup-before-update']) {
+                backupManager = new metadata_sync_1.FileBackupManager();
+                await backupManager.initialize();
+            }
             // Create pull service and execute
             const pullService = new metadata_sync_1.PullService(syncEngine, (0, metadata_sync_1.getSystemUser)());
-            try {
-                const result = await pullService.pull({
-                    entity: flags.entity,
-                    filter: flags.filter,
-                    dryRun: flags['dry-run'],
-                    multiFile: flags['multi-file'],
-                    verbose: flags.verbose,
-                    noValidate: flags['no-validate'],
-                    targetDir: envTargetDir
-                }, {
-                    onProgress: (message) => {
-                        spinner.start(message);
-                    },
-                    onSuccess: (message) => {
-                        spinner.succeed(message);
-                    },
-                    onError: (message) => {
-                        spinner.fail(message);
-                    },
-                    onWarn: (message) => {
-                        this.warn(message);
-                    },
-                    onLog: (message) => {
-                        this.log(message);
-                    }
-                });
-                if (!flags['dry-run']) {
-                    this.log(`\n✅ Pull completed successfully`);
+            // Build pull options - only include CLI flags that were explicitly provided
+            const pullOptions = {
+                entity: flags.entity,
+                targetDir,
+                dryRun: flags['dry-run'],
+                verbose: flags.verbose,
+                noValidate: flags['no-validate']
+            };
+            // Add optional flags only if explicitly provided to avoid overriding entity config
+            if (flags.filter !== undefined)
+                pullOptions.filter = flags.filter;
+            if (flags['multi-file'] !== undefined)
+                pullOptions.multiFile = flags['multi-file'];
+            if (flags['update-existing'] !== undefined)
+                pullOptions.updateExistingRecords = flags['update-existing'];
+            if (flags['create-new'] !== undefined)
+                pullOptions.createNewFileIfNotFound = flags['create-new'];
+            if (flags['backup-before-update'] !== undefined)
+                pullOptions.backupBeforeUpdate = flags['backup-before-update'];
+            if (flags['merge-strategy'] !== undefined)
+                pullOptions.mergeStrategy = flags['merge-strategy'];
+            if (flags['backup-directory'] !== undefined)
+                pullOptions.backupDirectory = flags['backup-directory'];
+            if (flags['preserve-fields'] !== undefined)
+                pullOptions.preserveFields = flags['preserve-fields'];
+            if (flags['exclude-fields'] !== undefined)
+                pullOptions.excludeFields = flags['exclude-fields'];
+            await pullService.pull(pullOptions, {
+                onProgress: (message) => {
+                    spinner.start(message);
+                },
+                onSuccess: (message) => {
+                    spinner.succeed(message);
+                },
+                onError: (message) => {
+                    spinner.fail(message);
+                },
+                onWarn: (message) => {
+                    this.warn(message);
+                },
+                onLog: (message) => {
+                    this.log(message);
+                }
+            });
+            // Clean up backups on success
+            if (backupManager && !flags['dry-run']) {
+                await backupManager.cleanup();
+                if (flags.verbose) {
+                    this.log(chalk_1.default.green('✓ Temporary backup files cleaned up'));
                 }
             }
-            catch (pullError) {
-                // If it's a "multiple directories found" error, handle it specially
-                if (pullError instanceof Error && pullError.message.includes('Multiple directories found')) {
-                    // Re-throw to be caught by outer handler
-                    throw pullError;
+            // Clean up persistent backup files created by PullService
+            if (!flags['dry-run']) {
+                try {
+                    const backupCount = pullService.getCreatedBackupFiles().length;
+                    await pullService.cleanupBackupFiles();
+                    if (flags.verbose && backupCount > 0) {
+                        this.log(chalk_1.default.green(`✓ Cleaned up ${backupCount} persistent backup files`));
+                    }
+                }
+                catch (cleanupError) {
+                    this.warn(`Failed to cleanup persistent backup files: ${cleanupError}`);
                 }
-                throw pullError;
+            }
+            if (!flags['dry-run']) {
+                this.log(`\n✅ Pull completed successfully`);
             }
         }
         catch (error) {
             spinner.fail('Pull failed');
-            // Handle multiple directories error
-            if (error instanceof Error && error.message.includes('Multiple directories found')) {
-                const entityDirs = await this.findEntityDirectories(flags.entity);
-                const targetDir = await (0, prompts_1.select)({
-                    message: `Multiple directories found for entity "${flags.entity}". Which one to use?`,
-                    choices: entityDirs.map(dir => ({ name: dir, value: dir }))
-                });
-                // Re-run with specific target directory
-                process.env.METADATA_SYNC_TARGET_DIR = targetDir;
-                await this.run();
-                return;
+            // Rollback backups on error
+            if (backupManager) {
+                try {
+                    await backupManager.rollback();
+                    if (flags.verbose) {
+                        this.log(chalk_1.default.yellow('↩️  Backup files restored'));
+                    }
+                }
+                catch (rollbackError) {
+                    this.warn(`Failed to rollback backup files: ${rollbackError}`);
+                }
             }
             // Enhanced error logging
             this.log('\n=== Pull Error Details ===');
@@ -177,9 +221,52 @@ class Pull extends core_1.Command {
         }
     }
     async findEntityDirectories(entityName) {
-        // This is a simplified version - would need full implementation
-        const { findEntityDirectories } = await Promise.resolve().then(() => __importStar(require('@memberjunction/metadata-sync')));
-        return findEntityDirectories(metadata_sync_1.configManager.getOriginalCwd());
+        try {
+            const workingDir = metadata_sync_1.configManager.getOriginalCwd();
+            // Search recursively for all directories with .mj-sync.json files
+            const allDirs = this.findAllEntityDirectoriesRecursive(workingDir);
+            // Filter directories that match the requested entity
+            const entityDirs = [];
+            for (const dir of allDirs) {
+                try {
+                    const config = await (0, metadata_sync_1.loadEntityConfig)(dir);
+                    if (config && config.entity === entityName) {
+                        entityDirs.push(dir);
+                    }
+                }
+                catch (error) {
+                    this.warn(`Skipping directory ${dir}: invalid configuration (${error})`);
+                }
+            }
+            return entityDirs;
+        }
+        catch (error) {
+            this.error(`Failed to find entity directories: ${error}`);
+        }
+    }
+    findAllEntityDirectoriesRecursive(dir) {
+        const fs = require('fs');
+        const path = require('path');
+        const directories = [];
+        try {
+            // Check if current directory has .mj-sync.json
+            const syncConfigPath = path.join(dir, '.mj-sync.json');
+            if (fs.existsSync(syncConfigPath)) {
+                directories.push(dir);
+            }
+            // Recursively search subdirectories
+            const items = fs.readdirSync(dir, { withFileTypes: true });
+            for (const item of items) {
+                if (item.isDirectory() && !item.name.startsWith('.')) {
+                    const subdirPath = path.join(dir, item.name);
+                    directories.push(...this.findAllEntityDirectoriesRecursive(subdirPath));
+                }
+            }
+        }
+        catch (error) {
+            // Skip directories we can't read
+        }
+        return directories;
     }
 }
 exports.default = Pull;

package/oclif.manifest.json

@@ -304,7 +304,11 @@
       "description": "Pull metadata from database to local files",
       "examples": [
         "<%= config.bin %> <%= command.id %> --entity=\"AI Prompts\"",
-        "<%= config.bin %> <%= command.id %> --entity=\"AI Prompts\" --filter=\"CategoryID='customer-service-id'\""
+        "<%= config.bin %> <%= command.id %> --entity=\"AI Prompts\" --filter=\"CategoryID='customer-service-id'\"",
+        "<%= config.bin %> <%= command.id %> --entity=\"AI Agents\" --merge-strategy=overwrite",
+        "<%= config.bin %> <%= command.id %> --entity=\"Actions\" --target-dir=./custom-actions --no-validate",
+        "<%= config.bin %> <%= command.id %> --entity=\"Templates\" --dry-run --verbose",
+        "<%= config.bin %> <%= command.id %> --entity=\"AI Prompts\" --exclude-fields=InternalNotes,DebugInfo"
       ],
       "flags": {
         "entity": {
@@ -347,6 +351,65 @@
           "name": "no-validate",
           "allowNo": false,
           "type": "boolean"
+        },
+        "update-existing": {
+          "description": "Update existing records during pull",
+          "name": "update-existing",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "create-new": {
+          "description": "Create new files for records not found locally",
+          "name": "create-new",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "backup-before-update": {
+          "description": "Create backups before updating files",
+          "name": "backup-before-update",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "merge-strategy": {
+          "description": "Merge strategy for updates",
+          "name": "merge-strategy",
+          "default": "merge",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "merge",
+            "overwrite",
+            "skip"
+          ],
+          "type": "option"
+        },
+        "backup-directory": {
+          "description": "Custom backup directory (default: .backups)",
+          "name": "backup-directory",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "preserve-fields": {
+          "description": "Comma-separated list of fields to preserve during updates",
+          "name": "preserve-fields",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "exclude-fields": {
+          "description": "Comma-separated list of fields to exclude from pull",
+          "name": "exclude-fields",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "target-dir": {
+          "description": "Specific target directory (overrides auto-discovery)",
+          "name": "target-dir",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -577,5 +640,5 @@
       ]
     }
   },
-  "version": "2.67.0"
+  "version": "2.69.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/cli",
-  "version": "2.67.0",
+  "version": "2.69.0",
   "description": "MemberJunction command line tools",
   "keywords": [
     "oclif"
@@ -51,9 +51,9 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^5.0.1",
-    "@memberjunction/codegen-lib": "2.67.0",
-    "@memberjunction/metadata-sync": "2.67.0",
-    "@memberjunction/sqlserver-dataprovider": "2.67.0",
+    "@memberjunction/codegen-lib": "2.69.0",
+    "@memberjunction/metadata-sync": "2.69.0",
+    "@memberjunction/sqlserver-dataprovider": "2.69.0",
     "@oclif/core": "^3",
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-version": "^2.0.17",