@magentrix-corp/magentrix-cli 1.3.16 → 1.3.17

package/utils/compare.js

@@ -1,135 +1,135 @@
-import fs from 'fs';
-import { sha256 } from './hash.js';
-import { findFileByTag } from './filetag.js';
-import path from 'path';
-
-/**
- * Compares a local file to its remote representation and determines their sync status.
- *
- * - Checks file existence, last modified times, and content hashes.
- * - Returns detailed sync info; never logs or warns directly.
- *
- * @param {string} localFilePath - The path to the local file.
- * @param {Object} remoteData - Object containing remote file metadata and content.
- * @param {string} remoteData.content - The file content from the remote.
- * @param {string} remoteData.ModifiedOn - The last modified date of the remote file (ISO string).
- * @returns {Object} An object describing the sync status. Possible statuses:
- *   - 'in_sync': Files match (hashes and times).
- *   - 'behind': Local file is older than remote, but content is identical.
- *   - 'conflict': Local file is behind remote and contents differ (conflict).
- *   - 'ahead': Local file is newer than remote and contents differ.
- *   - 'ahead_identical': Local file is newer than remote but contents are identical (possible clock drift).
- *   - 'content_differs': Timestamps match but contents differ (possible manual edit).
- *   - 'missing': Local file does not exist (safe to download from remote).
- *   Additional returned fields depend on status.
- */
-export function compareLocalAndRemote(localFilePath, remoteData) {
-    // If local file does not exist, it's fine—just return 'missing'
-    if (!fs.existsSync(localFilePath)) {
-        return {
-            status: 'missing',
-            message: 'Local file is missing.'
-        };
-    }
-
-    // Gather local file details
-    const localStats = fs.statSync(localFilePath);
-    const localContent = fs.readFileSync(localFilePath, 'utf8');
-    const localMtime = Math.ceil(localStats.mtimeMs); // Local last modified time (ms)
-    const localHash = sha256(localContent); // Local file content hash
-
-    // Gather remote file details
-    const remoteContent = remoteData.content;
-    const remoteMtime = Math.ceil(new Date(remoteData.ModifiedOn).getTime()); // Remote last modified time (ms)
-    const remoteHash = sha256(remoteContent); // Remote file content hash
-
-    // Case: local is behind remote (older mtime)
-    if (localMtime < remoteMtime) {
-        if (localHash !== remoteHash) {
-            // File changed on both local and remote: conflict!
-            return {
-                status: 'conflict',
-                localMtime,
-                remoteMtime,
-                localHash,
-                remoteHash,
-                message: 'Local file is behind remote and has conflicting changes.'
-            };
-        } else {
-            // Local is older but identical to remote
-            // return {
-            //     status: 'behind',
-            //     localMtime,
-            //     remoteMtime,
-            //     message: 'Local file is behind remote but contents are identical.'
-            // };
-
-            return {
-                status: 'in_sync',
-                localMtime,
-                remoteMtime,
-                message: 'Local and remote file are in sync.'
-            };
-        }
-    }
-    // Case: local is ahead of remote (newer mtime)
-    else if (localMtime > remoteMtime) {
-        if (localHash !== remoteHash) {
-            return {
-                status: 'ahead',
-                localMtime,
-                remoteMtime,
-                localHash,
-                remoteHash,
-                message: 'Local file is ahead of remote and content differs.'
-            };
-        } else {
-            // Local is ahead but identical
-            // return {
-            //     status: 'ahead_identical',
-            //     localMtime,
-            //     remoteMtime,
-            //     message: 'Local file is ahead of remote but contents are identical.'
-            // };
-
-            return {
-                status: 'in_sync',
-                localMtime,
-                remoteMtime,
-                message: 'Local and remote file are in sync.'
-            };
-        }
-    }
-    // Case: mtimes match
-    else {
-        // Check for rename
-        const matchingFilePath = findFileByTag(remoteData.Id);
-        const absoluteLocalPath = path.resolve(localFilePath);
-
-        if (matchingFilePath !== absoluteLocalPath) {
-            return {
-                status: 'rename',
-                localMtime,
-                remoteMtime,
-                message: 'Local and remote file names differ.'
-            };
-        } else if (localHash === remoteHash) {
-            return {
-                status: 'in_sync',
-                localMtime,
-                remoteMtime,
-                message: 'Local and remote file are in sync.'
-            };
-        } else {
-            // Timestamps match but contents do not
-            return {
-                status: 'content_differs',
-                localMtime,
-                remoteMtime,
-                localHash,
-                remoteHash,
-                message: 'File times match, but content differs (possible manual edit).'
-            };
-        }
-    }
-}
+import fs from 'fs';
+import { sha256 } from './hash.js';
+import { findFileByTag } from './filetag.js';
+import path from 'path';
+
+/**
+ * Compares a local file to its remote representation and determines their sync status.
+ *
+ * - Checks file existence, last modified times, and content hashes.
+ * - Returns detailed sync info; never logs or warns directly.
+ *
+ * @param {string} localFilePath - The path to the local file.
+ * @param {Object} remoteData - Object containing remote file metadata and content.
+ * @param {string} remoteData.content - The file content from the remote.
+ * @param {string} remoteData.ModifiedOn - The last modified date of the remote file (ISO string).
+ * @returns {Object} An object describing the sync status. Possible statuses:
+ *   - 'in_sync': Files match (hashes and times).
+ *   - 'behind': Local file is older than remote, but content is identical.
+ *   - 'conflict': Local file is behind remote and contents differ (conflict).
+ *   - 'ahead': Local file is newer than remote and contents differ.
+ *   - 'ahead_identical': Local file is newer than remote but contents are identical (possible clock drift).
+ *   - 'content_differs': Timestamps match but contents differ (possible manual edit).
+ *   - 'missing': Local file does not exist (safe to download from remote).
+ *   Additional returned fields depend on status.
+ */
+export function compareLocalAndRemote(localFilePath, remoteData) {
+    // If local file does not exist, it's fine—just return 'missing'
+    if (!fs.existsSync(localFilePath)) {
+        return {
+            status: 'missing',
+            message: 'Local file is missing.'
+        };
+    }
+
+    // Gather local file details
+    const localStats = fs.statSync(localFilePath);
+    const localContent = fs.readFileSync(localFilePath, 'utf8');
+    const localMtime = Math.ceil(localStats.mtimeMs); // Local last modified time (ms)
+    const localHash = sha256(localContent); // Local file content hash
+
+    // Gather remote file details
+    const remoteContent = remoteData.content;
+    const remoteMtime = Math.ceil(new Date(remoteData.ModifiedOn).getTime()); // Remote last modified time (ms)
+    const remoteHash = sha256(remoteContent); // Remote file content hash
+
+    // Case: local is behind remote (older mtime)
+    if (localMtime < remoteMtime) {
+        if (localHash !== remoteHash) {
+            // File changed on both local and remote: conflict!
+            return {
+                status: 'conflict',
+                localMtime,
+                remoteMtime,
+                localHash,
+                remoteHash,
+                message: 'Local file is behind remote and has conflicting changes.'
+            };
+        } else {
+            // Local is older but identical to remote
+            // return {
+            //     status: 'behind',
+            //     localMtime,
+            //     remoteMtime,
+            //     message: 'Local file is behind remote but contents are identical.'
+            // };
+
+            return {
+                status: 'in_sync',
+                localMtime,
+                remoteMtime,
+                message: 'Local and remote file are in sync.'
+            };
+        }
+    }
+    // Case: local is ahead of remote (newer mtime)
+    else if (localMtime > remoteMtime) {
+        if (localHash !== remoteHash) {
+            return {
+                status: 'ahead',
+                localMtime,
+                remoteMtime,
+                localHash,
+                remoteHash,
+                message: 'Local file is ahead of remote and content differs.'
+            };
+        } else {
+            // Local is ahead but identical
+            // return {
+            //     status: 'ahead_identical',
+            //     localMtime,
+            //     remoteMtime,
+            //     message: 'Local file is ahead of remote but contents are identical.'
+            // };
+
+            return {
+                status: 'in_sync',
+                localMtime,
+                remoteMtime,
+                message: 'Local and remote file are in sync.'
+            };
+        }
+    }
+    // Case: mtimes match
+    else {
+        // Check for rename
+        const matchingFilePath = findFileByTag(remoteData.Id);
+        const absoluteLocalPath = path.resolve(localFilePath);
+
+        if (matchingFilePath !== absoluteLocalPath) {
+            return {
+                status: 'rename',
+                localMtime,
+                remoteMtime,
+                message: 'Local and remote file names differ.'
+            };
+        } else if (localHash === remoteHash) {
+            return {
+                status: 'in_sync',
+                localMtime,
+                remoteMtime,
+                message: 'Local and remote file are in sync.'
+            };
+        } else {
+            // Timestamps match but contents do not
+            return {
+                status: 'content_differs',
+                localMtime,
+                remoteMtime,
+                localHash,
+                remoteHash,
+                message: 'File times match, but content differs (possible manual edit).'
+            };
+        }
+    }
+}

package/utils/compress.js

@@ -1,18 +1,18 @@
-import pako from 'pako';
-
-export const compressString = (input) => {
-    const compressed = pako.deflate(input);
-    const compressedStr = Buffer.from(compressed).toString('base64');
-    return compressedStr;
-}
-
-export const decompressString = (compressedInput) => {
-    try {
-        if (!compressedInput) return '';
-        const decoded = Buffer.from(compressedInput, 'base64');
-        const decompressed = pako.inflate(decoded, { to: 'string' });
-        return decompressed;
-    } catch (err) {
-        return '';
-    }
+import pako from 'pako';
+
+export const compressString = (input) => {
+    const compressed = pako.deflate(input);
+    const compressedStr = Buffer.from(compressed).toString('base64');
+    return compressedStr;
+}
+
+export const decompressString = (compressedInput) => {
+    try {
+        if (!compressedInput) return '';
+        const decoded = Buffer.from(compressedInput, 'base64');
+        const decompressed = pako.inflate(decoded, { to: 'string' });
+        return decompressed;
+    } catch (err) {
+        return '';
+    }
 }