create-cloesce 0.0.5 → 0.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-cloesce",
   "description": "Create Cloesce App",
-  "version": "0.0.5",
+  "version": "0.2.0",
   "author": "Ben Schreiber <bpschreiber2003@gmail.com>",
   "repository": {
     "url": "https://github.com/bens-schreiber/create-cloesce-app"

package/templates/default/cloesce.config.ts

@@ -0,0 +1,16 @@
+import { defineConfig } from "cloesce/config";
+import { Weather } from "./src/data/models.cloesce";
+
+const config = defineConfig({
+    srcPaths: ["./src/data"],
+    workersUrl: "http://localhost:5000/api",
+    wranglerConfigFormat: "jsonc",
+});
+
+// The Fluent API can be used to further configure models,
+// for example to add a unique constraint on the Weather model:
+config.model(Weather, builder => {
+    builder.unique("dateTime", "location");
+});
+
+export default config;

package/templates/default/package.json

@@ -5,14 +5,14 @@
   "main": "index.js",
   "scripts": {
     "build": "cloesce compile && wrangler build",
-    "migrate:cloesce": "cloesce migrate",
+    "migrate:cloesce": "cloesce migrate db",
     "migrate:wrangler": "wrangler d1 migrations apply db",
     "start:dev": "wrangler dev --port 5000",
     "start:web": "vite",
     "test": "vitest"
   },
   "dependencies": {
-    "cloesce": ">=0.1.0",
+    "cloesce": ">=0.2.2",
     "wrangler": "^4.61.1"
   },
   "devDependencies": {

package/templates/default/src/data/models.cloesce.ts

@@ -1,19 +1,18 @@
-import { GET, POST, HttpResult, IncludeTree, Integer, Model, R2, Inject } from "cloesce/backend";
+import { Get, Post, HttpResult, Integer, Model, R2, Inject, Crud } from "cloesce/backend";
 import { R2ObjectBody, ReadableStream } from "@cloudflare/workers-types";
 import { Env } from "./main.cloesce";
 
-@Model()
+@Model("db")
 export class Weather {
     // Cloesce interprets this is a primary key.
     // Optionally, decorate with @PrimaryKey
     id: Integer;
 
     // Foreign key to WeatherReport
-    // Optionally, decorate with @ForeignKey
+    // Optionally, decorate with @ForeignKey<WeatherReport>(wr => wr.id)
     weatherReportId: Integer;
 
     // Navigation property to weatherReportId
-    // Optionally, decorate with @OneToOne<Weather>(w => w.weatherReportId)
     weatherReport: WeatherReport | undefined;
 
     dateTime: Date;
@@ -24,18 +23,13 @@ export class Weather {
     @R2("weather/photo/{id}", "bucket")
     photo: R2ObjectBody | undefined;
 
-    // Hydrates the photo when the client calls "withPhoto"
-    static readonly withPhoto: IncludeTree<Weather> = {
-        photo: {}
-    }
-
-    @POST
+    @Post()
     async uploadPhoto(@Inject env: Env, stream: ReadableStream): Promise<HttpResult<void>> {
         await env.bucket.put(`weather/photo/${this.id}`, stream);
         return HttpResult.ok(200);
     }
 
-    @GET
+    @Get({ includeTree: { photo: {} } })
     downloadPhoto(): HttpResult<ReadableStream> {
         if (!this.photo) {
             return HttpResult.fail(404, "Photo not found");
@@ -44,7 +38,8 @@ export class Weather {
     }
 }
 
-@Model(["GET", "LIST", "SAVE"])
+@Crud("GET", "SAVE", "LIST")
+@Model("db")
 export class WeatherReport {
     // Cloesce assumes this is a primary key.
     // Optionally, decorate with @PrimaryKey
@@ -54,12 +49,5 @@ export class WeatherReport {
     description: string;
 
     // Cloesce assumes this is a foreign key to Weather.weatherReportId
-    // Optionally, or if multiple FKs exist, decorate with
-    // @OneToMany<Weather>(w => w.weatherReportId)
     weatherEntries: Weather[];
-
-    // Hydrates the weatherEntries when the client calls "withWeatherEntries"
-    static readonly withWeatherEntries: IncludeTree<WeatherReport> = {
-        weatherEntries: {}
-    }
 }

package/templates/default/src/web/index.ts

@@ -21,7 +21,7 @@ const showResult = (outputId: string, result: any) => {
 };
 
 window.listReports = async () => {
-    const result = await WeatherReport.LIST("withWeatherEntries");
+    const result = await WeatherReport.LIST(null, null, null);
     showResult('list-output', result);
 };
 
@@ -46,7 +46,7 @@ window.addWeatherEntry = async () => {
         return;
     }
 
-    const getResult = await WeatherReport.GET(reportId, "withWeatherEntries");
+    const getResult = await WeatherReport.GET(reportId);
     if (!getResult.ok) {
         showResult('entry-output', getResult);
         return;
@@ -66,7 +66,7 @@ window.addWeatherEntry = async () => {
         title: report.title,
         description: report.description,
         weatherEntries: [...(report.weatherEntries || []), newEntry]
-    }, "withWeatherEntries");
+    });
 
     showResult('entry-output', result);
 };
@@ -90,7 +90,7 @@ window.uploadPhoto = async () => {
     const weather = new Weather();
     weather.id = id;
 
-    const result = await weather.uploadPhoto(new Uint8Array(buffer), "withPhoto");
+    const result = await weather.uploadPhoto(new Uint8Array(buffer));
     showResult('upload-output', result);
 };
 
@@ -104,7 +104,7 @@ window.downloadPhoto = async () => {
 
     const weather = new Weather();
     weather.id = id;
-    const result = await weather.downloadPhoto("withPhoto");
+    const result = await weather.downloadPhoto();
 
     if (result.ok && result.data) {
         const blob = await result.data.blob();

package/templates/default/test/weather.test.ts

@@ -33,7 +33,10 @@ async function createTestEnv() {
       "condition" text NOT NULL,
       FOREIGN KEY ("weatherReportId") REFERENCES "WeatherReport" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
     );
-    CREATE TABLE IF NOT EXISTS "_cloesce_tmp" ("path" text PRIMARY KEY, "id" integer NOT NULL);
+    CREATE TABLE IF NOT EXISTS "_cloesce_tmp" (
+    "path" text PRIMARY KEY,
+    "primary_key" text NOT NULL
+    );
   `).run();
 
     return { env, orm: Orm.fromEnv(env) };
@@ -65,13 +68,12 @@ describe("Miniflare Integration Tests", () => {
                     condition: "Sunny"
                 }]
             },
-            WeatherReport.withWeatherEntries
         );
 
         await report!.weatherEntries[0].uploadPhoto(env, testData as any);
 
         // Act
-        const weatherEntries = await orm.list(Weather, Weather.withPhoto);
+        const weatherEntries = await orm.list(Weather);
         const photo = weatherEntries[0].downloadPhoto();
 
         // Assert

package/templates/default/vitest.config.ts

@@ -0,0 +1,6 @@
+import { defineConfig } from "vitest/config";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+export default defineConfig({
+    plugins: [tsconfigPaths()]
+});

package/templates/default/wrangler.jsonc

@@ -0,0 +1,3 @@
+{
+    "main": ".generated/workers.ts"
+}

package/templates/default/cloesce.config.json

@@ -1,7 +0,0 @@
-{
-    "paths": [
-        "./src/data"
-    ],
-    "workersUrl": "http://localhost:5000/api",
-    "migrationsPath": "./migrations"
-}

package/templates/default/wrangler.toml

@@ -1 +0,0 @@
-main = ".generated/workers.ts"