@pgpmjs/env 2.8.6 → 2.8.7
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/esm/merge.js +21 -1
- package/merge.js +21 -1
- package/package.json +2 -2
package/esm/merge.js
CHANGED
|
@@ -20,7 +20,27 @@ export const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
|
|
20
20
|
const opts = getEnvOptions({
|
|
21
21
|
db: overrides
|
|
22
22
|
}, cwd);
|
|
23
|
-
|
|
23
|
+
// Ensure roles is always resolved from defaults even if config/env explicitly sets it to undefined
|
|
24
|
+
const db = opts.db ?? {};
|
|
25
|
+
const defaultRoles = pgpmDefaults.db?.roles ?? {};
|
|
26
|
+
const defaultConnections = pgpmDefaults.db?.connections ?? {};
|
|
27
|
+
return {
|
|
28
|
+
...db,
|
|
29
|
+
roles: {
|
|
30
|
+
...defaultRoles,
|
|
31
|
+
...(db.roles ?? {})
|
|
32
|
+
},
|
|
33
|
+
connections: {
|
|
34
|
+
app: {
|
|
35
|
+
...defaultConnections.app,
|
|
36
|
+
...(db.connections?.app ?? {})
|
|
37
|
+
},
|
|
38
|
+
admin: {
|
|
39
|
+
...defaultConnections.admin,
|
|
40
|
+
...(db.connections?.admin ?? {})
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
};
|
|
24
44
|
};
|
|
25
45
|
export const getDeploymentEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
|
26
46
|
const opts = getEnvOptions({
|
package/merge.js
CHANGED
|
@@ -27,7 +27,27 @@ const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
|
|
27
27
|
const opts = (0, exports.getEnvOptions)({
|
|
28
28
|
db: overrides
|
|
29
29
|
}, cwd);
|
|
30
|
-
|
|
30
|
+
// Ensure roles is always resolved from defaults even if config/env explicitly sets it to undefined
|
|
31
|
+
const db = opts.db ?? {};
|
|
32
|
+
const defaultRoles = types_1.pgpmDefaults.db?.roles ?? {};
|
|
33
|
+
const defaultConnections = types_1.pgpmDefaults.db?.connections ?? {};
|
|
34
|
+
return {
|
|
35
|
+
...db,
|
|
36
|
+
roles: {
|
|
37
|
+
...defaultRoles,
|
|
38
|
+
...(db.roles ?? {})
|
|
39
|
+
},
|
|
40
|
+
connections: {
|
|
41
|
+
app: {
|
|
42
|
+
...defaultConnections.app,
|
|
43
|
+
...(db.connections?.app ?? {})
|
|
44
|
+
},
|
|
45
|
+
admin: {
|
|
46
|
+
...defaultConnections.admin,
|
|
47
|
+
...(db.connections?.admin ?? {})
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
};
|
|
31
51
|
};
|
|
32
52
|
exports.getConnEnvOptions = getConnEnvOptions;
|
|
33
53
|
const getDeploymentEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pgpmjs/env",
|
|
3
|
-
"version": "2.8.
|
|
3
|
+
"version": "2.8.7",
|
|
4
4
|
"author": "Dan Lynch <Dan Lynch>",
|
|
5
5
|
"description": "PGPM environment management",
|
|
6
6
|
"main": "index.js",
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"makage": "^0.1.9"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "248d4056d3191b71bcab5892ef98b09164de9f7f"
|
|
47
47
|
}
|