@cogs/config 0.5.0 → 0.5.1
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.
- package/README.md +4 -4
- package/dist/cjs/dotenv-fixers.js +15 -18
- package/dist/cli-core.d.ts +2 -2
- package/dist/cli-core.d.ts.map +1 -1
- package/dist/cli-core.js +5 -6
- package/dist/cli-core.js.map +1 -1
- package/dist/dotenv-fixers.d.ts.map +1 -1
- package/dist/dotenv-fixers.js +15 -18
- package/dist/dotenv-fixers.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -161,10 +161,10 @@ BAR=plain
|
|
|
161
161
|
|
|
162
162
|
These are disclosed rather than silently inherited:
|
|
163
163
|
|
|
164
|
-
- **`--fix`
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
164
|
+
- **`--fix` strips quotes only as one outer matched pair**, and only adds a
|
|
165
|
+
wrapping quote the value does not already contain. A value with an
|
|
166
|
+
unmatched or internal quote (e.g. `O'Brien`) is reported but left
|
|
167
|
+
unchanged. Review every `--fix` diff before committing it.
|
|
168
168
|
- **`--fix` also applies `dotenvKeyFixers` to the key** (e.g. lowercase keys
|
|
169
169
|
are rewritten to uppercase), not just the value fixers above.
|
|
170
170
|
- **`--fix` only rewrites single-line entries.** Multiline quoted values are
|
|
@@ -38,15 +38,17 @@ const lowercaseKeyFixer = (key, line) => {
|
|
|
38
38
|
return [key.toUpperCase(), line];
|
|
39
39
|
};
|
|
40
40
|
exports.lowercaseKeyFixer = lowercaseKeyFixer;
|
|
41
|
-
|
|
42
|
-
//
|
|
43
|
-
//
|
|
41
|
+
const WRAPPING_QUOTES = ["'", '"', '`'];
|
|
42
|
+
// Quote character: strips ONE outer matched pair (`'`, `"` or backtick), the
|
|
43
|
+
// same pair dotenv removes when parsing. A value with an unmatched or internal
|
|
44
|
+
// quote (`O'Brien`) has no safe fix and is left unchanged.
|
|
44
45
|
const quoteCharacterFixer = (key, line) => {
|
|
45
46
|
if (!(0, dotenv_checkers_js_1.quoteCharacterChecker)(key, line)) {
|
|
46
47
|
return [key, line];
|
|
47
48
|
}
|
|
48
|
-
const
|
|
49
|
-
|
|
49
|
+
const wrapped = line.length >= 2 &&
|
|
50
|
+
WRAPPING_QUOTES.some((q) => line.startsWith(q) && line.endsWith(q));
|
|
51
|
+
return [key, wrapped ? line.slice(1, -1) : line];
|
|
50
52
|
};
|
|
51
53
|
exports.quoteCharacterFixer = quoteCharacterFixer;
|
|
52
54
|
// Fixes trailing whitespace.
|
|
@@ -57,23 +59,18 @@ const trailingWhitespaceFixer = (key, line) => {
|
|
|
57
59
|
return [key, line.trimEnd()];
|
|
58
60
|
};
|
|
59
61
|
exports.trailingWhitespaceFixer = trailingWhitespaceFixer;
|
|
60
|
-
// Value without quotes:
|
|
61
|
-
//
|
|
62
|
+
// Value without quotes: wraps a whitespace-containing unquoted value in a quote
|
|
63
|
+
// character the value does not contain, so dotenv parses it back unchanged.
|
|
64
|
+
// The trimmed value is wrapped because dotenv trims unquoted values. Double
|
|
65
|
+
// quotes are skipped when the value holds a literal `\n`, which dotenv would
|
|
66
|
+
// expand inside them. If no quote is safe, the value is left unchanged.
|
|
62
67
|
const valueWithoutQuotesFixer = (key, line) => {
|
|
63
68
|
if (!(0, dotenv_checkers_js_1.valueWithoutQuotesChecker)(key, line)) {
|
|
64
69
|
return [key, line];
|
|
65
70
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
}
|
|
70
|
-
else if (line.includes('"')) {
|
|
71
|
-
pureVal = `'${line}'`;
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
74
|
-
pureVal = `'${line}'`;
|
|
75
|
-
}
|
|
76
|
-
return [key, pureVal];
|
|
71
|
+
const value = line.trim();
|
|
72
|
+
const quote = WRAPPING_QUOTES.find((q) => !value.includes(q) && !(q === '"' && value.includes('\\n')));
|
|
73
|
+
return [key, quote ? `${quote}${value}${quote}` : line];
|
|
77
74
|
};
|
|
78
75
|
exports.valueWithoutQuotesFixer = valueWithoutQuotesFixer;
|
|
79
76
|
exports.dotenvKeyFixers = [
|
package/dist/cli-core.d.ts
CHANGED
|
@@ -61,8 +61,8 @@ export declare const lintContents: (contents: string) => Finding[];
|
|
|
61
61
|
* about — multiline values, duplicate keys, continuation lines that happen to
|
|
62
62
|
* look like entries — is left untouched rather than guessed at.
|
|
63
63
|
*
|
|
64
|
-
*
|
|
65
|
-
*
|
|
64
|
+
* The value fixers themselves only strip or add one outer matched quote pair;
|
|
65
|
+
* see HELP's known limitations.
|
|
66
66
|
*/
|
|
67
67
|
export declare const applyFixes: (contents: string) => string;
|
|
68
68
|
export interface JsonFinding extends Finding {
|
package/dist/cli-core.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-core.d.ts","sourceRoot":"","sources":["../src/cli-core.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAQH,OAAO,EAGL,KAAK,OAAO,EACb,MAAM,sBAAsB,CAAA;AAK7B,eAAO,MAAM,SAAS,gBAAgB,CAAA;AAEtC,+FAA+F;AAC/F,eAAO,MAAM,OAAO,EAAE,MAYlB,CAAA;AAEJ,yEAAyE;AACzE,eAAO,MAAM,IAAI;;;;;CAKP,CAAA;AAEV,eAAO,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"cli-core.d.ts","sourceRoot":"","sources":["../src/cli-core.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAQH,OAAO,EAGL,KAAK,OAAO,EACb,MAAM,sBAAsB,CAAA;AAK7B,eAAO,MAAM,SAAS,gBAAgB,CAAA;AAEtC,+FAA+F;AAC/F,eAAO,MAAM,OAAO,EAAE,MAYlB,CAAA;AAEJ,yEAAyE;AACzE,eAAO,MAAM,IAAI;;;;;CAKP,CAAA;AAEV,eAAO,MAAM,IAAI,QA0CT,CAAA;AAMR,MAAM,WAAW,OAAO;IACtB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACvC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IACpD,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACzC;AA4BD,MAAM,WAAW,UAAU;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE,OAAO,CAAA;IACZ,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAE3C,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,KAAG,UA8B1C,CAAA;AA+DD,oCAAoC;AACpC,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,KAAG,OAAO,EAetD,CAAA;AASD;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,KAAG,MA8B7C,CAAA;AAMD,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,IAAI,EAAE,MAAM,CAAA;CACb;AAED,wBAAsB,IAAI,CACxB,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,GAAE,OAAY,GACjB,OAAO,CAAC,MAAM,CAAC,CAoEjB"}
|
package/dist/cli-core.js
CHANGED
|
@@ -69,10 +69,9 @@ and ENV from the environment:
|
|
|
69
69
|
|
|
70
70
|
KNOWN LIMITATIONS, disclosed rather than silently inherited:
|
|
71
71
|
|
|
72
|
-
--fix
|
|
73
|
-
|
|
74
|
-
internal
|
|
75
|
-
fixers is out of scope for the change that introduced this bin; review every
|
|
72
|
+
--fix strips quotes only as one outer matched pair, and only adds a wrapping
|
|
73
|
+
quote the value does not already contain. A value with an unmatched or
|
|
74
|
+
internal quote (e.g. O'Brien) is reported but left unchanged. Review every
|
|
76
75
|
--fix diff before committing it.
|
|
77
76
|
|
|
78
77
|
--fix also applies dotenvKeyFixers to the key (e.g. lowercase keys are
|
|
@@ -214,8 +213,8 @@ const ENTRY_PREFIX = /^(\s*)(export\s+)?([\w.-]+)(\s*=\s*)/;
|
|
|
214
213
|
* about — multiline values, duplicate keys, continuation lines that happen to
|
|
215
214
|
* look like entries — is left untouched rather than guessed at.
|
|
216
215
|
*
|
|
217
|
-
*
|
|
218
|
-
*
|
|
216
|
+
* The value fixers themselves only strip or add one outer matched quote pair;
|
|
217
|
+
* see HELP's known limitations.
|
|
219
218
|
*/
|
|
220
219
|
export const applyFixes = (contents) => {
|
|
221
220
|
const rawValues = correlateRawValues(contents);
|
package/dist/cli-core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-core.js","sourceRoot":"","sources":["../src/cli-core.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EACL,UAAU,IAAI,cAAc,EAC5B,YAAY,IAAI,gBAAgB,EAChC,aAAa,IAAI,iBAAiB,GACnC,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,GAEnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAEtE,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAA;AAEtC,+FAA+F;AAC/F,MAAM,CAAC,MAAM,OAAO,GAAW,CAAC,GAAG,EAAE;IACnC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,gBAAgB,CAC1B,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAC3C,MAAM,CACP,CAAA;QACD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,OAAO,GAAI,MAAgC,CAAC,OAAO,CAAA;QACzD,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAA;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAA;IAChB,CAAC;AACH,CAAC,CAAC,EAAE,CAAA;AAEJ,yEAAyE;AACzE,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,QAAQ,EAAE,CAAC;CACH,CAAA;AAEV,MAAM,CAAC,MAAM,IAAI,GAAG;EAClB,SAAS;;;;;;;IAOP,SAAS
|
|
1
|
+
{"version":3,"file":"cli-core.js","sourceRoot":"","sources":["../src/cli-core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotenv-fixers.d.ts","sourceRoot":"","sources":["../src/dotenv-fixers.ts"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAUhE,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAO9D,CAAA;AAGD,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAM1D,CAAA;
|
|
1
|
+
{"version":3,"file":"dotenv-fixers.d.ts","sourceRoot":"","sources":["../src/dotenv-fixers.ts"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAUhE,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAO9D,CAAA;AAGD,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAM1D,CAAA;AAOD,eAAO,MAAM,mBAAmB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAS5D,CAAA;AAGD,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAMhE,CAAA;AAOD,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,aAUhE,CAAA;AAED,eAAO,MAAM,eAAe,SAzEiB,MAAM,QAAQ,MAAM,gBA6EhE,CAAA;AAED,eAAO,MAAM,gBAAgB,SA3CY,MAAM,QAAQ,MAAM,gBA+C5D,CAAA"}
|
package/dist/dotenv-fixers.js
CHANGED
|
@@ -32,15 +32,17 @@ export const lowercaseKeyFixer = (key, line) => {
|
|
|
32
32
|
}
|
|
33
33
|
return [key.toUpperCase(), line];
|
|
34
34
|
};
|
|
35
|
-
|
|
36
|
-
//
|
|
37
|
-
//
|
|
35
|
+
const WRAPPING_QUOTES = ["'", '"', '`'];
|
|
36
|
+
// Quote character: strips ONE outer matched pair (`'`, `"` or backtick), the
|
|
37
|
+
// same pair dotenv removes when parsing. A value with an unmatched or internal
|
|
38
|
+
// quote (`O'Brien`) has no safe fix and is left unchanged.
|
|
38
39
|
export const quoteCharacterFixer = (key, line) => {
|
|
39
40
|
if (!quoteCharacterChecker(key, line)) {
|
|
40
41
|
return [key, line];
|
|
41
42
|
}
|
|
42
|
-
const
|
|
43
|
-
|
|
43
|
+
const wrapped = line.length >= 2 &&
|
|
44
|
+
WRAPPING_QUOTES.some((q) => line.startsWith(q) && line.endsWith(q));
|
|
45
|
+
return [key, wrapped ? line.slice(1, -1) : line];
|
|
44
46
|
};
|
|
45
47
|
// Fixes trailing whitespace.
|
|
46
48
|
export const trailingWhitespaceFixer = (key, line) => {
|
|
@@ -49,23 +51,18 @@ export const trailingWhitespaceFixer = (key, line) => {
|
|
|
49
51
|
}
|
|
50
52
|
return [key, line.trimEnd()];
|
|
51
53
|
};
|
|
52
|
-
// Value without quotes:
|
|
53
|
-
//
|
|
54
|
+
// Value without quotes: wraps a whitespace-containing unquoted value in a quote
|
|
55
|
+
// character the value does not contain, so dotenv parses it back unchanged.
|
|
56
|
+
// The trimmed value is wrapped because dotenv trims unquoted values. Double
|
|
57
|
+
// quotes are skipped when the value holds a literal `\n`, which dotenv would
|
|
58
|
+
// expand inside them. If no quote is safe, the value is left unchanged.
|
|
54
59
|
export const valueWithoutQuotesFixer = (key, line) => {
|
|
55
60
|
if (!valueWithoutQuotesChecker(key, line)) {
|
|
56
61
|
return [key, line];
|
|
57
62
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
else if (line.includes('"')) {
|
|
63
|
-
pureVal = `'${line}'`;
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
pureVal = `'${line}'`;
|
|
67
|
-
}
|
|
68
|
-
return [key, pureVal];
|
|
63
|
+
const value = line.trim();
|
|
64
|
+
const quote = WRAPPING_QUOTES.find((q) => !value.includes(q) && !(q === '"' && value.includes('\\n')));
|
|
65
|
+
return [key, quote ? `${quote}${value}${quote}` : line];
|
|
69
66
|
};
|
|
70
67
|
export const dotenvKeyFixers = [
|
|
71
68
|
incorrectDelimiterFixer,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotenv-fixers.js","sourceRoot":"","sources":["../src/dotenv-fixers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;IACnE,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;QAC1C,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAA;IAC/C,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;IAE/C,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;IAC5D,OAAO,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,UAAU,EAAE,EAAE,IAAI,CAAC,CAAA;AAC7D,CAAC,CAAA;AAED,qDAAqD;AACrD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;IACjE,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACpB,CAAC;IAED,MAAM,UAAU,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAA;IACjD,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AAC3B,CAAC,CAAA;AAED,0CAA0C;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;IAC7D,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACpB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC,CAAA;AAED
|
|
1
|
+
{"version":3,"file":"dotenv-fixers.js","sourceRoot":"","sources":["../src/dotenv-fixers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cogs/config",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.1",
|
|
4
4
|
"description": "Framework-agnostic layered-dotenv loader — resolves the canonical .env file chain, expands ${VAR} references, and folds values into process.env with deploy-injected variables staying authoritative. Dual ESM+CJS so it works from an ESM --import preload or a CJS --require hook (dd-trace and other one-offs)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
|
-
"url": "git+https://github.com/
|
|
8
|
+
"url": "git+https://github.com/catesworks/cogs.git",
|
|
9
9
|
"directory": "packages/config"
|
|
10
10
|
},
|
|
11
11
|
"type": "module",
|