cloesce 0.0.5-unstable.4 → 0.0.5-unstable.6

package/dist/router/router.d.ts

@@ -1,7 +1,7 @@
 import { OrmWasmExports } from "./wasm.js";
-import { HttpResult } from "../ui/backend.js";
-import { Either, KeysOfType } from "../ui/common.js";
 import { CloesceAst, Model, ApiMethod, Service } from "../ast.js";
+import { Either } from "../common.js";
+import { KeysOfType, HttpResult } from "../ui/backend.js";
 /**
  * Dependency injection container, mapping an object type name to an instance of that object.
  *
@@ -15,7 +15,7 @@ export type DependencyContainer = Map<string, any>;
  */
 export type ConstructorRegistry = Record<string, new () => any>;
 /**
- * Singleton instance containing the cidl, constructor registry, and wasm binary.
+ * Singleton instance containing the CIDL, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
  */
 export declare class RuntimeContainer {
@@ -45,44 +45,34 @@ export declare enum RouterError {
     UnknownPrefix = 0,
     UnknownRoute = 1,
     UnmatchedHttpVerb = 2,
-    InstantiatedMethodMissingId = 3,
-    RequestMissingBody = 4,
-    RequestBodyMissingParameters = 5,
-    RequestBodyInvalidParameter = 6,
-    InstantiatedMethodMissingDataSource = 7,
-    MissingDependency = 8,
-    InvalidDatabaseQuery = 9,
-    ModelNotFound = 10,
-    UncaughtException = 11
+    InstantiatedMethodMissingPrimaryKey = 3,
+    InstantiatedMethodMissingKeyParam = 4,
+    RequestMissingBody = 5,
+    RequestBodyMissingParameters = 6,
+    RequestBodyInvalidParameter = 7,
+    InstantiatedMethodMissingDataSource = 8,
+    MissingDependency = 9,
+    InvalidDatabaseQuery = 10,
+    ModelNotFound = 11,
+    UncaughtException = 12
 }
 export declare class CloesceApp {
     routePrefix: string;
+    static init(ast: CloesceAst, ctorReg: ConstructorRegistry): Promise<CloesceApp>;
     private globalMiddleware;
     /**
-     * Registers global middleware which runs before any route matching.
+     * Registers global middleware that runs before all requests.
      *
-     * TODO: Middleware may violate the API contract and return unexpected types
-     *
-     * @param m - The middleware function to register.
-     */
-    onRequest(m: MiddlewareFn): void;
-    private resultMiddleware;
-    /**
-     * 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.
+     * Runs before namespace middleware, request validation, and method middleware.
      *
      * TODO: Middleware may violate the API contract and return unexpected types
      *
      * @param m - The middleware function to register.
      */
-    onResult(m: ResultMiddlewareFn): void;
+    onRun(m: MiddlewareFn): void;
     private namespaceMiddleware;
     /**
-     * Registers middleware for a specific namespace (being, a model or service)
+     * Registers middleware for a specific namespace (model or service)
      *
      * Runs before request validation and method middleware.
      *
@@ -111,13 +101,14 @@ export declare class CloesceApp {
     /**
      * Runs the Cloesce app. Intended to be called from the generated workers code.
      */
-    run(request: Request, env: any, ast: CloesceAst, ctorReg: ConstructorRegistry): Promise<Response>;
+    run(request: Request, env: any): Promise<Response>;
 }
 export type MatchedRoute = {
     kind: "model" | "service";
     namespace: string;
     method: ApiMethod;
-    id: string | null;
+    primaryKey: string | null;
+    keyParams: Record<string, string>;
     model?: Model;
     service?: Service;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAuB,MAAM,WAAW,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAoB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EACL,UAAU,EACV,KAAK,EACL,SAAS,EAET,OAAO,EAER,MAAM,WAAW,CAAC;AAGnB;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEnD;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,CAAC;AAEhE;;;GAGG;AACH,qBAAa,gBAAgB;aAGT,GAAG,EAAE,UAAU;aACf,mBAAmB,EAAE,mBAAmB;aACxC,IAAI,EAAE,cAAc;IAJtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO;WAMM,IAAI,CACf,GAAG,EAAE,UAAU,EACf,mBAAmB,EAAE,mBAAmB,EACxC,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ;IAO7B,MAAM,CAAC,GAAG,IAAI,gBAAgB;IAI9B;;OAEG;IACH,MAAM,CAAC,OAAO;CAGf;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG,CACzB,EAAE,EAAE,mBAAmB,KACpB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;AAEhC,MAAM,MAAM,kBAAkB,GAAG,CAC/B,EAAE,EAAE,mBAAmB,EACvB,MAAM,EAAE,UAAU,KACf,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;AAEhC;;GAEG;AACH,oBAAY,WAAW;IACrB,aAAa,IAAA;IACb,YAAY,IAAA;IACZ,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,IAAA;IAClB,4BAA4B,IAAA;IAC5B,2BAA2B,IAAA;IAC3B,mCAAmC,IAAA;IACnC,iBAAiB,IAAA;IACjB,oBAAoB,IAAA;IACpB,aAAa,KAAA;IACb,iBAAiB,KAAA;CAClB;AAED,qBAAa,UAAU;IACd,WAAW,EAAE,MAAM,CAAS;IAEnC,OAAO,CAAC,gBAAgB,CAAsB;IAE9C;;;;;;OAMG;IACI,SAAS,CAAC,CAAC,EAAE,YAAY;IAIhC,OAAO,CAAC,gBAAgB,CAA4B;IAEpD;;;;;;;;;;;OAWG;IACI,QAAQ,CAAC,CAAC,EAAE,kBAAkB;IAIrC,OAAO,CAAC,mBAAmB,CAA0C;IAErE;;;;;;;;;;OAUG;IACI,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,YAAY;IAQxD,OAAO,CAAC,gBAAgB,CACZ;IAEZ;;;;;;;;;;;OAWG;IACI,QAAQ,CAAC,CAAC,EACf,IAAI,EAAE,UAAU,CAAC,EACjB,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,EAC5C,CAAC,EAAE,YAAY;YAcH,MAAM;IAqFpB;;OAEG;IACU,GAAG,CACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,QAAQ,CAAC;CAuErB;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,CAAC;IAClB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,iBAAS,UAAU,CACjB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CA6DlC;AAED;;;;GAIG;AACH,iBAAe,eAAe,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,YAAY,GAClB,OAAO,CACR,MAAM,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAC3E,CAkFA;AAgED;;;GAGG;AACH,iBAAe,cAAc,CAC3B,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,mBAAmB,EACvB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CA2C9B;AAaD;;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,11 +1,11 @@
-import { mapSql, loadOrmWasm } from "./wasm.js";
+import { loadOrmWasm } from "./wasm.js";
 import { proxyCrud } from "./crud.js";
-import { HttpResult, Orm } from "../ui/backend.js";
-import { Either } from "../ui/common.js";
 import { NO_DATA_SOURCE, MediaType, } from "../ast.js";
 import { RuntimeValidator } from "./validator.js";
+import { Either, InternalError } from "../common.js";
+import { Orm, HttpResult } from "../ui/backend.js";
 /**
- * Singleton instance containing the cidl, constructor registry, and wasm binary.
+ * Singleton instance containing the CIDL, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
  */
 export class RuntimeContainer {
@@ -42,48 +42,39 @@ export var RouterError;
     RouterError[RouterError["UnknownPrefix"] = 0] = "UnknownPrefix";
     RouterError[RouterError["UnknownRoute"] = 1] = "UnknownRoute";
     RouterError[RouterError["UnmatchedHttpVerb"] = 2] = "UnmatchedHttpVerb";
-    RouterError[RouterError["InstantiatedMethodMissingId"] = 3] = "InstantiatedMethodMissingId";
-    RouterError[RouterError["RequestMissingBody"] = 4] = "RequestMissingBody";
-    RouterError[RouterError["RequestBodyMissingParameters"] = 5] = "RequestBodyMissingParameters";
-    RouterError[RouterError["RequestBodyInvalidParameter"] = 6] = "RequestBodyInvalidParameter";
-    RouterError[RouterError["InstantiatedMethodMissingDataSource"] = 7] = "InstantiatedMethodMissingDataSource";
-    RouterError[RouterError["MissingDependency"] = 8] = "MissingDependency";
-    RouterError[RouterError["InvalidDatabaseQuery"] = 9] = "InvalidDatabaseQuery";
-    RouterError[RouterError["ModelNotFound"] = 10] = "ModelNotFound";
-    RouterError[RouterError["UncaughtException"] = 11] = "UncaughtException";
+    RouterError[RouterError["InstantiatedMethodMissingPrimaryKey"] = 3] = "InstantiatedMethodMissingPrimaryKey";
+    RouterError[RouterError["InstantiatedMethodMissingKeyParam"] = 4] = "InstantiatedMethodMissingKeyParam";
+    RouterError[RouterError["RequestMissingBody"] = 5] = "RequestMissingBody";
+    RouterError[RouterError["RequestBodyMissingParameters"] = 6] = "RequestBodyMissingParameters";
+    RouterError[RouterError["RequestBodyInvalidParameter"] = 7] = "RequestBodyInvalidParameter";
+    RouterError[RouterError["InstantiatedMethodMissingDataSource"] = 8] = "InstantiatedMethodMissingDataSource";
+    RouterError[RouterError["MissingDependency"] = 9] = "MissingDependency";
+    RouterError[RouterError["InvalidDatabaseQuery"] = 10] = "InvalidDatabaseQuery";
+    RouterError[RouterError["ModelNotFound"] = 11] = "ModelNotFound";
+    RouterError[RouterError["UncaughtException"] = 12] = "UncaughtException";
 })(RouterError || (RouterError = {}));
 export class CloesceApp {
     routePrefix = "api";
-    globalMiddleware = [];
-    /**
-     * Registers global middleware which runs before any route matching.
-     *
-     * TODO: Middleware may violate the API contract and return unexpected types
-     *
-     * @param m - The middleware function to register.
-     */
-    onRequest(m) {
-        this.globalMiddleware.push(m);
+    static async init(ast, ctorReg) {
+        await RuntimeContainer.init(ast, ctorReg);
+        return new CloesceApp();
     }
-    resultMiddleware = [];
+    globalMiddleware = [];
     /**
-     * Registers middleware which runs after the response is generated, but before
-     * it is returned to the client.
+     * Registers global middleware that runs before all requests.
      *
-     * Optionally, return a new HttpResult to short-circuit the response.
-     *
-     * Errors thrown in response middleware are caught and returned as a 500 response.
+     * Runs before namespace middleware, request validation, and method middleware.
      *
      * TODO: Middleware may violate the API contract and return unexpected types
      *
      * @param m - The middleware function to register.
      */
-    onResult(m) {
-        this.resultMiddleware.push(m);
+    onRun(m) {
+        this.globalMiddleware.push(m);
     }
     namespaceMiddleware = new Map();
     /**
-     * Registers middleware for a specific namespace (being, a model or service)
+     * Registers middleware for a specific namespace (model or service)
      *
      * Runs before request validation and method middleware.
      *
@@ -94,12 +85,12 @@ export class CloesceApp {
      * @param m - The middleware function to register.
      */
     onNamespace(ctor, m) {
-        if (this.namespaceMiddleware.has(ctor.name)) {
-            this.namespaceMiddleware.get(ctor.name).push(m);
-        }
-        else {
-            this.namespaceMiddleware.set(ctor.name, [m]);
+        const existing = this.namespaceMiddleware.get(ctor.name);
+        if (existing) {
+            existing.push(m);
+            return;
         }
+        this.namespaceMiddleware.set(ctor.name, [m]);
     }
     methodMiddleware = new Map();
     /**
@@ -115,14 +106,17 @@ export class CloesceApp {
      * @param m - The middleware function to register.
      */
     onMethod(ctor, method, m) {
-        if (!this.methodMiddleware.has(ctor.name)) {
-            this.methodMiddleware.set(ctor.name, new Map());
+        let classMap = this.methodMiddleware.get(ctor.name);
+        if (!classMap) {
+            classMap = new Map();
+            this.methodMiddleware.set(ctor.name, classMap);
         }
-        const methods = this.methodMiddleware.get(ctor.name);
-        if (!methods.has(method)) {
-            methods.set(method, []);
+        let methodArray = classMap.get(method);
+        if (!methodArray) {
+            methodArray = [];
+            classMap.set(method, methodArray);
         }
-        methods.get(method).push(m);
+        methodArray.push(m);
     }
     async router(request, env, ast, ctorReg, di) {
         // Global middleware
@@ -138,7 +132,7 @@ export class CloesceApp {
             return routeRes.value;
         }
         const route = routeRes.unwrap();
-        // Model middleware
+        // Namespace middleware
         for (const m of this.namespaceMiddleware.get(route.namespace) ?? []) {
             const res = await m(di);
             if (res) {
@@ -161,23 +155,7 @@ export class CloesceApp {
             }
         }
         // Hydration
-        const hydrated = await (async () => {
-            if (route.kind == "model") {
-                // TODO: Support multiple D1 bindings
-                // It's been verified by the compiler that wrangler_env exists if a D1 model is present
-                const d1 = env[ast.wrangler_env.db_binding];
-                // Proxy CRUD
-                if (route.method.is_static) {
-                    return Either.right(proxyCrud(ctorReg[route.namespace], ctorReg[route.namespace], d1));
-                }
-                return await hydrateModelD1(ctorReg, d1, route.model, route.id, dataSource);
-            }
-            // Services
-            if (route.method.is_static) {
-                return Either.right(ctorReg[route.namespace]);
-            }
-            return Either.right(di.get(route.namespace));
-        })();
+        const hydrated = await hydrate(di, ctorReg, route, dataSource, env);
         if (hydrated.isLeft()) {
             return hydrated.value;
         }
@@ -187,8 +165,8 @@ export class CloesceApp {
     /**
      * Runs the Cloesce app. Intended to be called from the generated workers code.
      */
-    async run(request, env, ast, ctorReg) {
-        await RuntimeContainer.init(ast, ctorReg);
+    async run(request, env) {
+        const { ast, constructorRegistry: ctorReg } = RuntimeContainer.get();
         const di = new Map();
         if (ast.wrangler_env) {
             di.set(ast.wrangler_env.name, env);
@@ -196,11 +174,12 @@ export class CloesceApp {
         di.set("Request", request);
         // Note: Services are in topological order
         for (const name in ast.services) {
-            const service = ast.services[name];
-            for (const attr of service.attributes) {
-                const injected = di.get(attr.injected);
+            const serviceMeta = ast.services[name];
+            const service = {};
+            for (const attr of serviceMeta.attributes) {
+                const injected = di.get(attr.inject_reference);
                 if (!injected) {
-                    return exit(500, RouterError.MissingDependency, `An injected parameter was missing from the instance registry: ${JSON.stringify(attr.injected)}`)
+                    return exit(500, RouterError.MissingDependency, `An injected parameter was missing from the instance registry: ${JSON.stringify(attr.inject_reference)}`)
                         .unwrapLeft()
                         .toResponse();
                 }
@@ -210,13 +189,10 @@ export class CloesceApp {
             di.set(name, Object.assign(new ctorReg[name](), service));
         }
         try {
-            let httpResult = await this.router(request, env, ast, ctorReg, di);
-            // Response middleware
-            for (const m of this.resultMiddleware) {
-                const res = await m(di, httpResult);
-                if (res) {
-                    return res.toResponse();
-                }
+            const httpResult = await this.router(request, env, ast, ctorReg, di);
+            // Log any 500 errors
+            if (httpResult.status === 500) {
+                console.error("A caught error occurred in the Cloesce Router: ", httpResult.message);
             }
             return httpResult.toResponse();
         }
@@ -262,10 +238,12 @@ function matchRoute(request, ast, routePrefix) {
     if (parts.length < 2) {
         return notFound(RouterError.UnknownPrefix);
     }
-    // Extract pattern
+    // Route format: /{namespace}/...{id}/{method}
     const namespace = parts[0];
     const methodName = parts[parts.length - 1];
-    const id = parts.length === 3 ? parts[1] : null;
+    const id = parts.length > 2
+        ? parts.slice(1, parts.length - 1).map(decodeURIComponent)
+        : [];
     const model = ast.models[namespace];
     if (model) {
         const method = model.methods[methodName];
@@ -274,19 +252,25 @@ function matchRoute(request, ast, routePrefix) {
         if (request.method !== method.http_verb) {
             return notFound(RouterError.UnmatchedHttpVerb);
         }
+        const hasPrimaryKey = model.primary_key !== null;
+        const offset = hasPrimaryKey ? 1 : 0;
+        const primaryKey = hasPrimaryKey ? (id.at(0) ?? null) : null;
+        const keyParams = Object.fromEntries(id
+            .slice(offset)
+            .map((v, i) => [model.key_params[i], decodeURIComponent(v)]));
         return Either.right({
             kind: "model",
             namespace,
             method,
             model,
-            id,
+            primaryKey,
+            keyParams,
         });
     }
     const service = ast.services[namespace];
     if (service) {
         const method = service.methods[methodName];
-        // Services do not have IDs.
-        if (!method || id)
+        if (!method || id.length > 0)
             return notFound(RouterError.UnknownRoute);
         if (request.method !== method.http_verb) {
             return notFound(RouterError.UnmatchedHttpVerb);
@@ -296,7 +280,8 @@ function matchRoute(request, ast, routePrefix) {
             namespace,
             method,
             service,
-            id: null,
+            primaryKey: null,
+            keyParams: {},
         });
     }
     return notFound(RouterError.UnknownRoute);
@@ -309,9 +294,20 @@ function matchRoute(request, ast, routePrefix) {
 async function validateRequest(request, ast, ctorReg, route) {
     // Error state: any missing parameter, body, or malformed input will exit with 400.
     const invalidRequest = (c) => exit(400, c, "Invalid Request Body");
-    // Models must have an ID on instantiated methods.
-    if (route.kind === "model" && !route.method.is_static && route.id == null) {
-        return invalidRequest(RouterError.InstantiatedMethodMissingId);
+    // Validate instantiated model ids
+    if (route.kind === "model" && !route.method.is_static) {
+        const model = route.model;
+        if (model.primary_key !== null && route.primaryKey === null) {
+            return invalidRequest(RouterError.InstantiatedMethodMissingPrimaryKey);
+        }
+        if (model.key_params.length !== Object.keys(route.keyParams).length) {
+            return invalidRequest(RouterError.InstantiatedMethodMissingKeyParam);
+        }
+        for (const keyParam of model.key_params) {
+            if (!(keyParam in route.keyParams)) {
+                return invalidRequest(RouterError.InstantiatedMethodMissingKeyParam);
+            }
+        }
     }
     // Filter out injected parameters
     const requiredParams = route.method.parameters.filter((p) => !(typeof p.cidl_type === "object" && "Inject" in p.cidl_type));
@@ -334,7 +330,7 @@ async function validateRequest(request, ast, ctorReg, route) {
                     break;
                 }
                 default: {
-                    throw new Error("not implemented");
+                    throw new InternalError("not implemented");
                 }
             }
         }
@@ -345,8 +341,7 @@ async function validateRequest(request, ast, ctorReg, route) {
     if (!requiredParams.every((p) => p.name in params)) {
         return invalidRequest(RouterError.RequestBodyMissingParameters);
     }
-    // Validate all parameters type
-    // Octet streams can be passed as is
+    // Validate all parameters type. Octet streams need no validation.
     if (route.method.parameters_media !== MediaType.Octet) {
         for (const p of requiredParams) {
             const res = RuntimeValidator.validate(params[p.name], p.cidl_type, ast, ctorReg);
@@ -361,50 +356,55 @@ async function validateRequest(request, ast, ctorReg, route) {
         .filter((p) => typeof p.cidl_type === "object" &&
         "DataSource" in p.cidl_type &&
         p.cidl_type.DataSource === route.namespace)
-        .map((p) => params[p.name])[0];
-    if (route.kind === "model" && !route.method.is_static && !dataSource) {
+        .map((p) => params[p.name])
+        .at(0);
+    if (route.kind === "model" &&
+        !route.method.is_static &&
+        dataSource === undefined) {
         return invalidRequest(RouterError.InstantiatedMethodMissingDataSource);
     }
     return Either.right({ params, dataSource: dataSource ?? null });
 }
 /**
- * Queries D1 for a particular model's ID, then transforms the SQL column output into
- * an instance of a model using the provided include tree and metadata as a guide.
- * @returns 404 if no record was found for the provided ID
- * @returns 500 if the D1 database is not synced with Cloesce and yields an error
- * @returns The instantiated model on success
+ * Hydrates a model or service instance for method dispatch.
+ * @returns 500 or the hydrated instance
  */
-async function hydrateModelD1(constructorRegistry, d1, model, id, dataSource) {
+async function hydrate(di, ctorReg, route, dataSource, env) {
+    if (route.kind === "service") {
+        if (route.method.is_static) {
+            return Either.right(ctorReg[route.namespace]);
+        }
+        return Either.right(di.get(route.namespace));
+    }
+    const model = route.model;
+    const modelCtor = ctorReg[model.name];
+    // Static methods operate on the class itself, no hydration needed
+    if (route.method.is_static) {
+        return Either.right(proxyCrud(modelCtor, modelCtor, env));
+    }
+    const includeTree = dataSource === NO_DATA_SOURCE
+        ? null
+        : ctorReg[model.name][dataSource];
+    const orm = Orm.fromEnv(env);
     // Error state: If some outside force tweaked the database schema, the query may fail.
     // Otherwise, this indicates a bug in the compiler or runtime.
     const malformedQuery = (e) => exit(500, RouterError.InvalidDatabaseQuery, `Error in hydration query, is the database out of sync with the backend?: ${e instanceof Error ? e.message : String(e)}`);
-    // Query DB
-    let records;
     try {
-        let includeTree = dataSource === NO_DATA_SOURCE
-            ? null
-            : constructorRegistry[model.name][dataSource];
-        records = await d1
-            .prepare(Orm.getQuery(constructorRegistry[model.name], includeTree))
-            .bind(id)
-            .run();
-        // Error state: If no record is found for the id, return a 404
-        if (!records?.results) {
-            return exit(404, RouterError.ModelNotFound, "Record not found");
-        }
-        if (records.error) {
-            return malformedQuery(records.error);
+        const result = await orm.get(modelCtor, {
+            id: route.primaryKey,
+            includeTree,
+            keyParams: route.keyParams,
+        });
+        // Result will only be null if the instance does not exist
+        // for a D1 query.
+        if (result === null) {
+            return exit(404, RouterError.ModelNotFound, `Model instance of type ${model.name} with primary key ${route.primaryKey} not found`);
         }
+        return Either.right(result);
     }
     catch (e) {
-        return malformedQuery(e);
-    }
-    // Hydrate
-    const models = mapSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {});
-    if (models.isLeft()) {
-        return malformedQuery(models.value);
+        return malformedQuery(JSON.stringify(e));
     }
-    return Either.right(models.unwrap()[0]);
 }
 /**
  * Calls a method on a model given a list of parameters.

package/dist/router/validator.d.ts

@@ -1,6 +1,6 @@
 import { CidlType, CloesceAst } from "../ast";
-import { Either } from "../ui/common";
 import { ConstructorRegistry } from "./router";
+import { Either } from "../common";
 /**
  * Runtime type validation, asserting that the structure of a value follows the
  * correlated CidlType.

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

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/router/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EAIX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAW,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;gBADP,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB;IAGtC,MAAM,CAAC,QAAQ,CACb,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;IAIpB,OAAO,CAAC,OAAO;CA+KhB"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/router/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EAIX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAW,MAAM,WAAW,CAAC;AAK5C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;gBADP,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB;IAGtC,MAAM,CAAC,QAAQ,CACb,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,mBAAmB,GAC3B,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;IAIpB,OAAO,CAAC,OAAO;CA0OhB"}

package/dist/router/validator.js

@@ -1,5 +1,7 @@
 import { NO_DATA_SOURCE, getNavigationPropertyCidlType, isNullableType, } from "../ast";
-import { Either, b64ToU8 } from "../ui/common";
+import { Either, b64ToU8 } from "../common";
+import { KValue } from "../ui/backend";
+// TODO: Create a "cleaned" object only with the values checked, discarding any extra.
 /**
  * Runtime type validation, asserting that the structure of a value follows the
  * correlated CidlType.
@@ -27,6 +29,10 @@ export class RuntimeValidator {
         return new RuntimeValidator(ast, ctorReg).recurse(value, cidlType, false);
     }
     recurse(value, cidlType, isPartial) {
+        // JsonValue accepts anything
+        if (cidlType === "JsonValue") {
+            return Either.right(value);
+        }
         isPartial ||= typeof cidlType !== "string" && "Partial" in cidlType;
         if (value === undefined) {
             // We will let arrays be undefined and interpret that as an empty array.
@@ -92,7 +98,7 @@ export class RuntimeValidator {
                 return Either.left(null);
             const valueObj = value;
             // Validate + instantiate PK
-            {
+            if (model.primary_key !== null) {
                 const pk = model.primary_key;
                 const res = this.recurse(valueObj[pk.name], pk.cidl_type, isPartial);
                 if (res.isLeft()) {
@@ -101,8 +107,8 @@ export class RuntimeValidator {
                 value[pk.name] = res.unwrap();
             }
             // Validate + instantiate attributes
-            for (let i = 0; i < model.attributes.length; i++) {
-                const attr = model.attributes[i];
+            for (let i = 0; i < model.columns.length; i++) {
+                const attr = model.columns[i];
                 const res = this.recurse(valueObj[attr.value.name], attr.value.cidl_type, isPartial);
                 if (res.isLeft()) {
                     return res;
@@ -118,6 +124,44 @@ export class RuntimeValidator {
                 }
                 value[nav.var_name] = res.unwrap();
             }
+            // Validate KV Objects
+            for (let i = 0; i < model.kv_objects.length; i++) {
+                const kvObjMeta = model.kv_objects[i];
+                const kvObj = valueObj[kvObjMeta.value.name];
+                if (kvObj === undefined) {
+                    // only allowed if partial
+                    if (isPartial) {
+                        continue;
+                    }
+                    else {
+                        return Either.left(null);
+                    }
+                }
+                if (typeof kvObj !== "object") {
+                    return Either.left(null);
+                }
+                // value["raw"] should exist and be of type kvObj.value.cidl_type
+                const rawRes = this.recurse(kvObj.raw, kvObjMeta.value.cidl_type, isPartial);
+                if (rawRes.isLeft()) {
+                    return rawRes;
+                }
+                // if value["metadata"] exists, it should be a JsonValue
+                const metadataRes = this.recurse(kvObj.metadata, "JsonValue", isPartial);
+                if (metadataRes.isLeft()) {
+                    return metadataRes;
+                }
+                // key must exist and be a string
+                // TODO: validate it follows the format?
+                const keyRes = this.recurse(kvObj.key, "Text", isPartial);
+                if (keyRes.isLeft()) {
+                    return keyRes;
+                }
+                value[kvObjMeta.value.name] = Object.assign(new KValue(), {
+                    key: keyRes.unwrap(),
+                    raw: rawRes.unwrap(),
+                    metadata: metadataRes.unwrap(),
+                });
+            }
             // Don't instantiate partials
             if (isPartial) {
                 return Either.right(value);

package/dist/router/wasm.d.ts

@@ -1,8 +1,7 @@
-import { CidlIncludeTree, CloesceAst } from "../ast.js";
-import { IncludeTree } from "../ui/backend.js";
-import { Either } from "../ui/common.js";
+import { CloesceAst } from "../ast.js";
+import { Either } from "../common.js";
 /**
- * WASM ABI
+ * Cloesce WASM ABI
  */
 export interface OrmWasmExports {
     memory: WebAssembly.Memory;
@@ -11,21 +10,20 @@ export interface OrmWasmExports {
     set_meta_ptr(ptr: number, len: number): number;
     alloc(len: number): number;
     dealloc(ptr: number, len: number): void;
-    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;
+    select_model(model_name_ptr: number, model_name_len: number, from_ptr: number, from_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
+    map(model_name_ptr: number, model_name_len: number, d1_result_ptr: number, d1_result_len: number, include_tree_ptr: number, include_tree_len: number): boolean;
 }
-/**
- * RAII for wasm memory
- */
 export declare class WasmResource {
     private wasm;
     ptr: number;
     len: number;
-    constructor(wasm: OrmWasmExports, ptr: number, len: number);
+    private constructor();
     free(): void;
     /**
-     * Copies a value from TS memory to WASM memory. A subsequent `free` is necessary.
+     * Copies a value from TS memory to WASM memory.
+     *
+     * A subsequent call to `free` is necessary.
      */
     static fromString(str: string, wasm: OrmWasmExports): WasmResource;
 }
@@ -37,9 +35,4 @@ export declare function loadOrmWasm(ast: CloesceAst, wasm?: WebAssembly.Instance
  * 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 the object relational mapping function to turn a row of SQL records into
- * an instantiated object.
- */
-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