@dotenvx/dotenvx 2.26.1 → 2.28.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/CHANGELOG.md +24 -1
  2. package/README.md +48 -40
  3. package/package.json +12 -2
  4. package/src/cli/actions/decrypt.js +3 -3
  5. package/src/cli/actions/encrypt.js +3 -3
  6. package/src/cli/actions/get.js +2 -2
  7. package/src/cli/actions/keypair.js +1 -1
  8. package/src/cli/actions/run.js +46 -42
  9. package/src/cli/actions/set.js +2 -2
  10. package/src/cli/actions/validate.js +21 -33
  11. package/src/cli/dotenvx.js +2 -2
  12. package/src/lib/grammars/envfile.peggy +98 -0
  13. package/src/lib/helpers/encryptedSources.js +15 -0
  14. package/src/lib/helpers/envfileParser.js +2731 -0
  15. package/src/lib/helpers/errors.js +16 -16
  16. package/src/lib/helpers/executeCommand.js +6 -2
  17. package/src/lib/helpers/formatEnvfileSyntaxError.js +24 -0
  18. package/src/lib/helpers/isValidEmail.js +11 -0
  19. package/src/lib/helpers/isValidUrl.js +9 -0
  20. package/src/lib/helpers/parseWithDecryptor.js +9 -1
  21. package/src/lib/helpers/prompts.js +2 -1
  22. package/src/lib/helpers/readEnvfile.js +128 -0
  23. package/src/lib/helpers/selectKeyStorage.js +19 -13
  24. package/src/lib/helpers/validate.js +83 -14
  25. package/src/lib/helpers/validateEnvfile.js +24 -0
  26. package/src/lib/main.js +7 -7
  27. package/src/lib/providers/index.js +1 -1
  28. package/src/lib/proxy/configureProxy.js +55 -0
  29. package/src/lib/proxy/eligibleHeaders.js +16 -0
  30. package/src/lib/proxy/prepareProxy.js +24 -0
  31. package/src/lib/proxy/proxyCertificates.js +44 -0
  32. package/src/lib/proxy/proxyForward.js +65 -0
  33. package/src/lib/proxy/proxyPreload.js +21 -0
  34. package/src/lib/proxy/proxyPreloadSource.js +3 -0
  35. package/src/lib/proxy/proxyServer.js +175 -0
  36. package/src/lib/resolvers/envs.js +15 -5
  37. package/src/lib/resolvers/get.js +1 -1
  38. package/src/lib/services/validate.js +58 -0
  39. package/src/lib/transforms/set.js +2 -2
  40. package/src/lib/helpers/validateEnvExample.js +0 -24
@@ -0,0 +1,98 @@
1
+ Document
2
+ = _ encrypted:EncryptedDefault? _ entries:((FileBlock / Declaration) _)* {
3
+ return { encrypted: encrypted === true, declarations: entries.map(item => item[0]).filter(item => !item.file), files: entries.map(item => item[0]).filter(item => item.file) };
4
+ }
5
+
6
+ FileBlock
7
+ = "file" [ \t]+ file:Filename [ \t]+ "do" [ \t]* Comment? Newline _ encrypted:EncryptedDefault? _ declarations:(Declaration _)* "end" [ \t]* Comment? (Newline / !.) {
8
+ return { file, encrypted, declarations: declarations.map(item => item[0]) };
9
+ }
10
+
11
+ Filename "a quoted filename"
12
+ = '"' value:$([^"\r\n\0]+) '"' { return value; }
13
+ / "'" value:$([^'\r\n\0]+) "'" { return value; }
14
+
15
+ EncryptedDefault
16
+ = "encrypted" [ \t]+ value:Boolean [ \t]* Comment? (Newline / !.) { return value; }
17
+
18
+ Declaration
19
+ = "env" [ \t]+ name:Name options:Option* [ \t]* Comment? (Newline / !.) {
20
+ const declaration = { name };
21
+ const seen = new Set();
22
+ for (const option of options) {
23
+ if (seen.has(option.key)) error(`Duplicate Envfile option: ${option.key}`);
24
+ if ((option.key === "optional" && seen.has("required")) ||
25
+ (option.key === "required" && seen.has("optional"))) {
26
+ error("Cannot combine required and optional in an Envfile declaration");
27
+ }
28
+ seen.add(option.key);
29
+ if (option.key === "optional") declaration.required = !option.value;
30
+ else declaration[option.key] = option.value;
31
+ }
32
+ return declaration;
33
+ }
34
+
35
+ Option
36
+ = [ \t]* "," _ "proxy" [ \t]* ":" _ value:(ProxyOptions / Disabled) { return { key: "proxy", value }; }
37
+ / [ \t]* "," _ "required" [ \t]* ":" _ value:Boolean { return { key: "required", value }; }
38
+ / [ \t]* "," _ "optional" [ \t]* ":" _ value:Boolean { return { key: "optional", value }; }
39
+ / [ \t]* "," _ "encrypted" [ \t]* ":" _ value:Boolean { return { key: "encrypted", value }; }
40
+ / [ \t]* "," _ "type" [ \t]* ":" _ value:Type { return { key: "type", value }; }
41
+ / [ \t]* "," _ "enum" [ \t]* ":" _ value:Enum { return { key: "enum", value }; }
42
+ / [ \t]* "," _ key:("min" / "max") [ \t]* ":" _ value:Integer { return { key, value }; }
43
+
44
+ Integer "an integer"
45
+ = value:$([+-]? [0-9]+) { return value; }
46
+
47
+ Enum
48
+ = "[" _ first:EnumValue rest:(_ "," _ value:EnumValue { return value; })* _ ","? _ "]" {
49
+ return [first, ...rest];
50
+ }
51
+
52
+ EnumValue
53
+ = '"' chars:(Escape / [^"\\\r\n])* '"' { return chars.join(""); }
54
+ / "'" chars:(Escape / [^'\\\r\n])* "'" { return chars.join(""); }
55
+ / Integer
56
+
57
+ Escape
58
+ = "\\" char:["'\\nrt] {
59
+ return ({ n: "\n", r: "\r", t: "\t" })[char] || char;
60
+ }
61
+
62
+ Type "a supported type (integer, boolean, port, url, email, or ip)"
63
+ = ('"integer"' / "'integer'") { return "integer"; }
64
+ / ('"boolean"' / "'boolean'") { return "boolean"; }
65
+ / ('"port"' / "'port'") { return "port"; }
66
+ / ('"url"' / "'url'") { return "url"; }
67
+ / ('"email"' / "'email'") { return "email"; }
68
+ / ('"ip"' / "'ip'") { return "ip"; }
69
+
70
+ Boolean "true or false"
71
+ = "true" { return true; }
72
+ / Disabled
73
+
74
+ ProxyOptions
75
+ = "{" _ "domain" [ \t]* ":" _ domain:Destination _ ","? _ "}" { return { domain }; }
76
+
77
+ Disabled
78
+ = "false" { return false; }
79
+
80
+ Destination "a quoted domain"
81
+ = '"' host:$([A-Za-z0-9.-]+) '"' { return host; }
82
+ / "'" host:$([A-Za-z0-9.-]+) "'" { return host; }
83
+
84
+ Name "a quoted variable name"
85
+ = '"' name:Identifier '"' { return name; }
86
+ / "'" name:Identifier "'" { return name; }
87
+
88
+ Identifier
89
+ = $([A-Za-z_] [A-Za-z0-9_]*)
90
+
91
+ Comment
92
+ = "#" [^\r\n]*
93
+
94
+ Newline
95
+ = "\r\n" / "\n" / "\r"
96
+
97
+ _
98
+ = ([ \t] / Newline / Comment)*
@@ -0,0 +1,15 @@
1
+ const { scan, encrypted } = require('@dotenvx/primitives')
2
+
3
+ // Follow actual injection order, so shell overrides and --overload retain their semantics.
4
+ module.exports = function encryptedSources (processedEnvs) {
5
+ const keys = new Set()
6
+ for (const row of processedEnvs || []) {
7
+ const { parsed } = scan(row.src || row.string || '')
8
+ for (const [key, value] of Object.entries(row.injected || {})) {
9
+ const original = parsed[key]?.at(-1)
10
+ if (encrypted(original) && !encrypted(value)) keys.add(key)
11
+ else keys.delete(key)
12
+ }
13
+ }
14
+ return keys
15
+ }