rwsdk 0.1.31 → 0.1.33

package/dist/runtime/lib/db/DOWorkerDialect.d.ts

@@ -1,23 +1,21 @@
-import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler, Driver, DatabaseConnection } from "kysely";
+import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler, Driver, DatabaseConnection, QueryResult } from "kysely";
+type DOWorkerDialectConfig = {
+    kyselyExecuteQuery: (compiledQuery: {
+        sql: string;
+        parameters: readonly unknown[];
+    }) => Promise<QueryResult<any>>;
+};
 export declare class DOWorkerDialect {
-    config: {
-        stub: any;
-    };
-    constructor(config: {
-        stub: any;
-    });
+    config: DOWorkerDialectConfig;
+    constructor(config: DOWorkerDialectConfig);
     createAdapter(): SqliteAdapter;
     createDriver(): DOWorkerDriver;
     createQueryCompiler(): SqliteQueryCompiler;
     createIntrospector(db: any): SqliteIntrospector;
 }
 declare class DOWorkerDriver implements Driver {
-    config: {
-        stub: any;
-    };
-    constructor(config: {
-        stub: any;
-    });
+    config: DOWorkerDialectConfig;
+    constructor(config: DOWorkerDialectConfig);
     init(): Promise<void>;
     acquireConnection(): Promise<DatabaseConnection>;
     beginTransaction(conn: any): Promise<any>;

package/dist/runtime/lib/db/DOWorkerDialect.js

@@ -24,7 +24,7 @@ class DOWorkerDriver {
     }
     async init() { }
     async acquireConnection() {
-        return new DOWorkerConnection(this.config.stub.kyselyExecuteQuery);
+        return new DOWorkerConnection(this.config.kyselyExecuteQuery);
     }
     async beginTransaction(conn) {
         return await conn.beginTransaction();

package/dist/runtime/lib/db/createDb.d.ts

@@ -1,2 +1,3 @@
 import { Kysely } from "kysely";
-export declare function createDb<T>(durableObjectBinding: any, name?: string): Kysely<T>;
+import { type SqliteDurableObject } from "./index.js";
+export declare function createDb<T>(durableObjectBinding: DurableObjectNamespace<SqliteDurableObject>, name?: string): Kysely<T>;

package/dist/runtime/lib/db/createDb.js

@@ -1,40 +1,14 @@
 import { Kysely } from "kysely";
-import { requestInfo, waitForRequestInfo } from "../../requestInfo/worker.js";
 import { DOWorkerDialect } from "./DOWorkerDialect.js";
-const createDurableObjectDb = (durableObjectBinding, name = "main") => {
-    const durableObjectId = durableObjectBinding.idFromName(name);
-    const stub = durableObjectBinding.get(durableObjectId);
-    stub.initialize();
-    return new Kysely({
-        dialect: new DOWorkerDialect({ stub }),
-    });
-};
 export function createDb(durableObjectBinding, name = "main") {
-    const cacheKey = `${durableObjectBinding}_${name}`;
-    const doCreateDb = () => {
-        if (!requestInfo.rw) {
-            throw new Error(`
-  rwsdk: A database created using createDb() was accessed before requestInfo was available.
-
-  Please make sure database access is happening in a request handler or action handler.
-  `);
-        }
-        let db = requestInfo.rw.databases.get(cacheKey);
-        if (!db) {
-            db = createDurableObjectDb(durableObjectBinding, name);
-            requestInfo.rw.databases.set(cacheKey, db);
-        }
-        return db;
-    };
-    waitForRequestInfo().then(() => doCreateDb());
-    return new Proxy({}, {
-        get(target, prop, receiver) {
-            const db = doCreateDb();
-            const value = db[prop];
-            if (typeof value === "function") {
-                return value.bind(db);
-            }
-            return value;
-        },
+    return new Kysely({
+        dialect: new DOWorkerDialect({
+            kyselyExecuteQuery: (...args) => {
+                const durableObjectId = durableObjectBinding.idFromName(name);
+                const stub = durableObjectBinding.get(durableObjectId);
+                stub.initialize();
+                return stub.kyselyExecuteQuery(...args);
+            },
+        }),
     });
 }

package/dist/runtime/lib/db/index.d.ts

@@ -2,3 +2,4 @@ export * from "./migrations.js";
 export * from "./SqliteDurableObject.js";
 export * from "./createDb.js";
 export type * from "./typeInference/database.js";
+export { sql } from "kysely";

package/dist/runtime/lib/db/index.js

@@ -1,3 +1,4 @@
 export * from "./migrations.js";
 export * from "./SqliteDurableObject.js";
 export * from "./createDb.js";
+export { sql } from "kysely";

package/dist/scripts/debug-sync.mjs

@@ -24,21 +24,12 @@ const getPackageManagerInfo = (targetDir) => {
     }
     return pnpmResult;
 };
-const performFullSync = async (sdkDir, targetDir, cacheBust = false) => {
+const performFullSync = async (sdkDir, targetDir) => {
     const sdkPackageJsonPath = path.join(sdkDir, "package.json");
     let originalSdkPackageJson = null;
     let tarballPath = "";
     let tarballName = "";
     try {
-        if (cacheBust) {
-            console.log("💥 Cache-busting version for full sync...");
-            originalSdkPackageJson = await fs.readFile(sdkPackageJsonPath, "utf-8");
-            const packageJson = JSON.parse(originalSdkPackageJson);
-            const now = Date.now();
-            // This is a temporary version used for cache busting
-            packageJson.version = `${packageJson.version}-dev.${now}`;
-            await fs.writeFile(sdkPackageJsonPath, JSON.stringify(packageJson, null, 2));
-        }
         console.log("📦 Packing SDK...");
         const packResult = await $({ cwd: sdkDir }) `npm pack`;
         tarballName = packResult.stdout?.trim() ?? "";
@@ -109,13 +100,17 @@ const performFastSync = async (sdkDir, targetDir) => {
     // Always copy package.json
     await fs.copyFile(path.join(sdkDir, "package.json"), path.join(targetDir, "node_modules/rwsdk/package.json"));
 };
+const areDependenciesEqual = (deps1, deps2) => {
+    // Simple string comparison for this use case is sufficient
+    return JSON.stringify(deps1 ?? {}) === JSON.stringify(deps2 ?? {});
+};
 const performSync = async (sdkDir, targetDir) => {
     console.log("🏗️  Rebuilding SDK...");
     await $ `pnpm build`;
     const forceFullSync = Boolean(process.env.RWSDK_FORCE_FULL_SYNC);
     if (forceFullSync) {
         console.log("🏃 Force full sync mode is enabled.");
-        await performFullSync(sdkDir, targetDir, true);
+        await performFullSync(sdkDir, targetDir);
         console.log("✅ Done syncing");
         return;
     }
@@ -125,7 +120,11 @@ const performSync = async (sdkDir, targetDir) => {
     if (existsSync(installedSdkPackageJsonPath)) {
         const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
         const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
-        if (sdkPackageJsonContent === installedSdkPackageJsonContent) {
+        const sdkPkg = JSON.parse(sdkPackageJsonContent);
+        const installedPkg = JSON.parse(installedSdkPackageJsonContent);
+        if (areDependenciesEqual(sdkPkg.dependencies, installedPkg.dependencies) &&
+            areDependenciesEqual(sdkPkg.devDependencies, installedPkg.devDependencies) &&
+            areDependenciesEqual(sdkPkg.peerDependencies, installedPkg.peerDependencies)) {
             packageJsonChanged = false;
         }
     }

package/dist/vite/miniflareHMRPlugin.mjs

@@ -109,19 +109,19 @@ export const miniflareHMRPlugin = (givenOptions) => [
             let clientDirectiveChanged = false;
             let serverDirectiveChanged = false;
             if (!clientFiles.has(ctx.file) && hasClientDirective) {
-                clientFiles.add(ctx.file);
+                clientFiles.add(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 clientDirectiveChanged = true;
             }
             else if (clientFiles.has(ctx.file) && !hasClientDirective) {
-                clientFiles.delete(ctx.file);
+                clientFiles.delete(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 clientDirectiveChanged = true;
             }
             if (!serverFiles.has(ctx.file) && hasServerDirective) {
-                serverFiles.add(ctx.file);
+                serverFiles.add(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 serverDirectiveChanged = true;
             }
             else if (serverFiles.has(ctx.file) && !hasServerDirective) {
-                serverFiles.delete(ctx.file);
+                serverFiles.delete(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 serverDirectiveChanged = true;
             }
             if (clientDirectiveChanged) {
@@ -129,12 +129,14 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     invalidateModule(ctx.server, environment, "virtual:use-client-lookup.js");
                 });
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-client-lookup.js");
+                invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-client-lookup.js");
             }
             if (serverDirectiveChanged) {
                 ["client", "ssr", environment].forEach((environment) => {
                     invalidateModule(ctx.server, environment, "virtual:use-server-lookup.js");
                 });
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-server-lookup.js");
+                invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-server-lookup.js");
             }
             // todo(justinvdm, 12 Dec 2024): Skip client references
             const modules = Array.from(ctx.server.environments[environment].moduleGraph.getModulesByFile(ctx.file) ?? []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {