@dotenvx/dotenvx-ops 0.17.1 → 0.19.0

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 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.17.1...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)
+
+### Added
+
+* Display conflict diff ([#2](https://github.com/dotenvx/dotenvx-ops/pull/2))
 
 ## [0.17.1](https://github.com/dotenvx/dotenvx-ops/compare/v0.17.0...v0.17.1) (2025-10-01)
 

package/package.json

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

package/src/cli/actions/sync.js

@@ -5,8 +5,10 @@ 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 SyncConflict = require('./../../lib/services/syncConflict')
 
 const spinner = createSpinner('syncing')
 
@@ -16,9 +18,10 @@ function sha256File (filepath) {
 }
 
 async function sync () {
+  // debug opts
+  const options = this.opts()
+
   try {
-    // debug opts
-    const options = this.opts()
     logger.debug(`options: ${JSON.stringify(options)}`)
 
     spinner.start()
@@ -64,6 +67,40 @@ async function sync () {
     if (error.stack) {
       logger.debug(error.stack)
     }
+
+    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 {
+        logger.error(error)
+      }
+      if (error.help) {
+        logger.help(error.help)
+      }
+      if (error.stack) {
+        logger.debug(error.stack)
+      }
+    }
+
     process.exit(1)
   }
 }

package/src/lib/api/getSynchronization.js

@@ -0,0 +1,34 @@
+const { http } = require('../../lib/helpers/http')
+const buildApiError = require('../../lib/helpers/buildApiError')
+
+class GetSynchronization {
+  constructor (hostname, token, synchronizationId) {
+    this.hostname = hostname || 'https://ops.dotenvx.com'
+    this.token = token
+    this.synchronizationId = synchronizationId
+  }
+
+  async run () {
+    const token = this.token
+    const synchronizationId = this.synchronizationId
+    const url = `${this.hostname}/api/synchronization/${synchronizationId}`
+
+    const resp = await http(url, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json'
+      }
+    })
+
+    const json = await resp.body.json()
+
+    if (resp.statusCode >= 400) {
+      throw buildApiError(resp.statusCode, json)
+    }
+
+    return json
+  }
+}
+
+module.exports = GetSynchronization

package/src/lib/helpers/buildApiError.js

@@ -2,10 +2,12 @@ function buildApiError (statusCode, json) {
   const code = json.error.code || statusCode.toString()
   const message = `[${code}] ${json.error.message}`
   const help = `[${code}] ${json.error.help || JSON.stringify(json)}`
+  const meta = json.error.meta
 
   const error = new Error(message)
   error.code = code
   error.help = help
+  error.meta = meta
 
   return error
 }

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