nitro-graphql 2.0.0-beta.72 → 2.0.0-beta.73

package/README.md

@@ -82,5 +82,5 @@ See the [documentation](https://nitro-graphql.pages.dev) for Nuxt and Vite setup
 [docs-href]: https://nitro-graphql.pages.dev
 [beta-src]: https://img.shields.io/npm/v/nitro-graphql/beta?style=flat&logo=rocket&logoColor=white&label=beta&color=7c3aed&colorA=080f12
 [beta-href]: https://github.com/productdevbook/nitro-graphql/releases
-[coverage-src]: https://img.shields.io/badge/coverage-66%25-green?style=flat&colorA=080f12
+[coverage-src]: https://img.shields.io/badge/coverage-71%25-green?style=flat&colorA=080f12
 [coverage-href]: https://github.com/productdevbook/nitro-graphql/actions/workflows/ci.yml

package/dist/cli/adapter.d.mts

@@ -4,9 +4,6 @@ import { CLIContext } from "./index.mjs";
 //#region src/cli/adapter.d.ts
 /**
  * CLI Framework Adapter
- *
- * Enables the CLI to use the same core functions as the Nitro module.
- * The adapter converts CLIContext to the types expected by core functions.
  */
 declare const CLIAdapter: FrameworkAdapter<CLIContext>;
 //#endregion

package/dist/cli/adapter.mjs

@@ -1,10 +1,7 @@
 import { LOG_TAG } from "../core/constants.mjs";
-import { createCoreConfig, createCoreContext, createScanContext } from "../core/config.mjs";
+import { createCoreConfig, createScanContext } from "../core/create-config.mjs";
 import consola from "consola";
 //#region src/cli/adapter.ts
-/**
-* Create a CoreLogger from consola for CLI usage
-*/
 function createCLILogger() {
 	const logger = consola.withTag(LOG_TAG);
 	return {
@@ -17,9 +14,6 @@ function createCLILogger() {
 }
 /**
 * CLI Framework Adapter
-*
-* Enables the CLI to use the same core functions as the Nitro module.
-* The adapter converts CLIContext to the types expected by core functions.
 */
 const CLIAdapter = {
 	name: "cli",
@@ -31,31 +25,14 @@ const CLIAdapter = {
 			clientDir: ctx.config.clientDir,
 			isNuxt: false,
 			isDev: true,
-			graphqlOptions: {
-				framework: ctx.config.framework,
-				endpoint: ctx.config.endpoint?.graphql,
-				security: ctx.config.security,
-				federation: ctx.config.federation,
-				externalServices: ctx.config.externalServices?.map((s) => ({
-					name: s.name,
-					endpoint: s.endpoint,
-					schema: (Array.isArray(s.schema) ? s.schema[0] : s.schema) || s.endpoint,
-					headers: s.headers,
-					documents: s.documents,
-					paths: s.paths ? {
-						sdk: typeof s.paths.sdk === "string" ? s.paths.sdk : void 0,
-						types: typeof s.paths.types === "string" ? s.paths.types : void 0
-					} : void 0
-				})),
-				codegen: ctx.config.codegen
-			},
 			logger: createCLILogger(),
-			ignorePatterns: ctx.config.ignore || []
+			ignorePatterns: ctx.config.ignore || [],
+			security: ctx.config.security,
+			federation: ctx.config.federation,
+			codegen: ctx.config.codegen,
+			externalServices: ctx.config.externalServices
 		});
 	},
-	createCoreContext: (ctx) => {
-		return createCoreContext(CLIAdapter.createCoreConfig(ctx));
-	},
 	createScanContext: (ctx) => {
 		return createScanContext(CLIAdapter.createCoreConfig(ctx));
 	},

package/dist/cli/commands/generate.mjs

@@ -1,7 +1,7 @@
 import { LOG_TAG } from "../../core/constants.mjs";
-import { loadGraphQLDocuments } from "../../core/codegen/document-loader.mjs";
 import { generateClientTypesCore } from "../../core/codegen/client.mjs";
-import { generateResolverModule, generateRuntimeIndex, generateSchemaModule } from "../../core/codegen/runtime.mjs";
+import { loadGraphQLDocuments } from "../../core/codegen/document-loader.mjs";
+import { generateResolverModule, generateRuntimeIndex, generateSchemaModule } from "../../core/codegen/runtime-generator.mjs";
 import { generateServerTypesCore } from "../../core/codegen/server.mjs";
 import { scanDocumentsCore } from "../../core/scanning/documents.mjs";
 import { scanResolversCore } from "../../core/scanning/resolvers.mjs";

package/dist/cli/config.d.mts

@@ -1,15 +1,14 @@
-import { NitroGraphQLOptions } from "../nitro/types.mjs";
-
+import { CLIGraphQLOptions } from "../nitro/types/config.mjs";
 //#region src/cli/config.d.ts
 /**
  * CLI configuration options
- * Now unified with NitroGraphQLOptions - all options available in both CLI and module context
+ * Extends NitroGraphQLOptions with CLI-specific fields (rootDir, buildDir, etc.)
  */
-type CLIConfig = NitroGraphQLOptions;
+type CLIConfig = CLIGraphQLOptions;
 /**
  * Define CLI configuration with type safety
  */
-declare function defineConfig(config: CLIConfig): CLIConfig;
+declare function defineConfig(config: Partial<CLIConfig>): Partial<CLIConfig>;
 /**
  * Default CLI configuration values
  */

package/dist/cli/config.mjs

@@ -10,9 +10,11 @@ function defineConfig(config) {
 */
 const DEFAULT_CLI_CONFIG = {
 	framework: "graphql-yoga",
+	rootDir: ".",
+	buildDir: ".graphql",
 	serverDir: "server/graphql",
 	clientDir: "graphql",
-	buildDir: ".graphql",
+	typesDir: ".graphql/types",
 	ignore: ["**/node_modules/**", "**/dist/**"]
 };
 //#endregion

package/dist/cli/index.d.mts

@@ -1,21 +1,18 @@
-import { NitroGraphQLOptions } from "../nitro/types.mjs";
+import { CLIGraphQLOptions } from "../nitro/types/config.mjs";
 import { CLIConfig, defineConfig } from "./config.mjs";
 
 //#region src/cli/index.d.ts
 /**
  * CLI context with resolved configuration
- * Uses NitroGraphQLOptions directly as CLI and module options are now unified
  */
 interface CLIContext {
-  config: Required<Pick<NitroGraphQLOptions, 'rootDir' | 'buildDir' | 'serverDir' | 'clientDir' | 'typesDir' | 'framework'>> & {
-    ignore: string[];
-  } & NitroGraphQLOptions;
+  config: CLIGraphQLOptions;
   cwd: string;
 }
 /**
  * Load CLI configuration from file or defaults
  */
-declare function loadConfig(cwd?: string): Promise<NitroGraphQLOptions>;
+declare function loadConfig(cwd?: string): Promise<Partial<CLIGraphQLOptions>>;
 /**
  * Create CLI context from configuration
  */

package/dist/cli/index.mjs

@@ -40,7 +40,7 @@ async function createCLIContext(options = {}) {
 	const cwd = options.cwd || getCwd();
 	const config = await loadConfig(cwd);
 	const rootDir = config.rootDir ? resolve(cwd, config.rootDir) : cwd;
-	const buildDir = config.buildDir ? resolve(rootDir, config.buildDir) : resolve(rootDir, ".nitro-graphql");
+	const buildDir = config.buildDir ? resolve(rootDir, config.buildDir) : resolve(rootDir, ".graphql");
 	const serverDir = config.serverDir ? resolve(rootDir, config.serverDir) : resolve(rootDir, "server/graphql");
 	const clientDir = config.clientDir ? resolve(rootDir, config.clientDir) : resolve(rootDir, "graphql");
 	const typesDir = config.typesDir ? resolve(rootDir, config.typesDir) : resolve(buildDir, "types");

package/dist/cli/server/graphql-handler.mjs

@@ -1,4 +1,5 @@
-import { BASE_SCHEMA, createYogaServer } from "../../core/server/yoga.mjs";
+import { BASE_SCHEMA } from "../../core/schema/builder.mjs";
+import { createYogaServer } from "../../core/server/yoga.mjs";
 import { loadDirectiveDefinitions, loadResolverDefinitions, loadSchemaDefinitions } from "./loader.mjs";
 import consola from "consola";
 //#region src/cli/server/graphql-handler.ts

package/dist/cli/server/watcher.mjs

@@ -1,5 +1,5 @@
 import { LOG_TAG } from "../../core/constants.mjs";
-import { closeWatcher, createCoreWatcher } from "../../core/watcher/index.mjs";
+import { closeWatcher, createCoreWatcher } from "../../core/watcher/create-watcher.mjs";
 import { generateAll } from "../commands/generate.mjs";
 import consola from "consola";
 //#region src/cli/server/watcher.ts

package/dist/core/codegen/client.d.mts

@@ -1,8 +1,6 @@
 import { ClientCodegenConfig, ClientCodegenInput, ClientCodegenResult, ExternalServiceCodegenConfig } from "../types/codegen.mjs";
-import { loadGraphQLDocuments } from "./document-loader.mjs";
-import { GraphQLLoadSchemaOptions, GraphQLTypeDefPointer, downloadAndSaveSchema, graphQLLoadSchemaSync, loadExternalSchema } from "./schema-loader.mjs";
 import { Source } from "@graphql-tools/utils";
-import { GraphQLSchema } from "graphql";
+import * as graphql from "graphql";
 
 //#region src/core/codegen/client.d.ts
 /**
@@ -11,32 +9,11 @@ import { GraphQLSchema } from "graphql";
 declare const DEFAULT_CLIENT_CODEGEN_CONFIG: ClientCodegenConfig;
 /**
  * Generate client-side GraphQL types
- * Pure function that generates TypeScript types from a GraphQL schema and documents
  */
 declare function generateClientTypesCore(input: ClientCodegenInput): Promise<ClientCodegenResult | false>;
 /**
- * Generate client types for external GraphQL service
+ * Generate client types for an external GraphQL service
  */
-declare function generateExternalClientTypesCore(service: ExternalServiceCodegenConfig, schema: GraphQLSchema, documents: Source[], virtualTypesPath?: string): Promise<ClientCodegenResult | false>;
-/**
- * Subscription info extracted from GraphQL documents
- */
-interface SubscriptionInfo {
-  /** Original operation name from GraphQL document (used for method names) */
-  name: string;
-  /** PascalCase version for type references (matches GraphQL codegen output) */
-  typeName: string;
-  fieldName: string;
-  hasVariables: boolean;
-}
-/**
- * Extract subscription operations from GraphQL documents
- */
-declare function extractSubscriptions(docs: Source[]): SubscriptionInfo[];
-/**
- * Generate subscription builder code (Drizzle-style API) + Vue Composables
- * Returns empty string if subscriptions are not enabled or no subscription operations found
- */
-declare function generateSubscriptionBuilder(docs: Source[], subscriptionsEnabled: boolean): string;
+declare function generateExternalClientTypesCore(service: ExternalServiceCodegenConfig, schema: graphql.GraphQLSchema, documents: Source[], virtualTypesPath?: string): Promise<ClientCodegenResult | false>;
 //#endregion
-export { DEFAULT_CLIENT_CODEGEN_CONFIG, type GraphQLLoadSchemaOptions, type GraphQLTypeDefPointer, SubscriptionInfo, downloadAndSaveSchema, extractSubscriptions, generateClientTypesCore, generateExternalClientTypesCore, generateSubscriptionBuilder, graphQLLoadSchemaSync, loadExternalSchema, loadGraphQLDocuments };
+export { DEFAULT_CLIENT_CODEGEN_CONFIG, generateClientTypesCore, generateExternalClientTypesCore };