@dotenvx/dotenvx-ops 0.18.0 → 0.20.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.18.0...main)
+[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.20.0...main)
+
+## [0.20.0](https://github.com/dotenvx/dotenvx-ops/compare/v0.19.0...v0.20.0) (2025-10-07)
+
+### Added
+
+* Add `--force` flag to `sync` ([#4](https://github.com/dotenvx/dotenvx-ops/pull/4))
+
+## [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/pull/3))
 
 ## [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.20.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')
@@ -35,7 +30,7 @@ async function sync () {
       dotenvxProjectId,
       projectUsernameName,
       files
-    } = await new Sync(options.hostname).run()
+    } = await new Sync(options.hostname, options.force).run()
     logger.debug(`files: ${JSON.stringify(files)}`)
 
     // write output files
@@ -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/cli/dotenvx-ops.js

@@ -50,6 +50,7 @@ program
   .description('sync .env file(s)')
   .option('-h, --hostname <url>', 'set hostname', sesh.hostname())
   .option('--unmask', 'unmask DOTENVX_PROJECT_ID')
+  .option('--force', 'force changes')
   .action(syncAction)
 
 // dotenvx-ops login

package/src/lib/api/postSync.js

@@ -3,7 +3,7 @@ const buildApiError = require('../../lib/helpers/buildApiError')
 const packageJson = require('../../lib/helpers/packageJson')
 
 class PostSync {
-  constructor (hostname, token, devicePublicKey, encoded, dotenvxProjectId, pwd = null, gitUrl = null, gitBranch = null, systemUuid = null, osPlatform = null, osArch = null) {
+  constructor (hostname, token, devicePublicKey, encoded, dotenvxProjectId, pwd = null, gitUrl = null, gitBranch = null, systemUuid = null, osPlatform = null, osArch = null, force = false) {
     this.hostname = hostname || 'https://ops.dotenvx.com'
     this.token = token
     this.devicePublicKey = devicePublicKey
@@ -15,6 +15,7 @@ class PostSync {
     this.systemUuid = systemUuid
     this.osPlatform = osPlatform
     this.osArch = osArch
+    this.force = force
   }
 
   async run () {
@@ -30,6 +31,7 @@ class PostSync {
     const systemUuid = this.systemUuid
     const osPlatform = this.osPlatform
     const osArch = this.osArch
+    const force = this.force
 
     const resp = await http(url, {
       method: 'POST',
@@ -48,7 +50,8 @@ class PostSync {
         system_uuid: systemUuid,
         os_platform: osPlatform,
         os_arch: osArch,
-        cli_version: packageJson.version
+        cli_version: packageJson.version,
+        force
       })
     })
 

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/sync.js

@@ -13,8 +13,9 @@ const Errors = require('./../helpers/errors')
 const PostSync = require('./../api/postSync')
 
 class Sync {
-  constructor (hostname) {
+  constructor (hostname, force = false) {
     this.hostname = hostname
+    this.force = force
     this.cwd = process.cwd()
   }
 
@@ -42,7 +43,7 @@ class Sync {
     const _osPlatform = osInfo.platform
     const _osArch = osInfo.arch
 
-    const data = await new PostSync(this.hostname, token, devicePublicKey, encoded, dotenvxProjectId, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch).run()
+    const data = await new PostSync(this.hostname, token, devicePublicKey, encoded, dotenvxProjectId, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch, this.force).run()
 
     return {
       id: data.id,

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