update drizzle example and update tsconfig to be ES2020

karthik2804 · karthik2804 · commit 1d147ab271f0 · 2025-01-27T14:13:29.000+01:00
Signed-off-by: karthik2804 &lt;karthik.ganeshram@fermyon.com&gt;
diff --git a/examples/aws/s3/tsconfig.json b/examples/aws/s3/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/aws/sqs/tsconfig.json b/examples/aws/sqs/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/blob-storage/backblaze/tsconfig.json b/examples/blob-storage/backblaze/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/common-patterns/outbound-http/tsconfig.json b/examples/common-patterns/outbound-http/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/common-patterns/routing-requests/tsconfig.json b/examples/common-patterns/routing-requests/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/github/octokit-rest/tsconfig.json b/examples/github/octokit-rest/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/orm/drizzle/.npmrc b/examples/orm/drizzle/.npmrc
@@ -0,0 +1 @@
+KNITWIT_SOURCE=./config/knitwit.json
diff --git a/examples/orm/drizzle/README.md b/examples/orm/drizzle/README.md
@@ -2,13 +2,6 @@
 
 This example showcases how to use [Drizzle ORM](https://orm.drizzle.team/) to generate database queries and execute it against Spin's SQLite database. 
 
-## Install Dependencies
-Install the necessary npm packages:
-
-```bash
-npm install
-```
-
 ## Building and Running the Example
 
 ```bash
diff --git a/examples/orm/drizzle/config/knitwit.json b/examples/orm/drizzle/config/knitwit.json
@@ -0,0 +1,9 @@
+{
+    "version": 1,
+    "project": {
+        "worlds": [
+            "spin-http"
+        ]
+    },
+    "packages": {}
+}
diff --git a/examples/orm/drizzle/knitwit.json b/examples/orm/drizzle/knitwit.json
diff --git a/examples/orm/drizzle/package.json b/examples/orm/drizzle/package.json
@@ -4,7 +4,7 @@
     "description": "",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp target && npx j2w -i dist.js -n spin-http -o target/drizzle.wasm",
+        "build": "knitwit --out-dir build/wit/knitwit --out-world combined && npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/drizzle.wasm",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "keywords": [],
@@ -15,10 +15,12 @@
         "ts-loader": "^9.4.1",
         "typescript": "^4.8.4",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.10.0",
+        "@fermyon/knitwit": "0.3.0"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.0.0",
+        "@fermyon/spin-sdk": "^3.0.0-rc1",
+        "itty-router": "^5.0.18",
         "drizzle-orm": "^0.31.2"
     }
 }
diff --git a/examples/orm/drizzle/spin.toml b/examples/orm/drizzle/spin.toml
@@ -11,9 +11,9 @@ route = "/..."
 component = "drizzle"
 
 [component.drizzle]
-source = "target/drizzle.wasm"
+source = "dist/drizzle.wasm"
 exclude_files = ["**/node_modules"]
 sqlite_databases = ["default"]
 [component.drizzle.build]
-command = "npm run build"
-watch = ["src/**/*.ts", "package.json"]
+command = ["npm install", "npm run build"]
+watch = ["src/**/*.ts"]
diff --git a/examples/orm/drizzle/src/index.ts b/examples/orm/drizzle/src/index.ts
@@ -1,38 +1,49 @@
-import { ResponseBuilder, Sqlite } from '@fermyon/spin-sdk';
+// https://itty.dev/itty-router/routers/autorouter
+import { Sqlite } from '@fermyon/spin-sdk';
+import { AutoRouter } from 'itty-router';
 import { ParameterValue } from '@fermyon/spin-sdk/lib/sqlite';
 import { eq } from 'drizzle-orm';
 import {
-  sqliteTable,
-  text,
-  integer,
-  QueryBuilder,
+    sqliteTable,
+    text,
+    integer,
+    QueryBuilder,
 } from 'drizzle-orm/sqlite-core';
 
 const users = sqliteTable('users', {
-  id: integer('id').primaryKey(),
-  name: text('name').notNull(),
-  age: integer('age'),
+    id: integer('id').primaryKey(),
+    name: text('name').notNull(),
+    age: integer('age'),
 });
 
 // Need this as BigInt does not implement to JSON by default.
 (BigInt.prototype as any).toJSON = function () {
-  return this.toString();
+    return this.toString();
 };
 
-export async function handler(_req: Request, res: ResponseBuilder) {
-  // Use drizzle to generate the query.
-  const qb = new QueryBuilder();
-  const query = qb.select().from(users).where(eq(users.name, 'Dan'));
-  const { sql, params } = query.toSQL();
+let router = AutoRouter();
 
-  // Use the generated query and parameters to execute against Spin's SQLite database.
-  let sqlite = Sqlite.openDefault();
-  try {
-    let result = sqlite.execute(sql, params as ParameterValue[]);
-    res.send(JSON.stringify(result, null, 2));
-  } catch (e: any) {
-    console.log('Error: ' + JSON.stringify(e.payload));
-    res.status(500);
-    res.send('Error: ' + JSON.stringify(e));
-  }
-}
+// Route ordering matters, the first route that matches will be used
+// Any route that does not return will be treated as a middleware
+// Any unmatched route will return a 404
+router
+    .get("/", () => {
+        // Use drizzle to generate the query.
+        const qb = new QueryBuilder();
+        const query = qb.select().from(users).where(eq(users.name, 'Dan'));
+        const { sql, params } = query.toSQL();
+
+        // Use the generated query and parameters to execute against Spin's SQLite database.
+        let sqlite = Sqlite.openDefault();
+        try {
+            let result = sqlite.execute(sql, params as ParameterValue[]);
+            return new Response(JSON.stringify(result, null, 2), { status: 200 });
+        } catch (e: any) {
+            return new Response('Error: ' + JSON.stringify(e), { status: 500 });
+        }
+    })
+
+//@ts-ignore
+addEventListener('fetch', async (event: FetchEvent) => {
+    event.respondWith(router.fetch(event.request));
+});
diff --git a/examples/orm/drizzle/src/spin.ts b/examples/orm/drizzle/src/spin.ts
diff --git a/examples/orm/drizzle/tsconfig.json b/examples/orm/drizzle/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/orm/drizzle/webpack.config.js b/examples/orm/drizzle/webpack.config.js
@@ -1,33 +1,35 @@
 const path = require('path');
-const SpinSdkPlugin = require('@fermyon/spin-sdk/plugins/webpack');
+const SpinSdkPlugin = require("@fermyon/spin-sdk/plugins/webpack")
 
 module.exports = {
-  entry: './src/spin.ts',
-  experiments: {
-    outputModule: true,
-  },
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
+    entry: './src/index.ts',
+    experiments: {
+        outputModule: true,
+    },
+    module: {
+        rules: [
+            {
+                test: /\.tsx?$/,
+                use: 'ts-loader',
+                exclude: /node_modules/,
+            },
+        ],
+    },
+    resolve: {
+        extensions: ['.tsx', '.ts', '.js'],
+    },
+    output: {
+        path: path.resolve(__dirname, './build'),
+        filename: 'bundle.js',
+        module: true,
+        library: {
+            type: "module",
+        }
+    },
+    plugins: [
+        new SpinSdkPlugin()
     ],
-  },
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js'],
-  },
-  output: {
-    path: path.resolve(__dirname, './'),
-    filename: 'dist.js',
-    module: true,
-    library: {
-      type: 'module',
+    optimization: {
+        minimize: false
     },
-  },
-  plugins: [new SpinSdkPlugin()],
-  optimization: {
-    minimize: false,
-  },
-};
+};
diff --git a/examples/serverless_db/neondb/tsconfig.json b/examples/serverless_db/neondb/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/serverless_db/planetscale/tsconfig.json b/examples/serverless_db/planetscale/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-kv/tsconfig.json b/examples/spin-host-apis/spin-kv/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-llm/tsconfig.json b/examples/spin-host-apis/spin-llm/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-mqtt/tsconfig.json b/examples/spin-host-apis/spin-mqtt/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-mysql/tsconfig.json b/examples/spin-host-apis/spin-mysql/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-postgres/tsconfig.json b/examples/spin-host-apis/spin-postgres/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-redis/tsconfig.json b/examples/spin-host-apis/spin-redis/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-sqlite/tsconfig.json b/examples/spin-host-apis/spin-sqlite/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/spin-host-apis/spin-variables/tsconfig.json b/examples/spin-host-apis/spin-variables/tsconfig.json
@@ -7,7 +7,7 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015",
+            "ES2020",
             "WebWorker"
         ],
         "allowJs": true,
diff --git a/examples/upstash/qstash/tsconfig.json b/examples/upstash/qstash/tsconfig.json
diff --git a/examples/upstash/vector/tsconfig.json b/examples/upstash/vector/tsconfig.json
diff --git a/templates/http-ts/content/tsconfig.json b/templates/http-ts/content/tsconfig.json
diff --git a/templates/redis-ts/content/tsconfig.json b/templates/redis-ts/content/tsconfig.json
