create-m5kdev 0.32.7 → 0.33.0

package/templates/minimal-app/apps/server/drizzle/meta/_journal.json.tpl

@@ -15,6 +15,13 @@
       "when": 1785171166863,
       "tag": "0001_third_ink",
       "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1786951360347,
+      "tag": "0002_concerned_proudstar",
+      "breakpoints": true
     }
   ]
 }

package/templates/minimal-app/apps/server/package.json.tpl

@@ -1,56 +1,55 @@
-{
-  "name": "{{PACKAGE_SCOPE}}/server",
-  "version": "0.0.0",
-  "private": true,
-  "main": "dist/index.js",
-  "scripts": {
-    "dev": "tsx watch --env-file=../shared/.env src/index.ts",
-    "build": "tsup",
-    "start": "node dist/index.js",
-    "lint": "biome check .",
-    "lint:fix": "biome check . --write",
-    "check-types": "tsc --noEmit",
-    "drizzle:generate": "drizzle-kit generate",
-    "drizzle:migrate": "drizzle-kit migrate",
-    "drizzle:studio": "drizzle-kit studio",
-    "drizzle:sync": "tsx --env-file=../shared/.env drizzle/sync.ts",
-    "drizzle:seed": "tsx --env-file=../shared/.env drizzle/seed.ts",
-    "drizzle:reset": "tsx --env-file=../shared/.env drizzle/reset.ts"
-  },
-  "dependencies": {
-    "{{PACKAGE_SCOPE}}/email": "workspace:*",
-    "{{PACKAGE_SCOPE}}/shared": "workspace:*",
-    "@libsql/client": "catalog:",
-    "@m5kdev/backend": "catalog:",
-    "@m5kdev/commons": "catalog:",
-    "@trpc/server": "catalog:",
-    "better-auth": "catalog:",
-    "cors": "catalog:",
-    "dotenv": "catalog:",
-    "drizzle-orm": "catalog:",
-    "drizzle-zod": "catalog:",
-    "express": "catalog:",
-    "ioredis": "catalog:",
-    "neverthrow": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
-    "uuid": "catalog:",
-    "zod": "catalog:"
-  },
-  "devDependencies": {
-    "@m5kdev/config": "catalog:",
-    "@types/cors": "catalog:",
-    "@types/express": "catalog:",
-    "@types/node": "catalog:",
-    "@types/react": "catalog:",
-    "@types/react-dom": "catalog:",
-    "drizzle-kit": "catalog:",
-    "tslib": "catalog:",
-    "tsup": "catalog:",
-    "tsx": "catalog:",
-    "typescript": "catalog:"
-  },
-  "exports": {
-    "./types": "./src/types.ts"
-  }
-}
+{
+  "name": "{{PACKAGE_SCOPE}}/server",
+  "version": "0.0.0",
+  "private": true,
+  "main": "dist/index.js",
+  "scripts": {
+    "dev": "tsx watch --env-file=../shared/.env src/index.ts",
+    "build": "tsup",
+    "start": "node dist/index.js",
+    "lint": "biome check .",
+    "lint:fix": "biome check . --write",
+    "check-types": "tsc --noEmit",
+    "drizzle:generate": "drizzle-kit generate",
+    "drizzle:migrate": "drizzle-kit migrate",
+    "drizzle:studio": "drizzle-kit studio",
+    "drizzle:sync": "tsx --env-file=../shared/.env drizzle/sync.ts",
+    "drizzle:seed": "tsx --env-file=../shared/.env drizzle/seed.ts",
+    "drizzle:reset": "tsx --env-file=../shared/.env drizzle/reset.ts"
+  },
+  "dependencies": {
+    "{{PACKAGE_SCOPE}}/email": "workspace:*",
+    "{{PACKAGE_SCOPE}}/shared": "workspace:*",
+    "@libsql/client": "catalog:m5kdev",
+    "@m5kdev/backend": "catalog:m5kdev",
+    "@m5kdev/commons": "catalog:m5kdev",
+    "@opentelemetry/api": "catalog:m5kdev",
+    "@trpc/server": "catalog:m5kdev",
+    "better-auth": "catalog:m5kdev",
+    "dotenv": "catalog:m5kdev",
+    "drizzle-orm": "catalog:m5kdev",
+    "drizzle-zod": "catalog:m5kdev",
+    "express": "catalog:m5kdev",
+    "ioredis": "catalog:m5kdev",
+    "neverthrow": "catalog:m5kdev",
+    "react": "catalog:m5kdev",
+    "react-dom": "catalog:m5kdev",
+    "uuid": "catalog:m5kdev",
+    "zod": "catalog:m5kdev"
+  },
+  "devDependencies": {
+    "@m5kdev/config": "catalog:m5kdev",
+    "@types/express": "catalog:m5kdev",
+    "@types/node": "catalog:m5kdev",
+    "@types/react": "catalog:m5kdev",
+    "@types/react-dom": "catalog:m5kdev",
+    "drizzle-kit": "catalog:m5kdev",
+    "tslib": "catalog:m5kdev",
+    "tsup": "catalog:m5kdev",
+    "tsx": "catalog:m5kdev",
+    "typescript": "catalog:m5kdev"
+  },
+  "exports": {
+    "./types": "./src/types.ts"
+  }
+}

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

@@ -1,141 +1,113 @@
-import { createBackendApp } from "@m5kdev/backend/app";
-import { createBetterAuth } from "@m5kdev/backend/modules/auth/auth.lib";
-import { AuthModule } from "@m5kdev/backend/modules/auth/auth.module";
-import { EmailModule } from "@m5kdev/backend/modules/email/email.module";
-import { EmailPreviewModule } from "@m5kdev/backend/modules/email/email.preview.module";
-import { WorkflowModule } from "@m5kdev/backend/modules/workflow/workflow.module";
-import { USER_LOCALE_HEADER } from "@m5kdev/commons/modules/auth/auth.constants";
-import { templates } from "{{PACKAGE_SCOPE}}/email";
-import { emailResources } from "{{PACKAGE_SCOPE}}/email/resources";
-import {
-  APP_LOCALE_CONFIG,
-  APP_NAME,
-  APP_ROLES_CONFIG,
-} from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
-import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
-import cors from "cors";
-import express from "express";
-import { PostsModule } from "./modules/posts/posts.module";
-// m5k:test-harness:start
-import { TestHarnessModule } from "./modules/test-harness/test-harness.module";
-// m5k:test-harness:end
-import * as schema from "./schema";
-
-const app = express();
-const appUrl = process.env.VITE_APP_URL ?? "http://localhost:5173";
-const serverUrl = process.env.VITE_SERVER_URL ?? "http://localhost:8080";
-const databaseUrl = process.env.DATABASE_URL ?? "file:./local.db";
-const syncUrl = process.env.TURSO_DATABASE_URL;
-const authToken = process.env.TURSO_AUTH_TOKEN;
-const redisUrl = process.env.REDIS_URL ?? "redis://127.0.0.1:6379";
-const resendApiKey = process.env.RESEND_API_KEY;
-const enableWaitlist = process.env.VITE_ENABLE_WAITLIST === "true";
-
-const connection =
-  syncUrl && authToken
-    ? {
-        url: databaseUrl,
-        syncUrl,
-        authToken,
-        syncInterval: 60,
-        readYourWrites: true,
-      }
-    : {
-        url: databaseUrl,
-      };
-
-app.use(express.json());
-app.use(
-  cors({
-    origin: [appUrl],
-    credentials: true,
-    methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
-    allowedHeaders: [
-      "Content-Type",
-      "Authorization",
-      "Waitlist-Invitation-Code",
-      "Organization-Invitation-Code",
-      "Admin-Create-Verified-User",
-      USER_LOCALE_HEADER,
-    ],
-  })
-);
-
-export const builtBackendApp = createBackendApp(
-  {
-    db: connection,
-    express: app,
-    schema,
-    app: {
-      name: APP_NAME,
-      urls: {
-        web: appUrl,
-        api: serverUrl,
-      },
-      locales: APP_LOCALE_CONFIG,
-      roles: APP_ROLES_CONFIG,
-    },
-    i18n: {
-      resources: emailResources,
-    },
-    redis: {
-      url: redisUrl,
-      options: { maxRetriesPerRequest: null },
-    },
-    resend: resendApiKey ? { apiKey: resendApiKey } : undefined,
-    email: {
-      mode: resendApiKey ? "send" : "store",
-      from: process.env.EMAIL_FROM ?? "no-reply@local.m5kdev.test",
-      systemNotificationEmail: process.env.SYSTEM_NOTIFICATION_EMAIL ?? "ops@local.m5kdev.test",
-      outputDirectory: process.env.EMAIL_OUTPUT_DIRECTORY ?? ".emails",
-    },
-    auth: {
-      factory({ db, services, appConfig, i18n }) {
-        return createBetterAuth({
-          orm: db.orm,
-          schema: db.schema,
-          services: {
-            email: services.email.email,
-          },
-          app: appConfig,
-          i18n,
-          config: {
-            waitlist: enableWaitlist,
-            provisionedAccountEmailDomain:
-              process.env.PROVISIONED_EMAIL_DOMAIN ?? "provisioned.{{APP_SLUG}}.local",
-          },
-          options: {
-            secret: process.env.BETTER_AUTH_SECRET ?? "QJvCmK9UBuHAWbNr2vV3ROVt8XrBYV5d",
-          },
-        });
-      },
-    },
-  },
-  [
-    new EmailModule(templates as never),
-    new AuthModule(),
-    new WorkflowModule({
-      queues: {
-        fast: { concurrency: 5 },
-      },
-      defaultQueue: "fast",
-      defaults: {
-        timeout: 60_000,
-        jobOptions: { removeOnComplete: { age: 3600 } },
-      },
-      reconcile: { enabled: true },
-    }),
-    new PostsModule(),
-    new EmailPreviewModule({ allowDelete: process.env.NODE_ENV !== "production" }),
-    // m5k:test-harness:start
-    new TestHarnessModule(),
-    // m5k:test-harness:end
-  ] as const
-);
-
-export type AppRouter = typeof builtBackendApp.trpc.router;
-export type RouterInputs = inferRouterInputs<AppRouter>;
-export type RouterOutputs = inferRouterOutputs<AppRouter>;
-
-export type Orm = typeof builtBackendApp.db.orm;
-export type Schema = typeof builtBackendApp.db.schema;
+import { createBackendApp } from "@m5kdev/backend/app";
+import { shutdownTelemetry } from "@m5kdev/backend/lib/otel";
+import { createBetterAuth } from "@m5kdev/backend/modules/auth/auth.lib";
+import { AuthModule } from "@m5kdev/backend/modules/auth/auth.module";
+import { EmailModule } from "@m5kdev/backend/modules/email/email.module";
+import { EmailPreviewModule } from "@m5kdev/backend/modules/email/email.preview.module";
+import { WorkflowModule } from "@m5kdev/backend/modules/workflow/workflow.module";
+import { templates } from "{{PACKAGE_SCOPE}}/email";
+import { emailResources } from "{{PACKAGE_SCOPE}}/email/resources";
+import {
+  APP_LOCALE_CONFIG,
+  APP_NAME,
+  APP_ROLES_CONFIG,
+} from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
+import { PostsModule } from "./modules/posts/posts.module";
+// m5k:test-harness:start
+import { TestHarnessModule } from "./modules/test-harness/test-harness.module";
+// m5k:test-harness:end
+import * as schema from "./schema";
+
+const appUrl = process.env.VITE_APP_URL ?? "http://localhost:5173";
+const serverUrl = process.env.VITE_SERVER_URL ?? "http://localhost:8080";
+const databaseUrl = process.env.DATABASE_URL ?? "file:./local.db";
+const syncUrl = process.env.TURSO_DATABASE_URL;
+const authToken = process.env.TURSO_AUTH_TOKEN;
+const redisUrl = process.env.REDIS_URL ?? "redis://127.0.0.1:6379";
+const resendApiKey = process.env.RESEND_API_KEY;
+const enableWaitlist = process.env.VITE_ENABLE_WAITLIST === "true";
+
+const connection =
+  syncUrl && authToken
+    ? {
+        url: databaseUrl,
+        syncUrl,
+        authToken,
+        syncInterval: 60,
+        readYourWrites: true,
+      }
+    : {
+        url: databaseUrl,
+      };
+
+export const builtBackendApp = createBackendApp(
+  {
+    db: connection,
+    schema,
+    onShutdown: shutdownTelemetry,
+    app: {
+      name: APP_NAME,
+      urls: {
+        web: appUrl,
+        api: serverUrl,
+      },
+      locales: APP_LOCALE_CONFIG,
+      roles: APP_ROLES_CONFIG,
+    },
+    i18n: {
+      resources: emailResources,
+    },
+    redis: {
+      url: redisUrl,
+      options: { maxRetriesPerRequest: null },
+    },
+    resend: resendApiKey ? { apiKey: resendApiKey } : undefined,
+    email: {
+      mode: resendApiKey ? "send" : "store",
+      from: process.env.EMAIL_FROM ?? "no-reply@local.m5kdev.test",
+      systemNotificationEmail: process.env.SYSTEM_NOTIFICATION_EMAIL ?? "ops@local.m5kdev.test",
+      outputDirectory: process.env.EMAIL_OUTPUT_DIRECTORY ?? ".emails",
+    },
+    auth: {
+      factory({ db, services, appConfig, i18n }) {
+        return createBetterAuth({
+          orm: db.orm,
+          schema: db.schema,
+          services: {
+            email: services.email.email,
+          },
+          app: appConfig,
+          i18n,
+          config: {
+            waitlist: enableWaitlist,
+            provisionedAccountEmailDomain:
+              process.env.PROVISIONED_EMAIL_DOMAIN ?? "provisioned.{{APP_SLUG}}.local",
+          },
+          options: {
+            secret: process.env.BETTER_AUTH_SECRET ?? "QJvCmK9UBuHAWbNr2vV3ROVt8XrBYV5d",
+          },
+        });
+      },
+    },
+  },
+  [
+    new EmailModule(templates as never),
+    new AuthModule(),
+    new WorkflowModule({
+      queues: {
+        fast: { concurrency: 5 },
+      },
+      defaultQueue: "fast",
+      defaults: {
+        timeout: 60_000,
+        jobOptions: { removeOnComplete: { age: 3600 } },
+      },
+      reconcile: { enabled: true },
+    }),
+    new PostsModule(),
+    new EmailPreviewModule({ allowDelete: process.env.NODE_ENV !== "production" }),
+    // m5k:test-harness:start
+    new TestHarnessModule(),
+    // m5k:test-harness:end
+  ] as const
+);

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

@@ -1,65 +1,12 @@
-import "./instrumentation";
-import type { Server } from "node:http";
-import { shutdownTelemetry } from "@m5kdev/backend/lib/otel";
-import { builtBackendApp } from "./app";
-
-const port = process.env.PORT ? Number.parseInt(process.env.PORT, 10) : 8080;
-
-let httpServer: Server | undefined;
-
-function logError(context: string, error: unknown): void {
-  console.error(`[server] ${context}`, error);
-}
-
-async function shutdown(): Promise<void> {
-  try {
-    await builtBackendApp.shutdown();
-  } catch (e) {
-    logError("builtBackendApp.shutdown() failed", e);
-  }
-  try {
-    await shutdownTelemetry();
-  } catch (e) {
-    logError("shutdownTelemetry() failed", e);
-  }
-  if (httpServer) {
-    await new Promise<void>((resolve) => {
-      httpServer?.close((err) => {
-        if (err) {
-          logError("HTTP server close failed", err);
-        }
-        resolve();
-      });
-    });
-  }
-  process.exit(0);
-}
-
-process.once("SIGINT", () => {
-  void shutdown();
-});
-process.once("SIGTERM", () => {
-  void shutdown();
-});
-
-async function start(): Promise<void> {
-  await builtBackendApp.start();
-  await new Promise<void>((resolve, reject) => {
-    httpServer = builtBackendApp.express.app.listen(port, () => {
-      console.info(
-        `Server running at ${process.env.VITE_SERVER_URL ?? `http://localhost:${port}`}`
-      );
-      resolve();
-    });
-    httpServer.on("error", reject);
-  });
-}
-
-void (async () => {
-  try {
-    await start();
-  } catch (e) {
-    logError("Fatal: builtBackendApp.start() or HTTP listen failed", e);
-    process.exit(1);
-  }
-})();
+import "./instrumentation";
+import { builtBackendApp } from "./app";
+
+void (async () => {
+  try {
+    await builtBackendApp.start();
+    console.info(`Server running at ${process.env.VITE_SERVER_URL}`);
+  } catch (e) {
+    console.error("[server] Fatal: builtBackendApp.start() failed", e);
+    process.exit(1);
+  }
+})();

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

@@ -12,14 +12,12 @@ export const postsGrants = flattenNestedGrants({
     },
     organization: {
       owner: {
-        read: "own",
-        write: "own",
-        delete: "own",
-        publish: "own",
+        read: "org",
+        write: "org",
+        delete: "org",
+        publish: "org",
       },
-    },
-    team: {
-      owner: {
+      member: {
         read: "own",
         write: "own",
         delete: "own",

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

@@ -14,7 +14,8 @@ export class PostsService extends BasePermissionService<
   readonly list = this.procedure("list")
     .input(postSchemas.input.list)
     .output(postSchemas.output.list)
-    .requireAuth()
+    .requireAuth("organization")
+    .addContextFilter(["organization"])
     .handle(async ({ input }) => {
       return withSpan(
         {
@@ -31,7 +32,7 @@ export class PostsService extends BasePermissionService<
     });
 
   readonly create = this.procedure("create")
-    .requireAuth()
+    .requireAuth("organization")
     .input(postSchemas.input.create)
     .output(postSchemas.output.single)
     .access({
@@ -59,7 +60,7 @@ export class PostsService extends BasePermissionService<
     });
 
   readonly update = this.procedure("update")
-    .requireAuth()
+    .requireAuth("organization")
     .input(postSchemas.input.update)
     .output(postSchemas.output.single)
     .loadResource("post", ({ input }) => this.repository.posts.findById(input.id))
@@ -81,7 +82,7 @@ export class PostsService extends BasePermissionService<
   readonly publish = this.procedure("publish")
     .input(postSchemas.input.publish)
     .output(postSchemas.output.single)
-    .requireAuth()
+    .requireAuth("organization")
     .loadResource("post", ({ input }) => this.repository.posts.findById(input.id))
     .access({
       action: "publish",
@@ -98,7 +99,7 @@ export class PostsService extends BasePermissionService<
   readonly softDelete = this.procedure("softDelete")
     .input(postSchemas.input.delete)
     .output(postSchemas.output.uuid)
-    .requireAuth()
+    .requireAuth("organization")
     .loadResource("post", ({ input }) => this.repository.posts.findById(input.id))
     .access({
       action: "delete",

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

@@ -3,7 +3,7 @@ import { postSchemas } from "./posts.dto";
 import type { PostsService } from "./posts.service";
 
 export function createPostsTRPC(
-  { router, privateProcedure: procedure }: TRPCMethods,
+  { router, organizationProcedure: procedure }: TRPCMethods,
   postsService: PostsService
 ) {
   return router({

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

@@ -1 +1,12 @@
-export type { AppRouter } from "./app";
+import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
+import type { builtBackendApp } from "./app";
+
+export type AppRouter = typeof builtBackendApp.trpc.router;
+export type RouterInputs = inferRouterInputs<AppRouter>;
+export type RouterOutputs = inferRouterOutputs<AppRouter>;
+
+export type Orm = typeof builtBackendApp.db.orm;
+export type Schema = typeof builtBackendApp.db.schema;
+
+export type Session = NonNullable<typeof builtBackendApp.auth>["instance"]["$Infer"]["Session"];
+export type User = Session["user"];

package/templates/minimal-app/apps/shared/package.json.tpl

@@ -9,13 +9,13 @@
     "check-types": "tsc --noEmit"
   },
   "dependencies": {
-    "@m5kdev/commons": "catalog:",
-    "zod": "catalog:"
+    "@m5kdev/commons": "catalog:m5kdev",
+    "zod": "catalog:m5kdev"
   },
   "devDependencies": {
-    "@m5kdev/config": "catalog:",
-    "tslib": "catalog:",
-    "typescript": "catalog:"
+    "@m5kdev/config": "catalog:m5kdev",
+    "tslib": "catalog:m5kdev",
+    "typescript": "catalog:m5kdev"
   },
   "exports": {
     "./modules/app/*": "./src/modules/app/*.ts",

package/templates/minimal-app/apps/webapp/package.json.tpl

@@ -13,41 +13,41 @@
   },
   "dependencies": {
     "{{PACKAGE_SCOPE}}/shared": "workspace:*",
-    "@heroui/react": "catalog:",
-    "@heroui/styles": "catalog:",
-    "@m5kdev/commons": "catalog:",
-    "@m5kdev/frontend": "catalog:",
-    "@m5kdev/web-ui": "catalog:",
-    "@tanstack/react-query": "catalog:",
-    "@trpc/client": "catalog:",
-    "@trpc/tanstack-react-query": "catalog:",
-    "better-auth": "catalog:",
-    "i18next": "catalog:",
-    "lucide-react": "catalog:",
-    "nuqs": "catalog:",
-    "posthog-js": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
-    "react-hook-form": "catalog:",
-    "react-i18next": "catalog:",
-    "react-router": "catalog:",
-    "sonner": "catalog:",
-    "tailwindcss": "catalog:",
-    "tw-animate-css": "catalog:",
-    "zod": "catalog:"
+    "@heroui/react": "catalog:m5kdev",
+    "@heroui/styles": "catalog:m5kdev",
+    "@m5kdev/commons": "catalog:m5kdev",
+    "@m5kdev/frontend": "catalog:m5kdev",
+    "@m5kdev/web-ui": "catalog:m5kdev",
+    "@tanstack/react-query": "catalog:m5kdev",
+    "@trpc/client": "catalog:m5kdev",
+    "@trpc/tanstack-react-query": "catalog:m5kdev",
+    "better-auth": "catalog:m5kdev",
+    "i18next": "catalog:m5kdev",
+    "lucide-react": "catalog:m5kdev",
+    "nuqs": "catalog:m5kdev",
+    "posthog-js": "catalog:m5kdev",
+    "react": "catalog:m5kdev",
+    "react-dom": "catalog:m5kdev",
+    "react-hook-form": "catalog:m5kdev",
+    "react-i18next": "catalog:m5kdev",
+    "react-router": "catalog:m5kdev",
+    "sonner": "catalog:m5kdev",
+    "tailwindcss": "catalog:m5kdev",
+    "tw-animate-css": "catalog:m5kdev",
+    "zod": "catalog:m5kdev"
   },
   "devDependencies": {
     "{{PACKAGE_SCOPE}}/server": "workspace:*",
-    "@m5kdev/config": "catalog:",
-    "@tailwindcss/vite": "catalog:",
-    "@types/react": "catalog:",
-    "@types/react-dom": "catalog:",
-    "@vitejs/plugin-react": "catalog:",
-    "babel-plugin-react-compiler": "catalog:",
-    "typescript": "catalog:",
-    "vite": "catalog:",
-    "vite-plugin-i18next-loader": "catalog:",
-    "vite-tsconfig-paths": "catalog:",
-    "@trpc/server": "catalog:"
+    "@m5kdev/config": "catalog:m5kdev",
+    "@tailwindcss/vite": "catalog:m5kdev",
+    "@types/react": "catalog:m5kdev",
+    "@types/react-dom": "catalog:m5kdev",
+    "@vitejs/plugin-react": "catalog:m5kdev",
+    "babel-plugin-react-compiler": "catalog:m5kdev",
+    "typescript": "catalog:m5kdev",
+    "vite": "catalog:m5kdev",
+    "vite-plugin-i18next-loader": "catalog:m5kdev",
+    "vite-tsconfig-paths": "catalog:m5kdev",
+    "@trpc/server": "catalog:m5kdev"
   }
 }