@dotenvx/dotenvx-ops 0.18.0 → 0.19.0

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.18.0...main)
+[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.19.0...main)
+
+## [0.19.0](https://github.com/dotenvx/dotenvx-ops/compare/v0.18.0...v0.19.0) (2025-10-07)
+
+### Added
+
+* Surface any conflicts during `sync` ([#3](https://github.com/dotenvx/dotenvx-ops/pull3))
 
 ## [0.18.0](https://github.com/dotenvx/dotenvx-ops/compare/v0.17.1...v0.18.0) (2025-10-06)
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.18.0",
+  "version": "0.19.0",
   "name": "@dotenvx/dotenvx-ops",
   "description": "Dotenvx Ops",
   "author": "@motdotla",

package/src/cli/actions/sync.js

@@ -5,18 +5,13 @@ const { logger } = require('@dotenvx/dotenvx')
 
 const { createSpinner } = require('./../../lib/helpers/createSpinner')
 const smartMask = require('./../../lib/helpers/smartMask')
+const pluralize = require('./../../lib/helpers/pluralize')
 
 const Sync = require('./../../lib/services/sync')
-
-const GetSynchronization = require('./../../lib/api/getSynchronization')
+const SyncConflict = require('./../../lib/services/syncConflict')
 
 const spinner = createSpinner('syncing')
 
-// move soon
-const Session = require('./../../db/session')
-const sesh = new Session()
-const token = sesh.token()
-
 function sha256File (filepath) {
   const buf = fs.readFileSync(filepath)
   return crypto.createHash('sha256').update(buf).digest('hex')
@@ -73,16 +68,36 @@ async function sync () {
       logger.debug(error.stack)
     }
 
-    // display conflict diff
-    if (error.code === 'DOTENVX_SYNC_CONFLICT') {
-      const synchronizationId = error.meta.synchronization_id
-      const data = await new GetSynchronization(options.hostname, token, synchronizationId).run()
-      const conflictedFile = data.files.find(f => f.status === 'conflicted')
-      if (conflictedFile) {
-        console.log(conflictedFile.filepath)
-        console.log(conflictedFile.diff_ansi)
+    try {
+      if (error.code === 'DOTENVX_SYNC_CONFLICT') {
+        spinner.start()
+
+        const synchronizationId = error.meta.synchronization_id
+        const { conflictedFiles } = await new SyncConflict(options.hostname, synchronizationId).run()
+
+        spinner.stop()
+
+        // loop through any conflicted files
+        for (const conflictedFile of conflictedFiles) {
+          logger.info('')
+          logger.info(`✖ conflict [${conflictedFile.filepath}]`)
+          console.log(conflictedFile.diffAnsi)
+        }
+
+        logger.info(`Review and edit the ${pluralize('file', conflictedFiles.length)} as needed, then confirm your version with [dotenvx-ops sync --force]`)
+      }
+    } catch (error) {
+      spinner.stop()
+      if (error.message) {
+        logger.error(error.message)
       } else {
-        console.log('No conflicted files found.')
+        logger.error(error)
+      }
+      if (error.help) {
+        logger.help(error.help)
+      }
+      if (error.stack) {
+        logger.debug(error.stack)
       }
     }
 

package/src/lib/helpers/pluralize.js

@@ -0,0 +1,10 @@
+function pluralize (word, count) {
+  // simple pluralization: add 's' at the end
+  if (count === 0 || count > 1) {
+    return word + 's'
+  } else {
+    return word
+  }
+}
+
+module.exports = pluralize

package/src/lib/services/syncConflict.js

@@ -0,0 +1,36 @@
+const Session = require('./../../db/session')
+
+// api calls
+const GetSynchronization = require('./../api/getSynchronization')
+
+class SyncConflict {
+  constructor (hostname, synchronizationId) {
+    this.hostname = hostname
+    this.synchronizationId = synchronizationId
+  }
+
+  async run () {
+    const sesh = new Session()
+    const token = sesh.token()
+    const synchronizationId = this.synchronizationId
+
+    const data = await new GetSynchronization(this.hostname, token, synchronizationId).run()
+
+    const conflictedFiles = []
+    for (const file of data.files) {
+      if (file.status === 'conflicted') {
+        conflictedFiles.push({
+          filepath: file.filepath,
+          diffAnsi: file.diff_ansi
+        })
+      }
+    }
+
+    return {
+      id: data.id,
+      conflictedFiles
+    }
+  }
+}
+
+module.exports = SyncConflict