@magentrix-corp/magentrix-cli 1.1.2 → 1.1.4

package/actions/publish.js

@@ -194,9 +194,25 @@ const handleDeleteStaticAssetAction = async (instanceUrl, apiKey, action) => {
  * Handles CREATE_FOLDER action.
  */
 const handleCreateFolderAction = async (instanceUrl, apiKey, action) => {
-    const response = await createFolder(instanceUrl, apiKey, action.parentPath, action.folderName);
-    if (response?.error) throw new Error(response.error);
-    return response;
+    try {
+        const response = await createFolder(instanceUrl, apiKey, action.parentPath, action.folderName);
+        return response;
+    } catch (error) {
+        // Check if folder already exists (likely created by file upload)
+        const errorMessage = error?.message || String(error);
+        const errorLower = errorMessage.toLowerCase();
+        const alreadyExists = errorLower.includes('already exists') ||
+                             errorLower.includes('folder exists') ||
+                             errorLower.includes('duplicate');
+
+        if (alreadyExists) {
+            // Folder already exists, update cache and treat as success
+            return { alreadyExisted: true };
+        }
+
+        // Other errors should still fail
+        throw error;
+    }
 };
 
 /**
@@ -654,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magentrix-corp/magentrix-cli",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "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 === '') {