create-joist-app 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-joist-app",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Create a new Joist ORM project with a single command",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,7 @@
     "format": "prettier --write 'src/**/*.{ts,js}'"
   },
   "dependencies": {
-    "commander": "^12.1.0",
+    "commander": "^14.0.3",
     "picocolors": "^1.1.1",
     "prompts": "^2.4.2",
     "validate-npm-package-name": "^6.0.2"
@@ -50,6 +50,6 @@
     "typescript": "5.9.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   }
 }

package/templates/graphql/src/context.ts

@@ -1,14 +1,23 @@
-import { EntityManager, newPgConnectionConfig } from "joist-orm";
+import { newPgConnectionConfig } from "joist-orm";
 import { PostgresDriver } from "joist-orm/pg";
 import { Pool } from "pg";
+import type { EntityManager } from "./entities";
 
-export interface Context {
+/** The app-wide global context, created once on boot & shared across all requests. */
+export interface AppContext {
   pool: Pool;
+  driver: PostgresDriver;
+}
+
+/** The request-specific context, created once per request. */
+export interface RequestContext extends AppContext {
   em: EntityManager;
 }
 
-export function newContext(): Context {
+export type Context = RequestContext;
+
+export function newAppContext(): AppContext {
   const pool = new Pool(newPgConnectionConfig());
-  const em = new EntityManager({}, new PostgresDriver(pool));
-  return { em, pool };
+  const driver = new PostgresDriver(pool);
+  return { pool, driver };
 }

package/templates/graphql/src/server.ts

@@ -1,13 +1,10 @@
 import { ApolloServer } from "@apollo/server";
 import { startStandaloneServer } from "@apollo/server/standalone";
-import { loadSchemaSync } from "@graphql-tools/load";
 import { GraphQLFileLoader } from "@graphql-tools/graphql-file-loader";
-import { EntityManager } from "joist-orm";
-import { newPgConnectionConfig } from "joist-orm/pg";
-import knex from "knex";
+import { loadSchemaSync } from "@graphql-tools/load";
 import path from "path";
-import { Context } from "./context";
-import { entities } from "./entities";
+import { Context, newAppContext } from "./context";
+import { EntityManager } from "./entities";
 import { resolvers } from "./resolvers";
 
 const typeDefs = loadSchemaSync(path.join(__dirname, "./**/*.graphql"), {
@@ -15,22 +12,17 @@ const typeDefs = loadSchemaSync(path.join(__dirname, "./**/*.graphql"), {
 });
 
 async function main() {
-  const config = newPgConnectionConfig();
-  const db = knex({ client: "pg", connection: config });
-
-  const server = new ApolloServer<Context>({
-    typeDefs,
-    resolvers,
-  });
-
+  const appContext = newAppContext();
+  const server = new ApolloServer<Context>({ typeDefs, resolvers });
   const { url } = await startStandaloneServer(server, {
     listen: { port: parseInt(process.env.PORT || "4000") },
     context: async () => {
-      const em = new EntityManager({ entities, driver: db }, {});
-      return { em };
+      const ctx = { ...appContext, em: null as any } satisfies Context;
+      const em = new EntityManager(ctx, appContext.driver);
+      Object.assign(ctx, { em });
+      return ctx;
     },
   });
-
   console.log(`🚀 Server ready at ${url}`);
 }
 

package/templates/graphql/src/setupTests.ts

@@ -25,7 +25,7 @@ afterAll(async () => {
 
 export function newEm(): EntityManager {
   const driver = new PostgresDriver(pool);
-  const ctx = { pool, em: null as any } satisfies Context;
+  const ctx = { pool, driver, em: null as any } satisfies Context;
   const em = new EntityManager(ctx, driver);
   Object.assign(ctx, { em });
   return em;