@pgpmjs/env 2.9.0 → 2.9.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/env.d.ts +3 -1
- package/env.js +4 -2
- package/esm/env.js +4 -2
- package/esm/merge.js +6 -2
- package/merge.d.ts +5 -1
- package/merge.js +6 -2
- package/package.json +2 -2
package/env.d.ts
CHANGED
|
@@ -3,8 +3,10 @@ export declare const parseEnvBoolean: (val?: string) => boolean | undefined;
|
|
|
3
3
|
/**
|
|
4
4
|
* Parse core PGPM environment variables.
|
|
5
5
|
* GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @constructive-io/graphql-env.
|
|
6
|
+
*
|
|
7
|
+
* @param env - Environment object to read from (defaults to process.env for backwards compatibility)
|
|
6
8
|
*/
|
|
7
|
-
export declare const getEnvVars: () => PgpmOptions;
|
|
9
|
+
export declare const getEnvVars: (env?: NodeJS.ProcessEnv) => PgpmOptions;
|
|
8
10
|
type NodeEnv = 'development' | 'production' | 'test';
|
|
9
11
|
export declare const getNodeEnv: () => NodeEnv;
|
|
10
12
|
export {};
|
package/env.js
CHANGED
|
@@ -22,13 +22,15 @@ const parseEnvStringArray = (val) => {
|
|
|
22
22
|
/**
|
|
23
23
|
* Parse core PGPM environment variables.
|
|
24
24
|
* GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @constructive-io/graphql-env.
|
|
25
|
+
*
|
|
26
|
+
* @param env - Environment object to read from (defaults to process.env for backwards compatibility)
|
|
25
27
|
*/
|
|
26
|
-
const getEnvVars = () => {
|
|
28
|
+
const getEnvVars = (env = process.env) => {
|
|
27
29
|
const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE,
|
|
28
30
|
// New connections.app and connections.admin env vars
|
|
29
31
|
DB_CONNECTIONS_APP_USER, DB_CONNECTIONS_APP_PASSWORD, DB_CONNECTIONS_ADMIN_USER, DB_CONNECTIONS_ADMIN_PASSWORD, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_PROVIDER, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SECRET_KEY, AWS_SECRET_ACCESS_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX,
|
|
30
32
|
// Jobs-related env vars
|
|
31
|
-
JOBS_SCHEMA, JOBS_SUPPORT_ANY, JOBS_SUPPORTED, INTERNAL_GATEWAY_URL, INTERNAL_JOBS_CALLBACK_URL, INTERNAL_JOBS_CALLBACK_PORT } =
|
|
33
|
+
JOBS_SCHEMA, JOBS_SUPPORT_ANY, JOBS_SUPPORTED, INTERNAL_GATEWAY_URL, INTERNAL_JOBS_CALLBACK_URL, INTERNAL_JOBS_CALLBACK_PORT } = env;
|
|
32
34
|
return {
|
|
33
35
|
db: {
|
|
34
36
|
...(PGROOTDATABASE && { rootDb: PGROOTDATABASE }),
|
package/esm/env.js
CHANGED
|
@@ -18,13 +18,15 @@ const parseEnvStringArray = (val) => {
|
|
|
18
18
|
/**
|
|
19
19
|
* Parse core PGPM environment variables.
|
|
20
20
|
* GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @constructive-io/graphql-env.
|
|
21
|
+
*
|
|
22
|
+
* @param env - Environment object to read from (defaults to process.env for backwards compatibility)
|
|
21
23
|
*/
|
|
22
|
-
export const getEnvVars = () => {
|
|
24
|
+
export const getEnvVars = (env = process.env) => {
|
|
23
25
|
const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE,
|
|
24
26
|
// New connections.app and connections.admin env vars
|
|
25
27
|
DB_CONNECTIONS_APP_USER, DB_CONNECTIONS_APP_PASSWORD, DB_CONNECTIONS_ADMIN_USER, DB_CONNECTIONS_ADMIN_PASSWORD, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_PROVIDER, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SECRET_KEY, AWS_SECRET_ACCESS_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX,
|
|
26
28
|
// Jobs-related env vars
|
|
27
|
-
JOBS_SCHEMA, JOBS_SUPPORT_ANY, JOBS_SUPPORTED, INTERNAL_GATEWAY_URL, INTERNAL_JOBS_CALLBACK_URL, INTERNAL_JOBS_CALLBACK_PORT } =
|
|
29
|
+
JOBS_SCHEMA, JOBS_SUPPORT_ANY, JOBS_SUPPORTED, INTERNAL_GATEWAY_URL, INTERNAL_JOBS_CALLBACK_URL, INTERNAL_JOBS_CALLBACK_PORT } = env;
|
|
28
30
|
return {
|
|
29
31
|
db: {
|
|
30
32
|
...(PGROOTDATABASE && { rootDb: PGROOTDATABASE }),
|
package/esm/merge.js
CHANGED
|
@@ -11,10 +11,14 @@ import { mergeArraysUnique } from './utils';
|
|
|
11
11
|
* 4. Runtime overrides
|
|
12
12
|
*
|
|
13
13
|
* For Constructive applications that need GraphQL options, use @constructive-io/graphql-env instead.
|
|
14
|
+
*
|
|
15
|
+
* @param overrides - Runtime overrides to apply last
|
|
16
|
+
* @param cwd - Working directory for config file resolution
|
|
17
|
+
* @param env - Environment object to read from (defaults to process.env for backwards compatibility)
|
|
14
18
|
*/
|
|
15
|
-
export const getEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
|
19
|
+
export const getEnvOptions = (overrides = {}, cwd = process.cwd(), env = process.env) => {
|
|
16
20
|
const configOptions = loadConfigSync(cwd);
|
|
17
|
-
const envOptions = getEnvVars();
|
|
21
|
+
const envOptions = getEnvVars(env);
|
|
18
22
|
return deepmerge.all([pgpmDefaults, configOptions, envOptions, overrides], {
|
|
19
23
|
arrayMerge: mergeArraysUnique
|
|
20
24
|
});
|
package/merge.d.ts
CHANGED
|
@@ -7,7 +7,11 @@ import { PgpmOptions, PgTestConnectionOptions, DeploymentOptions } from '@pgpmjs
|
|
|
7
7
|
* 4. Runtime overrides
|
|
8
8
|
*
|
|
9
9
|
* For Constructive applications that need GraphQL options, use @constructive-io/graphql-env instead.
|
|
10
|
+
*
|
|
11
|
+
* @param overrides - Runtime overrides to apply last
|
|
12
|
+
* @param cwd - Working directory for config file resolution
|
|
13
|
+
* @param env - Environment object to read from (defaults to process.env for backwards compatibility)
|
|
10
14
|
*/
|
|
11
|
-
export declare const getEnvOptions: (overrides?: PgpmOptions, cwd?: string) => PgpmOptions;
|
|
15
|
+
export declare const getEnvOptions: (overrides?: PgpmOptions, cwd?: string, env?: NodeJS.ProcessEnv) => PgpmOptions;
|
|
12
16
|
export declare const getConnEnvOptions: (overrides?: Partial<PgTestConnectionOptions>, cwd?: string) => PgTestConnectionOptions;
|
|
13
17
|
export declare const getDeploymentEnvOptions: (overrides?: Partial<DeploymentOptions>, cwd?: string) => DeploymentOptions;
|
package/merge.js
CHANGED
|
@@ -17,10 +17,14 @@ const utils_1 = require("./utils");
|
|
|
17
17
|
* 4. Runtime overrides
|
|
18
18
|
*
|
|
19
19
|
* For Constructive applications that need GraphQL options, use @constructive-io/graphql-env instead.
|
|
20
|
+
*
|
|
21
|
+
* @param overrides - Runtime overrides to apply last
|
|
22
|
+
* @param cwd - Working directory for config file resolution
|
|
23
|
+
* @param env - Environment object to read from (defaults to process.env for backwards compatibility)
|
|
20
24
|
*/
|
|
21
|
-
const getEnvOptions = (overrides = {}, cwd = process.cwd()) => {
|
|
25
|
+
const getEnvOptions = (overrides = {}, cwd = process.cwd(), env = process.env) => {
|
|
22
26
|
const configOptions = (0, config_1.loadConfigSync)(cwd);
|
|
23
|
-
const envOptions = (0, env_1.getEnvVars)();
|
|
27
|
+
const envOptions = (0, env_1.getEnvVars)(env);
|
|
24
28
|
return deepmerge_1.default.all([types_1.pgpmDefaults, configOptions, envOptions, overrides], {
|
|
25
29
|
arrayMerge: utils_1.mergeArraysUnique
|
|
26
30
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pgpmjs/env",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.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.9"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "14ed679aeb6172e013c817b8a458e5bee68ab492"
|
|
47
47
|
}
|