@magentrix-corp/magentrix-cli 1.1.4 → 1.1.5

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.4",
+  "version": "1.1.5",
   "description": "CLI tool for synchronizing local files with Magentrix cloud platform",
   "main": "index.js",
   "type": "module",