graphile-schema 1.10.1 → 1.10.3

package/build-schema.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSchemaSDL = buildSchemaSDL;
+const deepmerge_1 = __importDefault(require("deepmerge"));
 const graphql_1 = require("graphql");
 const graphile_settings_1 = require("graphile-settings");
 const graphile_build_1 = require("graphile-build");
@@ -15,16 +19,20 @@ async function buildSchemaSDL(opts) {
     // Without this, makePgService creates its own internal pool that isn't released,
     // causing "database has active sessions" errors during ephemeral DB teardown.
     const pool = (0, pg_cache_1.getPgPool)(config);
-    // Compose presets using Graphile's native `extends` mechanism instead of
-    // deepmerge.  deepmerge recursively clones every nested object — including
-    // the pg Pool (EventEmitter internals) and the entire PostGraphile preset
-    // tree — which overflows the call stack.
+    // Hybrid preset composition: use deepmerge for safe scalar/object keys
+    // (plugins, disablePlugins, schema, gather, etc.) but pluck out `extends`
+    // and `pgServices` to compose them via Graphile's native mechanism.
+    // deepmerge cannot deep-clone `extends` (contains the entire PostGraphile
+    // preset tree) or `pgServices` (contains pg Pool / EventEmitter internals)
+    // without overflowing the call stack.
+    const { extends: callerExtends, pgServices: _pgServices, ...callerRest } = opts.graphile ?? {};
+    const baseRest = {};
     const preset = {
+        ...(0, deepmerge_1.default)(baseRest, callerRest),
         extends: [
             graphile_settings_1.ConstructivePreset,
-            ...(opts.graphile?.extends ?? []),
+            ...(callerExtends ?? []),
         ],
-        plugins: opts.graphile?.plugins ?? [],
         pgServices: [
             (0, graphile_settings_1.makePgService)({
                 pool,

package/esm/build-schema.js

@@ -1,3 +1,4 @@
+import deepmerge from 'deepmerge';
 import { printSchema } from 'graphql';
 import { ConstructivePreset, makePgService } from 'graphile-settings';
 import { makeSchema } from 'graphile-build';
@@ -12,16 +13,20 @@ export async function buildSchemaSDL(opts) {
     // Without this, makePgService creates its own internal pool that isn't released,
     // causing "database has active sessions" errors during ephemeral DB teardown.
     const pool = getPgPool(config);
-    // Compose presets using Graphile's native `extends` mechanism instead of
-    // deepmerge.  deepmerge recursively clones every nested object — including
-    // the pg Pool (EventEmitter internals) and the entire PostGraphile preset
-    // tree — which overflows the call stack.
+    // Hybrid preset composition: use deepmerge for safe scalar/object keys
+    // (plugins, disablePlugins, schema, gather, etc.) but pluck out `extends`
+    // and `pgServices` to compose them via Graphile's native mechanism.
+    // deepmerge cannot deep-clone `extends` (contains the entire PostGraphile
+    // preset tree) or `pgServices` (contains pg Pool / EventEmitter internals)
+    // without overflowing the call stack.
+    const { extends: callerExtends, pgServices: _pgServices, ...callerRest } = opts.graphile ?? {};
+    const baseRest = {};
     const preset = {
+        ...deepmerge(baseRest, callerRest),
         extends: [
             ConstructivePreset,
-            ...(opts.graphile?.extends ?? []),
+            ...(callerExtends ?? []),
         ],
-        plugins: opts.graphile?.plugins ?? [],
         pgServices: [
             makePgService({
                 pool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-schema",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "author": "Constructive <developers@constructive.io>",
   "description": "Build GraphQL SDL from PostgreSQL databases using PostGraphile v5",
   "main": "index.js",
@@ -29,12 +29,13 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "deepmerge": "^4.3.1",
     "graphile-build": "5.0.0-rc.6",
     "graphile-config": "1.0.0-rc.6",
-    "graphile-settings": "^4.16.0",
+    "graphile-settings": "^4.16.1",
     "graphql": "16.13.0",
-    "pg-cache": "^3.4.0",
-    "pg-env": "^1.8.0"
+    "pg-cache": "^3.4.1",
+    "pg-env": "^1.8.1"
   },
   "devDependencies": {
     "makage": "^0.1.10",
@@ -49,5 +50,5 @@
     "introspection",
     "constructive"
   ],
-  "gitHead": "cedb1963bbae9beb2592474151b19cbd56df4772"
+  "gitHead": "e86099de99284e17b6e99ccbe8bb1997f808cec5"
 }