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

- Delete graphql/server/src/options.ts (type re-exports, duplicate defaults, unused type guards, legacy detection)
- Remove export * from '@pgpmjs/types' in graphql/types/src/index.ts
- Remove all re-exports from graphql/env/src/index.ts (was re-exporting @pgpmjs/env and @constructive-io/graphql-types)
- Remove duplicate ApiOptions type from graphql/server/src/types.ts
- Replace normalizeServerOptions with direct getEnvOptions call in server.ts
- Update middleware imports: getNodeEnv from @pgpmjs/env, ApiOptions -> ConstructiveOptions
- Add @pgpmjs/env as direct dependency of graphql/server

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,14 +1,15 @@
-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 { ConstructiveOptions } from '@constructive-io/graphql-types';
 import { parseUrl } from '@constructive-io/url-domains';
 import { NextFunction, Request, Response } from 'express';
 import { Pool } from 'pg';
 import { getPgPool } from 'pg-cache';
 
 import errorPage50x from '../errors/50x';
 import errorPage404Message from '../errors/404-message';
-import { ApiConfigResult, ApiError, ApiOptions, ApiStructure, RlsModule } from '../types';
+import { ApiConfigResult, ApiError, ApiStructure, RlsModule } from '../types';
 import './types';
 
 const log = new Logger('api');
@@ -122,7 +123,7 @@ interface ApiListRow {
 }
 
 interface ResolveContext {
-  opts: ApiOptions;
+  opts: ConstructiveOptions;
   pool: Pool;
   domain: string;
   subdomain: string | null;
@@ -166,7 +167,7 @@ export const getSubdomain = (subdomains: string[]): string | null => {
   return filtered.length ? filtered.join('.') : null;
 };
 
-export const getSvcKey = (opts: ApiOptions, req: Request): string => {
+export const getSvcKey = (opts: ConstructiveOptions, req: Request): string => {
   const { domain, subdomains } = getUrlDomains(req);
   const baseKey = subdomains.filter((n) => n !== 'www').concat(domain).join('.');
 
@@ -195,7 +196,7 @@ const toRlsModule = (row: RlsModuleRow | null): RlsModule | undefined => {
   };
 };
 
-const toApiStructure = (row: ApiRow, opts: ApiOptions, rlsModuleRow?: RlsModuleRow | null): ApiStructure => ({
+const toApiStructure = (row: ApiRow, opts: ConstructiveOptions, rlsModuleRow?: RlsModuleRow | null): ApiStructure => ({
   apiId: row.api_id,
   dbname: row.dbname || opts.pg?.database || '',
   anonRole: row.anon_role || 'anon',
@@ -209,7 +210,7 @@ const toApiStructure = (row: ApiRow, opts: ApiOptions, rlsModuleRow?: RlsModuleR
 });
 
 const createAdminStructure = (
-  opts: ApiOptions,
+  opts: ConstructiveOptions,
   schemas: string[],
   databaseId?: string
 ): ApiStructure => ({
@@ -408,7 +409,7 @@ const buildDevFallbackError = async (
 // =============================================================================
 
 export const getApiConfig = async (
-  opts: ApiOptions,
+  opts: ConstructiveOptions,
   req: Request
 ): Promise<ApiConfigResult> => {
   const pool = getPgPool(opts.pg);
@@ -500,7 +501,7 @@ export const getApiConfig = async (
 // Express Middleware
 // =============================================================================
 
-export const createApiMiddleware = (opts: ApiOptions) => {
+export const createApiMiddleware = (opts: ConstructiveOptions) => {
   return async (req: Request, res: Response, next: NextFunction): Promise<void> => {
     log.debug(`[api-middleware] ${req.method} ${req.path}`);
 

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';