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

package/dist/module.json

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

package/dist/module.mjs

@@ -1,7 +1,7 @@
 import { fileURLToPath } from 'url';
 import { resolve } from 'pathe';
 import { defu } from 'defu';
-import { useLogger, resolveAlias, resolveFiles, defineNuxtModule, createResolver, addImportsDir, addTemplate, addServerHandler, addPlugin, updateTemplates } from '@nuxt/kit';
+import { useLogger, resolveAlias, resolveFiles, defineNuxtModule, createResolver, addImports, addTemplate, addServerHandler, addPlugin, updateTemplates } from '@nuxt/kit';
 import inquirer from 'inquirer';
 import { onDevToolsInitialized, extendServerRpc } from '@nuxt/devtools-kit';
 import { existsSync } from 'fs';
@@ -20,7 +20,7 @@ import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import { pascalCase } from 'change-case-all';
 
 const name = "nuxt-graphql-middleware";
-const version = "4.0.0-beta.5";
+const version = "4.0.0-beta.6";
 
 const DEVTOOLS_UI_ROUTE = "/__nuxt-graphql-middleware";
 const DEVTOOLS_UI_LOCAL_PORT = 3300;
@@ -687,9 +687,20 @@ const module = defineNuxtModule({
       graphqlEndpoint: options.graphqlEndpoint || ""
     };
     if (options.includeComposables) {
-      addImportsDir(moduleResolver("runtime/composables"));
+      addImports({
+        from: moduleResolver("./runtime/composables/useGraphqlQuery"),
+        name: "useGraphqlQuery"
+      });
+      addImports({
+        from: moduleResolver("./runtime/composables/useGraphqlMutation"),
+        name: "useGraphqlMutation"
+      });
+      addImports({
+        from: moduleResolver("./runtime/composables/useGraphqlState"),
+        name: "useGraphqlState"
+      });
       nuxt.options.alias["#graphql-composable"] = moduleResolver(
-        "runtime/composables"
+        "runtime/composables/server"
       );
     }
     Object.values(GraphqlMiddlewareTemplate).forEach((filename) => {

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

@@ -0,0 +1,5 @@
+import type { FetchOptions } from 'ofetch';
+export declare function performRequest(operation: string, operationName: string, method: 'get' | 'post', options: FetchOptions): Promise<{
+    data: any;
+    errors: any[];
+}>;

package/dist/runtime/composables/nuxtApp.mjs

@@ -0,0 +1,15 @@
+import { useGraphqlState } from "./useGraphqlState.mjs";
+import { getEndpoint } from "./shared.mjs";
+export function performRequest(operation, operationName, method, options) {
+  const state = useGraphqlState();
+  return $fetch(getEndpoint(operation, operationName), {
+    ...state && state.fetchOptions ? state.fetchOptions : {},
+    ...options,
+    method
+  }).then((v) => {
+    return {
+      data: v.data,
+      errors: v.errors || []
+    };
+  });
+}

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

@@ -0,0 +1,10 @@
+import { GraphqlMiddlewareQueryName, GetQueryArgs, QueryObjectArgs, GetQueryResult, GraphqlMiddlewareMutationName, GetMutationArgs, MutationObjectArgs, GetMutationResult } from './shared';
+import type { GraphqlMiddlewareQuery, GraphqlMiddlewareMutation } from '#build/nuxt-graphql-middleware';
+/**
+ * Performs a GraphQL query.
+ */
+export declare function useGraphqlQuery<T extends GraphqlMiddlewareQueryName>(...args: GetQueryArgs<T, GraphqlMiddlewareQuery> | [QueryObjectArgs<T, GraphqlMiddlewareQuery>]): Promise<GetQueryResult<T, GraphqlMiddlewareQuery>>;
+/**
+ * Performs a GraphQL mutation.
+ */
+export declare function useGraphqlMutation<T extends GraphqlMiddlewareMutationName>(...args: GetMutationArgs<T, GraphqlMiddlewareMutation> | [MutationObjectArgs<T, GraphqlMiddlewareMutation>]): Promise<GetMutationResult<T, GraphqlMiddlewareMutation>>;

package/dist/runtime/composables/{index.mjs → server.mjs}

@@ -1,23 +1,9 @@
+import {
+  getEndpoint
+} from "./shared.mjs";
 import { buildRequestParams } from "./../helpers/index.mjs";
-import { useRuntimeConfig } from "#imports";
-function getEndpoint(operation, operationName) {
-  const config = useRuntimeConfig();
-  return `${config?.public?.["nuxt-graphql-middleware"]?.serverApiPrefix}/${operation}/${operationName}`;
-}
-export const useGraphqlState = function(providedApp) {
-  try {
-    const app = providedApp || useNuxtApp();
-    if (app.$graphqlState) {
-      return app.$graphqlState;
-    }
-  } catch (_e) {
-  }
-  return null;
-};
 function performRequest(operation, operationName, method, options) {
-  const state = useGraphqlState();
   return $fetch(getEndpoint(operation, operationName), {
-    ...state && state.fetchOptions ? state.fetchOptions : {},
     ...options,
     method
   }).then((v) => {

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

@@ -0,0 +1,31 @@
+import type { FetchOptions } from 'ofetch';
+import type { GraphqlMiddlewareQuery, GraphqlMiddlewareMutation } from '#build/nuxt-graphql-middleware';
+export type GraphqlMiddlewareQueryName = keyof GraphqlMiddlewareQuery;
+export type GraphqlMiddlewareMutationName = keyof GraphqlMiddlewareMutation;
+export type GetQueryArgs<T extends GraphqlMiddlewareQueryName, M extends GraphqlMiddlewareQuery> = M[T][0] extends null ? [T] : M[T][1] extends false ? [T, M[T][0]] : [T, M[T][0]?];
+export 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]?];
+export type GraphqlResponse<T> = {
+    data: T;
+    errors: any[];
+};
+export type GetQueryResult<T extends GraphqlMiddlewareQueryName, M extends GraphqlMiddlewareQuery> = M[T] extends undefined ? undefined : GraphqlResponse<M[T][2]>;
+export type GetMutationResult<T extends GraphqlMiddlewareMutationName, M extends GraphqlMiddlewareMutation> = M[T] extends undefined ? undefined : GraphqlResponse<M[T][2]>;
+export declare function getEndpoint(operation: string, operationName: string): string;
+export 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;
+};
+export 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;
+};

package/dist/runtime/composables/shared.mjs

@@ -0,0 +1,5 @@
+import { useRuntimeConfig } from "#imports";
+export function getEndpoint(operation, operationName) {
+  const config = useRuntimeConfig();
+  return `${config?.public?.["nuxt-graphql-middleware"]?.serverApiPrefix}/${operation}/${operationName}`;
+}

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

@@ -0,0 +1,6 @@
+import { GraphqlMiddlewareMutationName, GetMutationArgs, MutationObjectArgs, GetMutationResult } from './shared';
+import type { GraphqlMiddlewareMutation } from '#build/nuxt-graphql-middleware';
+/**
+ * Performs a GraphQL mutation.
+ */
+export declare function useGraphqlMutation<T extends GraphqlMiddlewareMutationName>(...args: GetMutationArgs<T, GraphqlMiddlewareMutation> | [MutationObjectArgs<T, GraphqlMiddlewareMutation>]): Promise<GetMutationResult<T, GraphqlMiddlewareMutation>>;

package/dist/runtime/composables/useGraphqlMutation.mjs

@@ -0,0 +1,8 @@
+import { performRequest } from "./nuxtApp.mjs";
+export function useGraphqlMutation(...args) {
+  const [name, body, fetchOptions = {}] = typeof args[0] === "string" ? [args[0], args[1]] : [args[0].name, args[0].variables, args[0].fetchOptions];
+  return performRequest("mutation", name, "post", {
+    body,
+    ...fetchOptions
+  });
+}

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

@@ -0,0 +1,6 @@
+import { GraphqlMiddlewareQueryName, GetQueryArgs, QueryObjectArgs, GetQueryResult } from './shared';
+import type { GraphqlMiddlewareQuery } from '#build/nuxt-graphql-middleware';
+/**
+ * Performs a GraphQL query.
+ */
+export declare function useGraphqlQuery<T extends GraphqlMiddlewareQueryName>(...args: GetQueryArgs<T, GraphqlMiddlewareQuery> | [QueryObjectArgs<T, GraphqlMiddlewareQuery>]): Promise<GetQueryResult<T, GraphqlMiddlewareQuery>>;

package/dist/runtime/composables/useGraphqlQuery.mjs

@@ -0,0 +1,9 @@
+import { buildRequestParams } from "./../helpers/index.mjs";
+import { performRequest } from "./nuxtApp.mjs";
+export function useGraphqlQuery(...args) {
+  const [name, variables, fetchOptions = {}] = typeof args[0] === "string" ? [args[0], args[1]] : [args[0].name, args[0].variables, args[0].fetchOptions];
+  return performRequest("query", name, "get", {
+    params: buildRequestParams(variables),
+    ...fetchOptions
+  });
+}

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

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

package/dist/runtime/composables/useGraphqlState.mjs

@@ -0,0 +1,11 @@
+import { useNuxtApp } from "nuxt/app";
+export const useGraphqlState = function(providedApp) {
+  try {
+    const app = providedApp || useNuxtApp();
+    if (app.$graphqlState) {
+      return app.$graphqlState;
+    }
+  } catch (_e) {
+  }
+  return null;
+};

package/package.json

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

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

@@ -1,41 +0,0 @@
-import type { FetchOptions } from 'ofetch';
-import { GraphqlMiddlewareState } from './../../types';
-import type { GraphqlMiddlewareQuery, GraphqlMiddlewareMutation } from '#build/nuxt-graphql-middleware';
-type GraphqlMiddlewareQueryName = keyof GraphqlMiddlewareQuery;
-type GraphqlMiddlewareMutationName = keyof GraphqlMiddlewareMutation;
-type GetQueryArgs<T extends GraphqlMiddlewareQueryName, M extends GraphqlMiddlewareQuery> = M[T][0] extends null ? [T] : M[T][1] extends false ? [T, M[T][0]] : [T, M[T][0]?];
-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: (providedApp?: any) => GraphqlMiddlewareState | null;
-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;
-};
-/**
- * Performs a GraphQL query.
- */
-export declare function useGraphqlQuery<T extends GraphqlMiddlewareQueryName>(...args: GetQueryArgs<T, GraphqlMiddlewareQuery> | [QueryObjectArgs<T, GraphqlMiddlewareQuery>]): Promise<GetQueryResult<T, GraphqlMiddlewareQuery>>;
-/**
- * Performs a GraphQL mutation.
- */
-export declare function useGraphqlMutation<T extends GraphqlMiddlewareMutationName>(...args: GetMutationArgs<T, GraphqlMiddlewareMutation> | [MutationObjectArgs<T, GraphqlMiddlewareMutation>]): Promise<GetMutationResult<T, GraphqlMiddlewareMutation>>;
-export {};