@magentrix-corp/magentrix-cli 1.1.3 → 1.1.5

package/actions/publish.js

@@ -670,27 +670,42 @@ export const runPublish = async (options = {}) => {
         });
     }
 
-    // Step 9: Filter out redundant file deletions
+    // Step 9: Filter out redundant file and folder deletions
     const foldersBeingDeleted = actionQueue
         .filter(a => a.action === 'delete_folder')
         .map(a => a.folderPath);
 
     const filteredActionQueue = actionQueue.filter(action => {
+        // Filter out files inside folders being deleted
         if (action.action === 'delete_static_asset' && action.filePath) {
-            // Check if this file's directory is inside any folder being deleted
             const fileDir = path.dirname(action.filePath);
             for (const deletedFolder of foldersBeingDeleted) {
-                // Use path.normalize to handle trailing slashes and ensure proper comparison
                 const normalizedFileDir = path.normalize(fileDir);
                 const normalizedDeletedFolder = path.normalize(deletedFolder);
 
-                // Check if file is inside the deleted folder (or is the folder itself)
                 if (normalizedFileDir === normalizedDeletedFolder ||
                     normalizedFileDir.startsWith(normalizedDeletedFolder + path.sep)) {
                     return false; // Skip - covered by folder deletion
                 }
             }
         }
+
+        // Filter out child folders inside folders being deleted
+        if (action.action === 'delete_folder' && action.folderPath) {
+            for (const deletedFolder of foldersBeingDeleted) {
+                // Don't compare a folder to itself
+                if (action.folderPath === deletedFolder) continue;
+
+                const normalizedChildFolder = path.normalize(action.folderPath);
+                const normalizedParentFolder = path.normalize(deletedFolder);
+
+                // Check if this folder is inside another folder being deleted
+                if (normalizedChildFolder.startsWith(normalizedParentFolder + path.sep)) {
+                    return false; // Skip - covered by parent folder deletion
+                }
+            }
+        }
+
         return true;
     });
 

package/actions/pull.js

@@ -5,7 +5,7 @@ import fs from "fs";
 import { withSpinner } from "../utils/spinner.js";
 import { EXPORT_ROOT, TYPE_DIR_MAP } from "../vars/global.js";
 import { mapRecordToFile, writeRecords } from "../utils/cli/writeRecords.js";
-import { updateBase } from "../utils/updateFileBase.js";
+import { updateBase, removeFromBase } from "../utils/updateFileBase.js";
 import { compareAllFilesAndLogStatus, promptConflictResolution, showCurrentConflicts } from "../utils/cli/helpers/compare.js";
 import path from "path";
 import { compareLocalAndRemote } from "../utils/compare.js";
@@ -94,7 +94,14 @@ export const pull = async () => {
         }
     ];
 
-    // Step 3: Download records in parallel with spinner
+    // Step 3: Load existing base.json to detect deletions
+    const hits = await config.searchObject({}, { filename: "base.json", global: false });
+    const cachedResults = hits?.[0]?.value || {};
+    const cachedAssets = Object.values(cachedResults).filter(c =>
+        c.type === 'File' || c.type === 'Folder'
+    );
+
+    // Step 4: Download records in parallel with spinner
     const [activeClassResult, activePageResult, assets] = await withSpinner("Downloading files...", async () => {
         const meqlResults = await Promise.all(
             queries.map(q => meqlQuery(instanceUrl, token.value, q.query))
@@ -108,7 +115,52 @@ export const pull = async () => {
         ]
     });
 
-    // Update assets base
+    // Collect all server asset paths
+    const serverAssetPaths = new Set();
+    const collectServerPaths = (records) => {
+        for (const record of records) {
+            const fullPath = path.join(EXPORT_ROOT, record?.Path);
+            serverAssetPaths.add(path.normalize(fullPath));
+
+            if (record?.Type === 'Folder' && record?.Children?.length > 0) {
+                collectServerPaths(record.Children);
+            }
+        }
+    };
+    collectServerPaths(assets.tree);
+
+    // Step 5: Detect and delete assets that were on server before but are now gone
+    const assetsToDelete = [];
+    for (const cached of cachedAssets) {
+        const cachedPath = path.normalize(cached.filePath || cached.lastKnownPath);
+
+        // If this asset was in base.json but not returned from server, it was deleted
+        if (!serverAssetPaths.has(cachedPath)) {
+            assetsToDelete.push(cachedPath);
+        }
+    }
+
+    // Delete local files/folders that were deleted on server
+    for (const assetPath of assetsToDelete) {
+        try {
+            if (fs.existsSync(assetPath)) {
+                const stats = fs.statSync(assetPath);
+                if (stats.isDirectory()) {
+                    fs.rmSync(assetPath, { recursive: true, force: true });
+                    console.log(chalk.gray(`  🗑️  Removed deleted folder: ${path.relative(process.cwd(), assetPath)}`));
+                } else {
+                    fs.unlinkSync(assetPath);
+                    console.log(chalk.gray(`  🗑️  Removed deleted file: ${path.relative(process.cwd(), assetPath)}`));
+                }
+            }
+            // Remove from base.json
+            removeFromBase(assetPath);
+        } catch (err) {
+            console.warn(chalk.yellow(`  ⚠️  Could not delete ${assetPath}: ${err.message}`));
+        }
+    }
+
+    // Step 6: Update assets base
     const processAssets = (records) => {
         for (const record of records) {
             if (record?.Type === 'Folder') {
@@ -139,7 +191,7 @@ export const pull = async () => {
 
     processAssets(assets.tree);
 
-    // Check for conflicts and have user select conflict resolution
+    // Step 7: Handle code entity (ActiveClass, ActivePage) deletions
     const activeClassRecords = (activeClassResult.Records || []).map(record => {
         record.Content = record.Body;
         delete record.Body;
@@ -149,6 +201,40 @@ export const pull = async () => {
     const activePageRecords = (activePageResult.Records || []);
     const allRecords = [...activeClassRecords, ...activePageRecords].map(mapRecordToFile);
 
+    // Get all server record IDs
+    const serverRecordIds = new Set([
+        ...activeClassRecords.map(r => r.Id),
+        ...activePageRecords.map(r => r.Id)
+    ]);
+
+    // Find code entities in base.json that are no longer on server
+    const cachedCodeEntities = Object.values(cachedResults).filter(c =>
+        c.type !== 'File' && c.type !== 'Folder' && c.recordId
+    );
+
+    const codeEntitiesToDelete = [];
+    for (const cached of cachedCodeEntities) {
+        // If this code entity was in base.json but not returned from server, it was deleted
+        if (!serverRecordIds.has(cached.recordId)) {
+            codeEntitiesToDelete.push(cached);
+        }
+    }
+
+    // Delete local code entity files that were deleted on server
+    for (const entity of codeEntitiesToDelete) {
+        const entityPath = entity.filePath || entity.lastKnownPath;
+        try {
+            if (entityPath && fs.existsSync(entityPath)) {
+                fs.unlinkSync(entityPath);
+                console.log(chalk.gray(`  🗑️  Removed deleted ${entity.type}: ${path.relative(process.cwd(), entityPath)}`));
+            }
+            // Remove from base.json
+            removeFromBase(entity.recordId);
+        } catch (err) {
+            console.warn(chalk.yellow(`  ⚠️  Could not delete ${entityPath}: ${err.message}`));
+        }
+    }
+
     const issues = [];
     for (const record of allRecords) {
         if (record?.error) {

package/package.json

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

package/utils/assetPaths.js

@@ -12,13 +12,13 @@ import { EXPORT_ROOT } from '../vars/global.js';
 
 /**
  * Convert a local asset path to an API path by adding the 'contents' prefix
- * and normalizing to lowercase with forward slashes.
+ * and normalizing with forward slashes (preserves original casing).
  *
- * @param {string} localPath - Local file path (e.g., "src/Assets/images/logo.png")
- * @returns {string} API path (e.g., "/contents/assets/images")
+ * @param {string} localPath - Local file path (e.g., "src/Assets/Images/Logo.png")
+ * @returns {string} API path (e.g., "/contents/assets/Images")
  *
  * @example
- * toApiPath("src/Assets/images/logo.png") // "/contents/assets/images"
+ * toApiPath("src/Assets/Images/Logo.png") // "/contents/assets/Images"
  * toApiPath("src/Assets") // "/contents/assets"
  */
 export const toApiPath = (localPath) => {
@@ -31,11 +31,11 @@ export const toApiPath = (localPath) => {
     const normalized = path.normalize(localPath);
     const relative = normalized.replace(new RegExp(`^${EXPORT_ROOT}[\\\\/]?`), '');
 
-    // Replace 'Assets' with 'contents/assets'
+    // Replace 'Assets' with 'contents/assets' (case insensitive search, but replace with lowercase)
     const apiPath = relative.replace(/^Assets/i, 'contents/assets');
 
-    // Normalize to forward slashes and lowercase, remove filename
-    let dirPath = path.dirname(apiPath).replace(/\\/g, '/').toLowerCase();
+    // Normalize to forward slashes (preserve casing!), remove filename
+    let dirPath = path.dirname(apiPath).replace(/\\/g, '/');
 
     // Handle edge case where dirname returns '.' for root
     if (dirPath === '.') {
@@ -69,13 +69,13 @@ export const toLocalPath = (apiPath) => {
 
 /**
  * Convert a local folder path to an API path (keeps the folder, doesn't extract parent).
- * Similar to toApiPath but for folders.
+ * Similar to toApiPath but for folders (preserves original casing).
  *
- * @param {string} localFolderPath - Local folder path (e.g., "src/Assets/images")
- * @returns {string} API path (e.g., "/contents/assets/images")
+ * @param {string} localFolderPath - Local folder path (e.g., "src/Assets/Images")
+ * @returns {string} API path (e.g., "/contents/assets/Images")
  *
  * @example
- * toApiFolderPath("src/Assets/images") // "/contents/assets/images"
+ * toApiFolderPath("src/Assets/Images") // "/contents/assets/Images"
  * toApiFolderPath("src/Assets") // "/contents/assets"
  */
 export const toApiFolderPath = (localFolderPath) => {
@@ -88,11 +88,11 @@ export const toApiFolderPath = (localFolderPath) => {
     const normalized = path.normalize(localFolderPath);
     const relative = normalized.replace(new RegExp(`^${EXPORT_ROOT}[\\\\/]?`), '');
 
-    // Replace 'Assets' with 'contents/assets'
+    // Replace 'Assets' with 'contents/assets' (case insensitive search, but replace with lowercase)
     let apiPath = relative.replace(/^Assets/i, 'contents/assets');
 
-    // Normalize to forward slashes and lowercase (but don't get dirname!)
-    apiPath = apiPath.replace(/\\/g, '/').toLowerCase();
+    // Normalize to forward slashes (preserve casing!)
+    apiPath = apiPath.replace(/\\/g, '/');
 
     // Handle edge case where path is just 'Assets'
     if (apiPath === 'contents/assets' || apiPath === '') {