Envs

.github/workflows/run-tests.yaml

@@ -52,11 +52,7 @@ jobs:
       - name: launchql/client
         run: cd ./packages/client && yarn test
         env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: password
-          POSTGRES_HOST: pg_db
-          POSTGRES_PORT: 5432
-          DATABASE_URL: postgres://postgres:password@pg_db:5432/postgres
+          TEST_DATABASE_URL: postgres://postgres:password@pg_db:5432/postgres
 
       - name: launchql/orm
         run: cd ./packages/orm && yarn test
@@ -84,15 +80,6 @@ jobs:
           AWS_SECRET_KEY: minioadmin
           AWS_REGION: us-east-1
           BUCKET_NAME: test-bucket
-
-      - name: launchql/stream-to-s3
-        run: cd ./packages/stream-to-s3 && yarn test
-        env:
-          MINIO_ENDPOINT: http://minio_cdn:9000
-          AWS_ACCESS_KEY: minioadmin
-          AWS_SECRET_KEY: minioadmin
-          AWS_REGION: us-east-1
-          BUCKET_NAME: test-bucket
 
       - name: launchql/upload-names
         run: cd ./packages/upload-names && yarn test

packages/cli/package.json

@@ -40,6 +40,7 @@
     "@launchql/migrate": "^2.0.0",
     "@launchql/explorer": "^2.0.0",
     "@launchql/server": "^2.0.0",
+    "@launchql/types": "^2.0.0",
     "chalk": "^4.1.0",
     "deepmerge": "^4.3.1",
     "inquirerer": "^1.9.1",

packages/cli/src/commands/explorer.ts

@@ -1,6 +1,7 @@
-import { LaunchQLExplorer as explorer, ExplorerOptions } from '@launchql/explorer';
+import { LaunchQLExplorer as explorer } from '@launchql/explorer';
 import { CLIOptions, Inquirerer, Question } from 'inquirerer';
 import chalk from 'chalk';
+import { getEnvOptions, LaunchQLOptions } from '@launchql/types';
 
 const questions: Question[] = [
   {
@@ -36,7 +37,8 @@ const questions: Question[] = [
     type: 'number',
     // alias: 'p',
     required: false,
-    default: 5555
+    default: 5555,
+    useDefault: true
   },
   {
     name: 'origin',
@@ -64,13 +66,17 @@ export default async (
     simpleInflection
   } = await prompter.prompt(argv, questions);
 
-  const options: ExplorerOptions = {
-    oppositeBaseNames,
-    origin,
-    port,
-    postgis,
-    simpleInflection
-  };
+  const options: LaunchQLOptions = getEnvOptions({
+    features: {
+      oppositeBaseNames,
+      simpleInflection,
+      postgis
+    },
+    server: {
+      origin,
+      port
+    }
+  });
 
   console.log(chalk.green('\n✅ Selected Configuration:'));
   for (const [key, value] of Object.entries(options)) {

packages/cli/src/commands/server.ts

@@ -1,6 +1,7 @@
-import { LaunchQLServer as server, ServerOptions } from '@launchql/server';
+import { LaunchQLServer as server } from '@launchql/server';
 import { CLIOptions, Inquirerer, Question } from 'inquirerer';
 import chalk from 'chalk';
+import { getEnvOptions, LaunchQLOptions } from '@launchql/types';
 
 const questions: Question[] = [
   {
@@ -36,7 +37,8 @@ const questions: Question[] = [
     type: 'number',
     // alias: 'p',
     required: false,
-    default: 5555
+    default: 5555,
+    useDefault: true
   },
 //   {
 //     name: 'origin',
@@ -63,12 +65,16 @@ export default async (
     simpleInflection
   } = await prompter.prompt(argv, questions);
 
-  const options: ServerOptions = {
-    oppositeBaseNames,
-    port,
-    postgis,
-    simpleInflection
-  };
+  const options: LaunchQLOptions = getEnvOptions({
+    features: {
+      oppositeBaseNames,
+      simpleInflection,
+      postgis
+    },
+    server: {
+      port
+    }
+  });
 
   console.log(chalk.green('\n✅ Selected Configuration:'));
   for (const [key, value] of Object.entries(options)) {

packages/client/__tests__/client.test.ts

@@ -1,11 +1,12 @@
-process.env.DATABASE_URL = process.env.DATABASE_URL ?? 'postgres://postgres:password@localhost:5432/postgres';
 import { PoolClient } from 'pg';
 import { Database } from '../src';
 
 let client: Database;
 
+const databaseUrl = process.env.TEST_DATABASE_URL || 'postgres://postgres:password@localhost:5432/postgres';
+
 beforeAll(() => {
-  client = new Database();
+  client = new Database(databaseUrl);
 });
 
 afterAll(async () => {

packages/client/package.json

@@ -32,7 +32,6 @@
   "keywords": [],
   "dependencies": {
     "@types/pg": "^8.11.10",
-    "envalid": "^8.0.0",
     "pg": "^8.13.1"
   }
 }

packages/client/src/index.ts

@@ -1,33 +1,18 @@
 import { Pool, PoolClient } from 'pg';
 
-import env from './env';
-
 export class Database {
-  private static instance: Database;
   private pool: Pool;
 
-  constructor() {
-    if (Database.instance) {
-      return Database.instance;
-    }
-
-    const pgPoolConfig = {
-      connectionString: env.DATABASE_URL,
-    };
-    this.pool = new Pool(pgPoolConfig);
+  constructor(databaseUrl: string) {
+    this.pool = new Pool({ connectionString: databaseUrl });
 
-    // Ensure the pool is closed on process termination
     process.on('SIGTERM', async () => {
       await this.shutdown();
     });
-
-    Database.instance = this;
-    return this;
   }
 
   /**
    * Executes a callback function within a database transaction.
-   * @param fn - A callback function that receives a PoolClient to perform database operations.
    */
   async withTransaction(fn: (client: PoolClient) => Promise<void>): Promise<void> {
     const client = await this.pool.connect();
@@ -39,7 +24,7 @@ export class Database {
       } catch (e) {
         console.error('Error during transaction:', e);
         await client.query('ROLLBACK');
-        throw e; // Re-throw the error to propagate it
+        throw e;
       }
     } finally {
       client.release();
@@ -52,4 +37,4 @@ export class Database {
   async shutdown(): Promise<void> {
     await this.pool.end();
   }
-}
+}

packages/explorer/package.json

@@ -39,7 +39,7 @@
     "@launchql/server-utils": "^0.4.0",
     "@launchql/url-domains": "^0.1.0",
     "@launchql/upload-names": "^0.1.0",
-    "envalid": "^8.0.0",
+    "@launchql/types": "^2.0.0",
     "express": "^5.1.0",
     "graphile-build": "^4.14.1",
     "graphql-upload": "^17.0.0",