@pgpmjs/env 2.8.8 → 2.8.10

package/README.md

@@ -59,7 +59,6 @@ Common issues and solutions for pgpm, PostgreSQL, and testing.
 * [@pgsql/enums](https://www.npmjs.com/package/@pgsql/enums): **🏷️ TypeScript enums** for PostgreSQL AST for safe and ergonomic parsing logic.
 * [@pgsql/types](https://www.npmjs.com/package/@pgsql/types): **📝 Type definitions** for PostgreSQL AST nodes in TypeScript.
 * [@pgsql/utils](https://www.npmjs.com/package/@pgsql/utils): **🛠️ AST utilities** for constructing and transforming PostgreSQL syntax trees.
-* [pg-ast](https://www.npmjs.com/package/pg-ast): **🔍 Low-level AST tools** and transformations for Postgres query structures.
 
 ### 🚀 API & Dev Tools
 

package/esm/index.js

@@ -1,4 +1,4 @@
 export { getEnvOptions, getConnEnvOptions, getDeploymentEnvOptions } from './merge';
 export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath } from './config';
 export { getEnvVars, getNodeEnv, parseEnvBoolean } from './env';
-export { walkUp } from './utils';
+export { walkUp, mergeArraysUnique } from './utils';

package/esm/merge.js

@@ -2,6 +2,7 @@ import deepmerge from 'deepmerge';
 import { pgpmDefaults } from '@pgpmjs/types';
 import { loadConfigSync } from './config';
 import { getEnvVars } from './env';
+import { mergeArraysUnique } from './utils';
 /**
  * Get core PGPM environment options by merging:
  * 1. PGPM defaults
@@ -14,7 +15,9 @@ import { getEnvVars } from './env';
 export const getEnvOptions = (overrides = {}, cwd = process.cwd()) => {
     const configOptions = loadConfigSync(cwd);
     const envOptions = getEnvVars();
-    return deepmerge.all([pgpmDefaults, configOptions, envOptions, overrides]);
+    return deepmerge.all([pgpmDefaults, configOptions, envOptions, overrides], {
+        arrayMerge: mergeArraysUnique
+    });
 };
 export const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
     const opts = getEnvOptions({

package/esm/utils.js

@@ -21,3 +21,7 @@ export const walkUp = (startDir, filename) => {
     }
     throw new Error(`File "${filename}" not found in any parent directories.`);
 };
+export const mergeArraysUnique = (target, source, _options) => {
+    const merged = [...target, ...source];
+    return [...new Set(merged)];
+};

package/index.d.ts

@@ -1,5 +1,5 @@
 export { getEnvOptions, getConnEnvOptions, getDeploymentEnvOptions } from './merge';
 export { loadConfigSync, loadConfigSyncFromDir, loadConfigFileSync, resolvePgpmPath } from './config';
 export { getEnvVars, getNodeEnv, parseEnvBoolean } from './env';
-export { walkUp } from './utils';
+export { walkUp, mergeArraysUnique } from './utils';
 export type { PgpmOptions, PgTestConnectionOptions, DeploymentOptions } from '@pgpmjs/types';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkUp = exports.parseEnvBoolean = exports.getNodeEnv = exports.getEnvVars = exports.resolvePgpmPath = exports.loadConfigFileSync = exports.loadConfigSyncFromDir = exports.loadConfigSync = exports.getDeploymentEnvOptions = exports.getConnEnvOptions = exports.getEnvOptions = void 0;
+exports.mergeArraysUnique = exports.walkUp = exports.parseEnvBoolean = exports.getNodeEnv = exports.getEnvVars = exports.resolvePgpmPath = exports.loadConfigFileSync = exports.loadConfigSyncFromDir = exports.loadConfigSync = exports.getDeploymentEnvOptions = exports.getConnEnvOptions = exports.getEnvOptions = void 0;
 var merge_1 = require("./merge");
 Object.defineProperty(exports, "getEnvOptions", { enumerable: true, get: function () { return merge_1.getEnvOptions; } });
 Object.defineProperty(exports, "getConnEnvOptions", { enumerable: true, get: function () { return merge_1.getConnEnvOptions; } });
@@ -16,3 +16,4 @@ Object.defineProperty(exports, "getNodeEnv", { enumerable: true, get: function (
 Object.defineProperty(exports, "parseEnvBoolean", { enumerable: true, get: function () { return env_1.parseEnvBoolean; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "walkUp", { enumerable: true, get: function () { return utils_1.walkUp; } });
+Object.defineProperty(exports, "mergeArraysUnique", { enumerable: true, get: function () { return utils_1.mergeArraysUnique; } });

package/merge.js

@@ -8,6 +8,7 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
 const types_1 = require("@pgpmjs/types");
 const config_1 = require("./config");
 const env_1 = require("./env");
+const utils_1 = require("./utils");
 /**
  * Get core PGPM environment options by merging:
  * 1. PGPM defaults
@@ -20,7 +21,9 @@ const env_1 = require("./env");
 const getEnvOptions = (overrides = {}, cwd = process.cwd()) => {
     const configOptions = (0, config_1.loadConfigSync)(cwd);
     const envOptions = (0, env_1.getEnvVars)();
-    return deepmerge_1.default.all([types_1.pgpmDefaults, configOptions, envOptions, overrides]);
+    return deepmerge_1.default.all([types_1.pgpmDefaults, configOptions, envOptions, overrides], {
+        arrayMerge: utils_1.mergeArraysUnique
+    });
 };
 exports.getEnvOptions = getEnvOptions;
 const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/env",
-  "version": "2.8.8",
+  "version": "2.8.10",
   "author": "Dan Lynch <Dan Lynch>",
   "description": "PGPM environment management",
   "main": "index.js",
@@ -29,7 +29,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpmjs/types": "^2.12.6",
+    "@pgpmjs/types": "^2.12.7",
     "deepmerge": "^4.3.1"
   },
   "keywords": [
@@ -43,5 +43,5 @@
   "devDependencies": {
     "makage": "^0.1.9"
   },
-  "gitHead": "deb816f0fb9aad6cef1accf0dc603e016e48d335"
+  "gitHead": "6e76a6344e93683031fd48c21f30829f12f10dd8"
 }

package/utils.d.ts

@@ -5,3 +5,4 @@
  * @returns The directory path containing the file.
  */
 export declare const walkUp: (startDir: string, filename: string) => string;
+export declare const mergeArraysUnique: <T>(target: T[], source: T[], _options?: unknown) => T[];

package/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkUp = void 0;
+exports.mergeArraysUnique = exports.walkUp = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**
@@ -25,3 +25,8 @@ const walkUp = (startDir, filename) => {
     throw new Error(`File "${filename}" not found in any parent directories.`);
 };
 exports.walkUp = walkUp;
+const mergeArraysUnique = (target, source, _options) => {
+    const merged = [...target, ...source];
+    return [...new Set(merged)];
+};
+exports.mergeArraysUnique = mergeArraysUnique;