@stonecrop/nuxt-grafserv 0.8.7 → 0.8.8

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@stonecrop/nuxt-grafserv",
   "configKey": "grafserv",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/runtime/handler.d.ts

@@ -3,10 +3,17 @@ import type { ModuleOptions } from '../types.js';
 /**
  * Get or create the grafserv instance
  * Exported for use by separate handler files
+ *
+ * For PostGraphile mode: uses pgl.createServ(grafserv) to preserve the full
+ * execution context (withPgClient, pgSettings, plugin middleware, etc.).
+ * For schema mode: builds a schema from files/function and wraps with grafserv.
  */
 export declare function getGrafservInstance(options: ModuleOptions): Promise<ReturnType<typeof grafserv>>;
 /**
  * Clear the cached instances (useful for development hot reload)
+ *
+ * For PostGraphile mode, only the grafserv reference is cleared — PostGraphile's
+ * pgl instance manages its own schema lifecycle and watch mode.
  */
 export declare function clearGrafservCache(): Promise<void>;
 /**

package/dist/runtime/handler.js

@@ -13,82 +13,81 @@ async function loadTypeDefsFromFiles(schemaPath) {
   });
   return sources.map((source) => source.document).filter(Boolean);
 }
-async function getSchema(options) {
+async function getSchemaForSchemaMode(options) {
   if (cachedSchema) {
     return cachedSchema;
   }
   let schema;
+  if (typeof options.schema === "function") {
+    console.debug("[@stonecrop/nuxt-grafserv] Using schema provider function");
+    schema = await options.schema();
+  } else {
+    console.debug("[@stonecrop/nuxt-grafserv] Loading schema from file(s)");
+    const typeDefDocs = await loadTypeDefsFromFiles(options.schema);
+    const objects = {};
+    if (options.resolversPath) {
+      try {
+        const resolverModule = await import("#internal/grafserv/resolvers");
+        const resolvers = resolverModule.default || resolverModule;
+        console.debug("[@stonecrop/nuxt-grafserv] Resolvers loaded:", Object.keys(resolvers));
+        for (const typeName of Object.keys(resolvers)) {
+          const typeResolvers = resolvers[typeName];
+          if (typeResolvers && typeof typeResolvers === "object" && "plans" in typeResolvers) {
+            objects[typeName] = typeResolvers;
+          } else {
+            objects[typeName] = { plans: typeResolvers };
+          }
+        }
+      } catch (e) {
+        console.error("[@stonecrop/nuxt-grafserv] Error loading resolvers:", e);
+        throw e;
+      }
+    } else {
+      console.debug("[@stonecrop/nuxt-grafserv] No resolvers specified");
+    }
+    try {
+      schema = makeGrafastSchema({
+        typeDefs: typeDefDocs,
+        objects
+      });
+      console.debug("[@stonecrop/nuxt-grafserv] Grafast schema created successfully");
+    } catch (error) {
+      console.error("[@stonecrop/nuxt-grafserv] Error creating Grafast schema:", error);
+      throw error;
+    }
+  }
+  cachedSchema = schema;
+  return schema;
+}
+export async function getGrafservInstance(options) {
+  if (grafservInstance) {
+    console.log("[@stonecrop/nuxt-grafserv] Returning cached grafserv instance");
+    return grafservInstance;
+  }
   if (options.type === "postgraphile") {
-    console.debug("[@stonecrop/nuxt-grafserv] Getting schema from PostGraphile instance");
+    console.debug("[@stonecrop/nuxt-grafserv] Creating grafserv via pgl.createServ()");
     try {
       const { pgl } = await import("#internal/grafserv/pgl");
-      console.debug("[@stonecrop/nuxt-grafserv] Calling pgl.getSchema()");
-      schema = await pgl.getSchema();
-      console.debug("[@stonecrop/nuxt-grafserv] PostGraphile schema retrieved successfully");
+      grafservInstance = pgl.createServ(grafserv);
+      console.log("[@stonecrop/nuxt-grafserv] PostGraphile grafserv instance created via pgl.createServ()");
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "MODULE_NOT_FOUND") {
         throw new Error(
           '[@stonecrop/nuxt-grafserv] PostGraphile preset provided but "postgraphile" package not found. Install it with: npm install postgraphile'
         );
       }
-      console.error("[@stonecrop/nuxt-grafserv] Error getting PostGraphile schema:", error);
+      console.error("[@stonecrop/nuxt-grafserv] Error creating PostGraphile grafserv instance:", error);
       throw error;
     }
   } else if (options.type === "schema") {
-    if (typeof options.schema === "function") {
-      console.debug("[@stonecrop/nuxt-grafserv] Using schema provider function");
-      schema = await options.schema();
-    } else {
-      console.debug("[@stonecrop/nuxt-grafserv] Loading schema from file(s)");
-      const typeDefDocs = await loadTypeDefsFromFiles(options.schema);
-      const objects = {};
-      if (options.resolversPath) {
-        try {
-          const resolverModule = await import("#internal/grafserv/resolvers");
-          const resolvers = resolverModule.default || resolverModule;
-          console.debug("[@stonecrop/nuxt-grafserv] Resolvers loaded:", Object.keys(resolvers));
-          for (const typeName of Object.keys(resolvers)) {
-            const typeResolvers = resolvers[typeName];
-            if (typeResolvers && typeof typeResolvers === "object" && "plans" in typeResolvers) {
-              objects[typeName] = typeResolvers;
-            } else {
-              objects[typeName] = { plans: typeResolvers };
-            }
-          }
-        } catch (e) {
-          console.error("[@stonecrop/nuxt-grafserv] Error loading resolvers:", e);
-          throw e;
-        }
-      } else {
-        console.debug("[@stonecrop/nuxt-grafserv] No resolvers specified");
-      }
-      try {
-        schema = makeGrafastSchema({
-          typeDefs: typeDefDocs,
-          objects
-        });
-        console.debug("[@stonecrop/nuxt-grafserv] Grafast schema created successfully");
-      } catch (error) {
-        console.error("[@stonecrop/nuxt-grafserv] Error creating Grafast schema:", error);
-        throw error;
-      }
-    }
+    const schema = await getSchemaForSchemaMode(options);
+    grafservInstance = grafserv({ schema });
+    console.log("[@stonecrop/nuxt-grafserv] Schema-mode grafserv instance created");
   } else {
     throw new Error(
       `[@stonecrop/nuxt-grafserv] Invalid configuration type: ${options.type}`
     );
   }
-  cachedSchema = schema;
-  return schema;
-}
-export async function getGrafservInstance(options) {
-  if (grafservInstance) {
-    console.log("[@stonecrop/nuxt-grafserv] Returning cached grafserv instance");
-    return grafservInstance;
-  }
-  const schema = await getSchema(options);
-  grafservInstance = grafserv({ schema });
-  console.log("[@stonecrop/nuxt-grafserv] Grafserv instance created");
   return grafservInstance;
 }
 export async function clearGrafservCache() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stonecrop/nuxt-grafserv",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "description": "Pluggable Grafserv GraphQL server as Nuxt Module",
   "license": "MIT",
   "type": "module",
@@ -43,7 +43,7 @@
     "grafast": "^1.0.0-rc.7",
     "grafserv": "^1.0.0-rc.6",
     "graphql": "^16.12.0",
-    "@stonecrop/graphql-middleware": "0.8.7"
+    "@stonecrop/graphql-middleware": "0.8.8"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",