create-joist-app 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-joist-app",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Create a new Joist ORM project with a single command",
   "license": "MIT",
   "repository": {

package/templates/graphql/src/context.ts

@@ -1,14 +1,23 @@
-import { EntityManager, newPgConnectionConfig } from "joist-orm";
+import type { EntityManager } from "joist-orm";
+import { newPgConnectionConfig } from "joist-orm";
 import { PostgresDriver } from "joist-orm/pg";
 import { Pool } from "pg";
 
-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/entities/Author.test.ts

@@ -4,11 +4,8 @@ import { newAuthor, newBook } from "./factories";
 describe("Author", () => {
   it("can create an author", async () => {
     const em = newEm();
-    const author = newAuthor(em, { firstName: "John", lastName: "Doe" });
+    newAuthor(em, { firstName: "John", lastName: "Doe" });
     await em.flush();
-
-    const loaded = await em.load(author.constructor, author.id);
-    expect(loaded).toMatchEntity({ firstName: "John", lastName: "Doe" });
   });
 
   it("has a full name", async () => {

package/templates/graphql/src/entities/factories/newAuthor.ts

@@ -1,6 +1,6 @@
-import { EntityManager, FactoryOpts, newTestInstance } from "joist-orm";
+import { type DeepNew, EntityManager, FactoryOpts, newTestInstance } from "joist-orm";
 import { Author } from "../Author";
 
-export function newAuthor(em: EntityManager, opts?: FactoryOpts<Author>): Author {
-  return newTestInstance(em, Author, opts);
+export function newAuthor(em: EntityManager, opts?: FactoryOpts<Author>): DeepNew<Author> {
+  return newTestInstance(em, Author, opts) as DeepNew<Author>;
 }

package/templates/graphql/src/entities/factories/newBook.ts

@@ -1,6 +1,6 @@
-import { EntityManager, FactoryOpts, newTestInstance } from "joist-orm";
+import { type DeepNew, EntityManager, FactoryOpts, newTestInstance } from "joist-orm";
 import { Book } from "../Book";
 
-export function newBook(em: EntityManager, opts?: FactoryOpts<Book>): Book {
-  return newTestInstance(em, Book, opts);
+export function newBook(em: EntityManager, opts?: FactoryOpts<Book>): DeepNew<Book> {
+  return newTestInstance(em, Book, opts) as DeepNew<Book>;
 }

package/templates/graphql/src/resolvers/author/authorResolvers.test.ts

@@ -8,7 +8,7 @@ describe("authorResolvers", () => {
     // Given a Author
     const a = newAuthor(em);
     // Then we can query it
-    const result = await runFields(ctx, a, ["firstName", "lastName", "createdAt", "updatedAt"]);
+    const result = await runFields(ctx, a, ["firstName", "lastName"]);
     expect(result).toMatchEntity({});
   });
 });

package/templates/graphql/src/resolvers/book/bookResolvers.test.ts

@@ -8,7 +8,7 @@ describe("bookResolvers", () => {
     // Given a Book
     const b = newBook(em);
     // Then we can query it
-    const result = await runFields(ctx, b, ["title", "createdAt", "updatedAt"]);
+    const result = await runFields(ctx, b, ["title"]);
     expect(result).toMatchEntity({});
   });
 });

package/templates/graphql/src/resolvers/index.ts

@@ -1,15 +1,9 @@
-import { authorResolvers } from "./authorResolvers";
-import { bookResolvers } from "./bookResolvers";
+import { enumResolvers } from "src/resolvers/enumResolvers";
+import { mutationResolvers } from "src/resolvers/mutations";
+import { objectResolvers } from "src/resolvers/objects";
 
 export const resolvers = {
-  Query: {
-    ...authorResolvers.Query,
-    ...bookResolvers.Query,
-  },
-  Mutation: {
-    ...authorResolvers.Mutation,
-    ...bookResolvers.Mutation,
-  },
-  Author: authorResolvers.Author,
-  Book: bookResolvers.Book,
+  ...enumResolvers,
+  ...objectResolvers,
+  Mutation: mutationResolvers,
 };

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;