@pgpmjs/env 2.10.0 → 2.10.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/esm/index.js +1 -1
- package/esm/merge.js +2 -2
- package/esm/utils.js +6 -3
- package/index.d.ts +1 -1
- package/index.js +2 -2
- package/merge.js +1 -1
- package/package.json +2 -2
- package/utils.d.ts +5 -1
- package/utils.js +8 -5
package/esm/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { getEnvOptions, getConnEnvOptions, getDeploymentEnvOptions } from './merge';
|
|
2
2
|
export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath, resolvePnpmWorkspace, resolveLernaWorkspace, resolveNpmWorkspace, resolveWorkspaceByType } from './config';
|
|
3
3
|
export { getEnvVars, getNodeEnv, parseEnvBoolean, parseEnvNumber } from './env';
|
|
4
|
-
export { walkUp,
|
|
4
|
+
export { walkUp, replaceArrays } from './utils';
|
package/esm/merge.js
CHANGED
|
@@ -2,7 +2,7 @@ import deepmerge from 'deepmerge';
|
|
|
2
2
|
import { pgpmDefaults } from '@pgpmjs/types';
|
|
3
3
|
import { loadConfigSync } from './config';
|
|
4
4
|
import { getEnvVars } from './env';
|
|
5
|
-
import {
|
|
5
|
+
import { replaceArrays } from './utils';
|
|
6
6
|
/**
|
|
7
7
|
* Get core PGPM environment options by merging:
|
|
8
8
|
* 1. PGPM defaults
|
|
@@ -20,7 +20,7 @@ export const getEnvOptions = (overrides = {}, cwd = process.cwd(), env = process
|
|
|
20
20
|
const configOptions = loadConfigSync(cwd);
|
|
21
21
|
const envOptions = getEnvVars(env);
|
|
22
22
|
return deepmerge.all([pgpmDefaults, configOptions, envOptions, overrides], {
|
|
23
|
-
arrayMerge:
|
|
23
|
+
arrayMerge: replaceArrays
|
|
24
24
|
});
|
|
25
25
|
};
|
|
26
26
|
export const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
package/esm/utils.js
CHANGED
|
@@ -21,7 +21,10 @@ export const walkUp = (startDir, filename) => {
|
|
|
21
21
|
}
|
|
22
22
|
throw new Error(`File "${filename}" not found in any parent directories.`);
|
|
23
23
|
};
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Array merge strategy that replaces target array with source array.
|
|
26
|
+
* This allows later configuration sources to completely override earlier ones.
|
|
27
|
+
*/
|
|
28
|
+
export const replaceArrays = (_target, source, _options) => {
|
|
29
|
+
return source;
|
|
27
30
|
};
|
package/index.d.ts
CHANGED
|
@@ -2,5 +2,5 @@ export { getEnvOptions, getConnEnvOptions, getDeploymentEnvOptions } from './mer
|
|
|
2
2
|
export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath, resolvePnpmWorkspace, resolveLernaWorkspace, resolveNpmWorkspace, resolveWorkspaceByType } from './config';
|
|
3
3
|
export type { WorkspaceType } from './config';
|
|
4
4
|
export { getEnvVars, getNodeEnv, parseEnvBoolean, parseEnvNumber } from './env';
|
|
5
|
-
export { walkUp,
|
|
5
|
+
export { walkUp, replaceArrays } from './utils';
|
|
6
6
|
export type { PgpmOptions, PgTestConnectionOptions, DeploymentOptions } from '@pgpmjs/types';
|
package/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.replaceArrays = exports.walkUp = exports.parseEnvNumber = exports.parseEnvBoolean = exports.getNodeEnv = exports.getEnvVars = exports.resolveWorkspaceByType = exports.resolveNpmWorkspace = exports.resolveLernaWorkspace = exports.resolvePnpmWorkspace = exports.resolvePgpmPath = exports.loadConfigFileSync = exports.loadConfigSyncFromDir = exports.loadConfigSync = exports.getDeploymentEnvOptions = exports.getConnEnvOptions = exports.getEnvOptions = void 0;
|
|
4
4
|
var merge_1 = require("./merge");
|
|
5
5
|
Object.defineProperty(exports, "getEnvOptions", { enumerable: true, get: function () { return merge_1.getEnvOptions; } });
|
|
6
6
|
Object.defineProperty(exports, "getConnEnvOptions", { enumerable: true, get: function () { return merge_1.getConnEnvOptions; } });
|
|
@@ -21,4 +21,4 @@ Object.defineProperty(exports, "parseEnvBoolean", { enumerable: true, get: funct
|
|
|
21
21
|
Object.defineProperty(exports, "parseEnvNumber", { enumerable: true, get: function () { return env_1.parseEnvNumber; } });
|
|
22
22
|
var utils_1 = require("./utils");
|
|
23
23
|
Object.defineProperty(exports, "walkUp", { enumerable: true, get: function () { return utils_1.walkUp; } });
|
|
24
|
-
Object.defineProperty(exports, "
|
|
24
|
+
Object.defineProperty(exports, "replaceArrays", { enumerable: true, get: function () { return utils_1.replaceArrays; } });
|
package/merge.js
CHANGED
|
@@ -26,7 +26,7 @@ const getEnvOptions = (overrides = {}, cwd = process.cwd(), env = process.env) =
|
|
|
26
26
|
const configOptions = (0, config_1.loadConfigSync)(cwd);
|
|
27
27
|
const envOptions = (0, env_1.getEnvVars)(env);
|
|
28
28
|
return deepmerge_1.default.all([types_1.pgpmDefaults, configOptions, envOptions, overrides], {
|
|
29
|
-
arrayMerge: utils_1.
|
|
29
|
+
arrayMerge: utils_1.replaceArrays
|
|
30
30
|
});
|
|
31
31
|
};
|
|
32
32
|
exports.getEnvOptions = getEnvOptions;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pgpmjs/env",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.1",
|
|
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.10"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "39b5c59b01b8ce391dc14daf5a9430ca0ff67574"
|
|
47
47
|
}
|
package/utils.d.ts
CHANGED
|
@@ -5,4 +5,8 @@
|
|
|
5
5
|
* @returns The directory path containing the file.
|
|
6
6
|
*/
|
|
7
7
|
export declare const walkUp: (startDir: string, filename: string) => string;
|
|
8
|
-
|
|
8
|
+
/**
|
|
9
|
+
* Array merge strategy that replaces target array with source array.
|
|
10
|
+
* This allows later configuration sources to completely override earlier ones.
|
|
11
|
+
*/
|
|
12
|
+
export declare const replaceArrays: <T>(_target: T[], source: T[], _options?: unknown) => T[];
|
package/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.replaceArrays = exports.walkUp = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
/**
|
|
@@ -25,8 +25,11 @@ const walkUp = (startDir, filename) => {
|
|
|
25
25
|
throw new Error(`File "${filename}" not found in any parent directories.`);
|
|
26
26
|
};
|
|
27
27
|
exports.walkUp = walkUp;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
/**
|
|
29
|
+
* Array merge strategy that replaces target array with source array.
|
|
30
|
+
* This allows later configuration sources to completely override earlier ones.
|
|
31
|
+
*/
|
|
32
|
+
const replaceArrays = (_target, source, _options) => {
|
|
33
|
+
return source;
|
|
31
34
|
};
|
|
32
|
-
exports.
|
|
35
|
+
exports.replaceArrays = replaceArrays;
|