Made Cloudflare samples more idiomatic

The initial version was fine as it was working and using Pongo, Hono
with Emmett wrappers. Still, it wasn't perfect, as it contained also a
lot of boilerplate that can and should be dropped when used Pongo and
Emmett wrappers idiomatically.

Note, there'll be a follow up PR with changes when Pongo and Emmett gets
polished some rough edges found in this usage.

Author: oskardudycz

plan.md

@@ -3,3 +3,11 @@ import 'cloudflare:workers';
 declare module 'cloudflare:workers' {
   interface ProvidedEnv extends CloudflareBindings {}
 }
+
+declare global {
+  namespace Cloudflare {
+    interface Env {
+      MIGRATION_TOKEN?: string;
+    }
+  }
+}

samples/cloudflare/d1/env.d.ts

@@ -9,8 +9,8 @@
     "dev": "wrangler dev --var ENVIRONMENT:development",
     "build": "wrangler deploy --dry-run --outdir dist",
     "deploy": "node scripts/deploy.ts",
-    "types:cloudflare": "wrangler types worker-configuration.d.ts --env-interface CloudflareBindings",
-    "types:cloudflare:check": "wrangler types worker-configuration.d.ts --env-interface CloudflareBindings --check",
+    "types:cloudflare": "wrangler types worker-configuration.d.ts --env-interface CloudflareBindings --strict-vars=false",
+    "types:cloudflare:check": "wrangler types worker-configuration.d.ts --env-interface CloudflareBindings --strict-vars=false --check",
     "build:ts": "tsc -b",
     "build:ts:watch": "tsc -b --watch",
     "lint": "npm run lint:eslint && npm run lint:prettier",

samples/cloudflare/d1/package.json

@@ -1,47 +1,16 @@
 import { getApplication } from '@event-driven-io/emmett-honojs';
-import { pongoClient, type PongoDb } from '@event-driven-io/pongo';
-import { d1Driver } from '@event-driven-io/pongo/cloudflare';
-import { Hono } from 'hono';
+import { env } from 'cloudflare:workers';
 import { migrationsApi } from './migrations';
-import pongoConfig from './pongo.config';
-import { shoppingCartApi } from './shoppingCarts';
-
-type Bindings = Omit<CloudflareBindings, 'ENVIRONMENT'> & {
-  ENVIRONMENT: 'development' | 'production' | 'test';
-  MIGRATION_TOKEN?: string;
-};
-
-let pongoDb: PongoDb | undefined;
-
-const getPongoDb = (env: Bindings): PongoDb => {
-  pongoDb ??= pongoClient({
-    driver: d1Driver,
-    database: env.DB,
-    schema: {
-      definition: pongoConfig.schema,
-      autoMigration:
-        env.ENVIRONMENT === 'development' ? 'CreateOrUpdate' : 'None',
-    },
-  }).database;
-  return pongoDb;
-};
-
-const unitPrices: Readonly<Record<string, number>> = {
-  'product-1': 1000,
-  'product-2': 2500,
-};
-
-const getUnitPrice = (productId: string): Promise<number> => {
-  const unitPrice = unitPrices[productId];
-  if (unitPrice === undefined) throw new Error('Product not found');
-  return Promise.resolve(unitPrice);
-};
-
-const api = new Hono<{ Bindings: Bindings }>();
-migrationsApi(getPongoDb)(api);
-shoppingCartApi(getPongoDb, getUnitPrice, () => new Date())(api);
-
-const app = getApplication({ apis: [] });
-app.route('/', api);
-
-export default app;
+import { pongoDb } from './pongo';
+import { getUnitPrice, shoppingCartApi } from './shoppingCarts';
+
+export default getApplication({
+  apis: [
+    migrationsApi({ pongoDb, migrationToken: env.MIGRATION_TOKEN }),
+    shoppingCartApi({
+      pongoDb,
+      getUnitPrice,
+      getCurrentTime: () => new Date(),
+    }),
+  ],
+});

samples/cloudflare/d1/src/index.ts

@@ -1,28 +1,23 @@
+import { NoContent, type WebApiSetup } from '@event-driven-io/emmett-honojs';
 import type { PongoDb } from '@event-driven-io/pongo';
-import type { Hono } from 'hono';
 
-type MigrationBindings = {
-  MIGRATION_TOKEN?: string;
+type MigrationsApiDependencies = {
+  pongoDb: PongoDb;
+  migrationToken?: string;
 };
 
 export const migrationsApi =
-  <Bindings extends MigrationBindings>(
-    getPongoDb: (bindings: Bindings) => PongoDb,
-  ) =>
-  (router: Hono<{ Bindings: Bindings }>) => {
+  ({ pongoDb, migrationToken }: MigrationsApiDependencies): WebApiSetup =>
+  (router) => {
     router.post('/_system/migrations', async (context) => {
-      const migrationToken = context.env.MIGRATION_TOKEN;
       if (
         !migrationToken ||
         context.req.header('Authorization') !== `Bearer ${migrationToken}`
       )
         return context.body(null, 401);
 
-      try {
-        await getPongoDb(context.env).schema.migrate();
-        return context.body(null, 204);
-      } catch {
-        return context.body(null, 500);
-      }
+      await pongoDb.schema.migrate();
+
+      return NoContent({ context });
     });
   };

samples/cloudflare/d1/src/migrations/api.ts

@@ -0,0 +1,15 @@
+import { pongoClient } from '@event-driven-io/pongo';
+import { d1Driver } from '@event-driven-io/pongo/cloudflare';
+import { env } from 'cloudflare:workers';
+import pongoConfig from './pongo.config';
+
+export const pongoDb = pongoClient({
+  driver: d1Driver,
+  database: env.DB,
+  schema: {
+    definition: pongoConfig.schema,
+    autoMigration:
+      env.ENVIRONMENT === 'development' ? 'CreateOrUpdate' : 'None',
+  },
+  errors: { throwOnOperationFailures: true },
+}).database;

samples/cloudflare/d1/src/pongo.ts

@@ -9,7 +9,7 @@ import {
 import { beforeAll, describe, expect, it } from 'vitest';
 
 const given = ApiE2ESpecification.for({
-  fetch: (request) => exports.default.fetch(request),
+  getApplication: () => exports.default,
 });
 
 describe('D1 shopping-cart Worker', () => {