cloesce 0.0.4-unstable.7 → 0.0.4-unstable.9

package/README.md

@@ -17,7 +17,7 @@ Internal documentation going over design decisions and general thoughts for each
 Create an NPM project and install cloesce
 
 ```sh
-npm i cloesce@0.0.4-unstable.7
+npm i cloesce@0.0.4-unstable.9
 ```
 
 ### 2) TypeScript
@@ -70,6 +70,8 @@ export default defineConfig({
 });
 ```
 
+Middleware support for CORS is also supported (see Middleware section).
+
 ### 5) Wrangler Config
 
 Cloesce will generate any missing `wrangler.toml` values (or the file if missing). A minimal `wrangler.toml` looks like this:
@@ -445,7 +447,7 @@ class Horse {
 await orm.list(
   Horse,
   Horse.default,
-  "SELECT * FROM Horse ORDER BY name LIMIT 10"
+  "SELECT * FROM Horse ORDER BY name LIMIT 10",
 );
 ```
 
@@ -488,11 +490,11 @@ static async get(
 
 ### Middleware
 
-Cloesce supports middleware at the global level (before routing to a model+method), the model level (before hydration) and the method level (before hydration). Middleware also exposes read/write access to the dependency injection instance that all models use.
+Cloesce supports middleware at the global level (before routing to a model+method), the model level (before validation) and the method level (before hydration). Middleware also exposes read/write access to the dependency injection instance that all models use.
 
 Middleware is capable of exiting from the Cloesce Router early with an HTTP Result.
 
-An example of all levels of middleware is below. All middleware must be defined in the file `app.cloesce.ts`.
+An example of all levels of middleware is below. All middleware must be defined in the file `app.cloesce.ts` which exports a `CloesceApp` instance as default.
 
 ```ts
 @PlainOldObject
@@ -520,30 +522,41 @@ export class Model {
   }
 }
 
-// Middleware instance
 const app: CloesceApp = new CloesceApp();
 
-app.useGlobal((request: Request, env, ir) => {
+app.onRequest((request: Request, env, ir) => {
   if (request.method === "POST") {
     return { ok: false, status: 401, message: "POST methods aren't allowed." };
   }
 });
 
-app.useModel(Model, (request, env, ir) => {
+app.onModel(Model, (request, env, ir) => {
   ir.set(InjectedThing.name, {
     value: "hello world",
   });
 });
 
-app.useMethod(Model, "blockedMethod", (request, env, ir) => {
+app.onMethod(Model, "blockedMethod", (request, env, ir) => {
   return { ok: false, status: 401, message: "Blocked method" };
 });
 
-// Exporting the instance is required
+app.onResponse(async (request, env, di, response: Response) => {
+  // basic CORS, allow all origins
+  response.headers.set("Access-Control-Allow-Origin", "*");
+  response.headers.set(
+    "Access-Control-Allow-Methods",
+    "GET, POST, PUT, DELETE, OPTIONS",
+  );
+  response.headers.set(
+    "Access-Control-Allow-Headers",
+    "Content-Type, Authorization",
+  );
+});
+
 export default app;
 ```
 
-With this middleware, all POST methods will be blocked, and all methods for the model `Model` will be able to inject `InjectedThing`. Additionally, on the method level, `blockedMethod` will return a 401.
+With this middleware, all POST methods will be blocked, and all methods for the model `Model` will be able to inject `InjectedThing`,and `blockedMethod` will return a 401. Additionally, all responses will have CORS headers.
 
 ### Plain Old Objects
 

package/dist/cli.js

@@ -22,8 +22,8 @@ const cmds = subcommands({
             },
             handler: async (args) => {
                 const config = loadCloesceConfig(process.cwd(), args.debug);
-                if (!config.workersUrl || !config.clientUrl) {
-                    console.error("Error: `workersUrl` and `clientUrl` must be defined in cloesce.config.json");
+                if (!config.workersUrl) {
+                    console.error("Error: `workersUrl`` must be defined in cloesce.config.json");
                     process.exit(1);
                 }
                 // Creates a `cidl.json` file. Exits the process on failure.
@@ -39,7 +39,6 @@ const cmds = subcommands({
                         "wrangler.toml",
                         path.join(outputDir, "workers.ts"),
                         path.join(outputDir, "client.ts"),
-                        config.clientUrl,
                         config.workersUrl,
                     ],
                 };

package/dist/common.d.ts

@@ -134,103 +134,9 @@ export type HttpResult<T = unknown> = {
     data?: T;
     message?: string;
 };
-/**
- * Dependency injection container, mapping an object type name to an instance of that object.
- *
- * Comes with the WranglerEnv and Request by default.
- */
-export type InstanceRegistry = Map<string, any>;
-export type MiddlewareFn = (request: Request, env: any, ir: InstanceRegistry) => Promise<HttpResult | undefined>;
 export type KeysOfType<T, U> = {
     [K in keyof T]: T[K] extends U ? (K extends string ? K : never) : never;
 }[keyof T];
-/**
- * Represents the core middleware container for a Cloesce application.
- *
- * The `CloesceApp` class provides scoped middleware registration and
- * management across three primary levels of execution:
- *
- * 1. **Global Middleware** — Executed before any routing or model resolution occurs.
- * 2. **Model-Level Middleware** — Executed for requests targeting a specific model type.
- * 3. **Method-Level Middleware** — Executed for requests targeting a specific method on a model.
- *
- * When an instance of `CloesceApp` is exported from `app.cloesce.ts`,
- * it becomes the central container that the Cloesce runtime uses to
- * assemble and apply middleware in the correct execution order.
- *
- * ### Middleware Execution Order
- * Middleware is executed in FIFO order per scope. For example:
- * ```ts
- * app.use(Foo, A);
- * app.use(Foo, B);
- * app.use(Foo, C);
- * // Executed in order: A → B → C
- * ```
- *
- * Each middleware function (`MiddlewareFn`) can optionally short-circuit
- * execution by returning a result, in which case subsequent middleware
- * at the same or lower scope will not run.
- *
- * ### Example Usage
- * ```ts
- * import { app } from "cloesce";
- *
- * // Global authentication middleware
- * app.useGlobal((request, env, di) => {
- *   // ... authenticate and inject user
- * });
- *
- * // Model-level authorization
- * app.useModel(User, (user) => user.hasPermissions([UserPermissions.canUseFoo]));
- *
- * // Method-level middleware (e.g., CRUD operation)
- * app.useMethod(Foo, "someMethod", (user) => user.hasPermissions([UserPermissions.canUseFooMethod]));
- * ```
- */
-export declare class CloesceApp {
-    global: MiddlewareFn[];
-    model: Map<string, MiddlewareFn[]>;
-    method: Map<string, Map<string, MiddlewareFn[]>>;
-    /**
-     * Registers a new global middleware function.
-     *
-     * Global middleware runs before all routing and model resolution.
-     * It is the ideal place to perform tasks such as:
-     * - Authentication (e.g., JWT verification)
-     * - Global request logging
-     * - Dependency injection of shared context
-     *
-     * @param m - The middleware function to register.
-     */
-    useGlobal(m: MiddlewareFn): void;
-    /**
-     * Registers middleware for a specific model type.
-     *
-     * Model-level middleware runs after all global middleware,
-     * but before method-specific middleware. This scope allows
-     * logic to be applied consistently across all endpoints
-     * associated with a given model (e.g., authorization).
-     *
-     * @typeParam T - The model type.
-     * @param ctor - The model constructor (used to derive its name).
-     * @param m - The middleware function to register.
-     */
-    useModel<T>(ctor: new () => T, m: MiddlewareFn): void;
-    /**
-     * Registers middleware for a specific method on a model.
-     *
-     * Method-level middleware is executed after model middleware,
-     * and before the method implementation itself. It can be used for:
-     * - Fine-grained permission checks
-     * - Custom logging or tracing per endpoint
-     *
-     * @typeParam T - The model type.
-     * @param ctor - The model constructor (used to derive its name).
-     * @param method - The method name on the model.
-     * @param m - The middleware function to register.
-     */
-    useMethod<T>(ctor: new () => T, method: KeysOfType<T, (...args: any) => any>, m: MiddlewareFn): void;
-}
 export type CrudKind = "SAVE" | "GET" | "LIST";
 export type CidlType = "Void" | "Integer" | "Real" | "Text" | "Blob" | "DateIso" | "Boolean" | {
     DataSource: string;
@@ -316,6 +222,7 @@ export interface WranglerEnv {
     name: string;
     source_path: string;
     db_binding: string;
+    vars: Record<string, CidlType>;
 }
 export interface CloesceAst {
     version: string;

package/dist/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}

package/dist/common.js

@@ -150,111 +150,6 @@ export class Either {
             : Either.left(fn(this.inner.left));
     }
 }
-/**
- * Represents the core middleware container for a Cloesce application.
- *
- * The `CloesceApp` class provides scoped middleware registration and
- * management across three primary levels of execution:
- *
- * 1. **Global Middleware** — Executed before any routing or model resolution occurs.
- * 2. **Model-Level Middleware** — Executed for requests targeting a specific model type.
- * 3. **Method-Level Middleware** — Executed for requests targeting a specific method on a model.
- *
- * When an instance of `CloesceApp` is exported from `app.cloesce.ts`,
- * it becomes the central container that the Cloesce runtime uses to
- * assemble and apply middleware in the correct execution order.
- *
- * ### Middleware Execution Order
- * Middleware is executed in FIFO order per scope. For example:
- * ```ts
- * app.use(Foo, A);
- * app.use(Foo, B);
- * app.use(Foo, C);
- * // Executed in order: A → B → C
- * ```
- *
- * Each middleware function (`MiddlewareFn`) can optionally short-circuit
- * execution by returning a result, in which case subsequent middleware
- * at the same or lower scope will not run.
- *
- * ### Example Usage
- * ```ts
- * import { app } from "cloesce";
- *
- * // Global authentication middleware
- * app.useGlobal((request, env, di) => {
- *   // ... authenticate and inject user
- * });
- *
- * // Model-level authorization
- * app.useModel(User, (user) => user.hasPermissions([UserPermissions.canUseFoo]));
- *
- * // Method-level middleware (e.g., CRUD operation)
- * app.useMethod(Foo, "someMethod", (user) => user.hasPermissions([UserPermissions.canUseFooMethod]));
- * ```
- */
-export class CloesceApp {
-    global = [];
-    model = new Map();
-    method = new Map();
-    /**
-     * Registers a new global middleware function.
-     *
-     * Global middleware runs before all routing and model resolution.
-     * It is the ideal place to perform tasks such as:
-     * - Authentication (e.g., JWT verification)
-     * - Global request logging
-     * - Dependency injection of shared context
-     *
-     * @param m - The middleware function to register.
-     */
-    useGlobal(m) {
-        this.global.push(m);
-    }
-    /**
-     * Registers middleware for a specific model type.
-     *
-     * Model-level middleware runs after all global middleware,
-     * but before method-specific middleware. This scope allows
-     * logic to be applied consistently across all endpoints
-     * associated with a given model (e.g., authorization).
-     *
-     * @typeParam T - The model type.
-     * @param ctor - The model constructor (used to derive its name).
-     * @param m - The middleware function to register.
-     */
-    useModel(ctor, m) {
-        if (this.model.has(ctor.name)) {
-            this.model.get(ctor.name).push(m);
-        }
-        else {
-            this.model.set(ctor.name, [m]);
-        }
-    }
-    /**
-     * Registers middleware for a specific method on a model.
-     *
-     * Method-level middleware is executed after model middleware,
-     * and before the method implementation itself. It can be used for:
-     * - Fine-grained permission checks
-     * - Custom logging or tracing per endpoint
-     *
-     * @typeParam T - The model type.
-     * @param ctor - The model constructor (used to derive its name).
-     * @param method - The method name on the model.
-     * @param m - The middleware function to register.
-     */
-    useMethod(ctor, method, m) {
-        if (!this.method.has(ctor.name)) {
-            this.method.set(ctor.name, new Map());
-        }
-        const methods = this.method.get(ctor.name);
-        if (!methods.has(method)) {
-            methods.set(method, []);
-        }
-        methods.get(method).push(m);
-    }
-}
 export function isNullableType(ty) {
     return typeof ty === "object" && ty !== null && "Nullable" in ty;
 }

package/dist/extractor/extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/extractor/extract.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EACP,IAAI,EACJ,UAAU,EAEV,iBAAiB,EAEjB,gBAAgB,EAEhB,UAAU,EAEX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,UAAU,EACV,QAAQ,EAER,MAAM,EACN,QAAQ,EACR,KAAK,EAEL,WAAW,EAGX,WAAW,EACX,cAAc,EAEd,cAAc,EAGf,MAAM,cAAc,CAAC;AAuBtB,qBAAa,aAAa;IAEf,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,MAAM;gBADf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM;IAGxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IA8F7D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;IA8BlE,MAAM,CAAC,KAAK,CACV,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC;IAgQhC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC;IAmCzC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;IAuBtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CASjC;IAEF,MAAM,CAAC,QAAQ,CACb,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,OAAe,GACtB,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;IAkJnC,MAAM,CAAC,WAAW,CAChB,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,EAAE,EAAE,UAAU,GACb,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC;IAiF1C,MAAM,CAAC,MAAM,CACX,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;CA0EvC"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/extractor/extract.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EACP,IAAI,EACJ,UAAU,EAEV,iBAAiB,EAEjB,gBAAgB,EAEhB,UAAU,EAEX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,eAAe,EACf,UAAU,EACV,QAAQ,EAER,MAAM,EACN,QAAQ,EACR,KAAK,EAEL,WAAW,EAGX,WAAW,EACX,cAAc,EAEd,cAAc,EAEf,MAAM,cAAc,CAAC;AAuBtB,qBAAa,aAAa;IAEf,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,MAAM;gBADf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM;IAGxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IA8F7D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;IA8BlE,MAAM,CAAC,KAAK,CACV,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC;IAgQhC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC;IAmCzC,MAAM,CAAC,GAAG,CACR,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;IAuCtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CASjC;IAEF,MAAM,CAAC,QAAQ,CACb,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,OAAe,GACtB,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;IAkJnC,MAAM,CAAC,WAAW,CAChB,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,EAAE,EAAE,UAAU,GACb,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC;IAiF1C,MAAM,CAAC,MAAM,CACX,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;CA0EvC"}

package/dist/extractor/extract.js

@@ -1,5 +1,5 @@
 import { Node as MorphNode, SyntaxKind, Scope, } from "ts-morph";
-import { Either, HttpVerb, ExtractorError, ExtractorErrorCode, CloesceApp, } from "../common.js";
+import { Either, HttpVerb, ExtractorError, ExtractorErrorCode, } from "../common.js";
 import { TypeFormatFlags } from "typescript";
 var AttributeDecoratorKind;
 (function (AttributeDecoratorKind) {
@@ -123,7 +123,7 @@ export class CidlExtractor {
             return type?.getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope);
         };
         const typeText = getTypeText();
-        if (typeText === CloesceApp.name) {
+        if (typeText === "CloesceApp") {
             return Either.right(sourceFile.getFilePath().toString());
         }
         return err(ExtractorErrorCode.AppMissingDefaultExport);
@@ -357,18 +357,31 @@ export class CidlExtractor {
         });
     }
     static env(classDecl, sourceFile) {
-        const binding = classDecl.getProperties().find((p) => {
-            return (p
+        const vars = {};
+        let binding;
+        for (const prop of classDecl.getProperties()) {
+            if (prop
                 .getType()
-                .getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope) === "D1Database");
-        });
+                .getText(undefined, TypeFormatFlags.UseAliasDefinedOutsideCurrentScope) === "D1Database") {
+                binding = prop.getName();
+                continue;
+            }
+            const ty = CidlExtractor.cidlType(prop.getType());
+            if (ty.isLeft()) {
+                ty.value.context = prop.getName();
+                ty.value.snippet = prop.getText();
+                return ty;
+            }
+            vars[prop.getName()] = ty.unwrap();
+        }
         if (!binding) {
             return err(ExtractorErrorCode.MissingDatabaseBinding);
         }
         return Either.right({
             name: classDecl.getName(),
             source_path: sourceFile.getFilePath().toString(),
-            db_binding: binding.getName(),
+            db_binding: binding,
+            vars,
         });
     }
     static primTypeMap = {

package/dist/router/router.d.ts

@@ -1,6 +1,12 @@
-import { HttpResult, Either, ModelMethod, CloesceAst, Model, CloesceApp, InstanceRegistry } from "../common.js";
+import { HttpResult, Either, ModelMethod, CloesceAst, Model, KeysOfType } from "../common.js";
 import { OrmWasmExports } from "./wasm.js";
 import { CrudContext } from "./crud.js";
+/**
+ * Dependency injection container, mapping an object type name to an instance of that object.
+ *
+ * Comes with the WranglerEnv and Request by default.
+ */
+export type DependencyInjector = Map<string, any>;
 /**
  * Map of model names to their respective constructor.
  *
@@ -8,11 +14,6 @@ import { CrudContext } from "./crud.js";
  * is guaranteed to contain all model definitions.
  */
 type ModelConstructorRegistry = Record<string, new () => any>;
-/**
- * Given a request, this represents a map of each body / url  param name to
- * its actual value. Unknown, as the a request can be anything.
- */
-type RequestParamMap = Record<string, unknown>;
 /**
  * Meta information on the wrangler env and db bindings
  */
@@ -20,6 +21,68 @@ interface MetaWranglerEnv {
     envName: string;
     dbName: string;
 }
+export type MiddlewareFn = (request: Request, env: any, di: DependencyInjector) => Promise<HttpResult | void>;
+export type ResponseMiddlewareFn = (request: Request, env: any, di: DependencyInjector, response: Response) => Promise<HttpResult | void>;
+export declare class CloesceApp {
+    private globalMiddleware;
+    private modelMiddleware;
+    private methodMiddleware;
+    private responseMiddleware;
+    routePrefix: string;
+    /**
+     * Registers global middleware which runs before any route matching.
+     *
+     * @param m - The middleware function to register.
+     */
+    onRequest(m: MiddlewareFn): void;
+    /**
+     * Registers middleware which runs after the response is generated, but before
+     * it is returned to the client.
+     *
+     * Optionally, return a new HttpResult to short-circuit the response.
+     *
+     * Errors thrown in response middleware are caught and returned as a 500 response.
+     *
+     * Errors thrown in earlier middleware or route processing are not caught here.
+     *
+     * @param m - The middleware function to register.
+     */
+    onResponse(m: ResponseMiddlewareFn): void;
+    /**
+     * Registers middleware for a specific model type.
+     *
+     * Runs before request validation and method middleware.
+     *
+     * @typeParam T - The model type.
+     * @param ctor - The model constructor (used to derive its name).
+     * @param m - The middleware function to register.
+     */
+    onModel<T>(ctor: new () => T, m: MiddlewareFn): void;
+    /**
+     * Registers middleware for a specific method on a model.
+     *
+     * Runs after model middleware and request validation.
+     *
+     * @typeParam T - The model type.
+     * @param ctor - The model constructor (used to derive its name).
+     * @param method - The method name on the model.
+     * @param m - The middleware function to register.
+     */
+    onMethod<T>(ctor: new () => T, method: KeysOfType<T, (...args: any) => any>, m: MiddlewareFn): void;
+    /**
+     * Router entry point. Undergoes route matching, request validation, hydration, and method dispatch.
+     */
+    private cloesce;
+    /**
+     * Runs the Cloesce app. Intended to be called from the generated workers code.
+     */
+    run(request: Request, env: any, ast: CloesceAst, constructorRegistry: ModelConstructorRegistry, envMeta: MetaWranglerEnv): Promise<Response>;
+}
+/**
+ * Given a request, this represents a map of each body / url  param name to
+ * its actual value. Unknown, as the a request can be anything.
+ */
+export type RequestParamMap = Record<string, unknown>;
 /**
  * Singleton instance containing the cidl, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
@@ -33,19 +96,12 @@ export declare class RuntimeContainer {
     static init(ast: CloesceAst, constructorRegistry: ModelConstructorRegistry, wasm?: WebAssembly.Instance): Promise<void>;
     static get(): RuntimeContainer;
 }
-/**
- * Runtime entry point. Given a request, undergoes: routing, validating,
- * hydrating, and method dispatch.
- *
- * @returns A Response with an `HttpResult` JSON body.
- */
-export declare function cloesce(request: Request, env: any, ast: CloesceAst, app: CloesceApp, constructorRegistry: ModelConstructorRegistry, envMeta: MetaWranglerEnv, apiRoute: string): Promise<Response>;
 /**
  * Matches a request to a method on a model.
  * @param apiRoute The route from the domain to the actual API, ie https://foo.com/route/to/api => route/to/api/
  * @returns 404 or a `MatchedRoute`
  */
-declare function matchRoute(request: Request, ast: CloesceAst, apiRoute: string): Either<HttpResult, {
+declare function matchRoute(request: Request, ast: CloesceAst, routePrefix: string): Either<HttpResult, {
     model: Model;
     method: ModelMethod;
     id: string | null;
@@ -63,7 +119,7 @@ declare function validateRequest(request: Request, ast: CloesceAst, model: Model
  * Calls a method on a model given a list of parameters.
  * @returns 500 on an uncaught client error, 200 with a result body on success
  */
-declare function methodDispatch(crudCtx: CrudContext, instanceRegistry: InstanceRegistry, method: ModelMethod, params: Record<string, unknown>): Promise<HttpResult<unknown>>;
+declare function methodDispatch(crudCtx: CrudContext, instanceRegistry: DependencyInjector, method: ModelMethod, params: Record<string, unknown>): Promise<HttpResult<unknown>>;
 /**
  * For testing purposes
  */

package/dist/router/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,MAAM,EACN,WAAW,EAEX,UAAU,EAEV,KAAK,EAGL,UAAU,EACV,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAuB,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC;;;;;GAKG;AACH,KAAK,wBAAwB,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,CAAC;AAE9D;;;GAGG;AACH,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE/C;;GAEG;AACH,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,qBAAa,gBAAgB;aAGT,GAAG,EAAE,UAAU;aACf,mBAAmB,EAAE,wBAAwB;aAC7C,IAAI,EAAE,cAAc;IAJtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO;WAMM,IAAI,CACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,wBAAwB,EAC7C,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ;IAO7B,MAAM,CAAC,GAAG,IAAI,gBAAgB;CAG/B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,wBAAwB,EAC7C,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,CAmFnB;AAED;;;;GAIG;AACH,iBAAS,UAAU,CACjB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,QAAQ,EAAE,MAAM,GACf,MAAM,CACP,UAAU,EACV;IACE,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB,CACF,CAyCA;AAED;;;;GAIG;AACH,iBAAe,eAAe,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,WAAW,EACnB,EAAE,EAAE,MAAM,GAAG,IAAI,GAChB,OAAO,CACR,MAAM,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAC3E,CA4DA;AAgED;;;GAGG;AACH,iBAAe,cAAc,CAC3B,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAkD9B;AAoID;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}

package/dist/router/router.js

@@ -2,6 +2,159 @@ import { Either, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE,
 import { mapSql, loadOrmWasm } from "./wasm.js";
 import { CrudContext } from "./crud.js";
 import { Orm } from "../ui/backend.js";
+export class CloesceApp {
+    globalMiddleware = [];
+    modelMiddleware = new Map();
+    methodMiddleware = new Map();
+    responseMiddleware = [];
+    routePrefix = "api";
+    /**
+     * Registers global middleware which runs before any route matching.
+     *
+     * @param m - The middleware function to register.
+     */
+    onRequest(m) {
+        this.globalMiddleware.push(m);
+    }
+    /**
+     * Registers middleware which runs after the response is generated, but before
+     * it is returned to the client.
+     *
+     * Optionally, return a new HttpResult to short-circuit the response.
+     *
+     * Errors thrown in response middleware are caught and returned as a 500 response.
+     *
+     * Errors thrown in earlier middleware or route processing are not caught here.
+     *
+     * @param m - The middleware function to register.
+     */
+    onResponse(m) {
+        this.responseMiddleware.push(m);
+    }
+    /**
+     * Registers middleware for a specific model type.
+     *
+     * Runs before request validation and method middleware.
+     *
+     * @typeParam T - The model type.
+     * @param ctor - The model constructor (used to derive its name).
+     * @param m - The middleware function to register.
+     */
+    onModel(ctor, m) {
+        if (this.modelMiddleware.has(ctor.name)) {
+            this.modelMiddleware.get(ctor.name).push(m);
+        }
+        else {
+            this.modelMiddleware.set(ctor.name, [m]);
+        }
+    }
+    /**
+     * Registers middleware for a specific method on a model.
+     *
+     * Runs after model middleware and request validation.
+     *
+     * @typeParam T - The model type.
+     * @param ctor - The model constructor (used to derive its name).
+     * @param method - The method name on the model.
+     * @param m - The middleware function to register.
+     */
+    onMethod(ctor, method, m) {
+        if (!this.methodMiddleware.has(ctor.name)) {
+            this.methodMiddleware.set(ctor.name, new Map());
+        }
+        const methods = this.methodMiddleware.get(ctor.name);
+        if (!methods.has(method)) {
+            methods.set(method, []);
+        }
+        methods.get(method).push(m);
+    }
+    /**
+     * Router entry point. Undergoes route matching, request validation, hydration, and method dispatch.
+     */
+    async cloesce(request, env, ast, constructorRegistry, di, d1) {
+        // Global middleware
+        for (const m of this.globalMiddleware) {
+            const res = await m(request, env, di);
+            if (res) {
+                return toResponse(res);
+            }
+        }
+        // Route match
+        const route = matchRoute(request, ast, this.routePrefix);
+        if (route.isLeft()) {
+            return toResponse(route.value);
+        }
+        const { method, model, id } = route.unwrap();
+        // Model middleware
+        for (const m of this.modelMiddleware.get(model.name) ?? []) {
+            const res = await m(request, env, di);
+            if (res) {
+                return toResponse(res);
+            }
+        }
+        // Request validation
+        const validation = await validateRequest(request, ast, model, method, id);
+        if (validation.isLeft()) {
+            return toResponse(validation.value);
+        }
+        const { params, dataSource } = validation.unwrap();
+        // Method middleware
+        for (const m of this.methodMiddleware.get(model.name)?.get(method.name) ??
+            []) {
+            const res = await m(request, env, di);
+            if (res) {
+                return toResponse(res);
+            }
+        }
+        // Hydration
+        const crudCtx = await (async () => {
+            if (method.is_static) {
+                return Either.right(CrudContext.fromCtor(d1, constructorRegistry[model.name]));
+            }
+            const hydratedModel = await hydrateModel(constructorRegistry, d1, model, id, // id must exist after matchRoute
+            dataSource);
+            return hydratedModel.map((_) => CrudContext.fromInstance(d1, hydratedModel.value, constructorRegistry[model.name]));
+        })();
+        if (crudCtx.isLeft()) {
+            return toResponse(crudCtx.value);
+        }
+        // Method dispatch
+        return toResponse(await methodDispatch(crudCtx.unwrap(), di, method, params));
+    }
+    /**
+     * Runs the Cloesce app. Intended to be called from the generated workers code.
+     */
+    async run(request, env, ast, constructorRegistry, envMeta) {
+        const di = new Map();
+        di.set(envMeta.envName, env);
+        di.set("Request", request);
+        await RuntimeContainer.init(ast, constructorRegistry);
+        const d1 = env[envMeta.dbName]; // TODO: multiple dbs
+        try {
+            // Core cloesce processing
+            const response = await this.cloesce(request, env, ast, constructorRegistry, di, d1);
+            // Response middleware
+            for (const m of this.responseMiddleware) {
+                const res = await m(request, env, di, response);
+                if (res) {
+                    return toResponse(res);
+                }
+            }
+            return response;
+        }
+        catch (e) {
+            console.error(JSON.stringify(e));
+            return new Response(JSON.stringify({
+                ok: false,
+                status: 500,
+                message: e.toString(),
+            }), {
+                status: 500,
+                headers: { "Content-Type": "application/json" },
+            });
+        }
+    }
+}
 /**
  * Singleton instance containing the cidl, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
@@ -26,94 +179,29 @@ export class RuntimeContainer {
         return this.instance;
     }
 }
-/**
- * Runtime entry point. Given a request, undergoes: routing, validating,
- * hydrating, and method dispatch.
- *
- * @returns A Response with an `HttpResult` JSON body.
- */
-export async function cloesce(request, env, ast, app, constructorRegistry, envMeta, apiRoute) {
-    //#region Initialization
-    const ir = new Map();
-    ir.set(envMeta.envName, env);
-    ir.set("Request", request);
-    await RuntimeContainer.init(ast, constructorRegistry);
-    const d1 = env[envMeta.dbName]; // TODO: multiple dbs
-    //#endregion
-    //#region Global Middleware
-    for (const m of app.global) {
-        const res = await m(request, env, ir);
-        if (res) {
-            return toResponse(res);
-        }
-    }
-    //#endregion
-    //#region Match the route to a model method
-    const route = matchRoute(request, ast, apiRoute);
-    if (route.isLeft()) {
-        return toResponse(route.value);
-    }
-    const { method, model, id } = route.unwrap();
-    //#endregion
-    //#region Model Middleware
-    for (const m of app.model.get(model.name) ?? []) {
-        const res = await m(request, env, ir);
-        if (res) {
-            return toResponse(res);
-        }
-    }
-    //#endregion
-    //#region Validate request body to the model method
-    const validation = await validateRequest(request, ast, model, method, id);
-    if (validation.isLeft()) {
-        return toResponse(validation.value);
-    }
-    const { params, dataSource } = validation.unwrap();
-    //#endregion
-    //#region Method Middleware
-    for (const m of app.method.get(model.name)?.get(method.name) ?? []) {
-        const res = await m(request, env, ir);
-        if (res) {
-            return toResponse(res);
-        }
-    }
-    //#endregion
-    //#region Instantatiate the model
-    const crudCtx = await (async () => {
-        if (method.is_static) {
-            return Either.right(CrudContext.fromCtor(d1, constructorRegistry[model.name]));
-        }
-        const hydratedModel = await hydrateModel(constructorRegistry, d1, model, id, // id must exist after matchRoute
-        dataSource);
-        return hydratedModel.map((_) => CrudContext.fromInstance(d1, hydratedModel.value, constructorRegistry[model.name]));
-    })();
-    if (crudCtx.isLeft()) {
-        return toResponse(crudCtx.value);
-    }
-    //#endregion
-    return toResponse(await methodDispatch(crudCtx.unwrap(), ir, method, params));
-}
 /**
  * Matches a request to a method on a model.
  * @param apiRoute The route from the domain to the actual API, ie https://foo.com/route/to/api => route/to/api/
  * @returns 404 or a `MatchedRoute`
  */
-function matchRoute(request, ast, apiRoute) {
+function matchRoute(request, ast, routePrefix) {
     const url = new URL(request.url);
+    const parts = url.pathname.split("/").filter(Boolean);
+    const prefix = routePrefix.split("/").filter(Boolean);
     // Error state: We expect an exact request format, and expect that the model
     // and are apart of the CIDL
     const notFound = (e) => Either.left(errorState(404, `Path not found: ${e} ${url.pathname}`));
-    const routeParts = url.pathname
-        .slice(apiRoute.length)
-        .split("/")
-        .filter(Boolean);
-    if (routeParts.length < 2) {
+    for (const p of prefix) {
+        if (parts.shift() !== p)
+            return notFound(`Missing prefix segment "${p}"`);
+    }
+    if (parts.length < 2) {
         return notFound("Expected /model/method or /model/:id/method");
     }
     // Attempt to extract from routeParts
-    const modelName = routeParts[0];
-    const methodName = routeParts[routeParts.length - 1];
-    const id = routeParts.length === 3 ? routeParts[1] : null;
+    const modelName = parts[0];
+    const methodName = parts[parts.length - 1];
+    const id = parts.length === 3 ? parts[1] : null;
     const model = ast.models[modelName];
     if (!model) {
         return notFound(`Unknown model ${modelName}`);
@@ -203,7 +291,7 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
             ? null
             : constructorRegistry[model.name][dataSource];
         records = await d1
-            .prepare(Orm.getQuery(constructorRegistry[model.name], includeTree).unwrap())
+            .prepare(Orm.getQuery(constructorRegistry[model.name], includeTree))
             .bind(id)
             .run();
         if (!records?.results) {
@@ -261,6 +349,11 @@ async function methodDispatch(crudCtx, instanceRegistry, method, params) {
         return uncaughtException(e);
     }
 }
+/**
+ * Runtime type validation for CIDL types.
+ *
+ * Returns true if the value matches the CIDL type, false otherwise.
+ */
 function validateCidlType(ast, value, cidlType, isPartial) {
     if (value === undefined)
         return isPartial;

package/dist/ui/backend.d.ts

@@ -1,8 +1,7 @@
 import { D1Database } from "@cloudflare/workers-types/experimental/index.js";
 import { CrudKind, DeepPartial, Either, KeysOfType } from "../common.js";
-export { cloesce } from "../router/router.js";
-export type { HttpResult, Either, DeepPartial, InstanceRegistry, CrudKind, } from "../common.js";
-export { CloesceApp } from "../common.js";
+export { CloesceApp, MiddlewareFn, ResponseMiddlewareFn, DependencyInjector, } from "../router/router.js";
+export type { HttpResult, Either, DeepPartial, CrudKind } from "../common.js";
 /**
  * Marks a class as a D1-backed SQL model.
  *
@@ -209,7 +208,7 @@ export declare const ManyToMany: (_uniqueId: string) => PropertyDecorator;
  * dogId: number;
  * ```
  */
-export declare const ForeignKey: <T>(_model: T | string) => PropertyDecorator;
+export declare const ForeignKey: <T>(_Model: T | string) => PropertyDecorator;
 /**
  * Marks a method parameter for dependency injection.
  *
@@ -434,7 +433,7 @@ export declare class Orm {
         includeTree?: IncludeTree<T> | null;
         from?: string;
         tagCte?: string;
-    }): Either<string, string>;
+    }): string;
     /**
      * Returns a select query for a single model by primary key, creating a CTE view using the provided include tree.
      *
@@ -460,7 +459,7 @@ export declare class Orm {
      * SELECT * FROM Person_view WHERE [Person].[id] = ?
      * ```
      */
-    static getQuery<T extends object>(ctor: new () => T, includeTree?: IncludeTree<T> | null): Either<string, string>;
+    static getQuery<T extends object>(ctor: new () => T, includeTree?: IncludeTree<T> | null): string;
     /**
      * Retrieves all instances of a model from the database.
      * @param ctor The model constructor.

package/dist/ui/backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/ui/backend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/ui/backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQzE,OAAO,EACL,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,EAAE,EAAE,cAAyB,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,cAAc,EAAE,cAAyB,CAAC;AAEvD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,WAAW,EAAE,cAAyB,CAAC;AAEpD;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,UAAU,EAAE,iBAA4B,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,eAA0B,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,eAA0B,CAAC;AAE9C;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,eAA0B,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,eAA0B,CAAC;AAE/C;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,eAA0B,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,eAAO,MAAM,UAAU,EAAE,iBAA4B,CAAC;AAEtD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,SAAS,GACnB,mBAAmB,MAAM,KAAG,iBACrB,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,QAAQ,GAClB,mBAAmB,MAAM,KAAG,iBACrB,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,GACpB,WAAW,MAAM,KAAG,iBACb,CAAC;AAEX;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU,GACpB,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,KAAG,iBACjB,CAAC;AAEX;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,MAAM,EAAE,kBAA6B,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,IAAI,GACd,QAAQ,QAAQ,EAAE,KAAG,cACd,CAAC;AAEX,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAEhF;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,SAAS,GAC7C,KAAK,GACL;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GACrC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAC3B,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,CAAC;AAErC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI,CACzC,UAAU,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAC7B,MAAM,CACT,GAAG;IAAE,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/B;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG;IAAE,OAAO,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAEvD;;GAEG;AACH,qBAAa,GAAG;IACM,OAAO,CAAC,EAAE;IAA9B,OAAO;IAEP;;;OAGG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,GAAG,GAAG;IAIlC;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,EAC5B,IAAI,EAAE,UAAU,CAAC,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC9B,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IAItB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0CG;IACG,MAAM,CAAC,CAAC,SAAS,MAAM,EAC3B,IAAI,EAAE,UAAU,CAAC,EACjB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EACxB,WAAW,GAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAW,GACxC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IA6C/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,MAAM,EAC/B,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACpC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GACA,MAAM;IAiBT;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,MAAM,EAC9B,IAAI,EAAE,UAAU,CAAC,EACjB,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,GAClC,MAAM;IAKT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,IAAI,CAAC,CAAC,SAAS,MAAM,EACzB,IAAI,EAAE,UAAU,CAAC,EACjB,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QACpC,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAmB/B;;;;;;;;;;;;OAYG;IACG,GAAG,CAAC,CAAC,SAAS,MAAM,EACxB,IAAI,EAAE,UAAU,CAAC,EACjB,EAAE,EAAE,GAAG,EACP,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,GAClC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;CAqBrC"}

package/dist/ui/backend.js

@@ -1,8 +1,7 @@
 import { Either } from "../common.js";
 import { RuntimeContainer } from "../router/router.js";
 import { WasmResource, mapSql as mapSql, invokeOrmWasm, } from "../router/wasm.js";
-export { cloesce } from "../router/router.js";
-export { CloesceApp } from "../common.js";
+export { CloesceApp, } from "../router/router.js";
 /**
  * Marks a class as a D1-backed SQL model.
  *
@@ -23,7 +22,7 @@ export { CloesceApp } from "../common.js";
  *  }
  * ```
  */
-export const D1 = (_) => { };
+export const D1 = () => { };
 /**
  * Marks a class as a plain serializable object.
  *
@@ -50,7 +49,7 @@ export const D1 = (_) => { };
  * async function foo(): Promise<HttpResult<CatStuff>> { ... }
  * ```
  */
-export const PlainOldObject = (_) => { };
+export const PlainOldObject = () => { };
 /**
  * Declares a Wrangler environment definition.
  *
@@ -72,7 +71,7 @@ export const PlainOldObject = (_) => { };
  * foo(＠Inject env: WranglerEnv) {...}
  * ```
  */
-export const WranglerEnv = (_) => { };
+export const WranglerEnv = () => { };
 /**
  * Marks a property as the SQL primary key for a model.
  *
@@ -89,32 +88,32 @@ export const WranglerEnv = (_) => { };
  * }
  * ```
  */
-export const PrimaryKey = (_) => { };
+export const PrimaryKey = () => { };
 /**
  * Exposes a class method as an HTTP GET endpoint.
  * The method will appear in both backend and generated client APIs.
  */
-export const GET = (_) => { };
+export const GET = () => { };
 /**
  * Exposes a class method as an HTTP POST endpoint.
  * The method will appear in both backend and generated client APIs.
  */
-export const POST = (_) => { };
+export const POST = () => { };
 /**
  * Exposes a class method as an HTTP PUT endpoint.
  * The method will appear in both backend and generated client APIs.
  */
-export const PUT = (_) => { };
+export const PUT = () => { };
 /**
  * Exposes a class method as an HTTP PATCH endpoint.
  * The method will appear in both backend and generated client APIs.
  */
-export const PATCH = (_) => { };
+export const PATCH = () => { };
 /**
  * Exposes a class method as an HTTP DEL endpoint.
  * The method will appear in both backend and generated client APIs.
  */
-export const DELETE = (_) => { };
+export const DELETE = () => { };
 /**
  * Declares a static property as a data source.
  *
@@ -155,7 +154,7 @@ export const DELETE = (_) => { };
  * // => Person { id: 1, dogId: 2, dog: { id: 2, name: "Fido" } }[]
  * ```
  */
-export const DataSource = (_) => { };
+export const DataSource = () => { };
 /**
  * Declares a one-to-many relationship between models.
  *
@@ -209,7 +208,7 @@ export const ManyToMany = (_uniqueId) => () => { };
  * dogId: number;
  * ```
  */
-export const ForeignKey = (_model) => () => { };
+export const ForeignKey = (_Model) => () => { };
 /**
  * Marks a method parameter for dependency injection.
  *
@@ -393,7 +392,11 @@ export class Orm {
             WasmResource.fromString(JSON.stringify(opts.tagCte ?? null), wasm),
             WasmResource.fromString(JSON.stringify(opts.from ?? null), wasm),
         ];
-        return invokeOrmWasm(wasm.list_models, args, wasm);
+        const res = invokeOrmWasm(wasm.list_models, args, wasm);
+        if (res.isLeft()) {
+            throw new Error(`Error invoking the Cloesce WASM Binary: ${res.value}`);
+        }
+        return res.unwrap();
     }
     /**
      * Returns a select query for a single model by primary key, creating a CTE view using the provided include tree.
@@ -422,9 +425,7 @@ export class Orm {
      */
     static getQuery(ctor, includeTree) {
         const { ast } = RuntimeContainer.get();
-        return this.listQuery(ctor, {
-            includeTree,
-        }).map((inner) => `${inner} WHERE [${ast.models[ctor.name].primary_key.name}] = ?`);
+        return `${this.listQuery(ctor, { includeTree })} WHERE [${ast.models[ctor.name].primary_key.name}] = ?`;
     }
     /**
      * Retrieves all instances of a model from the database.
@@ -457,11 +458,8 @@ export class Orm {
      *
      */
     async list(ctor, opts) {
-        const queryRes = Orm.listQuery(ctor, opts);
-        if (queryRes.isLeft()) {
-            return Either.left(queryRes.value);
-        }
-        const stmt = this.db.prepare(queryRes.value);
+        const sql = Orm.listQuery(ctor, opts);
+        const stmt = this.db.prepare(sql);
         const records = await stmt.all();
         if (!records.success) {
             return Either.left(records.error ?? "D1 query failed, but no error was returned.");
@@ -486,11 +484,8 @@ export class Orm {
      * ```
      */
     async get(ctor, id, includeTree) {
-        const queryRes = Orm.getQuery(ctor, includeTree);
-        if (queryRes.isLeft()) {
-            return Either.left(queryRes.value);
-        }
-        const record = await this.db.prepare(queryRes.value).bind(id).run();
+        const sql = Orm.getQuery(ctor, includeTree);
+        const record = await this.db.prepare(sql).bind(id).run();
         if (!record.success) {
             return Either.left(record.error ?? "D1 query failed, but no error was returned.");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloesce",
-  "version": "0.0.4-unstable.7",
+  "version": "0.0.4-unstable.9",
   "description": "A tool to extract and compile TypeScript code into something wrangler can consume and deploy for D1 Databases and Cloudflare Workers",
   "type": "module",
   "license": "Apache-2.0",