@magentrix-corp/magentrix-cli 1.2.0 → 1.2.1

package/actions/setup.js

@@ -4,6 +4,7 @@ import Config from "../utils/config.js";
 import { getAccessToken, tryAuthenticate } from "../utils/magentrix/api/auth.js";
 import { ensureVSCodeFileAssociation } from "../utils/preferences.js";
 import { EXPORT_ROOT, HASHED_CWD } from "../vars/global.js";
+import { select } from "@inquirer/prompts";
 
 const config = new Config();
 
@@ -35,24 +36,70 @@ export const setup = async (cliOptions = {}) => {
     }
 
     if (cliOptions.instanceUrl) {
-        const trimmedUrl = cliOptions.instanceUrl.trim();
+        let trimmedUrl = cliOptions.instanceUrl.trim();
+        // Automatically strip trailing slashes
+        trimmedUrl = trimmedUrl.replace(/\/+$/, '');
+
         if (!urlRegex.test(trimmedUrl)) {
-            throw new Error('--instance-url must be in the form: https://subdomain.domain.com (NO http, NO trailing /, NO extra path)');
+            throw new Error('--instance-url must be in the form: https://subdomain.domain.com (no http, no extra path)');
         }
+        // Update the option with the cleaned URL
+        cliOptions.instanceUrl = trimmedUrl;
     }
 
-    // Get API key (from CLI or prompt)
-    const apiKey = cliOptions.apiKey
-        ? cliOptions.apiKey.trim()
-        : await ensureApiKey(true);
-
-    // Get instance URL (from CLI or prompt)
-    const instanceUrl = cliOptions.instanceUrl
-        ? cliOptions.instanceUrl.trim()
-        : await ensureInstanceUrl(true);
-
-    // Validate credentials by attempting to fetch an access token
-    const tokenData = await tryAuthenticate(apiKey, instanceUrl);
+    // Retry loop for authentication
+    let authSuccess = false;
+    let apiKey, instanceUrl, tokenData;
+
+    while (!authSuccess) {
+        // Get API key (from CLI or prompt)
+        apiKey = cliOptions.apiKey
+            ? cliOptions.apiKey.trim()
+            : await ensureApiKey(true);
+
+        // Get instance URL (from CLI or prompt)
+        instanceUrl = cliOptions.instanceUrl
+            ? cliOptions.instanceUrl.trim()
+            : await ensureInstanceUrl(true);
+
+        // Validate credentials by attempting to fetch an access token
+        try {
+            tokenData = await tryAuthenticate(apiKey, instanceUrl);
+            authSuccess = true;
+        } catch (error) {
+            console.log(error.message);
+            console.log();
+
+            // Ask user if they want to retry
+            try {
+                const retry = await select({
+                    message: 'What would you like to do?',
+                    choices: [
+                        { name: 'Try again', value: 'retry' },
+                        { name: 'Exit setup', value: 'exit' }
+                    ],
+                    default: 'retry'
+                });
+
+                if (retry !== 'retry') {
+                    console.log('❌ Setup cancelled.');
+                    process.exit(0);
+                }
+
+                // Reset CLI options so user can re-enter them
+                cliOptions.apiKey = null;
+                cliOptions.instanceUrl = null;
+                console.log(); // Blank line for spacing
+            } catch (error) {
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.log('\n❌ Setup cancelled.');
+                    process.exit(0);
+                }
+                throw error;
+            }
+        }
+    }
 
     console.log(); // Blank line for spacing
 
@@ -69,7 +116,7 @@ export const setup = async (cliOptions = {}) => {
         { global: true, pathHash: HASHED_CWD }
     );
 
-    // Set up the editor 
+    // Set up the editor
     await ensureVSCodeFileAssociation('./');
 
     console.log(); // Blank line for spacing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magentrix-corp/magentrix-cli",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "CLI tool for synchronizing local files with Magentrix cloud platform",
   "main": "index.js",
   "type": "module",

package/utils/cli/helpers/ensureApiKey.js

@@ -1,4 +1,4 @@
-import prompts from "prompts";
+import { password } from "@inquirer/prompts";
 import Config from "../../config.js";
 import { HASHED_CWD } from "../../../vars/global.js";
 
@@ -27,27 +27,33 @@ export const ensureApiKey = async (forcePrompt = false) => {
         console.log('\n🚀 Magentrix CLI Setup:');
 
         while (true) {
-            const response = await prompts({
-                type: 'password',
-                name: 'apiKey',
-                message: 'Enter your Magentrix API key (no spaces):',
-                validate: value =>
-                    !value || value.trim().length < 12
-                        ? "API key must be at least 12 characters."
-                        : /\s/.test(value)
-                            ? "API key cannot contain any spaces."
-                            : true,
-            });
-
-            if (!response.apiKey) {
-                console.error('❌ API key is required. Exiting.');
-                process.exit(1);
-            }
-
-            const trimmed = response.apiKey.trim();
-
-            if (isValid(trimmed)) {
-                return trimmed;
+            try {
+                const apiKeyInput = await password({
+                    message: 'Enter your Magentrix API key (no spaces):',
+                    mask: '*',
+                    validate: (value) => {
+                        if (!value || value.trim().length < 12) {
+                            return "API key must be at least 12 characters.";
+                        }
+                        if (/\s/.test(value)) {
+                            return "API key cannot contain any spaces.";
+                        }
+                        return true;
+                    }
+                });
+
+                const trimmed = apiKeyInput.trim();
+
+                if (isValid(trimmed)) {
+                    return trimmed;
+                }
+            } catch (error) {
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.error('\n❌ API key is required. Exiting.');
+                    process.exit(1);
+                }
+                throw error;
             }
             // Invalid: will re-prompt.
         }

package/utils/cli/helpers/ensureInstanceUrl.js

@@ -1,4 +1,4 @@
-import prompts from "prompts";
+import { input } from "@inquirer/prompts";
 import Config from "../../config.js";
 import { checkInstanceUrl } from "../checkInstanceUrl.js";
 import { withSpinner } from "../../spinner.js";
@@ -27,37 +27,45 @@ export const ensureInstanceUrl = async (forcePrompt = false) => {
         console.log('\n🚀 Magentrix CLI Setup: Instance URL');
 
         while (true) {
-            // Prompt: Only validate format, NOT reachability
-            const { instanceUrl: inputUrl } = await prompts({
-                type: 'text',
-                name: 'instanceUrl',
-                message: 'Enter your Magentrix instance URL (e.g., https://example.magentrix.com):',
-                validate: value =>
-                    urlRegex.test(value.trim())
-                        ? true
-                        : 'Instance URL must be in the form: https://subdomain.domain.com (NO http, NO trailing /, NO extra path)',
-            });
-
-            if (!inputUrl) {
-                console.error('❌ Instance URL is required. Exiting.');
-                process.exit(1);
-            }
+            try {
+                // Prompt: Only validate format, NOT reachability
+                const inputUrl = await input({
+                    message: 'Enter your Magentrix instance URL (e.g., https://example.magentrix.com):',
+                    validate: (value) => {
+                        // Automatically strip trailing slashes for validation
+                        const cleaned = value.trim().replace(/\/+$/, '');
+                        if (!urlRegex.test(cleaned)) {
+                            return 'Instance URL must be in the form: https://subdomain.domain.com (no http, no extra path)';
+                        }
+                        return true;
+                    }
+                });
 
-            const trimmed = inputUrl.trim();
+                // Trim and automatically strip trailing slashes
+                const trimmed = inputUrl.trim().replace(/\/+$/, '');
 
-            // Now check reachability WITH a spinner
-            try {
-                await withSpinner('Checking instance URL...', () =>
-                    checkInstanceUrl(trimmed)
-                );
-                
-                return trimmed;
+                // Now check reachability WITH a spinner
+                try {
+                    await withSpinner('Checking instance URL...', () =>
+                        checkInstanceUrl(trimmed)
+                    );
+
+                    return trimmed;
+                } catch (error) {
+                    // Print error AFTER spinner, then re-prompt
+                    console.error('❌ Instance URL not reachable. Try again.');
+                }
             } catch (error) {
-                // Print error AFTER spinner, then re-prompt
-                console.error('❌ Instance URL not reachable. Try again.');
+                // Handle Ctrl+C or other cancellation
+                if (error.name === 'ExitPromptError') {
+                    console.error('\n❌ Instance URL is required. Exiting.');
+                    process.exit(1);
+                }
+                throw error;
             }
         }
     }
 
-    return instanceUrl.trim();
+    // Trim and automatically strip trailing slashes from existing URL
+    return instanceUrl.trim().replace(/\/+$/, '');
 };

package/utils/cli/writeRecords.js

@@ -39,7 +39,18 @@ export const mapRecordToFile = (record) => {
         ? path.join(mapping.directory, foundPathByRecordId.split(mapping.directory)[1] || "")
         : "";
 
-    const filePath = foundPathByRecordId ? relativeFoundPath : path.join(mapping.directory, filename);
+    // Fix for Bug 1: If the file exists but the name doesn't match the record name, 
+    // we should treat it as a rename and use the new name.
+    let useExistingPath = false;
+    if (foundPathByRecordId) {
+        const existingName = path.basename(foundPathByRecordId);
+        // Check if existing name matches the expected filename (ignoring extension case if needed, but strict for now)
+        if (existingName === filename) {
+            useExistingPath = true;
+        }
+    }
+
+    const filePath = useExistingPath ? relativeFoundPath : path.join(mapping.directory, filename);
 
     return {
         ...record,
@@ -198,7 +209,7 @@ export const writeRecords = async (records, resolutionMethod, progress = null, l
             try {
                 // Lookup a matching file dir in our cache, in case the file was renamed
                 const cachedFilePath = findFileByTag(record.Id) || path.resolve(filePath);
-                
+
                 // Ensure the directory exists (paranoia for deeply nested files)
                 fs.mkdirSync(path.dirname(cachedFilePath), { recursive: true });
                 fs.writeFileSync(cachedFilePath, finalContent, "utf8");

package/utils/config.js

@@ -200,6 +200,82 @@ class Config {
         }
     }
 
+    /**
+     * Remove multiple keys from config (global or project) in a single save operation.
+     * 
+     * @param {string[]} keys - Array of keys to remove.
+     * @param {Object} opts
+     * @param {boolean} opts.global - If true, use global config. Otherwise, use project config.
+     * @param {string} [opts.pathHash] - Optional. Hash for namespaced global config.
+     * @param {string} [opts.filename] - Optional. Custom filename for project config.
+     */
+    removeKeys(keys, opts = {}) {
+        const isGlobal = opts.global === true;
+        const filename = opts.filename;
+        const pathHash = opts.pathHash;
+
+        if (!Array.isArray(keys) || keys.length === 0) return;
+
+        if (isGlobal) {
+            if (this._globalConfig === null) this._globalConfig = this._loadConfig('global');
+
+            let changed = false;
+            if (pathHash) {
+                if (!this._globalConfig[pathHash]) return;
+                for (const key of keys) {
+                    if (key in this._globalConfig[pathHash]) {
+                        delete this._globalConfig[pathHash][key];
+                        changed = true;
+                    }
+                }
+            } else {
+                for (const key of keys) {
+                    if (key in this._globalConfig) {
+                        delete this._globalConfig[key];
+                        changed = true;
+                    }
+                }
+            }
+
+            if (changed) {
+                this._saveConfig(this._globalConfig, 'global');
+            }
+        } else {
+            if (filename) {
+                const projectFolderPath = path.join(this.projectDir, this.projectFolder);
+                if (!fs.existsSync(projectFolderPath)) return;
+                const customPath = path.join(projectFolderPath, filename);
+                const customConfig = this._loadConfig('project', customPath) || {};
+                
+                let changed = false;
+                for (const key of keys) {
+                    if (key in customConfig) {
+                        delete customConfig[key];
+                        changed = true;
+                    }
+                }
+
+                if (changed) {
+                    this._saveConfig(customConfig, 'project', customPath);
+                }
+            } else {
+                if (this._projectConfig === null) this._projectConfig = this._loadConfig('project');
+                
+                let changed = false;
+                for (const key of keys) {
+                    if (key in this._projectConfig) {
+                        delete this._projectConfig[key];
+                        changed = true;
+                    }
+                }
+
+                if (changed) {
+                    this._saveConfig(this._projectConfig, 'project');
+                }
+            }
+        }
+    }
+
 
     /**
      * Save a key-value pair to config (global or project).

package/utils/magentrix/api/auth.js

@@ -1,4 +1,5 @@
 import { fetchMagentrix } from "../fetch.js";
+import chalk from "chalk";
 
 /**
  * Authenticates with Magentrix and retrieves an access token using the API key as a refresh token.
@@ -45,12 +46,50 @@ export const tryAuthenticate = async (apiKey, instanceUrl) => {
     try {
         return await getAccessToken(apiKey, instanceUrl);
     } catch (error) {
-        throw new Error(
-            `❌ Failed to authenticate with Magentrix:\n` +
-            `The API key and/or instance URL you provided are incorrect or do not match.\n` +
-            `Please double-check both values and try again.\n\n` +
-            `Details: ${error.message || error}`
-        );
+        const errorMessage = error.message || String(error);
+
+        // Build formatted error message with colors and spacing
+        let formattedMessage = '\n' + chalk.red.bold('✖ Authentication Failed') + '\n';
+        formattedMessage += chalk.dim('─'.repeat(50)) + '\n\n';
+
+        if (errorMessage.includes('Network error')) {
+            formattedMessage += chalk.cyan.bold('🌐 Unable to reach the Magentrix instance') + '\n\n';
+            formattedMessage += chalk.yellow('  Possible causes:') + '\n';
+            formattedMessage += chalk.gray('  • Check your internet connection') + '\n';
+            formattedMessage += chalk.gray('  • Verify the instance URL is correct') + '\n';
+            formattedMessage += chalk.gray('  • Ensure the server is online and accessible') + '\n';
+        } else if (errorMessage.includes('HTTP 401') || errorMessage.includes('HTTP 403') || errorMessage.includes('Unauthorized')) {
+            formattedMessage += chalk.cyan.bold('🔑 Invalid API Key') + '\n\n';
+            formattedMessage += chalk.yellow('  What to do:') + '\n';
+            formattedMessage += chalk.gray('  • The API key you entered is incorrect') + '\n';
+            formattedMessage += chalk.gray('  • Verify your API key from the Magentrix admin panel') + '\n';
+        } else if (errorMessage.includes('HTTP 404')) {
+            formattedMessage += chalk.cyan.bold('🔍 Invalid Magentrix Instance URL') + '\n\n';
+            formattedMessage += chalk.yellow('  What to do:') + '\n';
+            formattedMessage += chalk.gray('  • The URL does not appear to be a valid Magentrix server') + '\n';
+            formattedMessage += chalk.gray('  • Verify the URL matches your Magentrix instance') + '\n';
+        } else if (errorMessage.includes('HTTP 5')) {
+            formattedMessage += chalk.cyan.bold('⚠️  Magentrix Server Error') + '\n\n';
+            formattedMessage += chalk.yellow('  What to do:') + '\n';
+            formattedMessage += chalk.gray('  • The server is experiencing issues') + '\n';
+            formattedMessage += chalk.gray('  • Please try again in a few moments') + '\n';
+            formattedMessage += chalk.gray('  • Contact support if the issue persists') + '\n';
+        } else if (errorMessage.includes('timeout') || errorMessage.includes('ETIMEDOUT')) {
+            formattedMessage += chalk.cyan.bold('⏱️  Connection Timeout') + '\n\n';
+            formattedMessage += chalk.yellow('  What to do:') + '\n';
+            formattedMessage += chalk.gray('  • The server took too long to respond') + '\n';
+            formattedMessage += chalk.gray('  • Check your internet connection') + '\n';
+            formattedMessage += chalk.gray('  • Try again in a moment') + '\n';
+        } else {
+            formattedMessage += chalk.cyan.bold('❓ Unable to Authenticate') + '\n\n';
+            formattedMessage += chalk.yellow('  What to do:') + '\n';
+            formattedMessage += chalk.gray('  • Verify both your API key and instance URL are correct') + '\n';
+            formattedMessage += chalk.gray('  • Ensure the API key matches the instance URL') + '\n';
+        }
+
+        formattedMessage += '\n' + chalk.dim('─'.repeat(50)) + '\n';
+
+        throw new Error(formattedMessage);
     }
 };
 

package/utils/updateFileBase.js

@@ -107,3 +107,7 @@ export const updateBase = (filePath, record, actualPath = '', contentSnapshot =
 export const removeFromBase = (recordId) => {
     config.removeKey(recordId, { filename: "base.json" });
 }
+
+export const removeFromBaseBulk = (recordIds) => {
+    config.removeKeys(recordIds, { filename: "base.json" });
+}