Merge pull request #764 from constructive-io/devin/1772430816-cleanup-graphql-reexports

refactor: remove duplicative re-exports and options from graphql packages

Author: pyramation

graphql/env/src/index.ts

@@ -1,18 +1,3 @@
-// Re-export core env utilities from @pgpmjs/env
-export { 
-  loadConfigSync, 
-  loadConfigFileSync, 
-  loadConfigSyncFromDir,
-  resolvePgpmPath,
-  getConnEnvOptions,
-  getDeploymentEnvOptions,
-  getNodeEnv
-} from '@pgpmjs/env';
-
 // Export Constructive-specific env functions
 export { getEnvOptions, getConstructiveEnvOptions } from './merge';
 export { getGraphQLEnvVars } from './env';
-
-// Re-export types for convenience
-export type { ConstructiveOptions, ConstructiveGraphQLOptions } from '@constructive-io/graphql-types';
-export { constructiveDefaults, constructiveGraphqlDefaults } from '@constructive-io/graphql-types';

graphql/server/package.json

@@ -46,6 +46,7 @@
     "@constructive-io/url-domains": "workspace:^",
     "@graphile-contrib/pg-many-to-many": "2.0.0-rc.1",
     "@graphile/simplify-inflection": "8.0.0-rc.3",
+    "@pgpmjs/env": "workspace:^",
     "@pgpmjs/logger": "workspace:^",
     "@pgpmjs/server-utils": "workspace:^",
     "@pgpmjs/types": "workspace:^",

graphql/server/src/index.ts

@@ -1,8 +1,5 @@
 export * from './server';
 
-// Export options module - types, defaults, type guards, and utility functions
-export * from './options';
-
 // Export middleware for use in testing packages
 export { createApiMiddleware, getSubdomain, getApiConfig } from './middleware/api';
 export { createAuthenticateMiddleware } from './middleware/auth';

graphql/server/src/middleware/api.ts

@@ -1,4 +1,4 @@
-import { getNodeEnv } from '@constructive-io/graphql-env';
+import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { svcCache } from '@pgpmjs/server-utils';
 import { parseUrl } from '@constructive-io/url-domains';

graphql/server/src/middleware/auth.ts

@@ -1,4 +1,4 @@
-import { getNodeEnv } from '@constructive-io/graphql-env';
+import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { PgpmOptions } from '@pgpmjs/types';
 import { NextFunction, Request, RequestHandler, Response } from 'express';

graphql/server/src/middleware/debug-memory.ts

@@ -1,4 +1,4 @@
-import { getNodeEnv } from '@constructive-io/graphql-env';
+import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { svcCache } from '@pgpmjs/server-utils';
 import type { RequestHandler } from 'express';

graphql/server/src/middleware/error-handler.ts

@@ -1,4 +1,4 @@
-import { getNodeEnv } from '@constructive-io/graphql-env';
+import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import type { ErrorRequestHandler, NextFunction, Request, Response } from 'express';
 

graphql/server/src/middleware/graphile.ts

@@ -1,5 +1,5 @@
 import crypto from 'node:crypto';
-import { getNodeEnv } from '@constructive-io/graphql-env';
+import { getNodeEnv } from '@pgpmjs/env';
 import type { ConstructiveOptions } from '@constructive-io/graphql-types';
 import { Logger } from '@pgpmjs/logger';
 import type { NextFunction, Request, RequestHandler, Response } from 'express';

graphql/server/src/options.ts

@@ -23,7 +23,6 @@ import { graphile } from './middleware/graphile';
 import { multipartBridge } from './middleware/multipart-bridge';
 import { createUploadAuthenticateMiddleware, uploadRoute } from './middleware/upload';
 import { debugMemory } from './middleware/debug-memory';
-import { normalizeServerOptions } from './options';
 
 const log = new Logger('server');
 
@@ -49,14 +48,8 @@ const log = new Logger('server');
  * ```
  */
 export const GraphQLServer = (rawOpts: ConstructiveOptions | PgpmOptions = {}) => {
-  // Normalize options to ConstructiveOptions with defaults applied
-  const normalizedOpts = normalizeServerOptions(rawOpts as ConstructiveOptions);
-
-  // Apply environment variable overrides via getEnvOptions
-  // Cast to PgpmOptions for backward compatibility with getEnvOptions
-  const envOptions = getEnvOptions(normalizedOpts as PgpmOptions);
-
-  const app = new Server(envOptions);
+  const opts = getEnvOptions(rawOpts);
+  const app = new Server(opts);
   app.addEventListener();
   app.listen();
 };