graphile-test 2.8.3 → 2.8.5

package/README.md

@@ -194,6 +194,8 @@ expect(result.data.createUser.username).toBe('alice');
 * Start with `getConnections()` for most use cases.
 * Consider `getConnectionsUnwrapped()` for cleaner test assertions.
 
+---
+
 ## Education and Tutorials
 
  1. 🚀 [Quickstart: Getting Up and Running](https://launchql.com/learn/quickstart)
@@ -268,4 +270,3 @@ Common issues and solutions for pgpm, PostgreSQL, and testing.
 AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED "AS IS", AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
 
 No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
-

package/context.js

@@ -13,6 +13,7 @@ const runGraphQLInContext = async ({ input, conn, pgPool, schema, options, authR
     if (!conn.pg.client) {
         throw new Error('pgClient is required and must be provided externally.');
     }
+    const { res: reqRes, ...restReqOptions } = reqOptions ?? {};
     const req = new mock_req_1.default({
         url: options.graphqlRoute || '/graphql',
         method: 'POST',
@@ -20,25 +21,30 @@ const runGraphQLInContext = async ({ input, conn, pgPool, schema, options, authR
             Accept: 'application/json',
             'Content-Type': 'application/json'
         },
-        ...reqOptions
+        ...restReqOptions
     });
+    const res = reqRes ?? {};
     const pgSettingsGenerator = options.pgSettings;
     // @ts-ignore
     const pgSettings = typeof pgSettingsGenerator === 'function'
         ? await pgSettingsGenerator(req)
         : pgSettingsGenerator || {};
+    const contextOptions = { ...options, pgPool, pgSettings, req, res };
     // @ts-ignore
-    return await (0, postgraphile_1.withPostGraphileContext)({ ...options, pgPool, pgSettings }, async (context) => {
+    return await (0, postgraphile_1.withPostGraphileContext)(contextOptions, async (context) => {
         const pgConn = input.useRoot ? conn.pg : conn.db;
         const pgClient = pgConn.client;
         // IS THIS BAD TO HAVE ROLE HERE 
         await setContextOnClient(pgClient, pgSettings, authRole);
         await pgConn.ctxQuery();
+        const additionalContext = typeof options.additionalGraphQLContextFromRequest === 'function'
+            ? await options.additionalGraphQLContextFromRequest(req, res)
+            : {};
         const printed = typeof query === 'string' ? query : (0, graphql_1.print)(query);
         const result = await (0, graphql_1.graphql)({
             schema,
             source: printed,
-            contextValue: { ...context, pgClient },
+            contextValue: { ...context, ...additionalContext, pgClient },
             variableValues: variables ?? null
         });
         return result;

package/esm/context.js

@@ -6,6 +6,7 @@ export const runGraphQLInContext = async ({ input, conn, pgPool, schema, options
     if (!conn.pg.client) {
         throw new Error('pgClient is required and must be provided externally.');
     }
+    const { res: reqRes, ...restReqOptions } = reqOptions ?? {};
     const req = new MockReq({
         url: options.graphqlRoute || '/graphql',
         method: 'POST',
@@ -13,25 +14,30 @@ export const runGraphQLInContext = async ({ input, conn, pgPool, schema, options
             Accept: 'application/json',
             'Content-Type': 'application/json'
         },
-        ...reqOptions
+        ...restReqOptions
     });
+    const res = reqRes ?? {};
     const pgSettingsGenerator = options.pgSettings;
     // @ts-ignore
     const pgSettings = typeof pgSettingsGenerator === 'function'
         ? await pgSettingsGenerator(req)
         : pgSettingsGenerator || {};
+    const contextOptions = { ...options, pgPool, pgSettings, req, res };
     // @ts-ignore
-    return await withPostGraphileContext({ ...options, pgPool, pgSettings }, async (context) => {
+    return await withPostGraphileContext(contextOptions, async (context) => {
         const pgConn = input.useRoot ? conn.pg : conn.db;
         const pgClient = pgConn.client;
         // IS THIS BAD TO HAVE ROLE HERE 
         await setContextOnClient(pgClient, pgSettings, authRole);
         await pgConn.ctxQuery();
+        const additionalContext = typeof options.additionalGraphQLContextFromRequest === 'function'
+            ? await options.additionalGraphQLContextFromRequest(req, res)
+            : {};
         const printed = typeof query === 'string' ? query : print(query);
         const result = await graphql({
             schema,
             source: printed,
-            contextValue: { ...context, pgClient },
+            contextValue: { ...context, ...additionalContext, pgClient },
             variableValues: variables ?? null
         });
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-test",
-  "version": "2.8.3",
+  "version": "2.8.5",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "PostGraphile Testing",
   "main": "index.js",
@@ -20,25 +20,25 @@
     "url": "https://github.com/launchql/launchql/issues"
   },
   "scripts": {
-    "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "makage clean",
     "prepack": "npm run build",
-    "build": "npm run clean; tsc -p tsconfig.json; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc -p tsconfig.json --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "makage build",
+    "build:dev": "makage build --dev",
     "lint": "eslint . --fix",
     "test": "jest",
     "test:watch": "jest --watch"
   },
   "devDependencies": {
     "@types/pg": "^8.15.2",
-    "graphql-tag": "2.12.6"
+    "graphql-tag": "2.12.6",
+    "makage": "^0.1.6"
   },
   "dependencies": {
-    "@launchql/types": "^2.8.3",
+    "@launchql/types": "^2.8.5",
     "graphql": "15.10.1",
     "mock-req": "^0.2.0",
     "pg": "^8.16.0",
-    "pgsql-test": "^2.14.6",
+    "pgsql-test": "^2.14.8",
     "postgraphile": "^4.14.1"
   },
   "keywords": [
@@ -48,5 +48,5 @@
     "launchql",
     "test"
   ],
-  "gitHead": "4850ef84ce134d1bb43dc9132619a59257bd1157"
+  "gitHead": "e4643c07b6a961b964bbb132308366fc549504a1"
 }