create-m5kdev 0.17.7 → 0.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-m5kdev",
-  "version": "0.17.7",
+  "version": "0.19.0",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",

package/templates/minimal-app/apps/server/drizzle/generate-schema.ts.tpl

@@ -1,27 +1,29 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { collectBackendSchema, generateBackendSchemaSource } from "@m5kdev/backend/app";
-import { backendSchemaModules } from "../src/schema-modules";
+import * as authTables from "@m5kdev/backend/modules/auth/auth.db";
+import * as notificationTables from "@m5kdev/backend/modules/notification/notification.db";
+import * as workflowTables from "@m5kdev/backend/modules/workflow/workflow.db";
+import * as postsTables from "../src/modules/posts/posts.db";
 
 export async function generateSchema(): Promise<void> {
-  const collected = collectBackendSchema(backendSchemaModules, {
-    env: process.env,
-  });
   const outputDirectory = path.resolve(process.cwd(), "src/generated");
   const outputPath = path.join(outputDirectory, "schema.ts");
 
   const source = [
-    'import { collectBackendSchema } from "@m5kdev/backend/app";',
-    'import { backendSchemaModules } from "../schema-modules";',
+    'import * as authTables from "@m5kdev/backend/modules/auth/auth.db";',
+    'import * as notificationTables from "@m5kdev/backend/modules/notification/notification.db";',
+    'import * as workflowTables from "@m5kdev/backend/modules/workflow/workflow.db";',
+    'import * as postsTables from "../modules/posts/posts.db";',
     "",
-    "const collected = collectBackendSchema(backendSchemaModules, {",
-    "  env: process.env,",
-    "});",
+    "export const schema = {",
+    "  ...authTables,",
+    "  ...workflowTables,",
+    "  ...notificationTables,",
+    "  ...postsTables,",
+    "};",
+    "",
+    "export type AppDbSchema = typeof schema;",
     "",
-    generateBackendSchemaSource({
-      schema: collected.schema,
-      schemaExpression: "collected.schema",
-    }),
   ].join("\n");
 
   await fs.mkdir(outputDirectory, { recursive: true });

package/templates/minimal-app/apps/server/src/modules/posts/posts.db.ts.tpl

@@ -2,44 +2,24 @@ import { type AnySQLiteColumn, integer, sqliteTable as table, text } from "drizz
 import { organizations, teams, users } from "@m5kdev/backend/modules/auth/auth.db";
 import { v4 as uuidv4 } from "uuid";
 
-export function createPostsTables(
-  references: {
-    users: { id: AnySQLiteColumn };
-    organizations: { id: AnySQLiteColumn };
-    teams: { id: AnySQLiteColumn };
-  } = {
-    users,
-    organizations,
-    teams,
-  }
-) {
-  const posts = table("posts", {
-    id: text("id").primaryKey().$default(uuidv4),
-    authorUserId: text("author_user_id").references(() => references.users.id, {
-      onDelete: "set null",
-    }),
-    organizationId: text("organization_id").references(() => references.organizations.id, {
-      onDelete: "set null",
-    }),
-    teamId: text("team_id").references(() => references.teams.id, { onDelete: "set null" }),
-    title: text("title").notNull(),
-    slug: text("slug").notNull().unique(),
-    excerpt: text("excerpt"),
-    content: text("content").notNull(),
-    status: text("status").$type<"draft" | "published">().notNull().default("draft"),
-    publishedAt: integer("published_at", { mode: "timestamp" }),
-    createdAt: integer("created_at", { mode: "timestamp" })
-      .notNull()
-      .$default(() => new Date()),
-    updatedAt: integer("updated_at", { mode: "timestamp" }),
-    deletedAt: integer("deleted_at", { mode: "timestamp" }),
-  });
-
-  return {
-    posts,
-  };
-}
-
-const postTables = createPostsTables();
-
-export const posts = postTables.posts;
+export const posts = table("posts", {
+  id: text("id").primaryKey().$default(uuidv4),
+  authorUserId: text("author_user_id").references(() => users.id, {
+    onDelete: "set null",
+  }),
+  organizationId: text("organization_id").references(() => organizations.id, {
+    onDelete: "set null",
+  }),
+  teamId: text("team_id").references(() => teams.id, { onDelete: "set null" }),
+  title: text("title").notNull(),
+  slug: text("slug").notNull().unique(),
+  excerpt: text("excerpt"),
+  content: text("content").notNull(),
+  status: text("status").$type<"draft" | "published">().notNull().default("draft"),
+  publishedAt: integer("published_at", { mode: "timestamp" }),
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .$default(() => new Date()),
+  updatedAt: integer("updated_at", { mode: "timestamp" }),
+  deletedAt: integer("deleted_at", { mode: "timestamp" }),
+});

package/templates/minimal-app/apps/server/src/modules/posts/posts.module.ts.tpl

@@ -1,37 +1,60 @@
-import { defineBackendModule } from "@m5kdev/backend/app";
-import { createPostsTRPC } from "./posts.trpc";
-import { createPostsTables } from "./posts.db";
+import { createBackendRouterMap } from "@m5kdev/backend/app";
+import type { AuthModule } from "@m5kdev/backend/modules/auth/auth.module";
+import {
+  BaseModule,
+  type ModuleRepositoriesContext,
+  type ModuleServicesContext,
+  type ModuleTRPCContext,
+} from "@m5kdev/backend/modules/base/base.module";
+import type * as postsTables from "./posts.db";
 import { postsGrants } from "./posts.grants";
 import { PostsRepository } from "./posts.repository";
 import { PostsService } from "./posts.service";
+import { createPostsTRPC } from "./posts.trpc";
+
+type PostsModuleDeps = { auth: AuthModule };
+type PostsModuleTables = typeof postsTables;
+type PostsModuleRepositories = {
+  posts: PostsRepository;
+};
+type PostsModuleServices = {
+  posts: PostsService;
+};
+type PostsModuleRouters = {
+  posts: ReturnType<typeof createPostsTRPC>;
+};
 
-export const postsModule = defineBackendModule({
-  id: "posts",
-  dependsOn: ["auth"],
-  db: ({ deps }) => {
-    const authTables = deps.auth.tables as any;
+export class PostsModule extends BaseModule<
+  PostsModuleDeps,
+  PostsModuleTables,
+  PostsModuleRepositories,
+  PostsModuleServices,
+  PostsModuleRouters
+> {
+  readonly id = "posts";
+  override readonly dependsOn = ["auth"] as const;
+
+  override repositories({ db }: ModuleRepositoriesContext<PostsModuleDeps, PostsModuleTables>) {
     return {
-      tables: createPostsTables({
-        users: authTables.users,
-        organizations: authTables.organizations,
-        teams: authTables.teams,
+      posts: new PostsRepository({
+        orm: db.orm,
+        schema: db.schema,
+        table: db.schema.posts,
       }),
     };
-  },
-  repositories: ({ db }) => {
-    const schema = db.schema as any;
+  }
+
+  override services({
+    repositories,
+  }: ModuleServicesContext<PostsModuleDeps, PostsModuleRepositories>) {
     return {
-      posts: new PostsRepository({
-        orm: db.orm as never,
-        schema: { posts: schema.posts } as never,
-        table: schema.posts,
-      }),
+      posts: new PostsService({ posts: repositories.posts }, {}, postsGrants),
     };
-  },
-  services: ({ repositories }) => ({
-    posts: new PostsService({ posts: repositories.posts }, {}, postsGrants),
-  }),
-  trpc: ({ trpc, services }) => ({
-    posts: createPostsTRPC(trpc, services.posts),
-  }),
-});
+  }
+
+  override trpc({ trpc, services }: ModuleTRPCContext<PostsModuleDeps, PostsModuleServices>) {
+    return createBackendRouterMap("posts", createPostsTRPC(trpc, services.posts));
+  }
+}
+
+export const postsModule = new PostsModule();

package/templates/minimal-app/apps/server/src/modules.ts.tpl

@@ -1,20 +1,16 @@
 import { defineBackendModules } from "@m5kdev/backend/app";
-import { createAuthBackendModule } from "@m5kdev/backend/modules/auth/auth.module";
-import { createEmailBackendModule } from "@m5kdev/backend/modules/email/email.module";
-import { createNotificationBackendModule } from "@m5kdev/backend/modules/notification/notification.module";
-import { createWorkflowBackendModule } from "@m5kdev/backend/modules/workflow/workflow.module";
+import { AuthModule } from "@m5kdev/backend/modules/auth/auth.module";
+import { EmailModule } from "@m5kdev/backend/modules/email/email.module";
+import { NotificationModule } from "@m5kdev/backend/modules/notification/notification.module";
+import { WorkflowModule } from "@m5kdev/backend/modules/workflow/workflow.module";
 import { templates } from "{{PACKAGE_SCOPE}}/email";
-import { postsModule } from "./modules/posts/posts.module";
+import { PostsModule } from "./modules/posts/posts.module";
 
-export const emailBackendModule = createEmailBackendModule({
-  templates: templates as never,
-});
+export const emailBackendModule = new EmailModule(templates as never);
 
-export const authBackendModule = createAuthBackendModule({
-  emailModuleId: "email",
-});
+export const authBackendModule = new AuthModule();
 
-export const workflowBackendModule = createWorkflowBackendModule({
+export const workflowBackendModule = new WorkflowModule({
   queues: {
     fast: { concurrency: 5 },
   },
@@ -25,8 +21,8 @@ export const workflowBackendModule = createWorkflowBackendModule({
   },
 });
 
-export const notificationBackendModule = createNotificationBackendModule();
-export const postsBackendModule = postsModule;
+export const notificationBackendModule = new NotificationModule();
+export const postsBackendModule = new PostsModule();
 
 export const backendModules = defineBackendModules([
   emailBackendModule,

package/templates/minimal-app/apps/server/src/schema-modules.ts.tpl

@@ -1,5 +1,10 @@
 import { defineBackendModule, defineBackendModules } from "@m5kdev/backend/app";
-import { authBackendModule, notificationBackendModule, postsBackendModule, workflowBackendModule } from "./modules";
+import {
+  authBackendModule,
+  notificationBackendModule,
+  postsBackendModule,
+  workflowBackendModule,
+} from "./modules";
 
 export const emailSchemaModule = defineBackendModule({
   id: "email",