@dotenvx/dotenvx 1.44.1 → 1.45.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/compare/v1.44.1...main)
+[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.45.0...main)
+
+## 1.45.0
+
+### Added
+
+* Add `logger.setName` and `logger.setVersion` for customization of logger ([#612](https://github.com/dotenvx/dotenvx/pull/612))
+
+## 1.44.2
+
+### Changed
+
+* Clarify license is BSD-3.
 
 ## [1.44.1](https://github.com/dotenvx/dotenvx/compare/v1.44.0...v1.44.1)
 

package/LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, Dotenvx LLC
+Copyright (c) 2024, Scott Motte
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -26,11 +26,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-Dotenvx is an Open Source project licensed under the BSD 3-Clause above.
-
-Dotenvx Pro is source-available with a commercial-friendly license. You can find 
-the full commercial license in `COMMERCIAL-LICENSE.txt`. See https://dotenvx.com 
-for features and purchasing options.

package/README.md

@@ -634,7 +634,7 @@ $ dotenvx encrypt
 ✔ encrypted (.env)
 ```
 
-![encrypted .env](https://github.com/dotenvx/dotenvx/assets/3848/2a8c3dc5-cd8e-4a08-8a59-c24d0535c81a)
+[![encrypted .env](https://github.com/user-attachments/assets/46dfe1a7-a027-4d80-9207-789eccc325dc)](https://dotenvx.com)
 
 > A `DOTENV_PUBLIC_KEY` (encryption key) and a `DOTENV_PRIVATE_KEY` (decryption key) are generated using the same public-key cryptography as [Bitcoin](https://en.bitcoin.it/wiki/Secp256k1).
 
@@ -2189,6 +2189,10 @@ Use dotenvx directly in code.
   // index.js
   require('@dotenvx/dotenvx').config({path: ['.env.local', '.env']})
 
+  // esm
+  // import dotenvx from "@dotenvx/dotenvx";
+  // dotenvx.config({path: ['.env.local', '.env']});
+
   console.log(`Hello ${process.env.HELLO}`)
   ```
 
@@ -2217,6 +2221,10 @@ Use dotenvx directly in code.
   // index.js
   require('@dotenvx/dotenvx').config({path: ['.env.local', '.env'], overload: true})
 
+  // esm
+  // import dotenvx from "@dotenvx/dotenvx";
+  // dotenvx.config({path: ['.env.local', '.env'], overload: true});
+
   console.log(`Hello ${process.env.HELLO}`)
   ```
 
@@ -2240,6 +2248,10 @@ Use dotenvx directly in code.
   // index.js
   require('@dotenvx/dotenvx').config({path: ['.env.missing', '.env'], strict: true})
 
+  // esm
+  // import dotenvx from "@dotenvx/dotenvx";
+  // dotenvx.config({path: ['.env.missing', '.env'], strict: true});
+
   console.log(`Hello ${process.env.HELLO}`)
   ```
 
@@ -2262,6 +2274,10 @@ Use dotenvx directly in code.
   // index.js
   require('@dotenvx/dotenvx').config({path: ['.env.missing', '.env'], ignore: ['MISSING_ENV_FILE']})
 
+  // esm
+  // import dotenvx from "@dotenvx/dotenvx";
+  // dotenvx.config({path: ['.env.missing', '.env'], ignore: ['MISSING_ENV_FILE']});
+
   console.log(`Hello ${process.env.HELLO}`)
   ```
 
@@ -2370,7 +2386,7 @@ Use dotenvx directly in code.
 
 > Dotenvx Pro is a commercial extension for [dotenvx](https://github.com/dotenvx/dotenvx).
 
-*Secrets Management – Done Right. Encrypted, Cloaked, Secrets as Code.*
+*Secrets Manager for Env Files.*
 
 * <details><summary>`pro keypair`</summary><br>
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.44.1",
+  "version": "1.45.0",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/lib/helpers/findPrivateKey.js

@@ -15,4 +15,4 @@ function findPrivateKey (envFilepath, envKeysFilepath = null) {
   return proKeypairs[privateKeyName] || keypairs[privateKeyName]
 }
 
-module.exports = findPrivateKey
+module.exports = { findPrivateKey }

package/src/lib/services/decrypt.js

@@ -6,7 +6,7 @@ const TYPE_ENV_FILE = 'envFile'
 
 const Errors = require('./../helpers/errors')
 const guessPrivateKeyName = require('./../helpers/guessPrivateKeyName')
-const findPrivateKey = require('./../helpers/findPrivateKey')
+const { findPrivateKey } = require('./../helpers/findPrivateKey')
 const decryptKeyValue = require('./../helpers/decryptKeyValue')
 const isEncrypted = require('./../helpers/isEncrypted')
 const dotenvParse = require('./../helpers/dotenvParse')

package/src/lib/services/encrypt.js

@@ -13,7 +13,7 @@ const dotenvParse = require('./../helpers/dotenvParse')
 const replace = require('./../helpers/replace')
 const detectEncoding = require('./../helpers/detectEncoding')
 const determineEnvs = require('./../helpers/determineEnvs')
-const findPrivateKey = require('./../helpers/findPrivateKey')
+const { findPrivateKey } = require('./../helpers/findPrivateKey')
 const findPublicKey = require('./../helpers/findPublicKey')
 const keypair = require('./../helpers/keypair')
 const truncate = require('./../helpers/truncate')

package/src/lib/services/rotate.js

@@ -14,7 +14,7 @@ const replace = require('./../helpers/replace')
 const append = require('./../helpers/append')
 const detectEncoding = require('./../helpers/detectEncoding')
 const determineEnvs = require('./../helpers/determineEnvs')
-const findPrivateKey = require('./../helpers/findPrivateKey')
+const { findPrivateKey } = require('./../helpers/findPrivateKey')
 const decryptKeyValue = require('./../helpers/decryptKeyValue')
 const keypair = require('./../helpers/keypair')
 

package/src/lib/services/run.js

@@ -11,7 +11,7 @@ const Errors = require('./../helpers/errors')
 const dotenvParse = require('./../helpers/dotenvParse')
 const parseEnvironmentFromDotenvKey = require('./../helpers/parseEnvironmentFromDotenvKey')
 const detectEncoding = require('./../helpers/detectEncoding')
-const findPrivateKey = require('./../helpers/findPrivateKey')
+const { findPrivateKey } = require('./../helpers/findPrivateKey')
 const guessPrivateKeyName = require('./../helpers/guessPrivateKeyName')
 const determineEnvs = require('./../helpers/determineEnvs')
 

package/src/lib/services/sets.js

@@ -12,7 +12,7 @@ const replace = require('./../helpers/replace')
 const dotenvParse = require('./../helpers/dotenvParse')
 const detectEncoding = require('./../helpers/detectEncoding')
 const determineEnvs = require('./../helpers/determineEnvs')
-const findPrivateKey = require('./../helpers/findPrivateKey')
+const { findPrivateKey } = require('./../helpers/findPrivateKey')
 const findPublicKey = require('./../helpers/findPublicKey')
 const keypair = require('./../helpers/keypair')
 const truncate = require('./../helpers/truncate')

package/src/shared/logger.js

@@ -22,6 +22,8 @@ const verbose = getColor('plum')
 const debug = getColor('plum')
 
 let currentLevel = levels.info // default log level
+let currentName = 'dotenvx' // default logger name
+let currentVersion = packageJson.version // default logger version
 
 function stderr (level, message) {
   const formattedMessage = formatMessage(level, message)
@@ -53,7 +55,7 @@ function formatMessage (level, message) {
     case 'success':
       return success(formattedMessage)
     case 'successv': // success with 'version'
-      return successv(`[dotenvx@${packageJson.version}] ${formattedMessage}`)
+      return successv(`[${currentName}@${currentVersion}] ${formattedMessage}`)
     // info
     case 'info':
       return formattedMessage
@@ -93,6 +95,14 @@ const logger = {
       currentLevel = levels[level]
       logger.level = level
     }
+  },
+  setName: (name) => {
+    currentName = name
+    logger.name = name
+  },
+  setVersion: (version) => {
+    currentVersion = version
+    logger.version = version
   }
 }
 
@@ -113,9 +123,23 @@ function setLogLevel (options) {
   }
 }
 
+function setLogName (options) {
+  const logName = options.logName
+  if (!logName) return
+  logger.setName(logName)
+}
+
+function setLogVersion (options) {
+  const logVersion = options.logVersion
+  if (!logVersion) return
+  logger.setVersion(logVersion)
+}
+
 module.exports = {
   logger,
   getColor,
   setLogLevel,
+  setLogName,
+  setLogVersion,
   levels
 }