Merge pull request #401 from constructive-io/feat/sep-types

Feat/sep types

Author: pyramation

graphile/graphile-settings/package.json

@@ -28,9 +28,10 @@
     "test": "jest",
     "test:watch": "jest --watch"
   },
-  "dependencies": {
-    "@graphile-contrib/pg-many-to-many": "^1.0.2",
-    "@pgpmjs/env": "workspace:^",
+    "dependencies": {
+      "@graphile-contrib/pg-many-to-many": "^1.0.2",
+      "@launchql/env": "workspace:^",
+      "@launchql/types": "workspace:^",
     "@pgpmjs/types": "workspace:^",
     "cors": "^2.8.5",
     "express": "^5.1.0",

graphile/graphile-settings/src/index.ts

@@ -1,6 +1,6 @@
 import PgManyToMany from '@graphile-contrib/pg-many-to-many';
-import { getEnvOptions } from '@pgpmjs/env';
-import { PgpmOptions } from '@pgpmjs/types';
+import { getEnvOptions } from '@launchql/env';
+import { LaunchQLOptions } from '@launchql/types';
 import PgPostgis from 'graphile-postgis';
 import FulltextFilterPlugin from 'graphile-plugin-fulltext-filter';
 import { NodePlugin, Plugin } from 'graphile-build';
@@ -19,7 +19,7 @@ import CustomPgTypeMappingsPlugin from 'graphile-pg-type-mappings';
 import UploadPostGraphilePlugin, { Uploader } from 'graphile-upload-plugin';
 
 export const getGraphileSettings = (
-  rawOpts: PgpmOptions
+  rawOpts: LaunchQLOptions
 ): PostGraphileOptions => {
   const opts = getEnvOptions(rawOpts);
 

graphile/graphile-test/package.json

@@ -33,8 +33,10 @@
     "graphql-tag": "2.12.6",
     "makage": "^0.1.8"
   },
-  "dependencies": {
-    "@pgpmjs/types": "workspace:^",
+    "dependencies": {
+      "@launchql/env": "workspace:^",
+      "@launchql/types": "workspace:^",
+      "@pgpmjs/types": "workspace:^",
     "graphql": "15.10.1",
     "mock-req": "^0.2.0",
     "pg": "^8.16.3",

graphile/graphile-test/src/types.ts

@@ -1,4 +1,4 @@
-import type { GraphileOptions } from '@pgpmjs/types';
+import type { GraphileOptions } from '@launchql/types';
 import { DocumentNode, GraphQLError } from 'graphql';
 
 export interface GraphQLQueryOptions<TVariables = Record<string, any>> {

graphile/graphile-upload-plugin/__tests__/plugin.test.ts

@@ -3,7 +3,7 @@ import { join } from 'path';
 import { createReadStream, writeFileSync, unlinkSync } from 'fs';
 import { tmpdir } from 'os';
 import { S3Client } from '@aws-sdk/client-s3';
-import { getEnvOptions } from '@pgpmjs/env';
+import { getEnvOptions } from '@launchql/env';
 import { createS3Bucket } from '@launchql/s3-utils';
 import { getConnections, snapshot, seed } from 'graphile-test';
 import type { PgTestClient } from 'pgsql-test/test-client';

graphile/graphile-upload-plugin/package.json

@@ -37,10 +37,10 @@
   "bugs": {
     "url": "https://github.com/constructive-io/constructive/issues"
   },
-  "devDependencies": {
-    "@aws-sdk/client-s3": "^3.948.0",
-    "@launchql/s3-utils": "workspace:^",
-    "@pgpmjs/env": "workspace:^",
+    "devDependencies": {
+      "@aws-sdk/client-s3": "^3.948.0",
+      "@launchql/env": "workspace:^",
+      "@launchql/s3-utils": "workspace:^",
     "@types/pg": "^8.16.0",
     "graphile-test": "workspace:^",
     "graphql-tag": "^2.12.6",

packages/cli/package.json

@@ -45,12 +45,12 @@
     "pg": "^8.16.3",
     "ts-node": "^10.9.2"
   },
-  "dependencies": {
-    "@launchql/codegen": "workspace:^",
-    "@launchql/explorer": "workspace:^",
-    "@launchql/server": "workspace:^",
-    "@pgpmjs/core": "workspace:^",
-    "@pgpmjs/env": "workspace:^",
+    "dependencies": {
+      "@launchql/codegen": "workspace:^",
+      "@launchql/env": "workspace:^",
+      "@launchql/explorer": "workspace:^",
+      "@launchql/server": "workspace:^",
+      "@pgpmjs/core": "workspace:^",
     "@pgpmjs/logger": "workspace:^",
     "@pgpmjs/server-utils": "workspace:^",
     "@pgpmjs/types": "workspace:^",

packages/cli/src/commands/explorer.ts

@@ -1,4 +1,4 @@
-import { getEnvOptions } from '@pgpmjs/env';
+import { getEnvOptions } from '@launchql/env';
 import { LaunchQLExplorer as explorer } from '@launchql/explorer';
 import { Logger } from '@pgpmjs/logger';
 import { PgpmOptions } from '@pgpmjs/types';

packages/cli/src/commands/server.ts

@@ -1,4 +1,4 @@
-import { getEnvOptions } from '@pgpmjs/env';
+import { getEnvOptions } from '@launchql/env';
 import { Logger } from '@pgpmjs/logger';
 import { LaunchQLServer as server } from '@launchql/server';
 import { PgpmOptions } from '@pgpmjs/types';

packages/env/src/env.ts

@@ -10,6 +10,10 @@ const parseEnvBoolean = (val?: string): boolean | undefined => {
   return ['true', '1', 'yes'].includes(val.toLowerCase());
 };
 
+/**
+ * Parse core PGPM environment variables.
+ * GraphQL-related env vars (GRAPHILE_*, FEATURES_*, API_*) are handled by @launchql/env.
+ */
 export const getEnvVars = (): PgpmOptions => {
   const {
     PGROOTDATABASE,
@@ -33,19 +37,6 @@ export const getEnvVars = (): PgpmOptions => {
     PGPASSWORD,
     PGDATABASE,
 
-    GRAPHILE_SCHEMA,
-
-    FEATURES_SIMPLE_INFLECTION,
-    FEATURES_OPPOSITE_BASE_NAMES,
-    FEATURES_POSTGIS,
-    API_ENABLE_META,
-    API_IS_PUBLIC,
-    API_EXPOSED_SCHEMAS,
-    API_META_SCHEMAS,
-    API_ANON_ROLE,
-    API_ROLE_NAME,
-    API_DEFAULT_DATABASE_ID,
-
     BUCKET_NAME,
     AWS_REGION,
     AWS_ACCESS_KEY,
@@ -90,27 +81,6 @@ export const getEnvVars = (): PgpmOptions => {
       ...(PGPASSWORD && { password: PGPASSWORD }),
       ...(PGDATABASE && { database: PGDATABASE }),
     },
-    graphile: {
-      ...(GRAPHILE_SCHEMA && { 
-        schema: GRAPHILE_SCHEMA.includes(',') 
-          ? GRAPHILE_SCHEMA.split(',').map(s => s.trim())
-          : GRAPHILE_SCHEMA 
-      }),
-    },
-    features: {
-      ...(FEATURES_SIMPLE_INFLECTION && { simpleInflection: parseEnvBoolean(FEATURES_SIMPLE_INFLECTION) }),
-      ...(FEATURES_OPPOSITE_BASE_NAMES && { oppositeBaseNames: parseEnvBoolean(FEATURES_OPPOSITE_BASE_NAMES) }),
-      ...(FEATURES_POSTGIS && { postgis: parseEnvBoolean(FEATURES_POSTGIS) }),
-    },
-    api: {
-      ...(API_ENABLE_META && { enableMetaApi: parseEnvBoolean(API_ENABLE_META) }),
-      ...(API_IS_PUBLIC && { isPublic: parseEnvBoolean(API_IS_PUBLIC) }),
-      ...(API_EXPOSED_SCHEMAS && { exposedSchemas: API_EXPOSED_SCHEMAS.split(',').map(s => s.trim()) }),
-      ...(API_META_SCHEMAS && { metaSchemas: API_META_SCHEMAS.split(',').map(s => s.trim()) }),
-      ...(API_ANON_ROLE && { anonRole: API_ANON_ROLE }),
-      ...(API_ROLE_NAME && { roleName: API_ROLE_NAME }),
-      ...(API_DEFAULT_DATABASE_ID && { defaultDatabaseId: API_DEFAULT_DATABASE_ID }),
-    },
     cdn: {
       ...(BUCKET_NAME && { bucketName: BUCKET_NAME }),
       ...(AWS_REGION && { awsRegion: AWS_REGION }),