@magentrix-corp/magentrix-cli 1.3.16 → 1.3.17

package/utils/merge.js

@@ -1,22 +1,22 @@
-import * as diff3 from 'node-diff3';                   // ESM import all
-
-/**
- * Merges local and remote file contents with a common ancestor (base),
- * returning the merged result and whether there was a conflict.
- *
- * @param {string} baseContent - The last synced (common ancestor) file content.
- * @param {string} localContent - The current local file content.
- * @param {string} remoteContent - The remote/server file content.
- * @returns {{ mergedText: string, hasConflict: boolean }}
- */
-export function mergeFiles(baseContent, localContent, remoteContent) {
-    const baseLines = baseContent.split('\n');
-    const localLines = localContent.split('\n');
-    const remoteLines = remoteContent.split('\n');
-
-    const result = diff3.merge(localLines, baseLines, remoteLines);
-    const mergedText = result.result.join('\n');
-
-    // Do NOT throw. Just return the merge, which will have conflict markers if unresolved.
-    return mergedText;
-}
+import * as diff3 from 'node-diff3';                   // ESM import all
+
+/**
+ * Merges local and remote file contents with a common ancestor (base),
+ * returning the merged result and whether there was a conflict.
+ *
+ * @param {string} baseContent - The last synced (common ancestor) file content.
+ * @param {string} localContent - The current local file content.
+ * @param {string} remoteContent - The remote/server file content.
+ * @returns {{ mergedText: string, hasConflict: boolean }}
+ */
+export function mergeFiles(baseContent, localContent, remoteContent) {
+    const baseLines = baseContent.split('\n');
+    const localLines = localContent.split('\n');
+    const remoteLines = remoteContent.split('\n');
+
+    const result = diff3.merge(localLines, baseLines, remoteLines);
+    const mergedText = result.result.join('\n');
+
+    // Do NOT throw. Just return the merge, which will have conflict markers if unresolved.
+    return mergedText;
+}

package/utils/permissionError.js

@@ -1,70 +1,70 @@
-import chalk from 'chalk';
-import os from 'os';
-
-/**
- * Display a user-friendly permission error message with platform-specific guidance.
- *
- * @param {object} options - Options for the error message
- * @param {string} options.operation - What operation failed ('delete' or 'restore')
- * @param {string} options.targetPath - The path that couldn't be accessed
- * @param {string} [options.backupPath] - Optional backup path (for restore operations)
- * @param {string} [options.slug] - Optional app slug (for restore operations)
- */
-export function showPermissionError({ operation, targetPath, backupPath, slug }) {
-    const platform = os.platform();
-    const username = os.userInfo().username;
-    const group = platform === 'darwin' ? 'staff' : username;
-
-    console.log();
-    console.log(chalk.bgYellow.bold.black('  ⚠ Permission Denied  '));
-    console.log(chalk.yellow('─'.repeat(48)));
-    console.log(chalk.white(`Cannot ${operation} files due to permission issues.`));
-    console.log();
-    console.log(chalk.white('This may happen if:'));
-    console.log(chalk.gray('  • A process has the folder locked'));
-    console.log(chalk.gray('  • The folder is owned by another user (e.g., root)'));
-    if (platform === 'darwin') {
-        console.log(chalk.gray('  • macOS Gatekeeper is blocking the operation'));
-    }
-    console.log();
-    console.log(chalk.white('To fix this, try:'));
-    console.log(chalk.cyan('  1. Close any editors that have the folder open'));
-    console.log(chalk.cyan('  2. Run the command again'));
-    console.log();
-
-    // Platform-specific ownership fix
-    if (platform === 'win32') {
-        console.log(chalk.white('If the folder has wrong ownership, run as Administrator:'));
-        console.log(chalk.cyan(`  icacls "${targetPath}" /grant ${username}:F /T`));
-    } else {
-        console.log(chalk.white('If the folder has wrong ownership, run:'));
-        console.log(chalk.cyan(`  sudo chown -R ${username}:${group} "${targetPath}"`));
-    }
-    console.log();
-
-    // Operation-specific manual commands
-    if (operation === 'delete') {
-        console.log(chalk.white('Or delete manually:'));
-        if (platform === 'win32') {
-            console.log(chalk.cyan(`  rmdir /s /q "${targetPath}"`));
-        } else {
-            console.log(chalk.cyan(`  rm -rf "${targetPath}"`));
-        }
-    } else if (operation === 'restore' && backupPath && slug) {
-        console.log(chalk.white('Or manually restore:'));
-        const zipPath = `${backupPath}/${slug}.zip`;
-        const destDir = targetPath.replace(/[/\\][^/\\]+$/, ''); // Parent directory
-        if (platform === 'win32') {
-            console.log(chalk.cyan(`  tar -xf "${zipPath}" -C "${destDir}"`));
-        } else {
-            console.log(chalk.cyan(`  unzip "${zipPath}" -d "${destDir}"`));
-        }
-    }
-
-    console.log(chalk.yellow('─'.repeat(48)));
-
-    if (backupPath) {
-        console.log();
-        console.log(chalk.gray(`Backup preserved at: ${backupPath}`));
-    }
-}
+import chalk from 'chalk';
+import os from 'os';
+
+/**
+ * Display a user-friendly permission error message with platform-specific guidance.
+ *
+ * @param {object} options - Options for the error message
+ * @param {string} options.operation - What operation failed ('delete' or 'restore')
+ * @param {string} options.targetPath - The path that couldn't be accessed
+ * @param {string} [options.backupPath] - Optional backup path (for restore operations)
+ * @param {string} [options.slug] - Optional app slug (for restore operations)
+ */
+export function showPermissionError({ operation, targetPath, backupPath, slug }) {
+    const platform = os.platform();
+    const username = os.userInfo().username;
+    const group = platform === 'darwin' ? 'staff' : username;
+
+    console.log();
+    console.log(chalk.bgYellow.bold.black('  ⚠ Permission Denied  '));
+    console.log(chalk.yellow('─'.repeat(48)));
+    console.log(chalk.white(`Cannot ${operation} files due to permission issues.`));
+    console.log();
+    console.log(chalk.white('This may happen if:'));
+    console.log(chalk.gray('  • A process has the folder locked'));
+    console.log(chalk.gray('  • The folder is owned by another user (e.g., root)'));
+    if (platform === 'darwin') {
+        console.log(chalk.gray('  • macOS Gatekeeper is blocking the operation'));
+    }
+    console.log();
+    console.log(chalk.white('To fix this, try:'));
+    console.log(chalk.cyan('  1. Close any editors that have the folder open'));
+    console.log(chalk.cyan('  2. Run the command again'));
+    console.log();
+
+    // Platform-specific ownership fix
+    if (platform === 'win32') {
+        console.log(chalk.white('If the folder has wrong ownership, run as Administrator:'));
+        console.log(chalk.cyan(`  icacls "${targetPath}" /grant ${username}:F /T`));
+    } else {
+        console.log(chalk.white('If the folder has wrong ownership, run:'));
+        console.log(chalk.cyan(`  sudo chown -R ${username}:${group} "${targetPath}"`));
+    }
+    console.log();
+
+    // Operation-specific manual commands
+    if (operation === 'delete') {
+        console.log(chalk.white('Or delete manually:'));
+        if (platform === 'win32') {
+            console.log(chalk.cyan(`  rmdir /s /q "${targetPath}"`));
+        } else {
+            console.log(chalk.cyan(`  rm -rf "${targetPath}"`));
+        }
+    } else if (operation === 'restore' && backupPath && slug) {
+        console.log(chalk.white('Or manually restore:'));
+        const zipPath = `${backupPath}/${slug}.zip`;
+        const destDir = targetPath.replace(/[/\\][^/\\]+$/, ''); // Parent directory
+        if (platform === 'win32') {
+            console.log(chalk.cyan(`  tar -xf "${zipPath}" -C "${destDir}"`));
+        } else {
+            console.log(chalk.cyan(`  unzip "${zipPath}" -d "${destDir}"`));
+        }
+    }
+
+    console.log(chalk.yellow('─'.repeat(48)));
+
+    if (backupPath) {
+        console.log();
+        console.log(chalk.gray(`Backup preserved at: ${backupPath}`));
+    }
+}

package/utils/preferences.js

@@ -1,40 +1,40 @@
-import { promises as fs } from 'fs';
-import path from 'path';
-
-/**
- * Ensures that the .vscode/settings.json file exists in the project root and
- * updates it to associate `.xyz` files with C# syntax highlighting in VS Code.
- * If the file or directory doesn't exist, it will be created. Existing settings
- * are preserved and merged.
- *
- * @async
- * @function ensureVSCodeFileAssociation
- * @param {string} projectRoot - The absolute path to the project root where the `.vscode` folder resides.
- * @returns {Promise<void>} Resolves once the settings file is updated or created.
- *
- * @example
- * await ensureVSCodeFileAssociation(process.cwd());
- */
-export async function ensureVSCodeFileAssociation(projectRoot) {
-    const vscodeDir = path.join(projectRoot, '.vscode');
-    const settingsPath = path.join(vscodeDir, 'settings.json');
-
-    await fs.mkdir(vscodeDir, { recursive: true });
-
-    let settings = {};
-    try {
-        const raw = await fs.readFile(settingsPath, 'utf-8');
-        settings = JSON.parse(raw);
-    } catch (err) {
-        // Ignore error if file doesn't exist or is invalid JSON
-    }
-
-    settings['files.associations'] = {
-        ...settings['files.associations'],
-        '*.ac': 'csharp',
-        '*.trigger': 'csharp',
-        '*.ctrl': 'csharp'
-    };
-
-    await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
-}
+import { promises as fs } from 'fs';
+import path from 'path';
+
+/**
+ * Ensures that the .vscode/settings.json file exists in the project root and
+ * updates it to associate `.xyz` files with C# syntax highlighting in VS Code.
+ * If the file or directory doesn't exist, it will be created. Existing settings
+ * are preserved and merged.
+ *
+ * @async
+ * @function ensureVSCodeFileAssociation
+ * @param {string} projectRoot - The absolute path to the project root where the `.vscode` folder resides.
+ * @returns {Promise<void>} Resolves once the settings file is updated or created.
+ *
+ * @example
+ * await ensureVSCodeFileAssociation(process.cwd());
+ */
+export async function ensureVSCodeFileAssociation(projectRoot) {
+    const vscodeDir = path.join(projectRoot, '.vscode');
+    const settingsPath = path.join(vscodeDir, 'settings.json');
+
+    await fs.mkdir(vscodeDir, { recursive: true });
+
+    let settings = {};
+    try {
+        const raw = await fs.readFile(settingsPath, 'utf-8');
+        settings = JSON.parse(raw);
+    } catch (err) {
+        // Ignore error if file doesn't exist or is invalid JSON
+    }
+
+    settings['files.associations'] = {
+        ...settings['files.associations'],
+        '*.ac': 'csharp',
+        '*.trigger': 'csharp',
+        '*.ctrl': 'csharp'
+    };
+
+    await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
+}