@glubean/cli 0.1.14 → 0.1.16
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/dist/lib/env.d.ts +10 -0
- package/dist/lib/env.d.ts.map +1 -1
- package/dist/lib/env.js +20 -1
- package/dist/lib/env.js.map +1 -1
- package/package.json +10 -5
package/dist/lib/env.d.ts
CHANGED
|
@@ -16,4 +16,14 @@ export declare function loadEnvFile(envPath: string): Promise<Record<string, str
|
|
|
16
16
|
* Secrets overlay env vars (later values win).
|
|
17
17
|
*/
|
|
18
18
|
export declare function loadProjectEnv(rootDir: string, envFileName?: string): Promise<Record<string, string>>;
|
|
19
|
+
/**
|
|
20
|
+
* Expand `${NAME}` references in env values.
|
|
21
|
+
*
|
|
22
|
+
* Lookup order:
|
|
23
|
+
* 1. Already-resolved values from the same pass (supports forward references
|
|
24
|
+
* only if the referenced key appears earlier in the file).
|
|
25
|
+
* 2. `process.env`
|
|
26
|
+
* 3. Empty string if not found.
|
|
27
|
+
*/
|
|
28
|
+
export declare function expandVars(vars: Record<string, string>): Record<string, string>;
|
|
19
29
|
//# sourceMappingURL=env.d.ts.map
|
package/dist/lib/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,SAAS,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,SAAS,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CASjC;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB"}
|
package/dist/lib/env.js
CHANGED
|
@@ -35,6 +35,25 @@ export async function loadProjectEnv(rootDir, envFileName = ".env") {
|
|
|
35
35
|
const secretsPath = resolve(rootDir, `${envFileName}.secrets`);
|
|
36
36
|
const envVars = await loadEnvFile(envPath);
|
|
37
37
|
const secrets = await loadEnvFile(secretsPath);
|
|
38
|
-
|
|
38
|
+
const merged = { ...envVars, ...secrets };
|
|
39
|
+
return expandVars(merged);
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Expand `${NAME}` references in env values.
|
|
43
|
+
*
|
|
44
|
+
* Lookup order:
|
|
45
|
+
* 1. Already-resolved values from the same pass (supports forward references
|
|
46
|
+
* only if the referenced key appears earlier in the file).
|
|
47
|
+
* 2. `process.env`
|
|
48
|
+
* 3. Empty string if not found.
|
|
49
|
+
*/
|
|
50
|
+
export function expandVars(vars) {
|
|
51
|
+
const result = {};
|
|
52
|
+
for (const [key, value] of Object.entries(vars)) {
|
|
53
|
+
result[key] = value.replace(/\$\{(\w+)\}/g, (_, name) => {
|
|
54
|
+
return result[name] ?? process.env[name] ?? "";
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
return result;
|
|
39
58
|
}
|
|
40
59
|
//# sourceMappingURL=env.js.map
|
package/dist/lib/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACjD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,oCAAoC,OAAO,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,WAAW,GAAG,MAAM;IAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,WAAW,UAAU,CAAC,CAAC;IAE/D,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACjD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,oCAAoC,OAAO,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,WAAW,GAAG,MAAM;IAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,WAAW,UAAU,CAAC,CAAC;IAE/D,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IAE1C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CACxB,IAA4B;IAE5B,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE;YAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@glubean/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.16",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"bin": {
|
|
6
6
|
"glubean": "./bin/gb.js"
|
|
@@ -26,15 +26,20 @@
|
|
|
26
26
|
"dotenv": "^16.4.0",
|
|
27
27
|
"yaml": "^2.7.0",
|
|
28
28
|
"tsx": "^4.19.0",
|
|
29
|
-
"@glubean/sdk": "0.1.
|
|
30
|
-
"@glubean/runner": "0.1.
|
|
31
|
-
"@glubean/redaction": "0.1.
|
|
32
|
-
"@glubean/scanner": "0.1.
|
|
29
|
+
"@glubean/sdk": "0.1.16",
|
|
30
|
+
"@glubean/runner": "0.1.16",
|
|
31
|
+
"@glubean/redaction": "0.1.16",
|
|
32
|
+
"@glubean/scanner": "0.1.16"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/node": "^22.0.0",
|
|
36
36
|
"@types/archiver": "^6.0.0"
|
|
37
37
|
},
|
|
38
|
+
"repository": {
|
|
39
|
+
"type": "git",
|
|
40
|
+
"url": "https://github.com/glubean/glubean.git",
|
|
41
|
+
"directory": "packages/cli"
|
|
42
|
+
},
|
|
38
43
|
"scripts": {
|
|
39
44
|
"build": "tsc -p tsconfig.build.json",
|
|
40
45
|
"test": "vitest run"
|