@dotenvx/dotenvx-ops 0.17.1 → 0.18.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.17.1...main)
+[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.18.0...main)
+
+## [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.18.0",
   "name": "@dotenvx/dotenvx-ops",
   "description": "Dotenvx Ops",
   "author": "@motdotla",

package/src/cli/actions/sync.js

@@ -8,17 +8,25 @@ const smartMask = require('./../../lib/helpers/smartMask')
 
 const Sync = require('./../../lib/services/sync')
 
+const GetSynchronization = require('./../../lib/api/getSynchronization')
+
 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')
 }
 
 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 +72,20 @@ async function sync () {
     if (error.stack) {
       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)
+      } else {
+        console.log('No conflicted files found.')
+      }
+    }
+
     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
 }