cloesce 0.0.5-unstable.1 → 0.0.5-unstable.2

package/dist/router/crud.d.ts

@@ -4,4 +4,4 @@ import { D1Database } from "@cloudflare/workers-types/experimental/index.js";
  * calling a default implementation.
  */
 export declare function proxyCrud(obj: any, ctor: any, d1: D1Database): any;
-//# sourceMappingURL=crud.d.ts.map
+//# sourceMappingURL=crud.d.ts.map

package/dist/router/crud.js

@@ -6,54 +6,55 @@ import { NO_DATA_SOURCE } from "../ast.js";
  * calling a default implementation.
  */
 export function proxyCrud(obj, ctor, d1) {
-  return new Proxy(obj, {
-    get(target, method) {
-      // If the instance defines the method, always use it (override allowed)
-      const value = Reflect.get(target, method);
-      if (typeof value === "function") {
-        return value.bind(target);
-      }
-      // Fallback to CRUD methods
-      if (method === "save") {
-        return (body, ds) => upsert(ctor, body, ds, d1);
-      }
-      if (method === "list") {
-        return (ds) => list(ctor, ds, d1);
-      }
-      if (method === "get") {
-        return (id, ds) => _get(ctor, id, ds, d1);
-      }
-      return value;
-    },
-  });
+    return new Proxy(obj, {
+        get(target, method) {
+            // If the instance defines the method, always use it (override allowed)
+            const value = Reflect.get(target, method);
+            if (typeof value === "function") {
+                return value.bind(target);
+            }
+            // Fallback to CRUD methods
+            if (method === "save") {
+                return (body, ds) => upsert(ctor, body, ds, d1);
+            }
+            if (method === "list") {
+                return (ds) => list(ctor, ds, d1);
+            }
+            if (method === "get") {
+                return (id, ds) => _get(ctor, id, ds, d1);
+            }
+            return value;
+        },
+    });
 }
 async function upsert(ctor, body, dataSource, d1) {
-  const includeTree = findIncludeTree(dataSource, ctor);
-  const orm = Orm.fromD1(d1);
-  const result = await orm.upsert(ctor, body, includeTree);
-  if (result.isLeft()) return HttpResult.fail(500, result.value);
-  const getRes = await orm.get(ctor, result.value, includeTree);
-  return getRes.isRight()
-    ? HttpResult.ok(200, getRes.value)
-    : HttpResult.fail(500, getRes.value);
+    const includeTree = findIncludeTree(dataSource, ctor);
+    const orm = Orm.fromD1(d1);
+    const result = await orm.upsert(ctor, body, includeTree);
+    if (result.isLeft())
+        return HttpResult.fail(500, result.value);
+    const getRes = await orm.get(ctor, result.value, includeTree);
+    return getRes.isRight()
+        ? HttpResult.ok(200, getRes.value)
+        : HttpResult.fail(500, getRes.value);
 }
 async function _get(ctor, id, dataSource, d1) {
-  const includeTree = findIncludeTree(dataSource, ctor);
-  const orm = Orm.fromD1(d1);
-  const res = await orm.get(ctor, id, includeTree);
-  return res.isRight()
-    ? HttpResult.ok(200, res.value)
-    : HttpResult.fail(500, res.value);
+    const includeTree = findIncludeTree(dataSource, ctor);
+    const orm = Orm.fromD1(d1);
+    const res = await orm.get(ctor, id, includeTree);
+    return res.isRight()
+        ? HttpResult.ok(200, res.value)
+        : HttpResult.fail(500, res.value);
 }
 async function list(ctor, dataSource, d1) {
-  const includeTree = findIncludeTree(dataSource, ctor);
-  const orm = Orm.fromD1(d1);
-  const res = await orm.list(ctor, { includeTree });
-  return res.isRight()
-    ? HttpResult.ok(200, res.value)
-    : HttpResult.fail(500, res.value);
+    const includeTree = findIncludeTree(dataSource, ctor);
+    const orm = Orm.fromD1(d1);
+    const res = await orm.list(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;
+    const normalizedDs = dataSource === NO_DATA_SOURCE ? null : dataSource;
+    return normalizedDs ? ctor[normalizedDs] : null;
 }

package/dist/router/router.d.ts

@@ -19,173 +19,136 @@ export type ConstructorRegistry = Record<string, new () => any>;
  * These values are guaranteed to never change throughout a workers lifetime.
  */
 export declare class RuntimeContainer {
-  readonly ast: CloesceAst;
-  readonly constructorRegistry: ConstructorRegistry;
-  readonly wasm: OrmWasmExports;
-  private static instance;
-  private constructor();
-  static init(
-    ast: CloesceAst,
-    constructorRegistry: ConstructorRegistry,
-    wasm?: WebAssembly.Instance,
-  ): Promise<void>;
-  static get(): RuntimeContainer;
-  /**
-   * Disposes the singleton instance. For testing purposes only.
-   */
-  static dispose(): void;
+    readonly ast: CloesceAst;
+    readonly constructorRegistry: ConstructorRegistry;
+    readonly wasm: OrmWasmExports;
+    private static instance;
+    private constructor();
+    static init(ast: CloesceAst, constructorRegistry: ConstructorRegistry, wasm?: WebAssembly.Instance): Promise<void>;
+    static get(): RuntimeContainer;
+    /**
+     * Disposes the singleton instance. For testing purposes only.
+     */
+    static dispose(): void;
 }
 /**
  * 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>;
-export type MiddlewareFn = (
-  di: DependencyContainer,
-) => Promise<HttpResult | void>;
-export type ResultMiddlewareFn = (
-  di: DependencyContainer,
-  result: HttpResult,
-) => Promise<HttpResult | void>;
+export type MiddlewareFn = (di: DependencyContainer) => Promise<HttpResult | void>;
+export type ResultMiddlewareFn = (di: DependencyContainer, result: HttpResult) => Promise<HttpResult | void>;
 /**
  * Expected states in which the router may exit.
  */
 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,
+    UnknownPrefix = 0,
+    UnknownRoute = 1,
+    UnmatchedHttpVerb = 2,
+    InstantiatedMethodMissingId = 3,
+    RequestMissingBody = 4,
+    RequestBodyMissingParameters = 5,
+    RequestBodyInvalidParameter = 6,
+    InstantiatedMethodMissingDataSource = 7,
+    MissingDependency = 8,
+    InvalidDatabaseQuery = 9,
+    ModelNotFound = 10,
+    UncaughtException = 11
 }
 export declare class CloesceApp {
-  routePrefix: string;
-  private 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: 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.
-   *
-   * TODO: Middleware may violate the API contract and return unexpected types
-   *
-   * @param m - The middleware function to register.
-   */
-  onResult(m: ResultMiddlewareFn): void;
-  private namespaceMiddleware;
-  /**
-   * Registers middleware for a specific namespace (being, a model or service)
-   *
-   * Runs before request validation and method middleware.
-   *
-   * TODO: Middleware may violate the API contract and return unexpected types
-   *
-   * @typeParam T - The namespace type
-   * @param ctor - The namespace's constructor (used to derive its name).
-   * @param m - The middleware function to register.
-   */
-  onNamespace<T>(ctor: new () => T, m: MiddlewareFn): void;
-  private methodMiddleware;
-  /**
-   * Registers middleware for a specific method on a namespace
-   *
-   * Runs after namespace middleware and request validation.
-   *
-   * TODO: Middleware may violate the API contract and return unexpected types
-   *
-   * @typeParam T - The namespace type
-   * @param ctor - The namespace constructor
-   * @param method - The method name on the namespace.
-   * @param m - The middleware function to register.
-   */
-  onMethod<T>(
-    ctor: new () => T,
-    method: KeysOfType<T, (...args: any) => any>,
-    m: MiddlewareFn,
-  ): void;
-  private router;
-  /**
-   * Runs the Cloesce app. Intended to be called from the generated workers code.
-   */
-  run(
-    request: Request,
-    env: any,
-    ast: CloesceAst,
-    ctorReg: ConstructorRegistry,
-  ): Promise<Response>;
+    routePrefix: string;
+    private 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: 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.
+     *
+     * TODO: Middleware may violate the API contract and return unexpected types
+     *
+     * @param m - The middleware function to register.
+     */
+    onResult(m: ResultMiddlewareFn): void;
+    private namespaceMiddleware;
+    /**
+     * Registers middleware for a specific namespace (being, a model or service)
+     *
+     * Runs before request validation and method middleware.
+     *
+     * TODO: Middleware may violate the API contract and return unexpected types
+     *
+     * @typeParam T - The namespace type
+     * @param ctor - The namespace's constructor (used to derive its name).
+     * @param m - The middleware function to register.
+     */
+    onNamespace<T>(ctor: new () => T, m: MiddlewareFn): void;
+    private methodMiddleware;
+    /**
+     * Registers middleware for a specific method on a namespace
+     *
+     * Runs after namespace middleware and request validation.
+     *
+     * TODO: Middleware may violate the API contract and return unexpected types
+     *
+     * @typeParam T - The namespace type
+     * @param ctor - The namespace constructor
+     * @param method - The method name on the namespace.
+     * @param m - The middleware function to register.
+     */
+    onMethod<T>(ctor: new () => T, method: KeysOfType<T, (...args: any) => any>, m: MiddlewareFn): void;
+    private router;
+    /**
+     * Runs the Cloesce app. Intended to be called from the generated workers code.
+     */
+    run(request: Request, env: any, ast: CloesceAst, ctorReg: ConstructorRegistry): Promise<Response>;
 }
 export type MatchedRoute = {
-  kind: "model" | "service";
-  namespace: string;
-  method: ApiMethod;
-  id: string | null;
-  model?: Model;
-  service?: Service;
+    kind: "model" | "service";
+    namespace: string;
+    method: ApiMethod;
+    id: string | null;
+    model?: Model;
+    service?: Service;
 };
 /**
  * Matches a request to an ApiInvocation
  * @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 matched route.
  */
-declare function matchRoute(
-  request: Request,
-  ast: CloesceAst,
-  routePrefix: string,
-): Either<HttpResult, MatchedRoute>;
+declare function matchRoute(request: Request, ast: CloesceAst, routePrefix: string): Either<HttpResult, MatchedRoute>;
 /**
  * Validates the request's body/search params against a ModelMethod
  * @returns 400 or a `RequestParamMap` consisting of each parameters name mapped to its value, and
  * a data source
  */
-declare function validateRequest(
-  request: Request,
-  ast: CloesceAst,
-  ctorReg: ConstructorRegistry,
-  route: MatchedRoute,
-): Promise<
-  Either<
-    HttpResult,
-    {
-      params: RequestParamMap;
-      dataSource: string | null;
-    }
-  >
->;
+declare function validateRequest(request: Request, ast: CloesceAst, ctorReg: ConstructorRegistry, route: MatchedRoute): Promise<Either<HttpResult, {
+    params: RequestParamMap;
+    dataSource: string | null;
+}>>;
 /**
  * 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(
-  obj: any,
-  di: DependencyContainer,
-  route: MatchedRoute,
-  params: Record<string, unknown>,
-): Promise<HttpResult<unknown>>;
+declare function methodDispatch(obj: any, di: DependencyContainer, route: MatchedRoute, params: Record<string, unknown>): Promise<HttpResult<unknown>>;
 /**
  * For testing purposes
  */
 export declare const _cloesceInternal: {
-  matchRoute: typeof matchRoute;
-  validateRequest: typeof validateRequest;
-  methodDispatch: typeof methodDispatch;
-  RuntimeContainer: typeof RuntimeContainer;
+    matchRoute: typeof matchRoute;
+    validateRequest: typeof validateRequest;
+    methodDispatch: typeof methodDispatch;
+    RuntimeContainer: typeof RuntimeContainer;
 };
 export {};
-//# sourceMappingURL=router.d.ts.map
+//# sourceMappingURL=router.d.ts.map