@stryke/env 0.17.6 → 0.18.0

package/dist/load-env.cjs

@@ -9,47 +9,48 @@ exports.loadEnv = loadEnv;
 exports.loadEnvFile = loadEnvFile;
 exports.loadServerEnv = loadServerEnv;
 var _dotenvx = require("@dotenvx/dotenvx");
+var _toArray = require("@stryke/convert/to-array");
 var _readFile = require("@stryke/fs/read-file");
 var _exists = require("@stryke/path/exists");
 var _joinPaths = require("@stryke/path/join-paths");
 var _defu = _interopRequireDefault(require("defu"));
 var _types = require("./types.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function getEnvFilesForMode(n, r = "production") {
-  return [".env", ".env.local", `.env.${r}`, `.env.${r}.local`, `.env.local.${r}`].map(s => (0, _joinPaths.joinPaths)(n, s));
+function getEnvFilesForMode(r, s = "production") {
+  return [".env", ".env.local", `.env.${s}`, `.env.${s}.local`, `.env.local.${s}`].map(i => (0, _joinPaths.joinPaths)(r, i));
 }
-async function loadEnvFile(n, r = []) {
-  const s = Array.isArray(r) ? r : [r];
-  return (await Promise.all((r.length > 0 ? s.map(t => (0, _joinPaths.joinPaths)(t, n)) : [n]).map(async t => {
-    if ((0, _exists.existsSync)(t)) return (0, _readFile.readFile)(t);
-  }))).reduce((t, c) => {
-    if (!c) return t;
-    const a = (0, _dotenvx.parse)(c, {
+async function loadEnvFile(r, s = []) {
+  const i = Array.isArray(s) ? s : [s];
+  return (await Promise.all((s.length > 0 ? i.map(e => (0, _joinPaths.joinPaths)(e, r)) : [r]).map(async e => {
+    if ((0, _exists.existsSync)(e)) return (0, _readFile.readFile)(e);
+  }))).reduce((e, a) => {
+    if (!a) return e;
+    const u = (0, _dotenvx.parse)(a, {
       processEnv: {
         ...process.env
       },
       privateKey: process.env.DOTENV_PRIVATE_KEY || process.env.STORM_PRIVATE_KEY
     });
-    return (0, _defu.default)(a, t);
+    return (0, _defu.default)(u, e);
   }, {});
 }
-async function loadEnv(n, r, s) {
-  if (r === "local") throw new Error('"local" cannot be used as a mode name because it conflicts with the .local postfix for .env files.');
-  const t = s ? Array.isArray(s) ? s : [s] : [],
-    c = Array.isArray(n) ? n : [n],
-    a = {},
-    E = c.reduce((e, i) => (e.push(...getEnvFilesForMode(i, r).filter(u => !e.includes(u))), e), []);
-  let o = (await Promise.all(E.map(async e => loadEnvFile(e)))).reduce((e, i) => (0, _defu.default)(i, e), {});
+async function loadEnv(r, s, i) {
+  if (s === "local") throw new Error('"local" cannot be used as a mode name because it conflicts with the .local postfix for .env files.');
+  const e = (0, _toArray.toArray)(i).reduce((n, t) => (t && (n.includes(t.endsWith("_") ? t : `${t}_`) || n.push(t.endsWith("_") ? t : `${t}_`), n.includes(`${t.endsWith("_") ? t : `${t}_`}PUBLIC_`) || n.push(`${t.endsWith("_") ? t : `${t}_`}PUBLIC_`)), n), []),
+    a = Array.isArray(r) ? r : [r],
+    u = {},
+    l = a.reduce((n, t) => (n.push(...getEnvFilesForMode(t, s).filter(c => !n.includes(c))), n), []);
+  let o = (await Promise.all(l.map(async n => loadEnvFile(n)))).reduce((n, t) => (0, _defu.default)(t, n), {});
   if (o.NODE_ENV && process.env.VITE_USER_NODE_ENV === void 0 && (process.env.VITE_USER_NODE_ENV = JSON.stringify(o.NODE_ENV)), o.BROWSER && process.env.BROWSER === void 0 && (process.env.BROWSER = JSON.stringify(o.BROWSER)), o.BROWSER_ARGS && process.env.BROWSER_ARGS === void 0 && (process.env.BROWSER_ARGS = JSON.stringify(o.BROWSER_ARGS)), o = (0, _defu.default)({
     ...process.env
-  }, o), t.length === 0) return o;
-  for (const [e, i] of Object.entries(o)) t.some(u => e.startsWith(u)) && (a[e] = String(i));
-  for (const e in process.env) t.some(i => e.startsWith(i)) && (a[e] = process.env[e]);
-  return a;
+  }, o), e.length === 0) return o;
+  for (const [n, t] of Object.entries(o)) e.some(c => n.startsWith(c)) && (u[n] = String(t));
+  for (const n in process.env) e.some(t => n.startsWith(t)) && (u[n] = process.env[n]);
+  return u;
 }
-async function loadClientEnv(n, r, s = _types.ENV_PREFIXES) {
-  return loadEnv(n, r, s);
+async function loadClientEnv(r, s, i = _types.ENV_PREFIXES) {
+  return loadEnv(r, s, i);
 }
-async function loadServerEnv(n, r) {
-  return loadEnv(n, r);
+async function loadServerEnv(r, s) {
+  return loadEnv(r, s);
 }

package/dist/load-env.mjs

@@ -1 +1 @@
-import{parse as v}from"@dotenvx/dotenvx";import{readFile as l}from"@stryke/fs/read-file";import{existsSync as g}from"@stryke/path/exists";import{joinPaths as f}from"@stryke/path/join-paths";import p from"defu";import{ENV_PREFIXES as m}from"./types";export function getEnvFilesForMode(n,r="production"){return[".env",".env.local",`.env.${r}`,`.env.${r}.local`,`.env.local.${r}`].map(s=>f(n,s))}export async function loadEnvFile(n,r=[]){const s=Array.isArray(r)?r:[r];return(await Promise.all((r.length>0?s.map(t=>f(t,n)):[n]).map(async t=>{if(g(t))return l(t)}))).reduce((t,c)=>{if(!c)return t;const a=v(c,{processEnv:{...process.env},privateKey:process.env.DOTENV_PRIVATE_KEY||process.env.STORM_PRIVATE_KEY});return p(a,t)},{})}export async function loadEnv(n,r,s){if(r==="local")throw new Error('"local" cannot be used as a mode name because it conflicts with the .local postfix for .env files.');const t=s?Array.isArray(s)?s:[s]:[],c=Array.isArray(n)?n:[n],a={},E=c.reduce((e,i)=>(e.push(...getEnvFilesForMode(i,r).filter(u=>!e.includes(u))),e),[]);let o=(await Promise.all(E.map(async e=>loadEnvFile(e)))).reduce((e,i)=>p(i,e),{});if(o.NODE_ENV&&process.env.VITE_USER_NODE_ENV===void 0&&(process.env.VITE_USER_NODE_ENV=JSON.stringify(o.NODE_ENV)),o.BROWSER&&process.env.BROWSER===void 0&&(process.env.BROWSER=JSON.stringify(o.BROWSER)),o.BROWSER_ARGS&&process.env.BROWSER_ARGS===void 0&&(process.env.BROWSER_ARGS=JSON.stringify(o.BROWSER_ARGS)),o=p({...process.env},o),t.length===0)return o;for(const[e,i]of Object.entries(o))t.some(u=>e.startsWith(u))&&(a[e]=String(i));for(const e in process.env)t.some(i=>e.startsWith(i))&&(a[e]=process.env[e]);return a}export async function loadClientEnv(n,r,s=m){return loadEnv(n,r,s)}export async function loadServerEnv(n,r){return loadEnv(n,r)}
+import{parse as E}from"@dotenvx/dotenvx";import{toArray as v}from"@stryke/convert/to-array";import{readFile as d}from"@stryke/fs/read-file";import{existsSync as m}from"@stryke/path/exists";import{joinPaths as p}from"@stryke/path/join-paths";import f from"defu";import{ENV_PREFIXES as g}from"./types";export function getEnvFilesForMode(r,s="production"){return[".env",".env.local",`.env.${s}`,`.env.${s}.local`,`.env.local.${s}`].map(i=>p(r,i))}export async function loadEnvFile(r,s=[]){const i=Array.isArray(s)?s:[s];return(await Promise.all((s.length>0?i.map(e=>p(e,r)):[r]).map(async e=>{if(m(e))return d(e)}))).reduce((e,a)=>{if(!a)return e;const u=E(a,{processEnv:{...process.env},privateKey:process.env.DOTENV_PRIVATE_KEY||process.env.STORM_PRIVATE_KEY});return f(u,e)},{})}export async function loadEnv(r,s,i){if(s==="local")throw new Error('"local" cannot be used as a mode name because it conflicts with the .local postfix for .env files.');const e=v(i).reduce((n,t)=>(t&&(n.includes(t.endsWith("_")?t:`${t}_`)||n.push(t.endsWith("_")?t:`${t}_`),n.includes(`${t.endsWith("_")?t:`${t}_`}PUBLIC_`)||n.push(`${t.endsWith("_")?t:`${t}_`}PUBLIC_`)),n),[]),a=Array.isArray(r)?r:[r],u={},l=a.reduce((n,t)=>(n.push(...getEnvFilesForMode(t,s).filter(c=>!n.includes(c))),n),[]);let o=(await Promise.all(l.map(async n=>loadEnvFile(n)))).reduce((n,t)=>f(t,n),{});if(o.NODE_ENV&&process.env.VITE_USER_NODE_ENV===void 0&&(process.env.VITE_USER_NODE_ENV=JSON.stringify(o.NODE_ENV)),o.BROWSER&&process.env.BROWSER===void 0&&(process.env.BROWSER=JSON.stringify(o.BROWSER)),o.BROWSER_ARGS&&process.env.BROWSER_ARGS===void 0&&(process.env.BROWSER_ARGS=JSON.stringify(o.BROWSER_ARGS)),o=f({...process.env},o),e.length===0)return o;for(const[n,t]of Object.entries(o))e.some(c=>n.startsWith(c))&&(u[n]=String(t));for(const n in process.env)e.some(t=>n.startsWith(t))&&(u[n]=process.env[n]);return u}export async function loadClientEnv(r,s,i=g){return loadEnv(r,s,i)}export async function loadServerEnv(r,s){return loadEnv(r,s)}

package/dist/types.cjs

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ENV_PREFIXES = void 0;
-const ENV_PREFIXES = exports.ENV_PREFIXES = ["VITE_", "ONE_", "STORM_PUBLIC_", "STORM_", "STORM_STACK_PUBLIC_", "STORM_STACK_", "NEXT_PUBLIC_"];
+const ENV_PREFIXES = exports.ENV_PREFIXES = ["VITE_", "ONE_", "STORM_", "STORM_STACK_", "NEXT_", "VERCEL_"];

package/dist/types.mjs

@@ -1 +1 @@
-export const ENV_PREFIXES=["VITE_","ONE_","STORM_PUBLIC_","STORM_","STORM_STACK_PUBLIC_","STORM_STACK_","NEXT_PUBLIC_"];
+export const ENV_PREFIXES=["VITE_","ONE_","STORM_","STORM_STACK_","NEXT_","VERCEL_"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/env",
-  "version": "0.17.6",
+  "version": "0.18.0",
   "type": "module",
   "description": "A package containing utility functions to handle environment specific processes",
   "repository": {
@@ -11,6 +11,7 @@
   "private": false,
   "dependencies": {
     "@dotenvx/dotenvx": "1.35.0",
+    "@stryke/convert": "^0.3.1",
     "@stryke/fs": "^0.25.0",
     "@stryke/path": "^0.12.5",
     "@stryke/string-format": "^0.10.0",
@@ -174,5 +175,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "a4337f9cb38835e8f5b60e857c08235552b7db77"
+  "gitHead": "3326ca10ce43fd782ffb2fa29d49bf152e1dac05"
 }