nuxt-graphql-middleware 4.0.0-beta.6 → 4.0.0-beta.8

package/dist/module.mjs

@@ -6,21 +6,21 @@ import inquirer from 'inquirer';
 import { onDevToolsInitialized, extendServerRpc } from '@nuxt/devtools-kit';
 import { existsSync } from 'fs';
 import { promises, existsSync as existsSync$1 } from 'node:fs';
+import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import fragmentImport from '@graphql-fragment-import/lib/inline-imports.js';
 import { validateGraphQlDocuments } from '@graphql-tools/utils';
 import { loadSchema } from '@graphql-tools/load';
 import Table from 'cli-table';
 import chalk from 'chalk';
-import { concatAST, print, Source, parse } from 'graphql';
+import { concatAST, parse, print, visit, Kind, Source } from 'graphql';
 import { generate as generate$1, executeCodegen } from '@graphql-codegen/cli';
 import * as PluginTypescript from '@graphql-codegen/typescript';
 import * as PluginTypescriptOperations from '@graphql-codegen/typescript-operations';
 import * as PluginSchemaAst from '@graphql-codegen/schema-ast';
-import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import { pascalCase } from 'change-case-all';
 
 const name = "nuxt-graphql-middleware";
-const version = "4.0.0-beta.6";
+const version = "4.0.0-beta.8";
 
 const DEVTOOLS_UI_ROUTE = "/__nuxt-graphql-middleware";
 const DEVTOOLS_UI_LOCAL_PORT = 3300;
@@ -303,7 +303,7 @@ function validateDeprecated(options) {
       );
       if (key === "graphqlEndpoint") {
         logger.info(`
-import { defineGraphqlServerOptions } from '#graphql-server-options'
+import { defineGraphqlServerOptions } from 'nuxt-graphql-middleware/dist/runtime/serverOptions'
 import { getHeader } from 'h3'
 import acceptLanguageParser from 'accept-language-parser';
 
@@ -321,7 +321,7 @@ export default defineGraphqlServerOptions({
       }
       if (key === "serverFetchOptions") {
         logger.info(`
-import { defineGraphqlServerOptions } from '#graphql-server-options'
+import { defineGraphqlServerOptions } from 'nuxt-graphql-middleware/dist/runtime/serverOptions'
 import { getHeader } from 'h3'
 
 // Pass the cookie from the client request to the GraphQL request.
@@ -337,7 +337,7 @@ export default defineGraphqlServerOptions({
       }
       if (key === "onServerResponse") {
         logger.info(`
-import { defineGraphqlServerOptions } from '#graphql-server-options'
+import { defineGraphqlServerOptions } from 'nuxt-graphql-middleware/dist/runtime/serverOptions'
 import type { H3Event } from 'h3'
 import type { FetchResponse } from 'ofetch'
 
@@ -362,7 +362,7 @@ export default defineGraphqlServerOptions({
       }
       if (key === "onServerError") {
         logger.info(`
-import { defineGraphqlServerOptions } from '#graphql-server-options'
+import { defineGraphqlServerOptions } from 'nuxt-graphql-middleware/dist/runtime/serverOptions'
 import type { H3Event } from 'h3'
 import type { FetchError } from 'ofetch'
 
@@ -461,8 +461,9 @@ function parseDocument(document, srcDir) {
   return parse(source);
 }
 function validateDocuments(schema, documents, srcDir) {
+  const validated = [];
   for (let i = 0; i < documents.length; i++) {
-    const document = documents[i];
+    const document = { ...documents[i] };
     if (document.filename) {
       document.relativePath = document.filename.replace(srcDir + "/", "");
     }
@@ -490,8 +491,59 @@ function validateDocuments(schema, documents, srcDir) {
       document.isValid = false;
     }
     document.id = [document.operation, document.name, document.filename].filter(Boolean).join("_");
+    validated.push(document);
+    if (!document.isValid) {
+      break;
+    }
+  }
+  return validated;
+}
+function cleanGraphqlDocument(graphqlContent, operationName) {
+  const document = parse(graphqlContent);
+  let selectedOperation = null;
+  const fragments = {};
+  const usedFragments = /* @__PURE__ */ new Set();
+  visit(document, {
+    OperationDefinition(node) {
+      if (node.name?.value === operationName) {
+        selectedOperation = node;
+      }
+    },
+    FragmentDefinition(node) {
+      fragments[node.name.value] = node;
+    }
+  });
+  if (!selectedOperation) {
+    throw new Error(`Operation named "${operationName}" not found`);
+  }
+  visit(selectedOperation, {
+    FragmentSpread(node) {
+      usedFragments.add(node.name.value);
+    }
+  });
+  let hasNewFragments = true;
+  while (hasNewFragments) {
+    hasNewFragments = false;
+    for (const fragmentName of usedFragments) {
+      visit(fragments[fragmentName], {
+        FragmentSpread(node) {
+          if (!usedFragments.has(node.name.value)) {
+            usedFragments.add(node.name.value);
+            hasNewFragments = true;
+          }
+        }
+      });
+    }
   }
-  return documents;
+  return {
+    kind: Kind.DOCUMENT,
+    definitions: [
+      selectedOperation,
+      ...Array.from(usedFragments).map(
+        (fragmentName) => fragments[fragmentName]
+      )
+    ]
+  };
 }
 async function generate(options, schemaPath, resolver, srcDir, logEverything = false) {
   const schemaContent = await promises.readFile(schemaPath).then((v) => v.toString());
@@ -502,17 +554,55 @@ async function generate(options, schemaPath, resolver, srcDir, logEverything = f
     resolver
   );
   const validated = validateDocuments(schema, documents, srcDir);
+  const extracted = validated.filter(
+    (v) => !v.operation
+  );
+  validated.forEach((v) => {
+    if (v.isValid) {
+      try {
+        const node = parse(v.content);
+        oldVisit(node, {
+          enter: {
+            OperationDefinition: (node2) => {
+              if (node2.name?.value && node2.loc?.source && (node2.operation === "query" || node2.operation === "mutation")) {
+                const document = { ...v };
+                const cleaned = cleanGraphqlDocument(
+                  node2.loc.source.body,
+                  node2.name.value
+                );
+                const errors = validateGraphQlDocuments(schema, [cleaned]);
+                document.errors = document.errors || [];
+                document.errors.push(...errors);
+                document.isValid = !document.errors.length;
+                document.name = node2.name.value;
+                document.operation = node2.operation;
+                document.content = print(cleaned);
+                document.id = [
+                  document.operation,
+                  document.name,
+                  document.filename
+                ].filter(Boolean).join("_");
+                extracted.push(document);
+              }
+            }
+          }
+        });
+      } catch (e) {
+        logger.error(e);
+      }
+    }
+  });
   const templates = await generateTemplates(
-    validated.filter((v) => v.isValid).map((v) => v.content),
+    extracted.filter((v) => v.isValid).map((v) => v.content),
     schemaPath,
     options
   );
-  const hasErrors = validated.some((v) => !v.isValid);
+  const hasErrors = extracted.some((v) => !v.isValid);
   if (hasErrors || logEverything) {
     const table = new Table({
       head: ["Operation", "Name", "File", "Errors"].map((v) => chalk.white(v))
     });
-    validated.forEach((document) => {
+    extracted.forEach((document) => {
       if (logEverything || !document.isValid) {
         table.push(
           [
@@ -539,7 +629,7 @@ async function generate(options, schemaPath, resolver, srcDir, logEverything = f
       return a.filename.localeCompare(b.filename);
     }),
     hasErrors,
-    documents: validated.sort((a, b) => {
+    documents: extracted.sort((a, b) => {
       const nameA = a.name || "";
       const nameB = b.name || "";
       return nameA.localeCompare(nameB);
@@ -741,9 +831,6 @@ declare module '#graphql-documents' {
 `;
       }
     });
-    nuxt.options.alias["#graphql-server-options"] = moduleResolver(
-      "runtime/serverOptions"
-    );
     const extensions = ["js", "mjs", "ts"];
     const resolvedPath = "~/app/graphqlMiddleware.serverOptions".replace(/^(~~|@@)/, nuxt.options.rootDir).replace(/^(~|@)/, nuxt.options.srcDir);
     const template = (() => {

package/dist/runtime/composables/useGraphqlState.d.ts

@@ -1,3 +1,2 @@
-import { NuxtApp } from 'nuxt/app';
 import { GraphqlMiddlewareState } from './../../types';
-export declare const useGraphqlState: (providedApp?: NuxtApp) => GraphqlMiddlewareState | null;
+export declare const useGraphqlState: (providedApp?: any) => GraphqlMiddlewareState | null;

package/dist/runtime/composables/useGraphqlState.mjs

@@ -1,4 +1,4 @@
-import { useNuxtApp } from "nuxt/app";
+import { useNuxtApp } from "#app";
 export const useGraphqlState = function(providedApp) {
   try {
     const app = providedApp || useNuxtApp();

package/dist/runtime/plugins/provideState.d.ts

@@ -1,5 +1,5 @@
 /**
  * Create and provide the state singleton for the composables.
  */
-declare const _default: import("nuxt/app").Plugin<Record<string, unknown>>;
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/serverHandler/debug.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<string>;
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, string>;
 export default _default;

package/dist/runtime/serverHandler/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<any>;
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
 export default _default;

package/dist/runtime/serverHandler/index.mjs

@@ -1,4 +1,4 @@
-import { defineEventHandler, getQuery, getMethod, readBody } from "h3";
+import { defineEventHandler, getQuery, readBody } from "h3";
 import {
   queryParamToVariables,
   getEndpoint,
@@ -12,38 +12,59 @@ import { documents } from "#graphql-documents";
 import serverOptions from "#graphql-middleware-server-options-build";
 import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
-  const method = getMethod(event);
+  const method = event.method;
   const operation = event.context?.params?.operation;
-  const name = event.context?.params?.name;
-  validateRequest(method, operation, name, documents);
-  const query = documents[operation][name];
+  const operationName = event.context?.params?.name;
+  validateRequest(method, operation, operationName, documents);
+  const operationDocument = documents[operation][operationName];
+  const variables = operation === GraphqlMiddlewareOperation.Query ? queryParamToVariables(getQuery(event)) : await readBody(event);
+  if (serverOptions.doGraphqlRequest) {
+    return serverOptions.doGraphqlRequest({
+      event,
+      operation,
+      operationName,
+      operationDocument,
+      variables
+    });
+  }
   const runtimeConfig = useRuntimeConfig().graphqlMiddleware;
   const endpoint = await getEndpoint(
     runtimeConfig,
     serverOptions,
     event,
     operation,
-    name
+    operationName
   );
   const fetchOptions = await getFetchOptions(
     serverOptions,
     event,
     operation,
-    name
+    operationName
   );
-  const variables = operation === GraphqlMiddlewareOperation.Query ? queryParamToVariables(getQuery(event)) : await readBody(event);
   return $fetch.raw(endpoint, {
     // @todo: Remove any once https://github.com/unjs/nitro/pull/883 is released.
     method: "POST",
     body: {
-      query,
+      query: operationDocument,
       variables,
-      operationName: name
+      operationName
     },
     ...fetchOptions
   }).then((response) => {
-    return onServerResponse(serverOptions, event, response, operation, name);
+    return onServerResponse(
+      serverOptions,
+      event,
+      response,
+      operation,
+      operationName
+    );
   }).catch((error) => {
-    return onServerError(serverOptions, event, error, operation, name);
+    return onServerError(
+      serverOptions,
+      event,
+      error,
+      operation,
+      operationName
+    );
   });
 });

package/dist/types.d.mts

@@ -0,0 +1,17 @@
+
+import { ModuleOptions, ModuleHooks } from './module'
+
+declare module '@nuxt/schema' {
+  interface NuxtConfig { ['graphqlMiddleware']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['graphqlMiddleware']?: ModuleOptions }
+  interface NuxtHooks extends ModuleHooks {}
+}
+
+declare module 'nuxt/schema' {
+  interface NuxtConfig { ['graphqlMiddleware']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['graphqlMiddleware']?: ModuleOptions }
+  interface NuxtHooks extends ModuleHooks {}
+}
+
+
+export { GraphqlMiddlewareServerOptions, ModuleHooks, ModuleOptions, default } from './module'

package/dist/types.d.ts

@@ -7,5 +7,11 @@ declare module '@nuxt/schema' {
   interface NuxtHooks extends ModuleHooks {}
 }
 
+declare module 'nuxt/schema' {
+  interface NuxtConfig { ['graphqlMiddleware']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['graphqlMiddleware']?: ModuleOptions }
+  interface NuxtHooks extends ModuleHooks {}
+}
+
 
 export { GraphqlMiddlewareServerOptions, ModuleHooks, ModuleOptions, default } from './module'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-graphql-middleware",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-beta.8",
   "description": "Module to perform GraphQL requests as a server middleware.",
   "repository": {
     "type": "git",
@@ -12,7 +12,8 @@
     ".": {
       "import": "./dist/module.mjs",
       "require": "./dist/module.cjs"
-    }
+    },
+    "./dist/runtime/serverOptions": "./dist/runtime/serverOptions/index.mjs"
   },
   "main": "./dist/module.cjs",
   "types": "./dist/types.d.ts",
@@ -35,45 +36,45 @@
     "cypress:open": "cypress open --e2e",
     "test": "vitest",
     "test:ci": "vitest run",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "prettier": "prettier --check .",
+    "prettier:fix": "prettier --write ."
   },
   "dependencies": {
-    "@graphql-codegen/cli": "^3.3.1",
-    "@graphql-codegen/schema-ast": "^3.0.1",
-    "@graphql-codegen/typescript": "^3.0.4",
-    "@graphql-codegen/typescript-generic-sdk": "^3.1.0",
-    "@graphql-codegen/typescript-operations": "^3.0.4",
+    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/schema-ast": "^4.0.0",
+    "@graphql-codegen/typescript": "^4.0.1",
+    "@graphql-codegen/typescript-generic-sdk": "^4.0.0",
+    "@graphql-codegen/typescript-operations": "^4.0.1",
     "@graphql-fragment-import/lib": "^3.0.0",
-    "@graphql-tools/utils": "^9.2.1",
-    "@nuxt/devtools-kit": "0.4.5",
-    "@nuxt/kit": "^3.4.3",
+    "@graphql-tools/utils": "^10.0.6",
+    "@nuxt/devtools-kit": "0.8.5",
+    "@nuxt/kit": "^3.7.4",
     "cli-table": "^0.3.11",
-    "inquirer": "^9.2.0",
-    "minisearch": "^6.0.1"
+    "inquirer": "^9.2.11",
+    "minisearch": "^6.1.0"
   },
   "devDependencies": {
-    "@iconify-json/carbon": "^1.1.16",
-    "@nuxt/devtools": "^0.4.5",
-    "@nuxt/devtools-ui-kit": "0.4.5",
-    "@nuxt/module-builder": "^0.3.0",
-    "@nuxt/schema": "^3.4.3",
-    "@nuxt/test-utils": "^3.4.3",
-    "@nuxtjs/eslint-config-typescript": "^12.0.0",
-    "@types/capture-console": "^1.0.1",
-    "@types/cli-table": "^0.3.1",
+    "@iconify-json/carbon": "^1.1.21",
+    "@nuxt/devtools": "^0.8.5",
+    "@nuxt/devtools-ui-kit": "0.8.5",
+    "@nuxt/module-builder": "^0.5.2",
+    "@nuxt/schema": "^3.7.4",
+    "@nuxtjs/eslint-config-typescript": "^12.1.0",
+    "@types/capture-console": "^1.0.2",
+    "@types/cli-table": "^0.3.2",
     "@types/inquirer": "^9.0.3",
-    "@vitest/coverage-c8": "^0.30.1",
-    "cypress": "^12.11.0",
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "cypress": "^13.3.0",
+    "eslint": "^8.50.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "jsdoc-to-markdown": "^8.0.0",
-    "nuxt": "^3.4.3",
-    "prettier": "^2.8.8",
-    "strip-ansi": "^7.0.1",
-    "typedoc": "^0.24.6",
-    "typedoc-plugin-markdown": "^3.15.3",
-    "vitepress": "^1.0.0-alpha.75",
-    "vitest": "^0.30.1"
+    "nuxt": "^3.7.4",
+    "prettier": "^3.0.3",
+    "strip-ansi": "^7.1.0",
+    "typedoc": "^0.25.1",
+    "typedoc-plugin-markdown": "^3.16.0",
+    "vitepress": "^1.0.0-rc.20",
+    "vitest": "^0.34.6"
   }
 }