@magentrix-corp/magentrix-cli 1.3.16 → 1.3.17

package/utils/spinner.js

@@ -1,43 +1,43 @@
-export async function withSpinner(message, fn, config = { showCompletion: true }) {
-    const spinnerChars = ['|', '/', '-', '\\'];
-    let i = 0;
-    let spinnerActive = true;
-    let spinner;
-
-    // Patch both log and error for full coverage
-    const originalLog = console.log;
-    const originalError = console.error;
-    function clearSpinnerLine() {
-        process.stdout.write('\r' + ' '.repeat(message.length + 8) + '\r');
-        if (spinnerActive) {
-            clearInterval(spinner);
-            spinnerActive = false;
-        }
-    }
-    console.log = (...args) => { clearSpinnerLine(); originalLog(...args); };
-    console.error = (...args) => { clearSpinnerLine(); originalError(...args); };
-
-    process.stdout.write(`${message} `);
-
-    spinner = setInterval(() => {
-        process.stdout.write(`\r${message} ${spinnerChars[i++ % spinnerChars.length]}`);
-    }, 80);
-
-    try {
-        const result = await fn();
-        const treatAsError = result?.hasErrors;
-        spinnerActive = false;
-        clearInterval(spinner);
-        if (config?.showCompletion) process.stdout.write(`\r${message} ${treatAsError ? '❌' : '✅'}\n`);
-        return result;
-    } catch (err) {
-        spinnerActive = false;
-        clearInterval(spinner);
-        if (config?.showCompletion) process.stdout.write(`\r${message} ❌\n`);
-        throw err;
-    } finally {
-        // Restore logs always
-        console.log = originalLog;
-        console.error = originalError;
-    }
-}
+export async function withSpinner(message, fn, config = { showCompletion: true }) {
+    const spinnerChars = ['|', '/', '-', '\\'];
+    let i = 0;
+    let spinnerActive = true;
+    let spinner;
+
+    // Patch both log and error for full coverage
+    const originalLog = console.log;
+    const originalError = console.error;
+    function clearSpinnerLine() {
+        process.stdout.write('\r' + ' '.repeat(message.length + 8) + '\r');
+        if (spinnerActive) {
+            clearInterval(spinner);
+            spinnerActive = false;
+        }
+    }
+    console.log = (...args) => { clearSpinnerLine(); originalLog(...args); };
+    console.error = (...args) => { clearSpinnerLine(); originalError(...args); };
+
+    process.stdout.write(`${message} `);
+
+    spinner = setInterval(() => {
+        process.stdout.write(`\r${message} ${spinnerChars[i++ % spinnerChars.length]}`);
+    }, 80);
+
+    try {
+        const result = await fn();
+        const treatAsError = result?.hasErrors;
+        spinnerActive = false;
+        clearInterval(spinner);
+        if (config?.showCompletion) process.stdout.write(`\r${message} ${treatAsError ? '❌' : '✅'}\n`);
+        return result;
+    } catch (err) {
+        spinnerActive = false;
+        clearInterval(spinner);
+        if (config?.showCompletion) process.stdout.write(`\r${message} ❌\n`);
+        throw err;
+    } finally {
+        // Restore logs always
+        console.log = originalLog;
+        console.error = originalError;
+    }
+}

package/utils/template.js

@@ -1,52 +1,52 @@
-/**
- * Returns the default template for an ActiveClass Controller.
- * @param {string} className
- * @returns {string}
- */
-export const getControllerTemplate = (className) => `
-public class ${className} : AspxController {
-    public override ActionResponse Index()
-    {
-        return View();
-    }
-}
-`.trim();
-
-/**
- * Returns the default template for an ActiveClass Trigger.
- * @param {string} className - For instance ContactTrigger
- * @param {string} entityName - For instance Force__Contact
- * @returns {string}
- */
-export const getTriggerTemplate = (className, entityName = '<ENTITYNAME>') => `
-public class ${className} : ActiveTrigger<${entityName}>
-{
-    public override void Execute(TransactionContext<${entityName}> trigger) {
-                 
-    }
-}
-`.trim();
-
-/**
- * Returns the default template for a general ActiveClass.
- * @param {string} className
- * @returns {string}
- */
-export const getClassTemplate = (className) => `
-public class ${className} {
-    
-}
-`.trim();
-
-/**
- * Returns the default template for an Active Page.
- * @param {string} pageName
- * @param {string} pageLabel
- * @returns {string}
- */
-export const getPageTemplate = (pageName, pageLabel) => `
-<aspx:AspxPage runat="server" Id="${pageName}" title="${pageLabel}">
-<body>
-</body>
-</aspx:AspxPage>
-`.trim();
+/**
+ * Returns the default template for an ActiveClass Controller.
+ * @param {string} className
+ * @returns {string}
+ */
+export const getControllerTemplate = (className) => `
+public class ${className} : AspxController {
+    public override ActionResponse Index()
+    {
+        return View();
+    }
+}
+`.trim();
+
+/**
+ * Returns the default template for an ActiveClass Trigger.
+ * @param {string} className - For instance ContactTrigger
+ * @param {string} entityName - For instance Force__Contact
+ * @returns {string}
+ */
+export const getTriggerTemplate = (className, entityName = '<ENTITYNAME>') => `
+public class ${className} : ActiveTrigger<${entityName}>
+{
+    public override void Execute(TransactionContext<${entityName}> trigger) {
+                 
+    }
+}
+`.trim();
+
+/**
+ * Returns the default template for a general ActiveClass.
+ * @param {string} className
+ * @returns {string}
+ */
+export const getClassTemplate = (className) => `
+public class ${className} {
+    
+}
+`.trim();
+
+/**
+ * Returns the default template for an Active Page.
+ * @param {string} pageName
+ * @param {string} pageLabel
+ * @returns {string}
+ */
+export const getPageTemplate = (pageName, pageLabel) => `
+<aspx:AspxPage runat="server" Id="${pageName}" title="${pageLabel}">
+<body>
+</body>
+</aspx:AspxPage>
+`.trim();

package/utils/updateFileBase.js

@@ -1,121 +1,121 @@
-import { EXPORT_ROOT } from "../vars/global.js";
-import fs from "fs";
-import path from "path";
-import { sha256 } from "./hash.js";
-import Config from "./config.js";
-import { compressString } from "./compress.js";
-
-const config = new Config();
-
-/**
- * Recursively collects all file paths under a directory, returning relative paths from base.
- *
- * @param {string} dirPath - Absolute or relative path to the root directory to scan.
- * @param {string} [basePath=''] - Internal use. The base path for recursion, relative to dirPath.
- * @returns {string[]} Array of relative file paths found under dirPath.
- */
-export function getAllFiles(dirPath, basePath = "") {
-    let results = [];
-    const fullDirPath = path.join(dirPath, basePath);
-    const entries = fs.readdirSync(fullDirPath, { withFileTypes: true });
-
-    for (const entry of entries) {
-        const relPath = path.join(basePath, entry.name);
-        const entryPath = path.join(dirPath, relPath);
-
-        if (entry.isDirectory()) {
-            // Recurse into subdirectory
-            results = results.concat(getAllFiles(dirPath, relPath));
-        } else if (entry.isFile()) {
-            // Add file's relative path to results
-            results.push(relPath);
-        }
-    }
-    return results;
-}
-
-/**
- * Updates (or creates) the base sync state for a specific file.
- *
- * Saves the current file's lastModified time, content hash, and contents
- * to base.json using config.save(), under the key of the file's relative path.
- *
- * This should be called only when the local and remote file are confirmed to be in sync
- * (i.e., after a successful pull, push, or conflict resolution).
- *
- * @param {string} filePath - The expected path to the file (relative to project root or EXPORT_ROOT).
- * @param {object} record - The Magentrix record
- * @param {string} actualPath - Should only be provided if the file has been renamed and the base has not been updated
- * @param {object} contentSnapshot - Optional { content, hash } snapshot of what was actually published (prevents race conditions)
- */
-export const updateBase = (filePath, record, actualPath = '', contentSnapshot = null) => {
-    // This is the true location of the file
-    const fileSystemLocation = actualPath || path.resolve(filePath);
-
-    if (!fs.existsSync(fileSystemLocation)) {
-        // Silently skip files that don't exist - they may have failed to download
-        // This is expected behavior for files that returned 404 during download
-        return;
-    }
-
-    // Get file stats for mtime
-    const fileStats = fs.statSync(fileSystemLocation);
-    const isDirectory = fileStats.isDirectory();
-
-    // Use snapshot if provided (to avoid race conditions), otherwise read from disk
-    let fileContent, contentHash;
-    if (isDirectory) {
-        // Folders don't have content - use provided contentHash if any (e.g., for Iris apps)
-        fileContent = '';
-        contentHash = record.contentHash || '';
-    } else if (contentSnapshot && contentSnapshot.content) {
-        // Use the snapshot of what was actually published
-        fileContent = contentSnapshot.content;
-        contentHash = contentSnapshot.hash;
-    } else {
-        // Read from disk (normal behavior)
-        fileContent = fs.readFileSync(fileSystemLocation, "utf-8");
-        contentHash = sha256(fileContent);
-    }
-
-    // Save sync metadata and content to base.json via config manager.
-    // - key: the relative path to the file
-    // - value: lastModified, contentHash, and full content
-    // - options: ensure writing to base.json
-    const saveData = {
-        lastModified: fileStats.mtimeMs,
-        contentHash,
-        compressedContent: isDirectory ? '' : compressString(fileContent),
-        recordId: record.Id,
-        type: record.Type,
-        filePath,
-        lastKnownActualPath: fileSystemLocation,
-        lastKnownPath: path.resolve(filePath)
-    };
-
-    // Preserve custom fields from record (e.g., for Iris apps: folderName, appName, modifiedOn)
-    const customFields = ['folderName', 'appName', 'modifiedOn', 'uploadedOn', 'size'];
-    for (const field of customFields) {
-        if (record[field] !== undefined) {
-            saveData[field] = record[field];
-        }
-    }
-
-    if (saveData.type === 'File' || saveData.type === 'Folder') delete saveData.compressedContent;
-
-    config.save(
-        record.Id,
-        saveData,
-        {
-            filename: "base.json"
-        }
-    );
-};
-
-export const removeFromBase = (recordId) => {
-    config.removeKey(recordId, { filename: "base.json" });
-}
-
-export const removeFromBaseBulk = (recordIds) => {
-    config.removeKeys(recordIds, { filename: "base.json" });
-}
+import { EXPORT_ROOT } from "../vars/global.js";
+import fs from "fs";
+import path from "path";
+import { sha256 } from "./hash.js";
+import Config from "./config.js";
+import { compressString } from "./compress.js";
+
+const config = new Config();
+
+/**
+ * Recursively collects all file paths under a directory, returning relative paths from base.
+ *
+ * @param {string} dirPath - Absolute or relative path to the root directory to scan.
+ * @param {string} [basePath=''] - Internal use. The base path for recursion, relative to dirPath.
+ * @returns {string[]} Array of relative file paths found under dirPath.
+ */
+export function getAllFiles(dirPath, basePath = "") {
+    let results = [];
+    const fullDirPath = path.join(dirPath, basePath);
+    const entries = fs.readdirSync(fullDirPath, { withFileTypes: true });
+
+    for (const entry of entries) {
+        const relPath = path.join(basePath, entry.name);
+        const entryPath = path.join(dirPath, relPath);
+
+        if (entry.isDirectory()) {
+            // Recurse into subdirectory
+            results = results.concat(getAllFiles(dirPath, relPath));
+        } else if (entry.isFile()) {
+            // Add file's relative path to results
+            results.push(relPath);
+        }
+    }
+    return results;
+}
+
+/**
+ * Updates (or creates) the base sync state for a specific file.
+ *
+ * Saves the current file's lastModified time, content hash, and contents
+ * to base.json using config.save(), under the key of the file's relative path.
+ *
+ * This should be called only when the local and remote file are confirmed to be in sync
+ * (i.e., after a successful pull, push, or conflict resolution).
+ *
+ * @param {string} filePath - The expected path to the file (relative to project root or EXPORT_ROOT).
+ * @param {object} record - The Magentrix record
+ * @param {string} actualPath - Should only be provided if the file has been renamed and the base has not been updated
+ * @param {object} contentSnapshot - Optional { content, hash } snapshot of what was actually published (prevents race conditions)
+ */
+export const updateBase = (filePath, record, actualPath = '', contentSnapshot = null) => {
+    // This is the true location of the file
+    const fileSystemLocation = actualPath || path.resolve(filePath);
+
+    if (!fs.existsSync(fileSystemLocation)) {
+        // Silently skip files that don't exist - they may have failed to download
+        // This is expected behavior for files that returned 404 during download
+        return;
+    }
+
+    // Get file stats for mtime
+    const fileStats = fs.statSync(fileSystemLocation);
+    const isDirectory = fileStats.isDirectory();
+
+    // Use snapshot if provided (to avoid race conditions), otherwise read from disk
+    let fileContent, contentHash;
+    if (isDirectory) {
+        // Folders don't have content - use provided contentHash if any (e.g., for Iris apps)
+        fileContent = '';
+        contentHash = record.contentHash || '';
+    } else if (contentSnapshot && contentSnapshot.content) {
+        // Use the snapshot of what was actually published
+        fileContent = contentSnapshot.content;
+        contentHash = contentSnapshot.hash;
+    } else {
+        // Read from disk (normal behavior)
+        fileContent = fs.readFileSync(fileSystemLocation, "utf-8");
+        contentHash = sha256(fileContent);
+    }
+
+    // Save sync metadata and content to base.json via config manager.
+    // - key: the relative path to the file
+    // - value: lastModified, contentHash, and full content
+    // - options: ensure writing to base.json
+    const saveData = {
+        lastModified: fileStats.mtimeMs,
+        contentHash,
+        compressedContent: isDirectory ? '' : compressString(fileContent),
+        recordId: record.Id,
+        type: record.Type,
+        filePath,
+        lastKnownActualPath: fileSystemLocation,
+        lastKnownPath: path.resolve(filePath)
+    };
+
+    // Preserve custom fields from record (e.g., for Iris apps: folderName, appName, modifiedOn)
+    const customFields = ['folderName', 'appName', 'modifiedOn', 'uploadedOn', 'size'];
+    for (const field of customFields) {
+        if (record[field] !== undefined) {
+            saveData[field] = record[field];
+        }
+    }
+
+    if (saveData.type === 'File' || saveData.type === 'Folder') delete saveData.compressedContent;
+
+    config.save(
+        record.Id,
+        saveData,
+        {
+            filename: "base.json"
+        }
+    );
+};
+
+export const removeFromBase = (recordId) => {
+    config.removeKey(recordId, { filename: "base.json" });
+}
+
+export const removeFromBaseBulk = (recordIds) => {
+    config.removeKeys(recordIds, { filename: "base.json" });
+}

package/utils/workspaces.js

@@ -1,108 +1,108 @@
-import { existsSync } from 'node:fs';
-import { join } from 'node:path';
-import Config from './config.js';
-
-const config = new Config();
-
-/**
- * Register a workspace in the global registry.
- * This stores the workspace path so it can be discovered later.
- *
- * @param {string} workspacePath - Full path to the workspace
- * @param {string} instanceUrl - The Magentrix instance URL for this workspace
- */
-export function registerWorkspace(workspacePath, instanceUrl) {
-    const workspaces = config.read('workspaces', { global: true }) || [];
-
-    // Check if already registered
-    const existingIndex = workspaces.findIndex(w => w.path === workspacePath);
-
-    if (existingIndex >= 0) {
-        // Update existing entry
-        workspaces[existingIndex] = {
-            path: workspacePath,
-            instanceUrl,
-            lastUsed: new Date().toISOString()
-        };
-    } else {
-        // Add new entry
-        workspaces.push({
-            path: workspacePath,
-            instanceUrl,
-            lastUsed: new Date().toISOString()
-        });
-    }
-
-    config.save('workspaces', workspaces, { global: true });
-}
-
-/**
- * Get all registered workspaces from the global registry.
- * Validates that each workspace still exists on disk.
- *
- * @returns {Array<{path: string, instanceUrl: string, lastUsed: string, valid: boolean}>}
- */
-export function getRegisteredWorkspaces() {
-    const workspaces = config.read('workspaces', { global: true }) || [];
-
-    return workspaces.map(workspace => {
-        // Check if the workspace still exists and is valid
-        const magentrixFolder = join(workspace.path, '.magentrix');
-        const srcFolder = join(workspace.path, 'src');
-
-        const valid = existsSync(magentrixFolder) && existsSync(srcFolder);
-
-        return {
-            ...workspace,
-            valid
-        };
-    });
-}
-
-/**
- * Get all valid registered workspaces (those that still exist on disk).
- *
- * @returns {Array<{path: string, instanceUrl: string, lastUsed: string, valid: boolean}>}
- */
-export function getValidWorkspaces() {
-    return getRegisteredWorkspaces().filter(w => w.valid);
-}
-
-/**
- * Remove a workspace from the global registry.
- *
- * @param {string} workspacePath - Path to the workspace to remove
- * @returns {boolean} True if removed, false if not found
- */
-export function unregisterWorkspace(workspacePath) {
-    const workspaces = config.read('workspaces', { global: true }) || [];
-    const initialLength = workspaces.length;
-
-    const filtered = workspaces.filter(w => w.path !== workspacePath);
-
-    if (filtered.length < initialLength) {
-        config.save('workspaces', filtered, { global: true });
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * Clean up invalid workspaces (those that no longer exist on disk).
- *
- * @returns {number} Number of workspaces removed
- */
-export function cleanupInvalidWorkspaces() {
-    const workspaces = getRegisteredWorkspaces();
-    const validWorkspaces = workspaces.filter(w => w.valid);
-    const removedCount = workspaces.length - validWorkspaces.length;
-
-    if (removedCount > 0) {
-        // Remove the 'valid' property before saving
-        const toSave = validWorkspaces.map(({ valid, ...rest }) => rest);
-        config.save('workspaces', toSave, { global: true });
-    }
-
-    return removedCount;
-}
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import Config from './config.js';
+
+const config = new Config();
+
+/**
+ * Register a workspace in the global registry.
+ * This stores the workspace path so it can be discovered later.
+ *
+ * @param {string} workspacePath - Full path to the workspace
+ * @param {string} instanceUrl - The Magentrix instance URL for this workspace
+ */
+export function registerWorkspace(workspacePath, instanceUrl) {
+    const workspaces = config.read('workspaces', { global: true }) || [];
+
+    // Check if already registered
+    const existingIndex = workspaces.findIndex(w => w.path === workspacePath);
+
+    if (existingIndex >= 0) {
+        // Update existing entry
+        workspaces[existingIndex] = {
+            path: workspacePath,
+            instanceUrl,
+            lastUsed: new Date().toISOString()
+        };
+    } else {
+        // Add new entry
+        workspaces.push({
+            path: workspacePath,
+            instanceUrl,
+            lastUsed: new Date().toISOString()
+        });
+    }
+
+    config.save('workspaces', workspaces, { global: true });
+}
+
+/**
+ * Get all registered workspaces from the global registry.
+ * Validates that each workspace still exists on disk.
+ *
+ * @returns {Array<{path: string, instanceUrl: string, lastUsed: string, valid: boolean}>}
+ */
+export function getRegisteredWorkspaces() {
+    const workspaces = config.read('workspaces', { global: true }) || [];
+
+    return workspaces.map(workspace => {
+        // Check if the workspace still exists and is valid
+        const magentrixFolder = join(workspace.path, '.magentrix');
+        const srcFolder = join(workspace.path, 'src');
+
+        const valid = existsSync(magentrixFolder) && existsSync(srcFolder);
+
+        return {
+            ...workspace,
+            valid
+        };
+    });
+}
+
+/**
+ * Get all valid registered workspaces (those that still exist on disk).
+ *
+ * @returns {Array<{path: string, instanceUrl: string, lastUsed: string, valid: boolean}>}
+ */
+export function getValidWorkspaces() {
+    return getRegisteredWorkspaces().filter(w => w.valid);
+}
+
+/**
+ * Remove a workspace from the global registry.
+ *
+ * @param {string} workspacePath - Path to the workspace to remove
+ * @returns {boolean} True if removed, false if not found
+ */
+export function unregisterWorkspace(workspacePath) {
+    const workspaces = config.read('workspaces', { global: true }) || [];
+    const initialLength = workspaces.length;
+
+    const filtered = workspaces.filter(w => w.path !== workspacePath);
+
+    if (filtered.length < initialLength) {
+        config.save('workspaces', filtered, { global: true });
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Clean up invalid workspaces (those that no longer exist on disk).
+ *
+ * @returns {number} Number of workspaces removed
+ */
+export function cleanupInvalidWorkspaces() {
+    const workspaces = getRegisteredWorkspaces();
+    const validWorkspaces = workspaces.filter(w => w.valid);
+    const removedCount = workspaces.length - validWorkspaces.length;
+
+    if (removedCount > 0) {
+        // Remove the 'valid' property before saving
+        const toSave = validWorkspaces.map(({ valid, ...rest }) => rest);
+        config.save('workspaces', toSave, { global: true });
+    }
+
+    return removedCount;
+}