cloesce 0.0.4-unstable.5 → 0.0.4-unstable.6

package/dist/router/router.js

@@ -1,6 +1,7 @@
-import { left, right, isNullableType, getNavigationPropertyCidlType, NO_DATA_SOURCE, } from "../common.js";
+import { 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";
 /**
  * Singleton instance containing the cidl, constructor registry, and wasm binary.
  * These values are guaranteed to never change throughout a workers lifetime.
@@ -49,10 +50,10 @@ export async function cloesce(request, env, ast, app, constructorRegistry, envMe
     //#endregion
     //#region Match the route to a model method
     const route = matchRoute(request, ast, apiRoute);
-    if (!route.ok) {
+    if (route.isLeft()) {
         return toResponse(route.value);
     }
-    const { method, model, id } = route.value;
+    const { method, model, id } = route.unwrap();
     //#endregion
     //#region Model Middleware
     for (const m of app.model.get(model.name) ?? []) {
@@ -64,10 +65,10 @@ export async function cloesce(request, env, ast, app, constructorRegistry, envMe
     //#endregion
     //#region Validate request body to the model method
     const validation = await validateRequest(request, ast, model, method, id);
-    if (!validation.ok) {
+    if (validation.isLeft()) {
         return toResponse(validation.value);
     }
-    const { params, dataSource } = validation.value;
+    const { params, dataSource } = validation.unwrap();
     //#endregion
     //#region Method Middleware
     for (const m of app.method.get(model.name)?.get(method.name) ?? []) {
@@ -80,20 +81,17 @@ export async function cloesce(request, env, ast, app, constructorRegistry, envMe
     //#region Instantatiate the model
     const crudCtx = await (async () => {
         if (method.is_static) {
-            return right(CrudContext.fromCtor(d1, constructorRegistry[model.name]));
+            return Either.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]));
+        return hydratedModel.map((_) => CrudContext.fromInstance(d1, hydratedModel.value, constructorRegistry[model.name]));
     })();
-    if (!crudCtx.ok) {
+    if (crudCtx.isLeft()) {
         return toResponse(crudCtx.value);
     }
     //#endregion
-    return toResponse(await methodDispatch(crudCtx.value, ir, method, params));
+    return toResponse(await methodDispatch(crudCtx.unwrap(), ir, method, params));
 }
 /**
  * Matches a request to a method on a model.
@@ -104,7 +102,7 @@ function matchRoute(request, ast, apiRoute) {
     const url = new URL(request.url);
     // 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 notFound = (e) => Either.left(errorState(404, `Path not found: ${e} ${url.pathname}`));
     const routeParts = url.pathname
         .slice(apiRoute.length)
         .split("/")
@@ -127,7 +125,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 +138,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(errorState(400, `Invalid Request Body: ${e}`));
     if (!method.is_static && id == null) {
         return invalidRequest("Id's are required for instantiated methods.");
     }
@@ -183,7 +181,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 +193,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(errorState(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 "${pk}" = ?`
-        : `SELECT * FROM "${model.name}" WHERE "${pk}" = ?`;
+    const missingRecord = Either.left(errorState(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).unwrap())
+            .bind(id)
+            .run();
         if (!records?.results) {
             return missingRecord;
         }
@@ -218,7 +218,7 @@ async function hydrateModel(constructorRegistry, d1, model, id, dataSource) {
     }
     // Hydrate
     const models = mapSql(constructorRegistry[model.name], records.results, model.data_sources[dataSource]?.tree ?? {}).value;
-    return right(models[0]);
+    return Either.right(models[0]);
 }
 /**
  * Calls a method on a model given a list of parameters.
@@ -326,6 +326,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;

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,7 +29,13 @@ 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.

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,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,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"}

package/dist/router/wasm.js

@@ -1,4 +1,4 @@
-import { left, right, } from "../common.js";
+import { Either } from "../common.js";
 import { RuntimeContainer } from "./router.js";
 // Requires the ORM binary to have been built
 import mod from "../orm.wasm";
@@ -41,6 +41,12 @@ export async function loadOrmWasm(ast, wasm) {
     // Intentionally leak `modelMeta`, it should exist for the programs lifetime.
     return wasmInstance.exports;
 }
+/**
+ * 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 function invokeOrmWasm(fn, args, wasm) {
     let resPtr;
     let resLen;
@@ -49,7 +55,7 @@ export function invokeOrmWasm(fn, args, wasm) {
         resPtr = wasm.get_return_ptr();
         resLen = wasm.get_return_len();
         const result = new TextDecoder().decode(new Uint8Array(wasm.memory.buffer, resPtr, resLen));
-        return failed ? left(result) : right(result);
+        return failed ? Either.left(result) : Either.right(result);
     }
     finally {
         args.forEach((a) => a.free());
@@ -68,11 +74,11 @@ export function mapSql(ctor, records, includeTree) {
         WasmResource.fromString(JSON.stringify(records), wasm),
         WasmResource.fromString(JSON.stringify(includeTree), wasm),
     ];
-    const jsonResults = invokeOrmWasm(wasm.object_relational_mapping, args, wasm);
-    if (!jsonResults.ok)
+    const jsonResults = invokeOrmWasm(wasm.map_sql, args, wasm);
+    if (jsonResults.isLeft())
         return jsonResults;
     const parsed = JSON.parse(jsonResults.value);
-    return right(parsed.map((obj) => instantiateDepthFirst(obj, ast.models[ctor.name], includeTree)));
+    return Either.right(parsed.map((obj) => instantiateDepthFirst(obj, ast.models[ctor.name], includeTree)));
     function instantiateDepthFirst(m, meta, includeTree) {
         m = Object.assign(new constructorRegistry[meta.name](), m);
         if (!includeTree) {

package/dist/ui/backend.d.ts

@@ -31,8 +31,6 @@ export declare const D1: ClassDecorator;
  * returned from a model method or API endpoint without being
  * treated as a database model.
  *
- * These are often used for DTOs or view models.
- *
  * Example:
  * ```ts
  * ＠PlainOldObject
@@ -40,6 +38,16 @@ export declare const D1: ClassDecorator;
  *   catFacts: string[];
  *   catNames: string[];
  * }
+ *
+ * // in a method...
+ * foo(): CatStuff {
+ *   return {
+ *    catFacts: ["cats sleep 16 hours a day"],
+ *   catNames: ["Whiskers", "Fluffy"]
+ *  };
+ *
+ * // which generates an API like:
+ * async function foo(): Promise<HttpResult<CatStuff>> { ... }
  * ```
  */
 export declare const PlainOldObject: ClassDecorator;
@@ -110,11 +118,8 @@ export declare const DELETE: MethodDecorator;
 /**
  * Declares a static property as a data source.
  *
- * Data sources describe SQL view definitions (joins) for
- * model relationships. They define which related models
- * are automatically included when querying. Data sources
- * can only reference navigation properties, not scalar
- * attributes.
+ * Data sources describe SQL left joins related to each
+ * models navigation properties.
  *
  * Example:
  * ```ts
@@ -137,27 +142,17 @@ export declare const DELETE: MethodDecorator;
  *   @OneToOne("dogId")
  *   dog: Dog | undefined;
  *
- *   // 👇 Defines a data source that joins the related Dog record
  *   ＠DataSource
  *   static readonly default: IncludeTree<Person> = {
- *     dog: {},
+ *     dog: {}, // join Dog table when querying Person with `default` data source
  *   };
  * }
  *
- * // The above will generate an SQL view similar to:
- * // CREATE VIEW "Person.default" AS
- * // SELECT
- * //   "Person"."id" AS "id",
- * //   "Person"."dogId" AS "dogId",
- * //   "Dog"."id" AS "dog.id",
- * //   "Dog"."name" AS "dog.name"
- * // FROM "Person"
- * // LEFT JOIN "Dog" ON "Person"."dogId" = "Dog"."id";
- *
  * // When queried via the ORM or client API:
  * const orm = Orm.fromD1(env.db);
- * const people = (await orm.list(Person, "default")).value;
- * // Each Person instance will now include a populated .dog property.
+ * const people = await orm.list(Person, Person.default);
+ *
+ * // => Person { id: 1, dogId: 2, dog: { id: 2, name: "Fido" } }[]
  * ```
  */
 export declare const DataSource: PropertyDecorator;
@@ -173,7 +168,7 @@ export declare const DataSource: PropertyDecorator;
  * dogs: Dog[];
  * ```
  */
-export declare const OneToMany: (_: string) => PropertyDecorator;
+export declare const OneToMany: (_foreignKeyColumn: string) => PropertyDecorator;
 /**
  * Declares a one-to-one relationship between models.
  *
@@ -186,7 +181,7 @@ export declare const OneToMany: (_: string) => PropertyDecorator;
  * dog: Dog | undefined;
  * ```
  */
-export declare const OneToOne: (_: string) => PropertyDecorator;
+export declare const OneToOne: (_foreignKeyColumn: string) => PropertyDecorator;
 /**
  * Declares a many-to-many relationship between models.
  *
@@ -199,7 +194,7 @@ export declare const OneToOne: (_: string) => PropertyDecorator;
  * courses: Course[];
  * ```
  */
-export declare const ManyToMany: (_: string) => PropertyDecorator;
+export declare const ManyToMany: (_uniqueId: string) => PropertyDecorator;
 /**
  * Declares a foreign key relationship between models.
  * Directly translates to a SQLite foreign key.
@@ -214,13 +209,16 @@ export declare const ManyToMany: (_: string) => PropertyDecorator;
  * dogId: number;
  * ```
  */
-export declare const ForeignKey: <T>(_: T | string) => PropertyDecorator;
+export declare const ForeignKey: <T>(_Model: T | string) => PropertyDecorator;
 /**
  * Marks a method parameter for dependency injection.
  *
  * Injected parameters can receive environment bindings,
  * middleware-provided objects, or other registered values.
  *
+ * Note that injected parameters will not appear in the client
+ * API.
+ *
  * Example:
  * ```ts
  * ＠POST
@@ -240,14 +238,13 @@ export declare const Inject: ParameterDecorator;
  * client bindings automatically, removing the need to manually
  * define common API operations.
  *
- * Supported kinds:
- * - **"SAVE"** — Performs an *upsert* (insert or update) for a model instance.
+ * CRUD Operations:
+ * - **"SAVE"** — Performs an *upsert* (insert, update, or both) for a model instance.
  * - **"GET"** — Retrieves a single record by its primary key, optionally using a `DataSource`.
  * - **"LIST"** — Retrieves all records for the model, using the specified `DataSource`.
- * - **(future)** `"DELETE"` — Will remove a record by primary key once implemented.
  *
  * The generated methods are static, exposed through both the backend
- * (Worker endpoints) and the frontend client API.
+ * and the frontend client API.
  *
  * Example:
  * ```ts
@@ -257,11 +254,6 @@ export declare const Inject: ParameterDecorator;
  *   ＠PrimaryKey id: number;
  *   name: string;
  * }
- *
- * // Generated methods (conceptually):
- * // static async save(item: CrudHaver): Promise<HttpResult<CrudHaver>>
- * // static async get(id: number, dataSource?: string): Promise<HttpResult<CrudHaver>>
- * // static async list(dataSource?: string): Promise<HttpResult<CrudHaver[]>>
  * ```
  */
 export declare const CRUD: (_kinds: CrudKind[]) => ClassDecorator;
@@ -301,8 +293,7 @@ export type IncludeTree<T> = (T extends Primitive ? never : {
  * Represents the name of a `＠DataSource` available on a model type `T`,
  * or `"none"` when no data source (no joins) should be applied.
  *
- * This type is used by ORM and CRUD methods to restrict valid
- * data source names to the actual static properties declared on the model.
+ * All instantiated model methods implicitly have a Data Source param `__dataSource`.
  *
  * Example:
  * ```ts
@@ -312,10 +303,15 @@ export type IncludeTree<T> = (T extends Primitive ? never : {
  *
  *   ＠DataSource
  *   static readonly default: IncludeTree<Person> = { dogs: {} };
+ *
+ *   ＠POST
+ *   foo(ds: DataSourceOf<Person>) {
+ *    // Cloesce won't append an implicit data source param here since it's explicit
+ *   }
  * }
  *
- * type DS = DataSourceOf<Person>;
- * // => "default" | "none"
+ * // on the API client:
+ * async foo(ds: "default" | "none"): Promise<void> {...}
  * ```
  */
 export type DataSourceOf<T extends object> = (KeysOfType<T, IncludeTree<T>> | "none") & {
@@ -342,22 +338,7 @@ export type Integer = number & {
     __brand?: "Integer";
 };
 /**
- * Provides helper methods for performing ORM operations against a D1 database.
- *
- * The `Orm` class uses the Cloesce metadata system to generate, execute,
- * and map SQL queries for model classes decorated with `＠D1`.
- *
- * Typical operations include:
- * - `fromD1(db)` — create an ORM instance bound to a `D1Database`
- * - `upsert()` — insert or update a model
- * - `list()` — fetch all instances of a model
- * - `get()` — fetch one instance by primary key
- *
- * Example:
- * ```ts
- * const orm = Orm.fromD1(env.db);
- * const horses = (await orm.list(Horse, "default")).value;
- * ```
+ * Exposes the ORM primitives Cloesce uses to interact with D1 databases.
  */
 export declare class Orm {
     private db;
@@ -376,28 +357,16 @@ export declare class Orm {
      * @param includeTree Include tree to define the relationships to join.
      */
     static mapSql<T extends object>(ctor: new () => T, records: Record<string, any>[], includeTree?: IncludeTree<T> | null): Either<string, T[]>;
-    /**
-     * Returns a SQL query to insert a model into the database. Uses an IncludeTree as a guide for
-     * foreign key relationships, only inserting the explicitly stated pattern in the tree.
-     *
-     * TODO: We should be able to leave primary keys and foreign keys undefined, with
-     * primary keys being auto incremented and foreign keys being assumed by navigation property
-     * context.
-     *
-     * @param ctor A model constructor.
-     * @param newModel The new model to insert.
-     * @param includeTree An include tree describing which foreign keys to join.
-     * @returns Either an error string, or the insert query string.
-     */
-    static upsertQuery<T extends object>(ctor: new () => T, newModel: DeepPartial<T>, includeTree?: IncludeTree<T> | null): Either<string, string>;
     /**
      * Executes an "upsert" query, adding or augmenting a model in the database.
+     *
      * If a model's primary key is not defined in `newModel`, the query is assumed to be an insert.
+     *
      * If a model's primary key _is_ defined, but some attributes are missing, the query is assumed to be an update.
+     *
      * Finally, if the primary key is defined, but all attributes are included, a SQLite upsert will be performed.
      *
-     * Capable of inferring foreign keys from the surrounding context of the model. A missing primary key is allowed
-     * only if the primary key is an integer, in which case it will be auto incremented and assigned.
+     * In any other case, an error string will be returned.
      *
      * ### Inserting a new Model
      * ```ts
@@ -433,23 +402,112 @@ export declare class Orm {
      */
     upsert<T extends object>(ctor: new () => T, newModel: DeepPartial<T>, includeTree?: IncludeTree<T> | null): Promise<Either<string, any>>;
     /**
-     * Returns a query of the form `SELECT * FROM [Model.DataSource]`
+     * Returns a select query, creating a CTE view for the model using the provided include tree.
+     *
+     * @param ctor The model constructor.
+     * @param includeTree An include tree describing which related models to join.
+     * @param from An optional custom `FROM` clause to use instead of the base table.
+     * @param tagCte An optional CTE name to tag the query with. Defaults to "Model.view".
+     *
+     * ### Example:
+     * ```ts
+     * // Using a data source
+     * const query = Orm.listQuery(Person, "default");
+     *
+     * // Using a custom from statement
+     * const query = Orm.listQuery(Person, null, "SELECT * FROM Person WHERE age > 18");
+     * ```
+     *
+     * ### Example SQL output:
+     * ```sql
+     * WITH Person_view AS (
+     * SELECT
+     * "Person"."id" AS "id",
+     * ...
+     * FROM "Person"
+     * LEFT JOIN ...
+     * )
+     * SELECT * FROM Person_view
+     * ```
      */
-    static listQuery<T extends object>(ctor: new () => T, includeTree?: KeysOfType<T, IncludeTree<T>> | null): string;
+    static listQuery<T extends object>(ctor: new () => T, opts: {
+        includeTree?: IncludeTree<T> | null;
+        from?: string;
+        tagCte?: string;
+    }): Either<string, string>;
     /**
-     * Returns a query of the form `SELECT * FROM [Model.DataSource] WHERE [PrimaryKey] = ?`.
-     * Requires the id parameter to be bound (use db.prepare().bind)
+     * Returns a select query for a single model by primary key, creating a CTE view using the provided include tree.
+     *
+     * @param ctor The model constructor.
+     * @param includeTree An include tree describing which related models to join.
+     *
+     * ### Example:
+     * ```ts
+     * // Using a data source
+     * const query = Orm.getQuery(Person, "default");
+     * ```
+     *
+     * ### Example SQL output:
+     *
+     * ```sql
+     * WITH Person_view AS (
+     * SELECT
+     * "Person"."id" AS "id",
+     * ...
+     * FROM "Person"
+     * LEFT JOIN ...
+     * )
+     * SELECT * FROM Person_view WHERE [Person].[id] = ?
+     * ```
      */
-    static getQuery<T extends object>(ctor: new () => T, includeTree?: KeysOfType<T, IncludeTree<T>> | null): string;
+    static getQuery<T extends object>(ctor: new () => T, includeTree?: IncludeTree<T> | null): Either<string, string>;
     /**
-     * Executes a query of the form `SELECT * FROM [Model.DataSource]`, returning all results
-     * as instantiated models.
+     * Retrieves all instances of a model from the database.
+     * @param ctor The model constructor.
+     * @param includeTree An include tree describing which related models to join.
+     * @param from An optional custom `FROM` clause to use instead of the base table.
+     * @returns Either an error string, or an array of model instances.
+     *
+     * ### Example:
+     * ```ts
+     * const orm = Orm.fromD1(env.db);
+     * const horses = await orm.list(Horse, Horse.default);
+     * ```
+     *
+     * ### Example with custom from:
+     * ```ts
+     * const orm = Orm.fromD1(env.db);
+     * const adultHorses = await orm.list(Horse, Horse.default, "SELECT * FROM Horse ORDER BY age DESC LIMIT 10");
+     * ```
+     *
+     * =>
+     *
+     * ```sql
+     * SELECT
+     *  "Horse"."id" AS "id",
+     * ...
+     * FROM (SELECT * FROM Horse ORDER BY age DESC LIMIT 10)
+     * LEFT JOIN ...
+     * ```
+     *
      */
-    list<T extends object>(ctor: new () => T, includeTreeKey?: KeysOfType<T, IncludeTree<T>> | null): Promise<Either<string, T[]>>;
+    list<T extends object>(ctor: new () => T, opts: {
+        includeTree?: IncludeTree<T> | null;
+        from?: string;
+    }): Promise<Either<string, T[]>>;
     /**
-     * Executes a query of the form `SELECT * FROM [Model.DataSource] WHERE [Model.PrimaryKey] = ?`
-     * returning all results as instantiated models.
+     * Retrieves a single model by primary key.
+     * @param ctor The model constructor.
+     * @param id The primary key value.
+     * @param includeTree An include tree describing which related models to join.
+     * @returns Either an error string, or the model instance (null if not found).
+     *
+     * ### Example:
+     * ```ts
+     * const orm = Orm.fromD1(env.db);
+     * const horse = await orm.get(Horse, 1, Horse.default);
+     * ```
      */
-    get<T extends object>(ctor: new () => T, id: any, includeTreeKey?: KeysOfType<T, IncludeTree<T>> | null): Promise<Either<string, T>>;
+    get<T extends object>(ctor: new () => T, id: any, includeTree?: IncludeTree<T> | null): Promise<Either<string, T | null>>;
 }
 //# sourceMappingURL=backend.d.ts.map

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":"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"}