cloesce 0.0.3-fix.3 → 0.0.3-fix.6

package/dist/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/README.md

@@ -0,0 +1,403 @@
+# cloesce (experimental, `v0.0.3`)
+
+Cloesce is a full stack compiler for the Cloudflare developer platform, allowing class definitions in high level languages to serve as the metadata basis for databases, a backend REST API, a frontend API client, and Cloudflare infrastructure.
+
+Cloesce is working towards an alpha MVP (v0.1.0), with the general milestones being [here](https://cloesce.pages.dev/schreiber/v0.1.0_milestones/).
+
+Internal documentation going over design decisions and general thoughts for each milestone can be found [here](https://cloesce.pages.dev/).
+
+# Documentation `v0.0.3`
+
+Note that this version is very unstable (ie, it passes our set of happy-path tests).
+
+## Getting Started
+
+`v0.0.3` supports only Typescript-to-Typescript projects. An example project is shown [here](https://github.com/bens-schreiber/cloesce/tree/main/examples).
+
+1. NPM
+
+- Create an NPM project and install cloesce
+
+```sh
+npm i cloesce@0.0.3-fix.3
+```
+
+2. TypeScript
+
+- Create a `tsconfig.json` with the following values:
+
+```json
+{
+  "compilerOptions": {
+    // ...
+    "resolveJsonModule": true,
+    "strict": true,
+    "strictPropertyInitialization": false,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true
+  },
+  "include": ["<your_src_dir>/**/*.ts", ".generated/*.ts"]
+}
+```
+
+3. Cloesce Config
+
+- Create a `cloesce.config.json` with the following values:
+
+```json
+{
+  "source": "./src", // or whatever src you want
+  "workersUrl": "http://localhost:5002/api", // or whatever url you want
+  "clientUrl": "http://localhost:5002/api"
+}
+```
+
+4. Vite
+
+- `v0.0.3` does not yet support middleware, so you'll run into CORs problems. A vite proxy in some `vite.config.ts` can fix this:
+
+```ts
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  server: {
+    port: 5173,
+    proxy: {
+      "/api": {
+        target: "http://localhost:5000",
+        changeOrigin: true,
+      },
+    },
+  },
+});
+```
+
+5. Wrangler Config
+
+- `v0.0.3` will generate the required areas of your wrangler config. A full config looks like this:
+
+```toml
+compatibility_date = "2025-10-02"
+main = ".generated/workers.ts"
+name = "example"
+
+[[d1_databases]]
+binding = "db"
+database_id = "..."
+database_name = "example"
+```
+
+## A Simple Model
+
+A model is a type which represents a database table, database view, backend api, frontend client and Cloudflare infrastructure (D1 + Workers).
+
+Suprisingly, it's pretty compact. A basic scalar model (being, without foreign keys) looks like this:
+
+```ts
+// horse.cloesce.ts
+
+@D1
+export class Horse {
+  @PrimaryKey
+  id: number;
+
+  name: string | null;
+
+  @POST
+  async neigh(): Promise<string> {
+    return `i am ${this.name}, this is my horse noise`;
+  }
+}
+```
+
+- `@D1` denotes that this is a SQL Table
+- `@PrimaryKey` sets the SQL primary key. All models require a primary key.
+- `@POST` reveals the method as an API endpoint with the `POST` HTTP Verb.
+
+After running `cloesce run`, you will get a fully generated project that can be ran with:
+
+```sh
+# migrate wrangler
+npx wrangler d1 migrations apply proj-name
+
+# build
+npx wrangler build
+
+# run wrangler
+npx wrangler dev --port 5000
+```
+
+Note the output in the `.generated/` dir:
+
+- `client.ts` is an importable API with all of your backend types and endpoints
+- `migrations/*.sql` is the generated SQL code (note, migrations beyond the initial aren't really supported yet)
+- `workers.ts` is the workers entrypoint.
+
+## Features
+
+### Wrangler Environment
+
+In order to interact with your database, you will need to define a WranglerEnv
+
+```ts
+// horse.cloesce.ts
+
+@WranglerEnv
+export class Env {
+  db: D1Database; // only one DB is supported for now-- make sure it matches the name in `wrangler.toml`
+
+  // you can also define values in the toml under [[vars]]
+  motd: string;
+}
+```
+
+The wrangler environment is dependency injected into your method calls:
+
+```ts
+@D1
+export class Horse {
+  @PrimaryKey
+  id: number;
+
+  @POST
+  async neigh(@Inject env: WranglerEnv): Promise<string> {
+    env.db.prepare(...);
+
+    return `i am ${this.name}, this is my horse noise`;
+  }
+}
+```
+
+## Foreign Keys, One to One, Data Sources
+
+More complex model relationships are permitted via the `@ForeignKey`, `@OneToOne / @OneToMany @ManyToMany` and `@DataSource` decorators.
+Foreign keys are scalar attributes which must reference some other model's primary key:
+
+```ts
+@D1
+export class B {
+  @PrimaryKey
+  id: number;
+}
+
+@D1
+export class A {
+  @PrimaryKey
+  id: number;
+
+  @ForeignKey(B)
+  bId: number;
+}
+```
+
+This representation is true to the underlying SQL table: `A` has a column `bId` which is a foreign key to `B`. Cloesce allows you to actually join these tables together in your model representation:
+
+```ts
+@D1
+export class B {
+  @PrimaryKey
+  id: number;
+}
+
+@D1
+export class A {
+  @PrimaryKey
+  id: number;
+
+  @ForeignKey(B)
+  bId: number;
+
+  @OneToOne("bId") // references A.bId
+  b: B | undefined; // This value is a "navigation property", which may or may not exist at runtime
+}
+```
+
+In `v0.0.3`, there are no defaults, only very explicit decisons. Because of that, navigation properties won't exist at runtime unless you tell them to. Cloesce does this via a `DataSource`, which describes the foreign key dependencies you wish to include. All scalar properties are included by default and cannot be excluded.
+
+```ts
+@D1
+export class B {
+  @PrimaryKey
+  id: number;
+}
+
+@D1
+export class A {
+  @PrimaryKey
+  id: number;
+
+  @ForeignKey(B)
+  bId: number;
+
+  @OneToOne("bId")
+  b: B | undefined;
+
+  @DataSource
+  static readonly default: IncludeTree<A> = {
+    b: {}, // says: on model population, join A's B
+  };
+}
+```
+
+Datasources are just SQL views and can be invoked in your queries. They are aliased in such a way that its identical to object properties. The frontend chooses which datasource to use in it's API client. `null` is a valid option, meaning no joins will occur.
+
+```ts
+@D1
+export class A {
+  @PrimaryKey
+  id: number;
+
+  @ForeignKey(B)
+  bId: number;
+
+  @OneToOne("bId")
+  b: B | undefined;
+
+  @DataSource
+  static readonly default: IncludeTree<A> = {
+    b: {},
+  };
+
+  @GET
+  static async get(id: number, @Inject env: WranglerEnv): Promise<A> {
+    let records = await env.db
+      .prepare("SELECT * FROM [A.default] WHERE [A.id] = ?") // A.default is the SQL view generated from the IncludeTree
+      .bind(id)
+      .run();
+
+    // modelsFromSql is a provided function to turn sql rows into an object.
+    // More ORM functions will be expanded on in v0.0.4.
+    return modelsFromSql(A, records.results, A.default)[0] as A;
+  }
+}
+```
+
+Note: In later versions, nearly all of the code from the example above won't be needed (we can usually infer primary keys, foreign keys, relationships, have default made include trees, and generate CRUD methods like `get`).
+
+### One to Many
+
+Cloesce supports models with `1:M` relationships:
+
+```ts
+@D1
+export class Person {
+  @PrimaryKey
+  id: number;
+
+  @OneToMany("personId") // directly references the FK on Dog
+  dogs: Dog[];
+
+  @DataSource
+  static readonly default: IncludeTree<Person> = {
+    dogs: {
+      person: {
+        dogs: {
+          // essentially means: "When you get a person, get their dogs, and get all of those dog's Person, ..."
+          // we could go on as long as we want
+        },
+      },
+    },
+  };
+}
+
+@D1
+export class Dog {
+  @PrimaryKey
+  id: number;
+
+  @ForeignKey(Person)
+  personId: number;
+
+  // optional navigation property, not needed.
+  @OneToOne("personId")
+  person: Person | undefined;
+}
+```
+
+### Many to Many
+
+NOTE: `M:M` relationships have a [bug](https://github.com/bens-schreiber/cloesce/issues/88) in `v0.0.3`, but the syntax is as follows:
+
+```ts
+@D1
+export class Student {
+  @PrimaryKey
+  id: number;
+
+  @ManyToMany("StudentsCourses") // unique ID for the generated junction table
+  courses: Course[];
+}
+
+@D1
+export class Course {
+  @PrimaryKey
+  id: number;
+
+  @ManyToMany("StudentsCourses")
+  students: Student[];
+}
+```
+
+### Plain Old Objects
+
+Simple non-model objects can be returned and serialized from a model method:
+
+```ts
+@PlainOldObject
+export class CatStuff {
+    catFacts: string[],
+    catNames: string[],
+}
+
+@D1
+export class Cat {
+    @PrimaryKey
+    id: number;
+
+    @GET
+    async query(): Promise<CatStuff> {
+        return {
+            catFacts: ["cats r cool"],
+            catNames: ["reginald"]
+        }
+    }
+}
+```
+
+### HttpResult
+
+Methods can return any kind of status code via the `HttpResult` wrapper:
+
+```ts
+@D1
+class Foo {
+    ...
+
+    @GET
+    async foo(): Promise<HttpResult<number>> {
+        return { ok: false, status: 500, message: "divided by 0"};
+    }
+}
+```
+
+# Testing the Compiler
+
+## Unit Tests
+
+- `src/extractor/ts` run `npm test`
+- `src/generator` run `cargo test`
+
+## Integration Tests
+
+- To run the regression tests: `cargo run --bin test regression`
+- To run the pass fail extractor tests: `cargo run --bin test run-fail`
+
+Optionally, pass `--check` if new snapshots should not be created.
+
+## E2E
+
+- `tests/e2e` run `npm test`
+
+## Code Formatting
+
+- `cargo fmt`, `cargo clippy`, `npm run format:fix`

package/dist/cli.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":""}

package/dist/{extractor/cli.js → cli.js}

@@ -5,8 +5,8 @@ import { readFile } from "fs/promises";
 import path from "node:path";
 import { command, run, subcommands, flag, option, optional, string, } from "cmd-ts";
 import { Project } from "ts-morph";
-import { CidlExtractor } from "./extract.js";
-import { ExtractorError, ExtractorErrorCode, getErrorInfo } from "../common.js";
+import { CidlExtractor } from "./extractor/extract.js";
+import { ExtractorError, ExtractorErrorCode, getErrorInfo } from "./common.js";
 const cmds = subcommands({
     name: "cloesce",
     cmds: {
@@ -28,7 +28,6 @@ const cmds = subcommands({
                 }
                 // Creates a `cidl.json` file. Exits the process on failure.
                 await extract({ debug: args.debug });
-                const root = process.cwd();
                 const outputDir = config.outputDir ?? ".generated";
                 const allConfig = {
                     name: "all",
@@ -37,8 +36,8 @@ const cmds = subcommands({
                         "generate",
                         "all",
                         path.join(outputDir, "cidl.json"),
-                        path.join(root, "wrangler.toml"),
-                        path.join(root, "migrations/migrations.sql"),
+                        "wrangler.toml",
+                        "migrations/migrations.sql",
                         path.join(outputDir, "workers.ts"),
                         path.join(outputDir, "client.ts"),
                         config.clientUrl,
@@ -54,11 +53,10 @@ const cmds = subcommands({
             description: "Generate wrangler.toml configuration",
             args: {},
             handler: async () => {
-                const root = process.cwd();
                 await generate({
                     name: "wrangler",
                     wasmFile: "generator.wasm",
-                    args: ["generate", "wrangler", path.join(root, "wrangler.toml")],
+                    args: ["generate", "wrangler", "wrangler.toml"],
                 });
             },
         }),
@@ -68,7 +66,6 @@ const cmds = subcommands({
             args: {},
             handler: async () => {
                 const config = loadCloesceConfig(process.cwd());
-                const root = process.cwd();
                 const outputDir = config.outputDir ?? ".generated";
                 await generate({
                     name: "d1",
@@ -77,7 +74,7 @@ const cmds = subcommands({
                         "generate",
                         "d1",
                         path.join(outputDir, "cidl.json"),
-                        path.join(root, "migrations/migrations.sql"),
+                        "migrations/migrations.sql",
                     ],
                 });
             },
@@ -88,10 +85,9 @@ const cmds = subcommands({
             args: {},
             handler: async () => {
                 const config = loadCloesceConfig(process.cwd());
-                const root = process.cwd();
                 const outputDir = config.outputDir ?? ".generated";
                 if (!config.workersUrl) {
-                    console.error("Error: workersUrl must be defined in cloesce-config.json");
+                    console.error("Error: workersUrl must be defined in cloesce.config.json");
                     process.exit(1);
                 }
                 await generate({
@@ -102,7 +98,7 @@ const cmds = subcommands({
                         "workers",
                         path.join(outputDir, "cidl.json"),
                         path.join(outputDir, "workers.ts"),
-                        path.join(root, "wrangler.toml"),
+                        "wrangler.toml",
                         config.workersUrl,
                     ],
                 });
@@ -238,32 +234,13 @@ async function generate(config) {
     if (!fs.existsSync(wranglerPath)) {
         fs.writeFileSync(wranglerPath, "");
     }
-    const wasiArgs = config.args.map((arg) => {
-        // Skip URLs
-        if (/^[a-zA-Z]+:\/\//.test(arg)) {
-            return arg;
-        }
-        // Convert file path it to Unix style
-        if (arg.includes(path.sep) || arg.includes("/")) {
-            // Convert to relative path from root
-            const relativePath = path.isAbsolute(arg)
-                ? path.relative(root, arg)
-                : arg;
-            // Convert Windows separators to Unix and ensure leading slash
-            const unixPath = relativePath.replace(/\\/g, "/");
-            return unixPath.startsWith("/") ? unixPath : "/" + unixPath;
-        }
-        return arg;
-    });
     const wasi = new WASI({
         version: "preview1",
-        args: ["generate", ...wasiArgs],
+        args: ["generate", ...config.args],
         env: { ...process.env, ...config.env },
-        preopens: { "/": root },
+        preopens: { ".": root },
     });
-    // Since `generator.wasm` is a binary and not a library, it must be
-    // manually read
-    const wasm = await readFile(new URL("../generator.wasm", import.meta.url));
+    const wasm = await readFile(new URL("./generator.wasm", import.meta.url));
     const mod = await WebAssembly.compile(new Uint8Array(wasm));
     let instance = await WebAssembly.instantiate(mod, {
         wasi_snapshot_preview1: wasi.wasiImport,

package/dist/common.d.ts

@@ -0,0 +1,126 @@
+export type Either<L, R> = {
+    ok: false;
+    value: L;
+} | {
+    ok: true;
+    value: R;
+};
+export declare function left<L>(value: L): Either<L, never>;
+export declare function right<R>(value: R): Either<never, R>;
+export declare enum ExtractorErrorCode {
+    UnknownType = 0,
+    MultipleGenericType = 1,
+    InvalidIncludeTree = 2,
+    UnknownNavigationPropertyReference = 3,
+    InvalidNavigationPropertyReference = 4,
+    MissingNavigationPropertyReference = 5,
+    MissingManyToManyUniqueId = 6,
+    MissingPrimaryKey = 7,
+    MissingWranglerEnv = 8,
+    TooManyWranglerEnvs = 9,
+    MissingFile = 10
+}
+export declare function getErrorInfo(code: ExtractorErrorCode): {
+    description: string;
+    suggestion: string;
+};
+export declare class ExtractorError {
+    code: ExtractorErrorCode;
+    context?: string;
+    snippet?: string;
+    constructor(code: ExtractorErrorCode);
+    addContext(fn: (val: string | undefined) => string | undefined): void;
+}
+export type HttpResult<T = unknown> = {
+    ok: boolean;
+    status: number;
+    data?: T;
+    message?: string;
+};
+export type CidlType = "Void" | "Integer" | "Real" | "Text" | "Blob" | {
+    Inject: string;
+} | {
+    Object: string;
+} | {
+    Nullable: CidlType;
+} | {
+    Array: CidlType;
+} | {
+    HttpResult: CidlType;
+};
+export declare function isNullableType(ty: CidlType): boolean;
+export declare enum HttpVerb {
+    GET = "GET",
+    POST = "POST",
+    PUT = "PUT",
+    PATCH = "PATCH",
+    DELETE = "DELETE"
+}
+export interface NamedTypedValue {
+    name: string;
+    cidl_type: CidlType;
+}
+export interface ModelAttribute {
+    value: NamedTypedValue;
+    foreign_key_reference: string | null;
+}
+export interface ModelMethod {
+    name: string;
+    is_static: boolean;
+    http_verb: HttpVerb;
+    return_type: CidlType | null;
+    parameters: NamedTypedValue[];
+}
+export type NavigationPropertyKind = {
+    OneToOne: {
+        reference: string;
+    };
+} | {
+    OneToMany: {
+        reference: string;
+    };
+} | {
+    ManyToMany: {
+        unique_id: string;
+    };
+};
+export interface NavigationProperty {
+    var_name: string;
+    model_name: string;
+    kind: NavigationPropertyKind;
+}
+export declare function getNavigationPropertyCidlType(nav: NavigationProperty): CidlType;
+export interface Model {
+    name: string;
+    primary_key: NamedTypedValue;
+    attributes: ModelAttribute[];
+    navigation_properties: NavigationProperty[];
+    methods: Record<string, ModelMethod>;
+    data_sources: Record<string, DataSource>;
+    source_path: string;
+}
+export interface PlainOldObject {
+    name: string;
+    attributes: NamedTypedValue[];
+    source_path: string;
+}
+export interface CidlIncludeTree {
+    [key: string]: CidlIncludeTree;
+}
+export interface DataSource {
+    name: string;
+    tree: CidlIncludeTree;
+}
+export interface WranglerEnv {
+    name: string;
+    source_path: string;
+}
+export interface CloesceAst {
+    version: string;
+    project_name: string;
+    language: "TypeScript";
+    wrangler_env: WranglerEnv;
+    models: Record<string, Model>;
+    poos: Record<string, PlainOldObject>;
+}
+//# sourceMappingURL=common.d.ts.map

package/dist/common.d.ts.map

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

package/dist/extractor/extract.d.ts

@@ -0,0 +1,15 @@
+import { Project } from "ts-morph";
+import { CloesceAst, Either, ExtractorError } from "../common.js";
+export declare class CidlExtractor {
+    projectName: string;
+    version: string;
+    constructor(projectName: string, version: string);
+    extract(project: Project): Either<ExtractorError, CloesceAst>;
+    private static model;
+    private static poo;
+    private static readonly primTypeMap;
+    private static cidlType;
+    private static includeTree;
+    private static method;
+}
+//# sourceMappingURL=extract.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/extractor/extract.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EASR,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,UAAU,EAGV,MAAM,EAUN,cAAc,EAGf,MAAM,cAAc,CAAC;AAsBtB,qBAAa,aAAa;IAEf,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,MAAM;gBADf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM;IAGxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC;IAuE7D,OAAO,CAAC,MAAM,CAAC,KAAK;IA6MpB,OAAO,CAAC,MAAM,CAAC,GAAG;IAgClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAQjC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ;IAoGvB,OAAO,CAAC,MAAM,CAAC,WAAW;IAqF1B,OAAO,CAAC,MAAM,CAAC,MAAM;CA+DtB"}

package/dist/index/backend.d.ts

@@ -0,0 +1,22 @@
+export { cloesce, modelsFromSql } from "../runtime/runtime.js";
+export type { HttpResult, Either } from "../common.js";
+export declare const D1: ClassDecorator;
+export declare const PlainOldObject: ClassDecorator;
+export declare const WranglerEnv: ClassDecorator;
+export declare const PrimaryKey: PropertyDecorator;
+export declare const GET: MethodDecorator;
+export declare const POST: MethodDecorator;
+export declare const PUT: MethodDecorator;
+export declare const PATCH: MethodDecorator;
+export declare const DELETE: MethodDecorator;
+export declare const DataSource: PropertyDecorator;
+export declare const OneToMany: (_: string) => PropertyDecorator;
+export declare const OneToOne: (_: string) => PropertyDecorator;
+export declare const ManyToMany: (_: string) => PropertyDecorator;
+export declare const ForeignKey: <T>(_: T) => PropertyDecorator;
+export declare const Inject: ParameterDecorator;
+type Primitive = string | number | boolean | bigint | symbol | null | undefined;
+export type IncludeTree<T> = T extends Primitive ? never : {
+    [K in keyof T]?: T[K] extends (infer U)[] ? IncludeTree<NonNullable<U>> : IncludeTree<NonNullable<T[K]>>;
+};
+//# sourceMappingURL=backend.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/index/backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC/D,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGvD,eAAO,MAAM,EAAE,EAAE,cAAyB,CAAC;AAC3C,eAAO,MAAM,cAAc,EAAE,cAAyB,CAAC;AACvD,eAAO,MAAM,WAAW,EAAE,cAAyB,CAAC;AACpD,eAAO,MAAM,UAAU,EAAE,iBAA4B,CAAC;AACtD,eAAO,MAAM,GAAG,EAAE,eAA0B,CAAC;AAC7C,eAAO,MAAM,IAAI,EAAE,eAA0B,CAAC;AAC9C,eAAO,MAAM,GAAG,EAAE,eAA0B,CAAC;AAC7C,eAAO,MAAM,KAAK,EAAE,eAA0B,CAAC;AAC/C,eAAO,MAAM,MAAM,EAAE,eAA0B,CAAC;AAChD,eAAO,MAAM,UAAU,EAAE,iBAA4B,CAAC;AACtD,eAAO,MAAM,SAAS,GACnB,GAAG,MAAM,KAAG,iBACL,CAAC;AACX,eAAO,MAAM,QAAQ,GAClB,GAAG,MAAM,KAAG,iBACL,CAAC;AACX,eAAO,MAAM,UAAU,GACpB,GAAG,MAAM,KAAG,iBACL,CAAC;AACX,eAAO,MAAM,UAAU,GACpB,CAAC,EAAE,GAAG,CAAC,KAAG,iBACH,CAAC;AACX,eAAO,MAAM,MAAM,EAAE,kBAA6B,CAAC;AAGnD,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAChF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5C,KAAK,GACL;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GACrC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAC3B,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC"}

package/dist/{index.js → index/backend.js}

@@ -1,4 +1,4 @@
-export { cloesce, modelsFromSql } from "./runtime/runtime.js";
+export { cloesce, modelsFromSql } from "../runtime/runtime.js";
 // Compiler hints
 export const D1 = () => { };
 export const PlainOldObject = () => { };
@@ -15,10 +15,3 @@ export const OneToOne = (_) => () => { };
 export const ManyToMany = (_) => () => { };
 export const ForeignKey = (_) => () => { };
 export const Inject = () => { };
-// Helpers
-export function instantiateObjectArray(data, ctor) {
-    if (Array.isArray(data)) {
-        return data.map((x) => instantiateObjectArray(x, ctor)).flat();
-    }
-    return [Object.assign(new ctor(), data)];
-}

package/dist/index/client.d.ts

@@ -0,0 +1,5 @@
+export type { HttpResult, Either } from "../common.js";
+export declare function instantiateObjectArray<T extends object>(data: any, ctor: {
+    new (): T;
+}): T[];
+//# sourceMappingURL=client.d.ts.map

package/dist/index/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/index/client.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGvD,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,IAAI,EAAE,GAAG,EACT,IAAI,EAAE;IAAE,QAAQ,CAAC,CAAA;CAAE,GAClB,CAAC,EAAE,CAKL"}

package/dist/index/client.js

@@ -0,0 +1,7 @@
+// Helpers
+export function instantiateObjectArray(data, ctor) {
+    if (Array.isArray(data)) {
+        return data.map((x) => instantiateObjectArray(x, ctor)).flat();
+    }
+    return [Object.assign(new ctor(), data)];
+}

package/dist/runtime/runtime.d.ts

@@ -0,0 +1,112 @@
+import { HttpResult, Either, ModelMethod, CloesceAst, Model } from "../common.js";
+import { IncludeTree } from "../index/backend.js";
+/**
+ * Map of model names to their respective constructor.
+ *
+ * The value accepted into the `cloesce` function is generated by the Cloesce compiler, and
+ * is guaranteed to contain all model definitions.
+ */
+type ModelConstructorRegistry = Record<string, new () => UserDefinedModel>;
+/**
+ * Dependency injection container, mapping an object type name to an instance of that object.
+ *
+ * The value accepted into the `cloesce` function is generated by the Cloesce compiler, and is
+ * guaranteed to contain all injected model method parameters.
+ */
+type InstanceRegistry = Map<string, any>;
+/**
+ * Users will create Cloesce models, which have metadata for them in the ast.
+ * For TypeScript's purposes, these models can be anything. We can assume any
+ * `UserDefinedModel` has been verified by the compiler.
+ */
+type UserDefinedModel = 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
+ */
+interface MetaWranglerEnv {
+    envName: string;
+    dbName: string;
+}
+/**
+ * WASM ABI
+ */
+interface RuntimeWasmExports {
+    memory: WebAssembly.Memory;
+    get_return_len(): number;
+    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): number;
+}
+/**
+ * Singleton instances of the cidl, constructor registry, and wasm binary.
+ * These values are guaranteed to never change throughout a program lifetime.
+ */
+declare class RuntimeContainer {
+    readonly ast: CloesceAst;
+    readonly constructorRegistry: ModelConstructorRegistry;
+    readonly wasm: RuntimeWasmExports;
+    private static instance;
+    private constructor();
+    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, ast: CloesceAst, constructorRegistry: ModelConstructorRegistry, instanceRegistry: InstanceRegistry, envMeta: MetaWranglerEnv, api_route: string): Promise<Response>;
+/**
+ * Matches a request to a method on a model.
+ * @param api_route 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, api_route: string): Either<HttpResult, {
+    model: Model;
+    method: ModelMethod;
+    id: string | null;
+}>;
+/**
+ * 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, model: Model, method: ModelMethod, id: string | null): 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(instance: object, instanceRegistry: InstanceRegistry, envMeta: MetaWranglerEnv, method: ModelMethod, params: Record<string, unknown>): Promise<HttpResult<unknown>>;
+/**
+ * Creates model instances given a properly formatted SQL record, being either:
+ *
+ *  1. Flat, relationship-less (ex: id, name, location, ...)
+ *  2. `DataSource` formatted (ex: Horse.id, Horse.name, Horse.rider, ...)
+ *
+ * @param ctor The type of the model
+ * @param records SQL records
+ * @param includeTree The include tree to use when parsing the records
+ * @returns An instantiated array of `T`, containing one or more objects.
+ */
+export declare function modelsFromSql<T extends object>(ctor: new () => T, records: Record<string, any>[], includeTree: IncludeTree<T> | null): T[];
+/**
+ * For testing purposes
+ */
+export declare const _cloesceInternal: {
+    matchRoute: typeof matchRoute;
+    validateRequest: typeof validateRequest;
+    methodDispatch: typeof methodDispatch;
+    RuntimeContainer: typeof RuntimeContainer;
+};
+export {};
+//# sourceMappingURL=runtime.d.ts.map

package/dist/runtime/runtime.d.ts.map

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

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "cloesce",
-  "version": "0.0.3-fix.3",
+  "version": "0.0.3-fix.6",
   "description": "A tool to extract and compile TypeScript code into something wrangler can consume and deploy for D1 Databases and Cloudflare Workers",
   "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "license": "Apache-2.0",
   "scripts": {
     "test": "vitest",
     "format:fix": "prettier --write .",
     "format": "prettier --check .",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.json && npm run copy-rs-runtime-wasm && npm run copy-generator-wasm",
+    "build": "tsc -p tsconfig.json && npm run copy-rs-runtime-wasm && npm run copy-generator-wasm && npm run copy-readme-license",
     "copy-rs-runtime-wasm": "cp ../../runtime/target/wasm32-unknown-unknown/release/runtime.wasm ./dist/runtime.wasm",
-    "copy-generator-wasm": "cp ../../generator/target/wasm32-wasip1/release/cli.wasm ./dist/generator.wasm"
+    "copy-generator-wasm": "cp ../../generator/target/wasm32-wasip1/release/cli.wasm ./dist/generator.wasm",
+    "copy-readme-license": "cp ../../../README.md ./dist/README.md && cp ../../../LICENSE ./dist/LICENSE"
   },
   "dependencies": {
     "cmd-ts": "^0.14.1",
@@ -29,19 +28,26 @@
     "vite-plugin-wasm": "^3.5.0"
   },
   "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+    "./client": {
+      "types": "./dist/index/client.d.ts",
+      "import": "./dist/index/client.js"
     },
-    "./cli": "./dist/extractor/cli.js"
+    "./backend": {
+      "types": "./dist/index/backend.d.ts",
+      "import": "./dist/index/backend.js"
+    }
   },
   "bin": {
-    "cloesce": "dist/extractor/cli.js"
+    "cloesce": "dist/cli.js"
+  },
+  "typesVersions": {
+    "*": {
+      "backend": ["dist/index/backend.d.ts"],
+      "client": ["dist/index/client.d.ts"]
+    }
   },
   "files": [
-    "dist/**/*",
-    "README.md",
-    "LICENSE"
+    "dist/**/*"
   ],
   "sideEffects": false,
   "engines": {