nitro-graphql 2.0.0-beta.8 → 2.0.0-beta.9

package/dist/index.js

@@ -1,7 +1,7 @@
 import { generateDirectiveSchemas } from "./utils/directive-parser.js";
 import { generateLayerIgnorePatterns, getLayerAppDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanResolvers, scanSchemas, validateExternalServices } from "./utils/index.js";
 import { writeFileIfNotExists } from "./utils/file-generator.js";
-import { getDefaultPaths, getScaffoldConfig, resolveFilePath, shouldGenerateScaffold } from "./utils/path-resolver.js";
+import { getScaffoldConfig, resolveFilePath, shouldGenerateScaffold } from "./utils/path-resolver.js";
 import { clientTypeGeneration, serverTypeGeneration } from "./utils/type-generation.js";
 import { rollupConfig } from "./rollup.js";
 import { existsSync, mkdirSync } from "node:fs";
@@ -25,11 +25,13 @@ var src_default = defineNitroModule({
 			}
 			consola.info(`Configured ${nitro.options.graphql.externalServices.length} external GraphQL services`);
 		}
+		const { getDefaultPaths: getDefaultPaths$1 } = await import("./utils/path-resolver.js");
+		const defaultPaths = getDefaultPaths$1(nitro);
 		nitro.graphql ||= {
 			buildDir: "",
 			watchDirs: [],
-			clientDir: "",
-			serverDir: resolve(nitro.options.rootDir, "server", "graphql"),
+			clientDir: defaultPaths.clientGraphql,
+			serverDir: defaultPaths.serverGraphql,
 			dir: {
 				build: relative(nitro.options.rootDir, nitro.options.buildDir),
 				client: "graphql",
@@ -61,11 +63,8 @@ var src_default = defineNitroModule({
 		const watchDirs = [];
 		switch (nitro.options.framework.name) {
 			case "nuxt": {
-				if (!nitro.graphql.clientDir) {
-					nitro.graphql.clientDir = resolve(nitro.options.rootDir, "app", "graphql");
-					nitro.graphql.dir.client = "app/graphql";
-				}
-				if (!nitro.options.graphql?.serverDir) nitro.graphql.serverDir = resolve(nitro.options.rootDir, "server", "graphql");
+				nitro.graphql.dir.client = relative(nitro.options.rootDir, nitro.graphql.clientDir);
+				nitro.graphql.dir.server = relative(nitro.options.rootDir, nitro.graphql.serverDir);
 				watchDirs.push(nitro.graphql.clientDir);
 				const layerServerDirs = getLayerServerDirectories(nitro);
 				const layerAppDirs = getLayerAppDirectories(nitro);
@@ -74,9 +73,8 @@ var src_default = defineNitroModule({
 				break;
 			}
 			case "nitro":
-				if (!nitro.options.graphql?.serverDir) nitro.graphql.serverDir = resolve(nitro.options.rootDir, "server", "graphql");
-				nitro.graphql.clientDir = resolve(nitro.options.rootDir, "graphql");
-				nitro.graphql.dir.client = "graphql";
+				nitro.graphql.dir.client = relative(nitro.options.rootDir, nitro.graphql.clientDir);
+				nitro.graphql.dir.server = relative(nitro.options.rootDir, nitro.graphql.serverDir);
 				watchDirs.push(nitro.graphql.clientDir);
 				watchDirs.push(nitro.graphql.serverDir);
 				break;
@@ -245,7 +243,7 @@ var src_default = defineNitroModule({
 			if (nuxtOptions) nuxtOptions.nitroGraphqlExternalServices = nitro.options.graphql?.externalServices || [];
 		});
 		if (shouldGenerateScaffold(nitro)) {
-			const placeholders = getDefaultPaths(nitro);
+			const placeholders = getDefaultPaths$1(nitro);
 			const scaffoldConfig = getScaffoldConfig(nitro);
 			const graphqlConfigPath = resolveFilePath(scaffoldConfig.graphqlConfig, scaffoldConfig.enabled, true, "graphql.config.ts", placeholders);
 			if (graphqlConfigPath) writeFileIfNotExists(graphqlConfigPath, `

package/dist/routes/apollo-server.d.ts

@@ -1,6 +1,6 @@
-import * as h30 from "h3";
+import * as h33 from "h3";
 
 //#region src/routes/apollo-server.d.ts
-declare const _default: h30.EventHandlerWithFetch<h30.EventHandlerRequest, Promise<any>>;
+declare const _default: h33.EventHandlerWithFetch<h33.EventHandlerRequest, Promise<any>>;
 //#endregion
 export { _default as default };

package/dist/routes/debug.d.ts

@@ -1,4 +1,4 @@
-import * as h35 from "h3";
+import * as h30 from "h3";
 
 //#region src/routes/debug.d.ts
 
@@ -10,7 +10,7 @@ import * as h35 from "h3";
  * - /_nitro/graphql/debug - HTML dashboard
  * - /_nitro/graphql/debug?format=json - JSON API
  */
-declare const _default: h35.EventHandlerWithFetch<h35.EventHandlerRequest, Promise<string | {
+declare const _default: h30.EventHandlerWithFetch<h30.EventHandlerRequest, Promise<string | {
   timestamp: string;
   environment: {
     dev: any;

package/dist/routes/graphql-yoga.d.ts

@@ -1,6 +1,6 @@
-import * as h33 from "h3";
+import * as h31 from "h3";
 
 //#region src/routes/graphql-yoga.d.ts
-declare const _default: h33.EventHandlerWithFetch<h33.EventHandlerRequest, Promise<Response>>;
+declare const _default: h31.EventHandlerWithFetch<h31.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

package/dist/routes/health.d.ts

@@ -1,7 +1,7 @@
-import * as h31 from "h3";
+import * as h35 from "h3";
 
 //#region src/routes/health.d.ts
-declare const _default: h31.EventHandlerWithFetch<h31.EventHandlerRequest, Promise<{
+declare const _default: h35.EventHandlerWithFetch<h35.EventHandlerRequest, Promise<{
   status: string;
   message: string;
   timestamp: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,