cloesce 0.0.4-unstable.0 → 0.0.4-unstable.10

package/dist/router/crud.js

@@ -1,4 +1,4 @@
-import { NO_DATA_SOURCE } from "../common.js";
+import { HttpResult, NO_DATA_SOURCE } from "../common.js";
 import { Orm } from "../ui/backend.js";
 /**
  * A wrapper for Model Instances, containing definitions for built-in CRUD methods.
@@ -24,7 +24,7 @@ export class CrudContext {
      */
     interceptCrud(methodName) {
         const map = {
-            post: this.upsert.bind(this),
+            save: this.upsert.bind(this),
             get: this.get.bind(this),
             list: this.list.bind(this),
         };
@@ -32,34 +32,39 @@ export class CrudContext {
         return fn ? fn.bind(this.instance) : map[methodName];
     }
     async upsert(obj, dataSource) {
-        const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
-        const includeTree = normalizedDs ? this.ctor[normalizedDs] : null;
+        const includeTree = findIncludeTree(dataSource, this.ctor);
         // Upsert
         const orm = Orm.fromD1(this.d1);
         const upsert = await orm.upsert(this.ctor, obj, includeTree);
-        if (!upsert.ok) {
-            return { ok: false, status: 500, data: upsert.value }; // TODO: better status code?
+        if (upsert.isLeft()) {
+            return HttpResult.fail(500, upsert.value); // TODO: better status code?
         }
         // Get
-        const get = await orm.get(this.ctor, upsert.value, normalizedDs);
-        return get.ok
-            ? { ok: true, status: 200, data: get.value }
-            : { ok: false, status: 500, data: get.value };
+        const get = await orm.get(this.ctor, upsert.value, includeTree);
+        return get.isRight()
+            ? HttpResult.ok(200, get.value)
+            : HttpResult.fail(500, get.value);
     }
     async get(id, dataSource) {
-        const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+        const includeTree = findIncludeTree(dataSource, this.ctor);
         const orm = Orm.fromD1(this.d1);
-        const res = await orm.get(this.ctor, id, normalizedDs);
-        return res.ok
-            ? { ok: true, status: 200, data: res.value }
-            : { ok: false, status: 500, data: res.value };
+        const res = await orm.get(this.ctor, id, includeTree);
+        return res.isRight()
+            ? HttpResult.ok(200, res.value)
+            : HttpResult.fail(500, res.value);
     }
     async list(dataSource) {
-        const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+        const includeTree = findIncludeTree(dataSource, this.ctor);
         const orm = Orm.fromD1(this.d1);
-        const res = await orm.list(this.ctor, normalizedDs);
-        return res.ok
-            ? { ok: true, status: 200, data: res.value }
-            : { ok: false, status: 500, data: res.value };
+        const res = await orm.list(this.ctor, {
+            includeTree,
+        });
+        return res.isRight()
+            ? HttpResult.ok(200, res.value)
+            : HttpResult.fail(500, res.value);
     }
 }
+function findIncludeTree(dataSource, ctor) {
+    const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+    return normalizedDs ? ctor[normalizedDs] : null;
+}

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 ResultMiddlewareFn = (request: Request, env: any, di: DependencyInjector, result: HttpResult) => Promise<HttpResult | void>;
+export declare class CloesceApp {
+    private globalMiddleware;
+    private modelMiddleware;
+    private methodMiddleware;
+    private resultMiddleware;
+    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.
+     */
+    onResult(m: ResultMiddlewareFn): 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,EAIX,UAAU,EAEV,KAAK,EAGL,UAAU,EACV,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAwB,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC;;;;;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,CAqFnB;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;AA2DD;;;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;AA+HD;;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

@@ -1,6 +1,153 @@
-import { left, right, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE, } from "../common.js";
-import { fromSql, loadOrmWasm } from "./wasm.js";
+import { HttpResult, Either, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE, } from "../common.js";
+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();
+    resultMiddleware = [];
+    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.
+     */
+    onResult(m) {
+        this.resultMiddleware.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 res;
+            }
+        }
+        // Route match
+        const route = matchRoute(request, ast, this.routePrefix);
+        if (route.isLeft()) {
+            return 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 res;
+            }
+        }
+        // Request validation
+        const validation = await validateRequest(request, ast, model, method, id);
+        if (validation.isLeft()) {
+            return 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 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 crudCtx.value;
+        }
+        // Method dispatch
+        return 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.resultMiddleware) {
+                const res = await m(request, env, di, response);
+                if (res) {
+                    return res.toResponse();
+                }
+            }
+            return response.toResponse();
+        }
+        catch (e) {
+            console.error(JSON.stringify(e));
+            return HttpResult.fail(500, e.toString()).toResponse();
+        }
+    }
+}
 /**
  * Singleton instance containing the cidl, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
@@ -25,97 +172,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.ok) {
-        return toResponse(route.value);
-    }
-    const { method, model, id } = route.value;
-    //#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.ok) {
-        return toResponse(validation.value);
-    }
-    const { params, dataSource } = validation.value;
-    //#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 right(CrudContext.fromCtor(d1, constructorRegistry[model.name]));
-        }
-        const hydratedModel = await hydrateModel(constructorRegistry, d1, model, id, // id must exist after matchRoute
-        dataSource);
-        if (!hydratedModel.ok) {
-            return hydratedModel;
-        }
-        return right(CrudContext.fromInstance(d1, hydratedModel.value, constructorRegistry[model.name]));
-    })();
-    if (!crudCtx.ok) {
-        return toResponse(crudCtx.value);
-    }
-    //#endregion
-    return toResponse(await methodDispatch(crudCtx.value, 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) => left(errorState(404, `Path not found: ${e} ${url.pathname}`));
-    const routeParts = url.pathname
-        .slice(apiRoute.length)
-        .split("/")
-        .filter(Boolean);
-    if (routeParts.length < 2) {
+    const notFound = (e) => Either.left(HttpResult.fail(404, `Path not found: ${e} ${url.pathname}`));
+    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}`);
@@ -127,7 +206,7 @@ function matchRoute(request, ast, apiRoute) {
     if (request.method !== method.http_verb) {
         return notFound("Unmatched HTTP method");
     }
-    return right({
+    return Either.right({
         model,
         method,
         id,
@@ -140,7 +219,7 @@ function matchRoute(request, ast, apiRoute) {
  */
 async function validateRequest(request, ast, model, method, id) {
     // Error state: any missing parameter, body, or malformed input will exit with 400.
-    const invalidRequest = (e) => left(errorState(400, `Invalid Request Body: ${e}`));
+    const invalidRequest = (e) => Either.left(HttpResult.fail(400, `Invalid Request Body: ${e}`));
     if (!method.is_static && id == null) {
         return invalidRequest("Id's are required for instantiated methods.");
     }
@@ -183,7 +262,7 @@ async function validateRequest(request, ast, model, method, id) {
         !(dataSource in model.data_sources)) {
         return invalidRequest(`Unknown data source ${dataSource}`);
     }
-    return right({ params, dataSource });
+    return Either.right({ params, dataSource });
 }
 /**
  * Queries D1 for a particular model's ID, then transforms the SQL column output into
@@ -195,17 +274,19 @@ async function validateRequest(request, ast, model, method, id) {
 async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
     // Error state: If the D1 database has been tweaked outside of Cloesce
     // resulting in a malformed query, exit with a 500.
-    const malformedQuery = (e) => left(errorState(500, `Error in hydration query, is the database out of sync with the backend?: ${e instanceof Error ? e.message : String(e)}`));
+    const malformedQuery = (e) => Either.left(HttpResult.fail(500, `Error in hydration query, is the database out of sync with the backend?: ${e instanceof Error ? e.message : String(e)}`));
     // Error state: If no record is found for the id, return a 404
-    const missingRecord = left(errorState(404, "Record not found"));
-    const pk = model.primary_key.name;
-    const query = dataSource !== NO_DATA_SOURCE
-        ? `SELECT * FROM "${model.name}.${dataSource}" WHERE "${model.name}.${pk}" = ?`
-        : `SELECT * FROM "${model.name}" WHERE "${pk}" = ?`;
+    const missingRecord = Either.left(HttpResult.fail(404, "Record not found"));
     // Query DB
     let records;
     try {
-        records = await d1.prepare(query).bind(id).run();
+        let includeTree = dataSource === NO_DATA_SOURCE
+            ? null
+            : constructorRegistry[model.name][dataSource];
+        records = await d1
+            .prepare(Orm.getQuery(constructorRegistry[model.name], includeTree))
+            .bind(id)
+            .run();
         if (!records?.results) {
             return missingRecord;
         }
@@ -217,8 +298,8 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
         return malformedQuery(e);
     }
     // Hydrate
-    const models = fromSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {}).value;
-    return right(models[0]);
+    const models = mapSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {}).value;
+    return Either.right(models[0]);
 }
 /**
  * Calls a method on a model given a list of parameters.
@@ -226,7 +307,7 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
  */
 async function methodDispatch(crudCtx, instanceRegistry, method, params) {
     // Error state: Client code ran into an uncaught exception.
-    const uncaughtException = (e) => errorState(500, `Uncaught exception in method dispatch: ${e instanceof Error ? e.message : String(e)}`);
+    const uncaughtException = (e) => HttpResult.fail(500, `Uncaught exception in method dispatch: ${e instanceof Error ? e.message : String(e)}`);
     const paramArray = [];
     for (const param of method.parameters) {
         if (params[param.name]) {
@@ -238,7 +319,7 @@ async function methodDispatch(crudCtx, instanceRegistry, method, params) {
         if (!injected) {
             // Error state: Injected parameters cannot be found at compile time, only at runtime.
             // If a injected reference does not exist, throw a 500.
-            return errorState(500, `An injected parameter was missing from the instance registry: ${JSON.stringify(param.cidl_type)}`);
+            return HttpResult.fail(500, `An injected parameter was missing from the instance registry: ${JSON.stringify(param.cidl_type)}`);
         }
         paramArray.push(injected);
     }
@@ -246,12 +327,12 @@ async function methodDispatch(crudCtx, instanceRegistry, method, params) {
     const resultWrapper = (res) => {
         const rt = method.return_type;
         if (rt === null) {
-            return { ok: true, status: 200 };
+            return HttpResult.ok(200);
         }
         if (typeof rt === "object" && rt !== null && "HttpResult" in rt) {
             return res;
         }
-        return { ok: true, status: 200, data: res };
+        return HttpResult.ok(200, res);
     };
     try {
         const res = await crudCtx.interceptCrud(method.name)(...paramArray);
@@ -261,6 +342,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;
@@ -281,8 +367,11 @@ function validateCidlType(ast, value, cidlType, isPartial) {
                 return !Number.isNaN(Number(value));
             case "Text":
                 return typeof value === "string";
-            case "Blob":
-                return value instanceof Blob || value instanceof ArrayBuffer;
+            case "Boolean":
+                return typeof value === "boolean";
+            case "DateIso":
+                const date = new Date(value);
+                return !isNaN(date.getTime());
             default:
                 return false;
         }
@@ -323,6 +412,7 @@ function validateCidlType(ast, value, cidlType, isPartial) {
         if (!poo.attributes.every((attr) => validateCidlType(ast, valueObj[attr.name], attr.cidl_type, isPartial))) {
             return false;
         }
+        return true;
     }
     if ("Array" in cidlType) {
         const arr = cidlType.Array;
@@ -338,15 +428,6 @@ function validateCidlType(ast, value, cidlType, isPartial) {
     }
     return false;
 }
-function errorState(status, message) {
-    return { ok: false, status, message };
-}
-function toResponse(r) {
-    return new Response(JSON.stringify(r), {
-        status: r.status,
-        headers: { "Content-Type": "application/json" },
-    });
-}
 /**
  * For testing purposes
  */

package/dist/router/wasm.d.ts

@@ -10,8 +10,9 @@ export interface OrmWasmExports {
     set_meta_ptr(ptr: number, len: number): number;
     alloc(len: number): number;
     dealloc(ptr: number, len: number): void;
-    object_relational_mapping(model_name_ptr: number, model_name_len: number, sql_rows_ptr: number, sql_rows_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
+    map_sql(model_name_ptr: number, model_name_len: number, sql_rows_ptr: number, sql_rows_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
     upsert_model(model_name_ptr: number, model_name_len: number, new_model_ptr: number, new_model_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
+    list_models(model_name_ptr: number, model_name_len: number, include_tree_ptr: number, include_tree_len: number, tag_cte_ptr: number, tag_cte_len: number, custom_from_ptr: number, custom_from_len: number): boolean;
 }
 /**
  * RAII for wasm memory
@@ -28,10 +29,16 @@ export declare class WasmResource {
     static fromString(str: string, wasm: OrmWasmExports): WasmResource;
 }
 export declare function loadOrmWasm(ast: CloesceAst, wasm?: WebAssembly.Instance): Promise<OrmWasmExports>;
-export declare function invokeOrmWasm<T>(fn: (...args: number[]) => boolean, args: WasmResource[], wasm: OrmWasmExports): Either<string, T>;
+/**
+ * Invokes a WASM ORM function with the provided arguments, handling memory
+ * allocation and deallocation.
+ *
+ * Returns an Either where Left is an error message and Right the raw string result.
+ */
+export declare function invokeOrmWasm(fn: (...args: number[]) => boolean, args: WasmResource[], wasm: OrmWasmExports): Either<string, string>;
 /**
  * Calls `object_relational_mapping` to turn a row of SQL records into
  * an instantiated object.
  */
-export declare function fromSql<T extends object>(ctor: new () => T, records: Record<string, any>[], includeTree: IncludeTree<T> | CidlIncludeTree | null): Either<string, T[]>;
+export declare function mapSql<T extends object>(ctor: new () => T, records: Record<string, any>[], includeTree: IncludeTree<T> | CidlIncludeTree | null): Either<string, T[]>;
 //# sourceMappingURL=wasm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wasm.d.ts","sourceRoot":"","sources":["../../src/router/wasm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,UAAU,EACV,MAAM,EAIP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IAC3B,cAAc,IAAI,MAAM,CAAC;IACzB,cAAc,IAAI,MAAM,CAAC;IACzB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAExC,yBAAyB,CACvB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;IAEX,YAAY,CACV,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;CACZ;AAED;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,IAAI;IACL,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;gBAFV,IAAI,EAAE,cAAc,EACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM;IAEpB,IAAI;IAIJ;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,YAAY;CAQnE;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ,GAC1B,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAC7B,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,EAClC,IAAI,EAAE,YAAY,EAAE,EACpB,IAAI,EAAE,cAAc,GACnB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAkBnB;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,EACtC,IAAI,EAAE,UAAU,CAAC,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC9B,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,eAAe,GAAG,IAAI,GACnD,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CA0DrB"}
+{"version":3,"file":"wasm.d.ts","sourceRoot":"","sources":["../../src/router/wasm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAS,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IAC3B,cAAc,IAAI,MAAM,CAAC;IACzB,cAAc,IAAI,MAAM,CAAC;IACzB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAExC,OAAO,CACL,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;IAEX,YAAY,CACV,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC;IAEX,WAAW,CACT,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC;CACZ;AAED;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,IAAI;IACL,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;gBAFV,IAAI,EAAE,cAAc,EACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM;IAEpB,IAAI;IAIJ;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,YAAY;CAQnE;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ,GAC1B,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,EAClC,IAAI,EAAE,YAAY,EAAE,EACpB,IAAI,EAAE,cAAc,GACnB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EACrC,IAAI,EAAE,UAAU,CAAC,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC9B,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,eAAe,GAAG,IAAI,GACnD,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAsDrB"}