@magentrix-corp/magentrix-cli 1.3.16 → 1.3.17

package/actions/setup.js

@@ -1,148 +1,148 @@
-import { ensureApiKey } from "../utils/cli/helpers/ensureApiKey.js";
-import { ensureInstanceUrl } from "../utils/cli/helpers/ensureInstanceUrl.js";
-import Config from "../utils/config.js";
-import { getAccessToken, tryAuthenticate } from "../utils/magentrix/api/auth.js";
-import { ensureVSCodeFileAssociation } from "../utils/preferences.js";
-import { CWD, EXPORT_ROOT, HASHED_CWD } from "../vars/global.js";
-import { select } from "@inquirer/prompts";
-import { registerWorkspace } from "../utils/workspaces.js";
-import debug from '../utils/debug.js';
-
-const config = new Config();
-
-/**
- * Runs the global setup for the Magentrix CLI.
- *
- * Prompts the user for their API key and instance URL if needed,
- * validates credentials by attempting authentication,
- * and saves them to the global config if successful.
- *
- * @async
- * @param {Object} cliOptions - CLI options passed from command flags
- * @param {string} [cliOptions.apiKey] - API key from CLI
- * @param {string} [cliOptions.instanceUrl] - Instance URL from CLI
- * @returns {Promise<{apiKey: string, instanceUrl: string}>} The saved API key and instance URL.
- * @throws {Error} If authentication fails with provided credentials.
- */
-export const setup = async (cliOptions = {}) => {
-    // Validation for CLI-provided values
-    const urlRegex = /^https:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-
-    if (cliOptions.apiKey) {
-        if (cliOptions.apiKey.trim().length < 12) {
-            throw new Error('--api-key must be at least 12 characters long');
-        }
-        if (/\s/.test(cliOptions.apiKey)) {
-            throw new Error('--api-key cannot contain spaces');
-        }
-    }
-
-    if (cliOptions.instanceUrl) {
-        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 extra path)');
-        }
-        // Update the option with the cleaned URL
-        cliOptions.instanceUrl = trimmedUrl;
-    }
-
-    // Retry loop for authentication
-    let authSuccess = false;
-    let apiKey, instanceUrl, tokenData;
-
-    debug.log('SETUP', `Starting setup (pathHash: ${HASHED_CWD}, CWD: ${CWD})`);
-    debug.log('SETUP', `CLI options provided: apiKey=${cliOptions.apiKey ? 'yes' : 'no'}, instanceUrl=${cliOptions.instanceUrl || 'no'}`);
-
-    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);
-
-        debug.log('SETUP', `Attempting authentication with instance: ${instanceUrl}`);
-
-        // Validate credentials by attempting to fetch an access token
-        try {
-            tokenData = await tryAuthenticate(apiKey, instanceUrl);
-            debug.log('SETUP', 'Authentication successful');
-            authSuccess = true;
-        } catch (error) {
-            debug.log('SETUP', `Authentication failed: ${error.message}`);
-            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
-
-    // Save values since authentication succeeded
-    debug.log('SETUP', `Saving credentials for pathHash: ${HASHED_CWD}`);
-    config.save('instanceUrl', instanceUrl, { global: true, pathHash: HASHED_CWD });
-    console.log('✅ Instance URL saved securely!');
-
-    config.save('apiKey', apiKey, { global: true, pathHash: HASHED_CWD });
-    console.log('✅ API key saved securely!');
-
-    config.save(
-        'token',
-        { value: tokenData.token, validUntil: tokenData.validUntil },
-        { global: true, pathHash: HASHED_CWD }
-    );
-
-    // Register this workspace in the global registry
-    registerWorkspace(CWD, instanceUrl);
-
-    // Set up the editor
-    await ensureVSCodeFileAssociation('./');
-
-    console.log(); // Blank line for spacing
-
-    console.log('🎉 Setup complete.');
-
-    return {
-        apiKey,
-        instanceUrl,
-        token: {
-            value: tokenData.token,
-            validUntil: tokenData.validUntil
-        }
-    }
-
-};
+import { ensureApiKey } from "../utils/cli/helpers/ensureApiKey.js";
+import { ensureInstanceUrl } from "../utils/cli/helpers/ensureInstanceUrl.js";
+import Config from "../utils/config.js";
+import { getAccessToken, tryAuthenticate } from "../utils/magentrix/api/auth.js";
+import { ensureVSCodeFileAssociation } from "../utils/preferences.js";
+import { CWD, EXPORT_ROOT, HASHED_CWD } from "../vars/global.js";
+import { select } from "@inquirer/prompts";
+import { registerWorkspace } from "../utils/workspaces.js";
+import debug from '../utils/debug.js';
+
+const config = new Config();
+
+/**
+ * Runs the global setup for the Magentrix CLI.
+ *
+ * Prompts the user for their API key and instance URL if needed,
+ * validates credentials by attempting authentication,
+ * and saves them to the global config if successful.
+ *
+ * @async
+ * @param {Object} cliOptions - CLI options passed from command flags
+ * @param {string} [cliOptions.apiKey] - API key from CLI
+ * @param {string} [cliOptions.instanceUrl] - Instance URL from CLI
+ * @returns {Promise<{apiKey: string, instanceUrl: string}>} The saved API key and instance URL.
+ * @throws {Error} If authentication fails with provided credentials.
+ */
+export const setup = async (cliOptions = {}) => {
+    // Validation for CLI-provided values
+    const urlRegex = /^https:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+
+    if (cliOptions.apiKey) {
+        if (cliOptions.apiKey.trim().length < 12) {
+            throw new Error('--api-key must be at least 12 characters long');
+        }
+        if (/\s/.test(cliOptions.apiKey)) {
+            throw new Error('--api-key cannot contain spaces');
+        }
+    }
+
+    if (cliOptions.instanceUrl) {
+        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 extra path)');
+        }
+        // Update the option with the cleaned URL
+        cliOptions.instanceUrl = trimmedUrl;
+    }
+
+    // Retry loop for authentication
+    let authSuccess = false;
+    let apiKey, instanceUrl, tokenData;
+
+    debug.log('SETUP', `Starting setup (pathHash: ${HASHED_CWD}, CWD: ${CWD})`);
+    debug.log('SETUP', `CLI options provided: apiKey=${cliOptions.apiKey ? 'yes' : 'no'}, instanceUrl=${cliOptions.instanceUrl || 'no'}`);
+
+    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);
+
+        debug.log('SETUP', `Attempting authentication with instance: ${instanceUrl}`);
+
+        // Validate credentials by attempting to fetch an access token
+        try {
+            tokenData = await tryAuthenticate(apiKey, instanceUrl);
+            debug.log('SETUP', 'Authentication successful');
+            authSuccess = true;
+        } catch (error) {
+            debug.log('SETUP', `Authentication failed: ${error.message}`);
+            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
+
+    // Save values since authentication succeeded
+    debug.log('SETUP', `Saving credentials for pathHash: ${HASHED_CWD}`);
+    config.save('instanceUrl', instanceUrl, { global: true, pathHash: HASHED_CWD });
+    console.log('✅ Instance URL saved securely!');
+
+    config.save('apiKey', apiKey, { global: true, pathHash: HASHED_CWD });
+    console.log('✅ API key saved securely!');
+
+    config.save(
+        'token',
+        { value: tokenData.token, validUntil: tokenData.validUntil },
+        { global: true, pathHash: HASHED_CWD }
+    );
+
+    // Register this workspace in the global registry
+    registerWorkspace(CWD, instanceUrl);
+
+    // Set up the editor
+    await ensureVSCodeFileAssociation('./');
+
+    console.log(); // Blank line for spacing
+
+    console.log('🎉 Setup complete.');
+
+    return {
+        apiKey,
+        instanceUrl,
+        token: {
+            value: tokenData.token,
+            validUntil: tokenData.validUntil
+        }
+    }
+
+};

package/actions/status.js

@@ -1,17 +1,17 @@
-import { showCurrentConflicts } from "../utils/cli/helpers/compare.js";
-import { ensureValidCredentials } from "../utils/cli/helpers/ensureCredentials.js";
-import { withSpinner } from "../utils/spinner.js";
-import { EXPORT_ROOT } from "../vars/global.js";
-
-export const status = async () => {
-    // Clear the terminal
-    process.stdout.write('\x1Bc');
-    
-    const credentials = await withSpinner('Authenticating...', async () => {
-        return await ensureValidCredentials();
-    });
-
-    console.log();
-
-    await showCurrentConflicts(EXPORT_ROOT, credentials.instanceUrl, credentials.token.value, true)
-};
+import { showCurrentConflicts } from "../utils/cli/helpers/compare.js";
+import { ensureValidCredentials } from "../utils/cli/helpers/ensureCredentials.js";
+import { withSpinner } from "../utils/spinner.js";
+import { EXPORT_ROOT } from "../vars/global.js";
+
+export const status = async () => {
+    // Clear the terminal
+    process.stdout.write('\x1Bc');
+    
+    const credentials = await withSpinner('Authenticating...', async () => {
+        return await ensureValidCredentials();
+    });
+
+    console.log();
+
+    await showCurrentConflicts(EXPORT_ROOT, credentials.instanceUrl, credentials.token.value, true)
+};