@dotenvx/next-env 2.0.0 → 2.0.2

package/README.md

@@ -7,7 +7,7 @@ Use it when you want Next.js to load encrypted dotenvx files during Next's own e
 ```json
 {
   "dependencies": {
-    "@dotenvx/next-env": "^1.74.0",
+    "@dotenvx/next-env": "^2.0.0",
     "next": "^16.0.0"
   },
   "overrides": {

package/dist/index.cjs

@@ -6010,40 +6010,12 @@ var require_dist = __commonJS({
         module22.exports = expand2;
       }
     });
-    var require_keyring = __commonJS2({
-      "src/keyring.js"(exports22, module22) {
-        var { PrivateKey } = require_dist2();
-        var derive2 = require_derive();
-        function keyring2() {
-          const mem = {};
-          const processEnv2 = process.env;
-          for (const name in processEnv2) {
-            if (name.startsWith("DOTENV_PRIVATE_KEY")) {
-              try {
-                const privateKeyHex = processEnv2[name];
-                const publicKeyHex = derive2(privateKeyHex);
-                mem[publicKeyHex] = privateKeyHex;
-              } catch (_e) {
-              }
-            }
-          }
-          return mem;
-        }
-        module22.exports = keyring2;
-      }
-    });
-    var require_parse = __commonJS2({
-      "src/parse.js"(exports22, module22) {
-        var decrypt2 = require_decrypt();
-        var keyring2 = require_keyring();
-        var encrypted2 = require_encrypted();
-        var evaluate2 = require_evaluate();
-        var expand2 = require_expand();
-        var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
+    var require_scan = __commonJS2({
+      "src/scan.js"(exports22, module22) {
         function trimmer(value) {
           return (value || "").trim();
         }
-        function quote(value) {
+        function getQuote(value) {
           const v = trimmer(value);
           const maybeQuote = v[0];
           let q = "";
@@ -6066,16 +6038,89 @@ var require_dist = __commonJS({
           }
           return q;
         }
-        function clean(value, _quote) {
+        function clean(value, quote) {
           let v = trimmer(value);
           v = v.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
-          if (_quote === '"') {
+          if (quote === '"') {
             v = v.replace(/\\n/g, "\n");
             v = v.replace(/\\r/g, "\r");
             v = v.replace(/\\t/g, "	");
           }
           return v;
         }
+        function scan2(src, transform) {
+          const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
+          const parsed = {};
+          const lines = (src || "").toString().replace(/\r\n?/mg, "\n");
+          let match;
+          while ((match = LINE.exec(lines)) !== null) {
+            const name = match[1];
+            const raw = match[2];
+            const quote = getQuote(raw);
+            const value = clean(raw, quote);
+            let parsedValue = value;
+            if (typeof transform === "function") {
+              parsedValue = transform({
+                name,
+                value,
+                quote
+              });
+            }
+            parsed[name] = parsedValue;
+          }
+          return {
+            parsed
+          };
+        }
+        module22.exports = scan2;
+      }
+    });
+    var require_keyring = __commonJS2({
+      "src/keyring.js"(exports22, module22) {
+        var fs2 = require("fs");
+        var derive2 = require_derive();
+        var scan2 = require_scan();
+        function keysFromFile(filepath = ".env.keys") {
+          try {
+            const src = fs2.readFileSync(filepath, "utf8");
+            const { parsed } = scan2(src);
+            return parsed;
+          } catch (_e) {
+            return {};
+          }
+        }
+        function keyring2() {
+          const mem = {};
+          const processEnv2 = process.env;
+          const keysFilepath = ".env.keys";
+          const sources = {
+            ...keysFromFile(keysFilepath),
+            ...processEnv2
+            // process.env wins
+          };
+          for (const name in sources) {
+            if (name.startsWith("DOTENV_PRIVATE_KEY")) {
+              try {
+                const privateKeyHex = sources[name];
+                const publicKeyHex = derive2(privateKeyHex);
+                mem[publicKeyHex] = privateKeyHex;
+              } catch (_e) {
+              }
+            }
+          }
+          return mem;
+        }
+        module22.exports = keyring2;
+      }
+    });
+    var require_parse = __commonJS2({
+      "src/parse.js"(exports22, module22) {
+        var decrypt2 = require_decrypt();
+        var keyring2 = require_keyring();
+        var encrypted2 = require_encrypted();
+        var evaluate2 = require_evaluate();
+        var expand2 = require_expand();
+        var scan2 = require_scan();
         function resolveEscapeSequences(value) {
           return value.replace(/\\\$/g, "$");
         }
@@ -6086,50 +6131,45 @@ var require_dist = __commonJS({
           function inProcessEnv(name) {
             return Object.prototype.hasOwnProperty.call(processEnv2, name);
           }
-          let parsed = {};
           let publicKeyHex;
           let runningParsed = {};
           let literals = {};
-          const lines = (src || "").toString().replace(/\r\n?/mg, "\n");
-          let match;
-          while ((match = LINE.exec(lines)) !== null) {
-            const name = match[1];
-            const value = match[2];
-            const _quote = quote(value);
-            parsed[name] = clean(value, _quote);
+          const { parsed } = scan2(src, ({ name, value, quote }) => {
+            let parsedValue = value;
             if (name.startsWith("DOTENV_PUBLIC_KEY")) {
-              publicKeyHex = parsed[name];
+              publicKeyHex = parsedValue;
             }
             if (!overload && inProcessEnv(name)) {
-              parsed[name] = processEnv2[name];
+              parsedValue = processEnv2[name];
             }
             try {
-              parsed[name] = decrypt2(ring[publicKeyHex], parsed[name]);
+              parsedValue = decrypt2(ring[publicKeyHex], parsedValue);
             } catch (_e) {
             }
-            const encryptedPrefixed = encrypted2(parsed[name]);
+            const encryptedPrefixed = encrypted2(parsedValue);
             let evaled = false;
-            if (!encryptedPrefixed && _quote !== "'" && (!inProcessEnv(name) || processEnv2[name] === parsed[name])) {
-              const priorEvaled = parsed[name];
+            if (!encryptedPrefixed && quote !== "'" && (!inProcessEnv(name) || processEnv2[name] === parsedValue)) {
+              const priorEvaled = parsedValue;
               try {
-                parsed[name] = evaluate2(priorEvaled, { processEnv: processEnv2, runningParsed });
+                parsedValue = evaluate2(priorEvaled, { processEnv: processEnv2, runningParsed });
               } catch (_e) {
               }
-              if (priorEvaled !== parsed[name]) {
+              if (priorEvaled !== parsedValue) {
                 evaled = true;
               }
             }
-            if (!encryptedPrefixed && !evaled && _quote !== "'" && (!processEnv2[name] || overload)) {
-              parsed[name] = resolveEscapeSequences(expand2(parsed[name], { processEnv: processEnv2, runningParsed, literals }));
+            if (!encryptedPrefixed && !evaled && quote !== "'" && (!processEnv2[name] || overload)) {
+              parsedValue = resolveEscapeSequences(expand2(parsedValue, { processEnv: processEnv2, runningParsed, literals }));
             }
             if (quote === "'") {
-              literals[name] = parsed[name];
+              literals[name] = parsedValue;
             }
-            runningParsed[name] = parsed[name];
+            runningParsed[name] = parsedValue;
             if (Object.prototype.hasOwnProperty.call(processEnv2, name) && !overload) {
             } else {
             }
-          }
+            return parsedValue;
+          });
           return {
             parsed
           };
@@ -6144,6 +6184,7 @@ var require_dist = __commonJS({
     var expand = require_expand();
     var keyring = require_keyring();
     var parse2 = require_parse();
+    var scan = require_scan();
     module2.exports = {
       decrypt,
       derive,
@@ -6151,7 +6192,8 @@ var require_dist = __commonJS({
       evaluate,
       expand,
       keyring,
-      parse: parse2
+      parse: parse2,
+      scan
     };
   }
 });
@@ -6201,8 +6243,7 @@ function processEnv(loadedEnvFiles, dir, log = console, forceReload = false, onR
   const parsed = {};
   for (const envFile of loadedEnvFiles) {
     try {
-      let result = {};
-      result.parsed = parse(envFile.contents);
+      const result = parse(envFile.contents);
       if (result.parsed && !previousLoadedEnvFiles.some(
         (item) => item.contents === envFile.contents && item.path === envFile.path
       )) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotenvx/next-env",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "dotenvx drop-in replacement for @next/env",
   "license": "BSD-3-Clause",
   "repository": {
@@ -23,7 +23,7 @@
     "prepublishOnly": "npm pack --dry-run"
   },
   "devDependencies": {
-    "@dotenvx/primitives": "0.3.0",
+    "@dotenvx/primitives": "0.4.0",
     "esbuild": "^0.28.1"
   }
 }