@pgpmjs/env 2.7.0 → 2.8.0

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.
Files changed (7) hide show
  1. package/env.d.ts +4 -0
  2. package/env.js +5 -22
  3. package/esm/env.js +5 -22
  4. package/esm/merge.js +10 -2
  5. package/merge.d.ts +9 -0
  6. package/merge.js +10 -2
  7. package/package.json +3 -3
package/env.d.ts CHANGED
@@ -1,4 +1,8 @@
1
1
  import { PgpmOptions } from '@pgpmjs/types';
2
+ /**
3
+ * Parse core PGPM environment variables.
4
+ * GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @launchql/env.
5
+ */
2
6
  export declare const getEnvVars: () => PgpmOptions;
3
7
  type NodeEnv = 'development' | 'production' | 'test';
4
8
  export declare const getNodeEnv: () => NodeEnv;
package/env.js CHANGED
@@ -10,8 +10,12 @@ const parseEnvBoolean = (val) => {
10
10
  return undefined;
11
11
  return ['true', '1', 'yes'].includes(val.toLowerCase());
12
12
  };
13
+ /**
14
+ * Parse core PGPM environment variables.
15
+ * GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @launchql/env.
16
+ */
13
17
  const getEnvVars = () => {
14
- const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, GRAPHILE_SCHEMA, FEATURES_SIMPLE_INFLECTION, FEATURES_OPPOSITE_BASE_NAMES, FEATURES_POSTGIS, API_ENABLE_META, API_IS_PUBLIC, API_EXPOSED_SCHEMAS, API_META_SCHEMAS, API_ANON_ROLE, API_ROLE_NAME, API_DEFAULT_DATABASE_ID, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_SECRET_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX, } = process.env;
18
+ const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_SECRET_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX, } = process.env;
15
19
  return {
16
20
  db: {
17
21
  ...(PGROOTDATABASE && { rootDb: PGROOTDATABASE }),
@@ -41,27 +45,6 @@ const getEnvVars = () => {
41
45
  ...(PGPASSWORD && { password: PGPASSWORD }),
42
46
  ...(PGDATABASE && { database: PGDATABASE }),
43
47
  },
44
- graphile: {
45
- ...(GRAPHILE_SCHEMA && {
46
- schema: GRAPHILE_SCHEMA.includes(',')
47
- ? GRAPHILE_SCHEMA.split(',').map(s => s.trim())
48
- : GRAPHILE_SCHEMA
49
- }),
50
- },
51
- features: {
52
- ...(FEATURES_SIMPLE_INFLECTION && { simpleInflection: parseEnvBoolean(FEATURES_SIMPLE_INFLECTION) }),
53
- ...(FEATURES_OPPOSITE_BASE_NAMES && { oppositeBaseNames: parseEnvBoolean(FEATURES_OPPOSITE_BASE_NAMES) }),
54
- ...(FEATURES_POSTGIS && { postgis: parseEnvBoolean(FEATURES_POSTGIS) }),
55
- },
56
- api: {
57
- ...(API_ENABLE_META && { enableMetaApi: parseEnvBoolean(API_ENABLE_META) }),
58
- ...(API_IS_PUBLIC && { isPublic: parseEnvBoolean(API_IS_PUBLIC) }),
59
- ...(API_EXPOSED_SCHEMAS && { exposedSchemas: API_EXPOSED_SCHEMAS.split(',').map(s => s.trim()) }),
60
- ...(API_META_SCHEMAS && { metaSchemas: API_META_SCHEMAS.split(',').map(s => s.trim()) }),
61
- ...(API_ANON_ROLE && { anonRole: API_ANON_ROLE }),
62
- ...(API_ROLE_NAME && { roleName: API_ROLE_NAME }),
63
- ...(API_DEFAULT_DATABASE_ID && { defaultDatabaseId: API_DEFAULT_DATABASE_ID }),
64
- },
65
48
  cdn: {
66
49
  ...(BUCKET_NAME && { bucketName: BUCKET_NAME }),
67
50
  ...(AWS_REGION && { awsRegion: AWS_REGION }),
package/esm/env.js CHANGED
@@ -7,8 +7,12 @@ const parseEnvBoolean = (val) => {
7
7
  return undefined;
8
8
  return ['true', '1', 'yes'].includes(val.toLowerCase());
9
9
  };
10
+ /**
11
+ * Parse core PGPM environment variables.
12
+ * GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @launchql/env.
13
+ */
10
14
  export const getEnvVars = () => {
11
- const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, GRAPHILE_SCHEMA, FEATURES_SIMPLE_INFLECTION, FEATURES_OPPOSITE_BASE_NAMES, FEATURES_POSTGIS, API_ENABLE_META, API_IS_PUBLIC, API_EXPOSED_SCHEMAS, API_META_SCHEMAS, API_ANON_ROLE, API_ROLE_NAME, API_DEFAULT_DATABASE_ID, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_SECRET_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX, } = process.env;
15
+ const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_SECRET_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX, } = process.env;
12
16
  return {
13
17
  db: {
14
18
  ...(PGROOTDATABASE && { rootDb: PGROOTDATABASE }),
@@ -38,27 +42,6 @@ export const getEnvVars = () => {
38
42
  ...(PGPASSWORD && { password: PGPASSWORD }),
39
43
  ...(PGDATABASE && { database: PGDATABASE }),
40
44
  },
41
- graphile: {
42
- ...(GRAPHILE_SCHEMA && {
43
- schema: GRAPHILE_SCHEMA.includes(',')
44
- ? GRAPHILE_SCHEMA.split(',').map(s => s.trim())
45
- : GRAPHILE_SCHEMA
46
- }),
47
- },
48
- features: {
49
- ...(FEATURES_SIMPLE_INFLECTION && { simpleInflection: parseEnvBoolean(FEATURES_SIMPLE_INFLECTION) }),
50
- ...(FEATURES_OPPOSITE_BASE_NAMES && { oppositeBaseNames: parseEnvBoolean(FEATURES_OPPOSITE_BASE_NAMES) }),
51
- ...(FEATURES_POSTGIS && { postgis: parseEnvBoolean(FEATURES_POSTGIS) }),
52
- },
53
- api: {
54
- ...(API_ENABLE_META && { enableMetaApi: parseEnvBoolean(API_ENABLE_META) }),
55
- ...(API_IS_PUBLIC && { isPublic: parseEnvBoolean(API_IS_PUBLIC) }),
56
- ...(API_EXPOSED_SCHEMAS && { exposedSchemas: API_EXPOSED_SCHEMAS.split(',').map(s => s.trim()) }),
57
- ...(API_META_SCHEMAS && { metaSchemas: API_META_SCHEMAS.split(',').map(s => s.trim()) }),
58
- ...(API_ANON_ROLE && { anonRole: API_ANON_ROLE }),
59
- ...(API_ROLE_NAME && { roleName: API_ROLE_NAME }),
60
- ...(API_DEFAULT_DATABASE_ID && { defaultDatabaseId: API_DEFAULT_DATABASE_ID }),
61
- },
62
45
  cdn: {
63
46
  ...(BUCKET_NAME && { bucketName: BUCKET_NAME }),
64
47
  ...(AWS_REGION && { awsRegion: AWS_REGION }),
package/esm/merge.js CHANGED
@@ -2,11 +2,19 @@ import deepmerge from 'deepmerge';
2
2
  import { pgpmDefaults } from '@pgpmjs/types';
3
3
  import { loadConfigSync } from './config';
4
4
  import { getEnvVars } from './env';
5
+ /**
6
+ * Get core PGPM environment options by merging:
7
+ * 1. PGPM defaults
8
+ * 2. Config file options
9
+ * 3. Environment variables
10
+ * 4. Runtime overrides
11
+ *
12
+ * For LaunchQL applications that need GraphQL options, use @launchql/env instead.
13
+ */
5
14
  export const getEnvOptions = (overrides = {}, cwd = process.cwd()) => {
6
- const defaults = pgpmDefaults;
7
15
  const configOptions = loadConfigSync(cwd);
8
16
  const envOptions = getEnvVars();
9
- return deepmerge.all([defaults, configOptions, envOptions, overrides]);
17
+ return deepmerge.all([pgpmDefaults, configOptions, envOptions, overrides]);
10
18
  };
11
19
  export const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
12
20
  const opts = getEnvOptions({
package/merge.d.ts CHANGED
@@ -1,4 +1,13 @@
1
1
  import { PgpmOptions, PgTestConnectionOptions, DeploymentOptions } from '@pgpmjs/types';
2
+ /**
3
+ * Get core PGPM environment options by merging:
4
+ * 1. PGPM defaults
5
+ * 2. Config file options
6
+ * 3. Environment variables
7
+ * 4. Runtime overrides
8
+ *
9
+ * For LaunchQL applications that need GraphQL options, use @launchql/env instead.
10
+ */
2
11
  export declare const getEnvOptions: (overrides?: PgpmOptions, cwd?: string) => PgpmOptions;
3
12
  export declare const getConnEnvOptions: (overrides?: Partial<PgTestConnectionOptions>, cwd?: string) => PgTestConnectionOptions;
4
13
  export declare const getDeploymentEnvOptions: (overrides?: Partial<DeploymentOptions>, cwd?: string) => DeploymentOptions;
package/merge.js CHANGED
@@ -8,11 +8,19 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
8
8
  const types_1 = require("@pgpmjs/types");
9
9
  const config_1 = require("./config");
10
10
  const env_1 = require("./env");
11
+ /**
12
+ * Get core PGPM environment options by merging:
13
+ * 1. PGPM defaults
14
+ * 2. Config file options
15
+ * 3. Environment variables
16
+ * 4. Runtime overrides
17
+ *
18
+ * For LaunchQL applications that need GraphQL options, use @launchql/env instead.
19
+ */
11
20
  const getEnvOptions = (overrides = {}, cwd = process.cwd()) => {
12
- const defaults = types_1.pgpmDefaults;
13
21
  const configOptions = (0, config_1.loadConfigSync)(cwd);
14
22
  const envOptions = (0, env_1.getEnvVars)();
15
- return deepmerge_1.default.all([defaults, configOptions, envOptions, overrides]);
23
+ return deepmerge_1.default.all([types_1.pgpmDefaults, configOptions, envOptions, overrides]);
16
24
  };
17
25
  exports.getEnvOptions = getEnvOptions;
18
26
  const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pgpmjs/env",
3
- "version": "2.7.0",
3
+ "version": "2.8.0",
4
4
  "author": "Dan Lynch <Dan Lynch>",
5
5
  "description": "PGPM environment management",
6
6
  "main": "index.js",
@@ -29,7 +29,7 @@
29
29
  "test:watch": "jest --watch"
30
30
  },
31
31
  "dependencies": {
32
- "@pgpmjs/types": "^2.11.0",
32
+ "@pgpmjs/types": "^2.12.0",
33
33
  "deepmerge": "^4.3.1"
34
34
  },
35
35
  "keywords": [
@@ -43,5 +43,5 @@
43
43
  "devDependencies": {
44
44
  "makage": "^0.1.8"
45
45
  },
46
- "gitHead": "e4d5396a5d9154f4886176bb00c2b460b0f320e5"
46
+ "gitHead": "293ffe3db7a328d1a096b8f239d9c71c26b43ec0"
47
47
  }