@dotenvx/next-env 2.1.0 → 2.1.2

package/dist/index.cjs

@@ -6120,7 +6120,22 @@ var require_dist = __commonJS({
         var fs2 = require("fs");
         var derive2 = require_derive();
         var scan2 = require_scan();
-        function keysFromFile(filepath = ".env.keys") {
+        async function keysFromFile(filepath = ".env.keys") {
+          try {
+            const src = await fs2.promises.readFile(filepath, "utf8");
+            const { parsed } = scan2(src);
+            const result = [];
+            for (const name in parsed) {
+              if (name.startsWith("DOTENV_PRIVATE_KEY")) {
+                result.push(parsed[name][parsed[name].length - 1]);
+              }
+            }
+            return result;
+          } catch (_e) {
+            return [];
+          }
+        }
+        function keysFromFileSync(filepath = ".env.keys") {
           try {
             const src = fs2.readFileSync(filepath, "utf8");
             const { parsed } = scan2(src);
@@ -6135,12 +6150,47 @@ var require_dist = __commonJS({
             return [];
           }
         }
-        function keyring2(options = {}) {
+        async function keyring2(options = {}) {
+          const ring = options.ring || {};
+          const provider = options.provider;
+          const processEnv2 = options.processEnv || process.env;
+          const keysFilepaths = Array.isArray(options.fk) ? options.fk : [options.fk || ".env.keys"];
+          const privateKeyValues = [];
+          for (const filepath of keysFilepaths) {
+            privateKeyValues.push(...await keysFromFile(filepath));
+          }
+          for (const name in processEnv2) {
+            if (name.startsWith("DOTENV_PRIVATE_KEY")) {
+              privateKeyValues.push(processEnv2[name]);
+            }
+          }
+          for (const privateKeyHex of privateKeyValues) {
+            try {
+              const publicKeyHex = derive2(privateKeyHex);
+              ring[publicKeyHex] = privateKeyHex;
+            } catch (_e) {
+            }
+          }
+          if (typeof provider === "function") {
+            for (const publicKeyHex in ring) {
+              if (ring[publicKeyHex]) {
+                continue;
+              }
+              const privateKeyHex = await provider(publicKeyHex);
+              if (privateKeyHex) {
+                ring[publicKeyHex] = privateKeyHex;
+              }
+            }
+          }
+          return ring;
+        }
+        function keyringSync2(options = {}) {
           const ring = options.ring || {};
+          const provider = options.provider;
           const processEnv2 = options.processEnv || process.env;
           const keysFilepaths = Array.isArray(options.fk) ? options.fk : [options.fk || ".env.keys"];
           const privateKeyValues = keysFilepaths.reduce((acc, filepath) => {
-            return acc.concat(keysFromFile(filepath));
+            return acc.concat(keysFromFileSync(filepath));
           }, []);
           for (const name in processEnv2) {
             if (name.startsWith("DOTENV_PRIVATE_KEY")) {
@@ -6154,9 +6204,21 @@ var require_dist = __commonJS({
             } catch (_e) {
             }
           }
+          if (typeof provider === "function") {
+            for (const publicKeyHex in ring) {
+              if (ring[publicKeyHex]) {
+                continue;
+              }
+              const privateKeyHex = provider(publicKeyHex);
+              if (privateKeyHex) {
+                ring[publicKeyHex] = privateKeyHex;
+              }
+            }
+          }
           return ring;
         }
         module22.exports = keyring2;
+        module22.exports.sync = keyringSync2;
       }
     });
     var require_publickeys = __commonJS2({
@@ -6179,6 +6241,7 @@ var require_dist = __commonJS({
       "src/parse.js"(exports22, module22) {
         var decrypt2 = require_decrypt();
         var keyring2 = require_keyring();
+        var keyringSync2 = require_keyring().sync;
         var encrypted2 = require_encrypted();
         var evaluate2 = require_evaluate();
         var expand2 = require_expand();
@@ -6211,21 +6274,41 @@ var require_dist = __commonJS({
           }
           return value;
         }
-        function parse22(src, options = {}) {
+        async function parse2(src, options = {}) {
+          const { overload, processEnv: processEnv2, fk, provider, publicKeyHexes, ring: initialRing } = keyringOptions(src, options);
+          const ring = await keyring2({ processEnv: processEnv2, ring: initialRing, fk, provider });
+          return parseWithRing(src, { overload, processEnv: processEnv2, ring, publicKeyHexes });
+        }
+        function parseSync22(src, options = {}) {
+          const { overload, processEnv: processEnv2, fk, provider, publicKeyHexes, ring: initialRing } = keyringOptions(src, options);
+          const ring = keyringSync2({ processEnv: processEnv2, ring: initialRing, fk, provider });
+          return parseWithRing(src, { overload, processEnv: processEnv2, ring, publicKeyHexes });
+        }
+        function keyringOptions(src, options = {}) {
           const overload = options.overload;
           const processEnv2 = options.processEnv || process.env;
+          const fk = options.fk;
+          const provider = options.provider;
           const publicKeyHexes = publickeys2(src);
-          let ring = {};
+          const ring = {};
           for (const publicKeyHex of publicKeyHexes) {
             ring[publicKeyHex] = "";
           }
-          ring = keyring2({ processEnv: processEnv2, ring });
+          return { overload, processEnv: processEnv2, fk, provider, publicKeyHexes, ring };
+        }
+        function parseWithRing(src, options = {}) {
+          const overload = options.overload;
+          const processEnv2 = options.processEnv || process.env;
+          const ring = options.ring || {};
+          const publicKeyHexes = options.publicKeyHexes || [];
           function inProcessEnv(name) {
             return Object.prototype.hasOwnProperty.call(processEnv2, name);
           }
           const runningParsed = {};
           const literals = {};
           const parsed = {};
+          const injected = {};
+          const existed = {};
           scan2(src, ({ name, value, quote }) => {
             let parsedValue = value;
             if (!overload && inProcessEnv(name)) {
@@ -6245,7 +6328,7 @@ var require_dist = __commonJS({
               }
             }
             if (!encryptedPrefixed && !evaled && quote !== "'" && (!processEnv2[name] || overload)) {
-              parsedValue = resolveEscapeSequences(expand2(parsedValue, { processEnv: processEnv2, runningParsed, literals }));
+              parsedValue = resolveEscapeSequences(expand2(parsedValue, { overload, processEnv: processEnv2, runningParsed, literals }));
             }
             if (quote === "'") {
               literals[name] = parsedValue;
@@ -6253,15 +6336,20 @@ var require_dist = __commonJS({
             runningParsed[name] = parsedValue;
             parsed[name] = parsedValue;
             if (Object.prototype.hasOwnProperty.call(processEnv2, name) && !overload) {
+              existed[name] = processEnv2[name];
             } else {
+              injected[name] = parsed[name];
             }
             return parsedValue;
           });
           return {
-            parsed
+            parsed,
+            injected,
+            existed
           };
         }
-        module22.exports = parse22;
+        module22.exports = parse2;
+        module22.exports.sync = parseSync22;
       }
     });
     var require_sealed = __commonJS2({
@@ -6293,7 +6381,9 @@ var require_dist = __commonJS({
     var expand = require_expand();
     var keypair = require_keypair();
     var keyring = require_keyring();
-    var parse2 = require_parse();
+    var keyringSync = require_keyring().sync;
+    var parse = require_parse();
+    var parseSync2 = require_parse().sync;
     var publickeys = require_publickeys();
     var scan = require_scan();
     var sealed = require_sealed();
@@ -6306,7 +6396,9 @@ var require_dist = __commonJS({
       expand,
       keypair,
       keyring,
-      parse: parse2,
+      keyringSync,
+      parse,
+      parseSync: parseSync2,
       publickeys,
       scan,
       sealed
@@ -6317,7 +6409,7 @@ var require_dist = __commonJS({
 // index.cjs
 var fs = require("fs");
 var path = require("path");
-var { parse } = require_dist();
+var { parseSync } = require_dist();
 var initialEnv;
 var combinedEnv;
 var parsedEnv;
@@ -6359,7 +6451,7 @@ function processEnv(loadedEnvFiles, dir, log = console, forceReload = false, onR
   const parsed = {};
   for (const envFile of loadedEnvFiles) {
     try {
-      const result = parse(envFile.contents);
+      const result = parseSync(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.1.0",
+  "version": "2.1.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.9.0",
+    "@dotenvx/primitives": "1.0.1",
     "esbuild": "^0.28.1"
   }
 }