nuxt-graphql-middleware 3.1.0-beta.2 → 3.1.0-beta.4

package/dist/module.d.ts

@@ -1,4 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
+import { Types } from '@graphql-codegen/plugin-helpers';
+import { SchemaASTConfig } from '@graphql-codegen/schema-ast';
 import { TypeScriptDocumentsPluginConfig } from '@graphql-codegen/typescript-operations';
 import { H3Event } from 'h3';
 import { FetchOptions, FetchResponse, FetchError } from 'ofetch';
@@ -193,7 +195,8 @@ interface ModuleOptions {
      */
     schemaPath?: string;
     /**
-     * These options are passed to the graphql-codegen method when generating the operations types.
+     * These options are passed to the graphql-codegen method when generating the
+     * TypeScript operations types.
      *
      * {@link https://www.the-guild.dev/graphql/codegen/plugins/typescript/typescript-operations}
      * @default
@@ -212,6 +215,31 @@ interface ModuleOptions {
      * ```
      */
     codegenConfig?: TypeScriptDocumentsPluginConfig;
+    /**
+     * Configuration for graphql-codegen when downloading the schema.
+     */
+    codegenSchemaConfig?: {
+        /**
+         * Configure how the schema.graphql file should be generated.
+         */
+        schemaAstConfig?: SchemaASTConfig;
+        /**
+         * Configure how the schema-ast introspection request should be made.
+         *
+         * Usually this is where you can provide a custom authentication header:
+         *
+         * ```typescript
+         * const codegenSchemaConfig = {
+         *   urlSchemaOptions: {
+         *     headers: {
+         *       authentication: 'foobar',
+         *     }
+         *   }
+         * }
+         * ```
+         */
+        urlSchemaOptions?: Types.UrlSchemaOptions;
+    };
 }
 type ModuleHooks = {};
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-graphql-middleware",
   "configKey": "graphqlMiddleware",
-  "version": "3.1.0-beta.2",
+  "version": "3.1.0-beta.4",
   "compatibility": {
     "nuxt": "^3.1.0"
   }

package/dist/module.mjs

@@ -17,7 +17,7 @@ import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import { pascalCase } from 'change-case-all';
 
 const name = "nuxt-graphql-middleware";
-const version = "3.1.0-beta.2";
+const version = "3.1.0-beta.4";
 
 var GraphqlMiddlewareTemplate = /* @__PURE__ */ ((GraphqlMiddlewareTemplate2) => {
   GraphqlMiddlewareTemplate2["OperationTypes"] = "graphql-operations.d.ts";
@@ -165,24 +165,25 @@ function pluginLoader(name) {
     return Promise.resolve(PluginSchemaAst);
   }
 }
-function generateSchema(url, dest, writeToDisk) {
-  return generate$1(
-    {
-      schema: url,
-      pluginLoader,
-      silent: true,
-      errorsOnly: true,
-      generates: {
-        [dest]: {
-          plugins: ["schema-ast"],
-          config: {
-            sort: true
-          }
-        }
+function generateSchema(moduleOptions, dest, writeToDisk) {
+  const pluginConfig = moduleOptions.codegenSchemaConfig?.urlSchemaOptions;
+  const schemaAstConfig = moduleOptions.codegenSchemaConfig?.schemaAstConfig || {
+    sort: true
+  };
+  const config = {
+    schema: moduleOptions.graphqlEndpoint,
+    pluginLoader,
+    silent: true,
+    errorsOnly: true,
+    config: pluginConfig,
+    generates: {
+      [dest]: {
+        plugins: ["schema-ast"],
+        config: schemaAstConfig
       }
-    },
-    writeToDisk
-  ).then((v) => v[0]);
+    }
+  };
+  return generate$1(config, writeToDisk).then((v) => v[0]);
 }
 function generateTemplates(documents, schemaPath, options) {
   return executeCodegen({
@@ -229,7 +230,7 @@ const defaultOptions = {
   debug: false,
   includeComposables: true,
   documents: [],
-  autoImportPatterns: ["**/*.{gql,graphql}", "!node_modules"]
+  autoImportPatterns: []
 };
 function inlineFragments(source, resolver) {
   return fragmentImport(source, {
@@ -353,7 +354,7 @@ async function getSchemaPath(options, resolver, writeToDisk = false) {
   if (!options.graphqlEndpoint) {
     throw new Error("Missing graphqlEndpoint config.");
   }
-  await generateSchema(options.graphqlEndpoint, dest, writeToDisk);
+  await generateSchema(options, dest, writeToDisk);
   return dest;
 }
 async function autoImportDocuments(patterns = [], srcResolver) {
@@ -500,6 +501,9 @@ const module = defineNuxtModule({
   defaults: defaultOptions,
   async setup(passedOptions, nuxt) {
     const options = defu({}, passedOptions, defaultOptions);
+    if (!passedOptions.autoImportPatterns) {
+      options.autoImportPatterns = ["**/*.{gql,graphql}", "!node_modules"];
+    }
     validateOptions(options);
     const moduleResolver = createResolver(import.meta.url).resolve;
     const srcDir = nuxt.options.srcDir;

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

@@ -1,3 +1,4 @@
+import type { FetchOptions } from 'ofetch';
 import { GraphqlMiddlewareState } from './../../types';
 import type { GraphqlMiddlewareQuery, GraphqlMiddlewareMutation } from '#build/nuxt-graphql-middleware';
 type GraphqlMiddlewareQueryName = keyof GraphqlMiddlewareQuery;
@@ -6,10 +7,29 @@ type GetQueryArgs<T extends GraphqlMiddlewareQueryName, M extends GraphqlMiddlew
 type GetMutationArgs<T extends GraphqlMiddlewareMutationName, M extends GraphqlMiddlewareMutation> = M[T][0] extends null ? [T] : M[T][1] extends false ? [T, M[T][0]] : [T, M[T][0]?];
 type GraphqlResponse<T> = {
     data: T;
+    errors: any[];
 };
 type GetQueryResult<T extends GraphqlMiddlewareQueryName, M extends GraphqlMiddlewareQuery> = M[T] extends undefined ? undefined : GraphqlResponse<M[T][2]>;
 type GetMutationResult<T extends GraphqlMiddlewareMutationName, M extends GraphqlMiddlewareMutation> = M[T] extends undefined ? undefined : GraphqlResponse<M[T][2]>;
 export declare const useGraphqlState: () => GraphqlMiddlewareState;
-export declare function useGraphqlQuery<T extends GraphqlMiddlewareQueryName>(...args: GetQueryArgs<T, GraphqlMiddlewareQuery>): Promise<GetQueryResult<T, GraphqlMiddlewareQuery>>;
-export declare function useGraphqlMutation<T extends GraphqlMiddlewareMutationName>(...args: GetMutationArgs<T, GraphqlMiddlewareMutation>): Promise<GetMutationResult<T, GraphqlMiddlewareMutation>>;
+type QueryObjectArgs<T extends GraphqlMiddlewareQueryName, M extends GraphqlMiddlewareQuery> = M[T][0] extends null ? {
+    name: T;
+    fetchOptions?: FetchOptions;
+    variables?: null;
+} : {
+    name: T;
+    variables: M[T][0];
+    fetchOptions?: FetchOptions;
+};
+type MutationObjectArgs<T extends GraphqlMiddlewareMutationName, M extends GraphqlMiddlewareMutation> = M[T][0] extends null ? {
+    name: T;
+    variables?: null;
+    fetchOptions?: FetchOptions;
+} : {
+    name: T;
+    variables: M[T][0];
+    fetchOptions?: FetchOptions;
+};
+export declare function useGraphqlQuery<T extends GraphqlMiddlewareQueryName>(...args: GetQueryArgs<T, GraphqlMiddlewareQuery> | [QueryObjectArgs<T, GraphqlMiddlewareQuery>]): Promise<GetQueryResult<T, GraphqlMiddlewareQuery>>;
+export declare function useGraphqlMutation<T extends GraphqlMiddlewareMutationName>(...args: GetMutationArgs<T, GraphqlMiddlewareMutation> | [MutationObjectArgs<T, GraphqlMiddlewareMutation>]): Promise<GetMutationResult<T, GraphqlMiddlewareMutation>>;
 export {};

package/dist/runtime/composables/index.mjs

@@ -11,28 +11,34 @@ export const useGraphqlState = () => {
   return state;
 };
 export function useGraphqlQuery(...args) {
-  const name = args[0];
-  if (typeof name !== "string") {
-    return Promise.reject(new Error("Invalid query name"));
-  }
+  const [name, variables, fetchOptions = {}] = typeof args[0] === "string" ? [args[0], args[1]] : [args[0].name, args[0].variables, args[0].fetchOptions];
   const state2 = useGraphqlState();
   return $fetch(getEndpoint("query", name), {
-    params: buildRequestParams(args[1]),
+    params: buildRequestParams(variables),
     // @todo: Remove any once https://github.com/unjs/nitro/pull/883 is released.
-    ...state2.fetchOptions
+    ...state2.fetchOptions,
+    ...fetchOptions
+  }).then((v) => {
+    return {
+      data: v.data,
+      errors: v.errors || []
+    };
   });
 }
 export function useGraphqlMutation(...args) {
+  const [name, variables, fetchOptions = {}] = typeof args[0] === "string" ? [args[0], args[1]] : [args[0].name, args[0].variables, args[0].fetchOptions];
   const state2 = useGraphqlState();
-  const name = args[0];
-  const body = args[1] || {};
-  if (typeof name !== "string") {
-    return Promise.reject(new Error("Invalid mutation name"));
-  }
   return $fetch(getEndpoint("mutation", name), {
     // @todo: Remove any once https://github.com/unjs/nitro/pull/883 is released.
     method: "post",
-    body,
-    ...state2.fetchOptions
+    body: variables,
+    ...state2.fetchOptions,
+    ...fetchOptions
+  }).then((v) => {
+    console.log(v);
+    return {
+      data: v.data,
+      errors: v.errors || []
+    };
   });
 }

package/dist/runtime/serverHandler/helpers/index.mjs

@@ -75,9 +75,10 @@ export function onServerError(serverOptions, event, error, operation, operationN
   if (serverOptions.onServerError) {
     return serverOptions.onServerError(event, error, operation, operationName);
   }
+  const message = error && "message" in error ? error.message : "";
   throw createError({
     statusCode: 500,
-    statusMessage: "Couldn't execute GraphQL query.",
+    statusMessage: "Couldn't execute GraphQL query: " + message,
     data: error && "message" in error ? error.message : error
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-graphql-middleware",
-  "version": "3.1.0-beta.2",
+  "version": "3.1.0-beta.4",
   "description": "Module to perform GraphQL requests as a server middleware.",
   "repository": {
     "type": "git",