@magentrix-corp/magentrix-cli 1.3.11 → 1.3.12

package/actions/publish.js

@@ -12,6 +12,7 @@ import {
     EXPORT_ROOT,
     TYPE_DIR_MAP,
     IRIS_APPS_DIR,
+    ALLOWED_SRC_DIRS,
 } from "../vars/global.js";
 import { getFileTag, setFileTag } from "../utils/filetag.js";
 import { sha256 } from "../utils/hash.js";
@@ -870,16 +871,19 @@ export const runPublish = async (options = {}) => {
         progress.completeStep('load', `✓ Loaded ${cachedFiles.length} entries (${loadTime}ms load, ${mapTime}ms map)`);
     }
 
-    // Step 3: Scan local workspace (excluding Assets and iris-apps folders)
+    // Step 3: Scan local workspace (only whitelisted code entity directories)
     if (progress) progress.startStep('scan');
 
     const walkStart = Date.now();
-    const localPaths = await walkFiles(EXPORT_ROOT, {
-        ignore: [
-            path.join(EXPORT_ROOT, 'Assets'),
-            path.join(EXPORT_ROOT, IRIS_APPS_DIR)
-        ]
-    });
+    // Only scan whitelisted directories for code entities (exclude Assets and iris-apps, handled separately)
+    const codeEntityDirs = ALLOWED_SRC_DIRS.filter(dir => dir !== 'Assets' && dir !== IRIS_APPS_DIR);
+    const localPathArrays = await Promise.all(
+        codeEntityDirs.map(dir => {
+            const dirPath = path.join(EXPORT_ROOT, dir);
+            return fs.existsSync(dirPath) ? walkFiles(dirPath) : Promise.resolve([]);
+        })
+    );
+    const localPaths = localPathArrays.flat();
     const walkTime = Date.now() - walkStart;
 
     const tagStart = Date.now();

package/bin/magentrix.js

@@ -20,6 +20,7 @@ import { configWizard } from '../actions/config.js';
 import { irisLink, irisDev, irisDelete, irisRecover, vueBuildStage } from '../actions/iris/index.js';
 import Config from '../utils/config.js';
 import { registerWorkspace, getRegisteredWorkspaces } from '../utils/workspaces.js';
+import { ensureVSCodeFileAssociation } from '../utils/preferences.js';
 
 const config = new Config();
 
@@ -102,6 +103,13 @@ function ensureWorkspaceRegistered() {
 
 async function preMiddleware() {
     ensureWorkspaceRegistered();
+
+    // Ensure .vscode folder exists in project root (not in src/) for Magentrix projects
+    const magentrixDir = join(CWD, '.magentrix');
+    if (existsSync(magentrixDir)) {
+        await ensureVSCodeFileAssociation(CWD);
+    }
+
     await recacheFileIdIndex(EXPORT_ROOT);
     await cacheDir(EXPORT_ROOT);
 }

package/package.json

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

package/utils/cacher.js

@@ -4,7 +4,7 @@ import Config from './config.js';
 import { findFileByTag, getFileTag, isPathLinkedToTagByLastKnownPath, setFileTag } from './filetag.js';
 import { compressString } from './compress.js';
 import { sha256 } from './hash.js';
-import { EXPORT_ROOT } from '../vars/global.js';
+import { EXPORT_ROOT, ALLOWED_SRC_DIRS, IRIS_APPS_DIR } from '../vars/global.js';
 
 const config = new Config();
 
@@ -19,8 +19,15 @@ export const cacheDir = async (dir) => {
 
     const absDir = path.resolve(dir);
 
-    // Walk files but exclude Assets folder (tracked separately in base.json)
-    const files = await walkFiles(absDir, { ignore: [path.join(absDir, 'Assets')] });
+    // Only walk whitelisted code entity directories (exclude Assets and iris-apps, handled separately)
+    const codeEntityDirs = ALLOWED_SRC_DIRS.filter(d => d !== 'Assets' && d !== IRIS_APPS_DIR);
+    const fileArrays = await Promise.all(
+        codeEntityDirs.map(d => {
+            const dirPath = path.join(absDir, d);
+            return fs.existsSync(dirPath) ? walkFiles(dirPath) : Promise.resolve([]);
+        })
+    );
+    const files = fileArrays.flat();
 
     const cache = config.read('cachedFiles', { global: false, filename: 'fileCache.json' }) || {};
 
@@ -108,10 +115,17 @@ export const cacheDir = async (dir) => {
  * @returns {Promise<void>}
  */
 export const recacheFileIdIndex = async (dir) => {
-    // Exclude Assets folder - they don't use file tags, tracked in base.json instead
     const absDir = path.resolve(dir);
-    const ignorePath = path.join(absDir, 'Assets');
-    const files = await walkFiles(absDir, { ignore: [ignorePath] });
+
+    // Only walk whitelisted code entity directories (exclude Assets and iris-apps, handled separately)
+    const codeEntityDirs = ALLOWED_SRC_DIRS.filter(d => d !== 'Assets' && d !== IRIS_APPS_DIR);
+    const fileArrays = await Promise.all(
+        codeEntityDirs.map(d => {
+            const dirPath = path.join(absDir, d);
+            return fs.existsSync(dirPath) ? walkFiles(dirPath) : Promise.resolve([]);
+        })
+    );
+    const files = fileArrays.flat();
     if (!files || files?.length < 1) return;
 
     // Process files in parallel batches of 50 for speed

package/utils/cli/writeRecords.js

@@ -245,7 +245,7 @@ export const writeRecords = async (records, resolutionMethod, progress = null, l
                     updateBase(filePath, record, cachedFilePath);
                 }
             } catch (err) {
-                const msg = `Failed to write file ${cachedFilePath}: ${err.message}`;
+                const msg = `Failed to write file ${filePath}: ${err.message}`;
                 if (logger) {
                     logger.error(msg, err);
                 } else {

package/vars/global.js

@@ -6,6 +6,22 @@ export const EXPORT_ROOT = "src";
 export const ASSETS_DIR = "Assets"; // Local directory name for static assets (API uses /contents/assets)
 export const IRIS_APPS_DIR = "iris-apps"; // Local directory for Iris Vue.js apps
 
+/**
+ * Whitelist of allowed directories inside EXPORT_ROOT.
+ * Only these folders will be scanned during publish/cache operations.
+ * This prevents accidental processing of hidden folders (.magentrix, .vscode, etc.)
+ * or any other unexpected directories users might create.
+ */
+export const ALLOWED_SRC_DIRS = [
+    "Assets",
+    "Classes",
+    "Controllers",
+    "iris-apps",
+    "Pages",
+    "Templates",
+    "Triggers"
+];
+
 /**
      * Maps Magentrix Type fields to local folder names and extensions.
      * Extensions chosen to avoid collisions and clearly indicate type.