pgsql-test 2.8.0 → 2.10.0

package/admin.d.ts

@@ -1,9 +1,11 @@
+import { PgTestConnectionOptions } from '@launchql/types';
 import { PgConfig } from 'pg-env';
 import { SeedAdapter } from './seed/types';
 export declare class DbAdmin {
     private config;
     private verbose;
-    constructor(config: PgConfig, verbose?: boolean);
+    private roleConfig?;
+    constructor(config: PgConfig, verbose?: boolean, roleConfig?: PgTestConnectionOptions);
     private getEnv;
     private run;
     private safeDropDb;

package/admin.js

@@ -5,14 +5,17 @@ const logger_1 = require("@launchql/logger");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const pg_env_1 = require("pg-env");
+const roles_1 = require("./roles");
 const stream_1 = require("./stream");
 const log = new logger_1.Logger('db-admin');
 class DbAdmin {
     config;
     verbose;
-    constructor(config, verbose = false) {
+    roleConfig;
+    constructor(config, verbose = false, roleConfig) {
         this.config = config;
         this.verbose = verbose;
+        this.roleConfig = roleConfig;
         this.config = (0, pg_env_1.getPgEnvOptions)(config);
     }
     getEnv() {
@@ -103,13 +106,15 @@ class DbAdmin {
         await this.streamSql(sql, db);
     }
     async createUserRole(user, password, dbName) {
+        const anonRole = (0, roles_1.getRoleName)('anonymous', this.roleConfig);
+        const authRole = (0, roles_1.getRoleName)('authenticated', this.roleConfig);
         const sql = `
       DO $$
       BEGIN
         IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
           CREATE ROLE ${user} LOGIN PASSWORD '${password}';
-          GRANT anonymous TO ${user};
-          GRANT authenticated TO ${user};
+          GRANT ${anonRole} TO ${user};
+          GRANT ${authRole} TO ${user};
         END IF;
       END $$;
     `.trim();

package/connect.js

@@ -7,13 +7,14 @@ const pg_cache_1 = require("pg-cache");
 const pg_env_1 = require("pg-env");
 const admin_1 = require("./admin");
 const manager_1 = require("./manager");
+const roles_1 = require("./roles");
 const seed_1 = require("./seed");
 let manager;
 const getPgRootAdmin = (connOpts = {}) => {
     const opts = (0, pg_env_1.getPgEnvOptions)({
         database: connOpts.rootDb
     });
-    const admin = new admin_1.DbAdmin(opts);
+    const admin = new admin_1.DbAdmin(opts, false, connOpts);
     return admin;
 };
 exports.getPgRootAdmin = getPgRootAdmin;
@@ -34,7 +35,7 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
     const connOpts = cn.db;
     const root = (0, exports.getPgRootAdmin)(connOpts);
     await root.createUserRole(connOpts.connection.user, connOpts.connection.password, connOpts.rootDb);
-    const admin = new admin_1.DbAdmin(config);
+    const admin = new admin_1.DbAdmin(config, false, connOpts);
     if (process.env.TEST_DB) {
         config.database = process.env.TEST_DB;
     }
@@ -72,7 +73,7 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
         user: connOpts.connection.user,
         password: connOpts.connection.password
     });
-    db.setContext({ role: 'anonymous' });
+    db.setContext({ role: (0, roles_1.getDefaultRole)(connOpts) });
     return { pg, db, teardown, manager, admin };
 };
 exports.getConnections = getConnections;

package/esm/admin.js

@@ -2,14 +2,17 @@ import { Logger } from '@launchql/logger';
 import { execSync } from 'child_process';
 import { existsSync } from 'fs';
 import { getPgEnvOptions } from 'pg-env';
+import { getRoleName } from './roles';
 import { streamSql as stream } from './stream';
 const log = new Logger('db-admin');
 export class DbAdmin {
     config;
     verbose;
-    constructor(config, verbose = false) {
+    roleConfig;
+    constructor(config, verbose = false, roleConfig) {
         this.config = config;
         this.verbose = verbose;
+        this.roleConfig = roleConfig;
         this.config = getPgEnvOptions(config);
     }
     getEnv() {
@@ -100,13 +103,15 @@ export class DbAdmin {
         await this.streamSql(sql, db);
     }
     async createUserRole(user, password, dbName) {
+        const anonRole = getRoleName('anonymous', this.roleConfig);
+        const authRole = getRoleName('authenticated', this.roleConfig);
         const sql = `
       DO $$
       BEGIN
         IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
           CREATE ROLE ${user} LOGIN PASSWORD '${password}';
-          GRANT anonymous TO ${user};
-          GRANT authenticated TO ${user};
+          GRANT ${anonRole} TO ${user};
+          GRANT ${authRole} TO ${user};
         END IF;
       END $$;
     `.trim();

package/esm/connect.js

@@ -4,13 +4,14 @@ import { teardownPgPools } from 'pg-cache';
 import { getPgEnvOptions, } from 'pg-env';
 import { DbAdmin } from './admin';
 import { PgTestConnector } from './manager';
+import { getDefaultRole } from './roles';
 import { seed } from './seed';
 let manager;
 export const getPgRootAdmin = (connOpts = {}) => {
     const opts = getPgEnvOptions({
         database: connOpts.rootDb
     });
-    const admin = new DbAdmin(opts);
+    const admin = new DbAdmin(opts, false, connOpts);
     return admin;
 };
 const getConnOopts = (cn = {}) => {
@@ -30,7 +31,7 @@ export const getConnections = async (cn = {}, seedAdapters = [seed.launchql()])
     const connOpts = cn.db;
     const root = getPgRootAdmin(connOpts);
     await root.createUserRole(connOpts.connection.user, connOpts.connection.password, connOpts.rootDb);
-    const admin = new DbAdmin(config);
+    const admin = new DbAdmin(config, false, connOpts);
     if (process.env.TEST_DB) {
         config.database = process.env.TEST_DB;
     }
@@ -68,6 +69,6 @@ export const getConnections = async (cn = {}, seedAdapters = [seed.launchql()])
         user: connOpts.connection.user,
         password: connOpts.connection.password
     });
-    db.setContext({ role: 'anonymous' });
+    db.setContext({ role: getDefaultRole(connOpts) });
     return { pg, db, teardown, manager, admin };
 };

package/esm/index.js

@@ -1,5 +1,6 @@
 export * from './admin';
 export * from './connect';
 export * from './manager';
+export * from './roles';
 export * from './seed';
 export * from './test-client';

package/esm/roles.js

@@ -0,0 +1,32 @@
+/**
+ * Default role mapping configuration
+ */
+export const DEFAULT_ROLE_MAPPING = {
+    anonymous: 'anonymous',
+    authenticated: 'authenticated',
+    administrator: 'administrator',
+    default: 'anonymous'
+};
+/**
+ * Get resolved role mapping with defaults
+ */
+export const getRoleMapping = (options) => {
+    return {
+        ...DEFAULT_ROLE_MAPPING,
+        ...(options?.roles || {})
+    };
+};
+/**
+ * Get role name by key with fallback to default mapping
+ */
+export const getRoleName = (roleKey, options) => {
+    const mapping = getRoleMapping(options);
+    return mapping[roleKey];
+};
+/**
+ * Get default role name
+ */
+export const getDefaultRole = (options) => {
+    const mapping = getRoleMapping(options);
+    return mapping.default;
+};

package/index.d.ts

@@ -1,5 +1,6 @@
 export * from './admin';
 export * from './connect';
 export * from './manager';
+export * from './roles';
 export * from './seed';
 export * from './test-client';

package/index.js

@@ -17,5 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./admin"), exports);
 __exportStar(require("./connect"), exports);
 __exportStar(require("./manager"), exports);
+__exportStar(require("./roles"), exports);
 __exportStar(require("./seed"), exports);
 __exportStar(require("./test-client"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "pgsql-test offers isolated, role-aware, and rollback-friendly PostgreSQL environments for integration tests — giving developers realistic test coverage without external state pollution",
   "main": "index.js",
@@ -60,14 +60,14 @@
     "@types/pg-copy-streams": "^1.2.5"
   },
   "dependencies": {
-    "@launchql/core": "^2.9.0",
-    "@launchql/env": "^2.2.1",
-    "@launchql/server-utils": "^2.2.1",
-    "@launchql/types": "^2.3.0",
+    "@launchql/core": "^2.11.0",
+    "@launchql/env": "^2.4.0",
+    "@launchql/server-utils": "^2.4.0",
+    "@launchql/types": "^2.5.0",
     "pg": "^8.16.0",
-    "pg-cache": "^1.1.1",
+    "pg-cache": "^1.3.0",
     "pg-copy-streams": "^6.0.6",
     "pg-env": "^1.1.0"
   },
-  "gitHead": "bd34477c5eb50fe5827db9be147fa4279c7d2569"
+  "gitHead": "f7d2375e14a9f45ebb00d58ab87c0efd6bd50618"
 }

package/roles.d.ts

@@ -0,0 +1,17 @@
+import { PgTestConnectionOptions, RoleMapping } from '@launchql/types';
+/**
+ * Default role mapping configuration
+ */
+export declare const DEFAULT_ROLE_MAPPING: Required<RoleMapping>;
+/**
+ * Get resolved role mapping with defaults
+ */
+export declare const getRoleMapping: (options?: PgTestConnectionOptions) => Required<RoleMapping>;
+/**
+ * Get role name by key with fallback to default mapping
+ */
+export declare const getRoleName: (roleKey: keyof Omit<RoleMapping, "default">, options?: PgTestConnectionOptions) => string;
+/**
+ * Get default role name
+ */
+export declare const getDefaultRole: (options?: PgTestConnectionOptions) => string;

package/roles.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultRole = exports.getRoleName = exports.getRoleMapping = exports.DEFAULT_ROLE_MAPPING = void 0;
+/**
+ * Default role mapping configuration
+ */
+exports.DEFAULT_ROLE_MAPPING = {
+    anonymous: 'anonymous',
+    authenticated: 'authenticated',
+    administrator: 'administrator',
+    default: 'anonymous'
+};
+/**
+ * Get resolved role mapping with defaults
+ */
+const getRoleMapping = (options) => {
+    return {
+        ...exports.DEFAULT_ROLE_MAPPING,
+        ...(options?.roles || {})
+    };
+};
+exports.getRoleMapping = getRoleMapping;
+/**
+ * Get role name by key with fallback to default mapping
+ */
+const getRoleName = (roleKey, options) => {
+    const mapping = (0, exports.getRoleMapping)(options);
+    return mapping[roleKey];
+};
+exports.getRoleName = getRoleName;
+/**
+ * Get default role name
+ */
+const getDefaultRole = (options) => {
+    const mapping = (0, exports.getRoleMapping)(options);
+    return mapping.default;
+};
+exports.getDefaultRole = getDefaultRole;