rwsdk 1.2.10 → 1.2.12

package/dist/runtime/client/navigation.js

@@ -34,6 +34,13 @@ export function validateClickEvent(event, target) {
 }
 let IS_CLIENT_NAVIGATION = false;
 let scrollRestoration = null;
+let currentPathKey = null;
+function getLocationPathKey() {
+    return `${window.location.pathname ?? ""}${window.location.search ?? ""}`;
+}
+function getUrlPathKey(url) {
+    return `${url.pathname ?? ""}${url.search ?? ""}` || getLocationPathKey();
+}
 export async function navigate(href, options = { history: "push" }) {
     if (!IS_CLIENT_NAVIGATION) {
         window.location.href = href;
@@ -52,6 +59,7 @@ export async function navigate(href, options = { history: "push" }) {
     else {
         scrollRestoration?.replaceEntry(href, url, nextScrollPosition);
     }
+    currentPathKey = getUrlPathKey(url);
     if (scrollToTop) {
         scrollRestoration?.setPendingScroll({
             ...nextScrollPosition,
@@ -109,6 +117,7 @@ export function initClientNavigation(opts = {}) {
     IS_CLIENT_NAVIGATION = true;
     scrollRestoration = createScrollRestoration();
     scrollRestoration.initialize();
+    currentPathKey = getLocationPathKey();
     document.addEventListener("click", async function handleClickEvent(event) {
         if (!validateClickEvent(event, event.target)) {
             return;
@@ -120,6 +129,12 @@ export function initClientNavigation(opts = {}) {
         await navigate(href, { history: "push", onNavigate: opts.onNavigate });
     }, true);
     window.addEventListener("popstate", async function handlePopState() {
+        const nextPathKey = getLocationPathKey();
+        const isHashOnlyChange = nextPathKey === currentPathKey;
+        currentPathKey = nextPathKey;
+        if (isHashOnlyChange) {
+            return;
+        }
         scrollRestoration?.restorePopStateScroll();
         await opts.onNavigate?.();
         await globalThis.__rsc_callServer(null, null, "navigation");

package/dist/runtime/client/navigation.test.js

@@ -103,7 +103,7 @@ describe("onNavigate callback (issue #1123 regression)", () => {
             }),
         });
         vi.stubGlobal("window", {
-            location: { href: "http://localhost/" },
+            location: { href: "http://localhost/", pathname: "/", search: "" },
             addEventListener: vi.fn((event, handler) => {
                 if (event === "popstate")
                     capturedPopstateHandler = handler;
@@ -167,6 +167,7 @@ describe("onNavigate callback (issue #1123 regression)", () => {
         const onNavigate = vi.fn();
         initClientNavigation({ onNavigate });
         expect(capturedPopstateHandler).not.toBeNull();
+        window.location.pathname = "/about";
         await capturedPopstateHandler();
         expect(onNavigate).toHaveBeenCalled();
     });
@@ -208,11 +209,13 @@ describe("initClientNavigation", () => {
     let capturedScrollHandler = null;
     let capturedPagehideHandler = null;
     let capturedVisibilityChangeHandler = null;
+    let capturedPopstateHandler = null;
     beforeEach(() => {
         historyState = {};
         capturedScrollHandler = null;
         capturedPagehideHandler = null;
         capturedVisibilityChangeHandler = null;
+        capturedPopstateHandler = null;
         vi.clearAllMocks();
         const mockHistory = {
             scrollRestoration: "auto",
@@ -236,7 +239,7 @@ describe("initClientNavigation", () => {
             }),
         });
         vi.stubGlobal("window", {
-            location: { href: "http://localhost/" },
+            location: { href: "http://localhost/", pathname: "/", search: "" },
             addEventListener: vi.fn((event, handler) => {
                 if (event === "scroll") {
                     capturedScrollHandler = handler;
@@ -244,6 +247,9 @@ describe("initClientNavigation", () => {
                 if (event === "pagehide") {
                     capturedPagehideHandler = handler;
                 }
+                if (event === "popstate") {
+                    capturedPopstateHandler = handler;
+                }
             }),
             history: mockHistory,
             fetch: vi.fn(),
@@ -279,6 +285,22 @@ describe("initClientNavigation", () => {
         initClientNavigation();
         expect(history.scrollRestoration).toBe("manual");
     });
+    it("ignores hash-only popstate events so anchor links keep their native scroll", async () => {
+        const onNavigate = vi.fn();
+        globalThis.__rsc_callServer = vi.fn().mockResolvedValue(undefined);
+        const { onHydrated } = initClientNavigation({ onNavigate });
+        expect(capturedPopstateHandler).not.toBeNull();
+        window.location.hash =
+            "#heading";
+        window.location.href =
+            "http://localhost/#heading";
+        window.scrollY = 500;
+        await capturedPopstateHandler();
+        onHydrated();
+        expect(onNavigate).not.toHaveBeenCalled();
+        expect(globalThis.__rsc_callServer).not.toHaveBeenCalled();
+        expect(window.scrollTo).not.toHaveBeenCalled();
+    });
     it("does not write to history state on scroll", () => {
         initClientNavigation();
         expect(capturedScrollHandler).not.toBeNull();

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

@@ -0,0 +1,8 @@
+import { type DatabaseMetadata, type DatabaseMetadataOptions, type Kysely, type SchemaMetadata, type TableMetadata } from "kysely";
+export declare class DOSqliteIntrospector {
+    #private;
+    constructor(db: Kysely<any>);
+    getSchemas(): Promise<SchemaMetadata[]>;
+    getTables(options?: DatabaseMetadataOptions): Promise<TableMetadata[]>;
+    getMetadata(options: DatabaseMetadataOptions): Promise<DatabaseMetadata>;
+}

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

@@ -0,0 +1,129 @@
+// NOTE(justinvdm, 9 Jun 2026): This file copies Kysely's SqliteIntrospector.
+// Before trying to simplify it, read this comment.
+//
+// Problem: Cloudflare's DO SQLite adds internal tables (_cf_KV, _cf_METADATA)
+// when storage.put/setAlarm is used. Kysely's SqliteIntrospector discovers
+// these via sqlite_master, then runs PRAGMA table_info on each. Cloudflare's
+// authorizer rejects PRAGMA on _cf_* tables with SQLITE_AUTH, breaking
+// migrations and rendering the DO unusable.
+//
+// Why we copied instead of composed:
+// - Kysely's SqliteIntrospector uses JS private fields (#db, #tablesQuery,
+//   #getTableMetadata). Private fields are truly private — subclasses cannot
+//   override them, and wrappers cannot intercept internal calls.
+// - We considered a lighter approach: query sqlite_master with Kysely's
+//   builder, then run PRAGMA table_info per-table. This is lighter but
+//   requires inlining the table name into raw SQL. Even with escaping,
+//   any injection risk is unacceptable. The CTE approach below uses
+//   `pragma_table_info(tl.name)` where `tl.name` is a column reference,
+//   not an inlined value — zero injection surface.
+// - We also considered Kysely plugins (AST rewriting, SQL string rewriting)
+//   but these are fragile: they depend on Kysely's internal AST shape and
+//   SQL formatting, both of which can change between releases.
+//
+// This is a copy of Kysely's SqliteIntrospector (MIT licensed) with one
+// change: `.where('name', 'not like', '_cf_%')` to exclude Cloudflare tables.
+//
+// See: https://github.com/redwoodjs/sdk/issues/1219
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _DOSqliteIntrospector_instances, _DOSqliteIntrospector_db, _DOSqliteIntrospector_tablesQuery, _DOSqliteIntrospector_getTableMetadata;
+import { DEFAULT_MIGRATION_LOCK_TABLE, DEFAULT_MIGRATION_TABLE, sql, } from "kysely";
+export class DOSqliteIntrospector {
+    constructor(db) {
+        _DOSqliteIntrospector_instances.add(this);
+        _DOSqliteIntrospector_db.set(this, void 0);
+        __classPrivateFieldSet(this, _DOSqliteIntrospector_db, db, "f");
+    }
+    async getSchemas() {
+        // Sqlite doesn't support schemas.
+        return [];
+    }
+    async getTables(options = { withInternalKyselyTables: false }) {
+        return await __classPrivateFieldGet(this, _DOSqliteIntrospector_instances, "m", _DOSqliteIntrospector_getTableMetadata).call(this, options);
+    }
+    async getMetadata(options) {
+        return {
+            tables: await this.getTables(options),
+        };
+    }
+}
+_DOSqliteIntrospector_db = new WeakMap(), _DOSqliteIntrospector_instances = new WeakSet(), _DOSqliteIntrospector_tablesQuery = function _DOSqliteIntrospector_tablesQuery(qb, options) {
+    let tablesQuery = qb
+        .selectFrom("sqlite_master")
+        .where("type", "in", ["table", "view"])
+        .where("name", "not like", "sqlite_%")
+        // context(justinvdm, 9 Jun 2026): Exclude Cloudflare internal tables.
+        // These are added by the DO runtime and cannot be introspected.
+        .where("name", "not like", "_cf_%")
+        .select(["name", "sql", "type"])
+        .orderBy("name");
+    if (!options.withInternalKyselyTables) {
+        tablesQuery = tablesQuery
+            .where("name", "!=", DEFAULT_MIGRATION_TABLE)
+            .where("name", "!=", DEFAULT_MIGRATION_LOCK_TABLE);
+    }
+    return tablesQuery;
+}, _DOSqliteIntrospector_getTableMetadata = async function _DOSqliteIntrospector_getTableMetadata(options) {
+    const tablesResult = await __classPrivateFieldGet(this, _DOSqliteIntrospector_instances, "m", _DOSqliteIntrospector_tablesQuery).call(this, __classPrivateFieldGet(this, _DOSqliteIntrospector_db, "f"), options).execute();
+    const tableMetadata = await __classPrivateFieldGet(this, _DOSqliteIntrospector_db, "f")
+        .with("table_list", (qb) => __classPrivateFieldGet(this, _DOSqliteIntrospector_instances, "m", _DOSqliteIntrospector_tablesQuery).call(this, qb, options))
+        .selectFrom([
+        "table_list as tl",
+        sql `pragma_table_info(tl.name)`.as("p"),
+    ])
+        .select([
+        "tl.name as table",
+        "p.cid",
+        "p.name",
+        "p.type",
+        "p.notnull",
+        "p.dflt_value",
+        "p.pk",
+    ])
+        .orderBy("tl.name")
+        .orderBy("p.cid")
+        .execute();
+    const columnsByTable = {};
+    for (const row of tableMetadata) {
+        columnsByTable[row.table] ??= [];
+        columnsByTable[row.table].push(row);
+    }
+    return tablesResult.map(({ name, sql: tableSql, type }) => {
+        let autoIncrementCol = tableSql
+            ?.split(/[\(\),]/)
+            ?.find((it) => it.toLowerCase().includes("autoincrement"))
+            ?.trimStart()
+            ?.split(/\s+/)?.[0]
+            ?.replace(/["`]/g, "");
+        const columns = columnsByTable[name] ?? [];
+        if (!autoIncrementCol) {
+            const pkCols = columns.filter((r) => r.pk > 0);
+            if (pkCols.length === 1 &&
+                pkCols[0].type.toLowerCase() === "integer") {
+                autoIncrementCol = pkCols[0].name;
+            }
+        }
+        return {
+            name: name,
+            isView: type === "view",
+            columns: columns.map((col) => ({
+                name: col.name,
+                dataType: col.type,
+                isNullable: !col.notnull,
+                isAutoIncrementing: col.name === autoIncrementCol,
+                hasDefaultValue: col.dflt_value != null,
+                comment: undefined,
+            })),
+        };
+    });
+};

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

@@ -1,4 +1,5 @@
-import { DatabaseConnection, Driver, QueryResult, SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely";
+import { DatabaseConnection, Driver, QueryResult, SqliteAdapter, SqliteQueryCompiler } from "kysely";
+import { DOSqliteIntrospector } from "./DOSqliteIntrospector.js";
 type DOWorkerDialectConfig = {
     kyselyExecuteQuery: (compiledQuery: {
         sql: string;
@@ -11,7 +12,7 @@ export declare class DOWorkerDialect {
     createAdapter(): SqliteAdapter;
     createDriver(): DOWorkerDriver;
     createQueryCompiler(): SqliteQueryCompiler;
-    createIntrospector(db: any): SqliteIntrospector;
+    createIntrospector(db: any): DOSqliteIntrospector;
 }
 declare class DOWorkerDriver implements Driver {
     config: DOWorkerDialectConfig;

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

@@ -1,5 +1,6 @@
-import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler, } from "kysely";
+import { SqliteAdapter, SqliteQueryCompiler, } from "kysely";
 import debug from "../debug";
+import { DOSqliteIntrospector } from "./DOSqliteIntrospector.js";
 const log = debug("sdk:db:do-worker-dialect");
 export class DOWorkerDialect {
     constructor(config) {
@@ -15,7 +16,7 @@ export class DOWorkerDialect {
         return new SqliteQueryCompiler();
     }
     createIntrospector(db) {
-        return new SqliteIntrospector(db);
+        return new DOSqliteIntrospector(db);
     }
 }
 class DOWorkerDriver {

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

@@ -2,7 +2,16 @@ import { DurableObject } from "cloudflare:workers";
 import { DODialect } from "kysely-do";
 import { Kysely, ParseJSONResultsPlugin, } from "kysely";
 import debug from "../debug.js";
+import { DOSqliteIntrospector } from "./DOSqliteIntrospector.js";
 import { createMigrator } from "./index.js";
+// context(justinvdm, 9 Jun 2026): Wrapper around kysely-do's DODialect that
+// uses our custom introspector to avoid SQLITE_AUTH on Cloudflare internal
+// _cf_* tables. See DOSqliteIntrospector for details.
+class DODialectWithCustomIntrospector extends DODialect {
+    createIntrospector(db) {
+        return new DOSqliteIntrospector(db);
+    }
+}
 const log = debug("sdk:do-db");
 // Base class for Durable Objects that need Kysely database access
 export class SqliteDurableObject extends DurableObject {
@@ -12,7 +21,7 @@ export class SqliteDurableObject extends DurableObject {
         this.migrations = migrations;
         this.migrationTableName = migrationTableName;
         this.kysely = new Kysely({
-            dialect: new DODialect({ ctx }),
+            dialect: new DODialectWithCustomIntrospector({ ctx }),
             plugins: plugins,
         });
     }

package/dist/vite/transformServerFunctions.mjs

@@ -94,10 +94,8 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         process.env.VERBOSE &&
             log(`Transforming for ${environment} environment: normalizedId=%s`, normalizedId);
         const exportInfo = findExportInfo(code, normalizedId);
-        const allExports = new Set([
-            ...exportInfo.localFunctions,
-            ...exportInfo.reExports.map((r) => r.localName),
-        ]);
+        const reExportNames = new Set(exportInfo.reExports.map((r) => r.localName));
+        const allExports = new Set(Array.from(exportInfo.localFunctions).filter((name) => !reExportNames.has(name)));
         // Check for default function exports that should also be named exports
         const defaultFunctionName = findDefaultFunctionName(code, normalizedId);
         if (defaultFunctionName) {
@@ -105,11 +103,26 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         }
         // Generate completely new code for SSR
         const s = new MagicString("");
-        if (environment === "ssr") {
-            s.append('import { createServerReference } from "rwsdk/__ssr";\n\n');
+        const hasDefExport = hasDefaultExport(code, normalizedId);
+        if (allExports.size > 0 || hasDefExport) {
+            if (environment === "ssr") {
+                s.append('import { createServerReference } from "rwsdk/__ssr";\n\n');
+            }
+            else {
+                s.append('import { createServerReference } from "rwsdk/client";\n\n');
+            }
         }
-        else {
-            s.append('import { createServerReference } from "rwsdk/client";\n\n');
+        for (const reExport of exportInfo.reExports) {
+            const reExportStatement = reExport.originalName === "default"
+                ? `export { default as ${reExport.localName} } from ${JSON.stringify(reExport.moduleSpecifier)};\n`
+                : reExport.originalName === reExport.localName
+                    ? `export { ${reExport.originalName} } from ${JSON.stringify(reExport.moduleSpecifier)};\n`
+                    : `export { ${reExport.originalName} as ${reExport.localName} } from ${JSON.stringify(reExport.moduleSpecifier)};\n`;
+            s.append(reExportStatement);
+            log(`Preserved ${environment} re-export for function: %s (original: %s) from %s in normalizedId=%s`, reExport.localName, reExport.originalName, reExport.moduleSpecifier, normalizedId);
+        }
+        if (exportInfo.reExports.length > 0 && allExports.size > 0) {
+            s.append("\n");
         }
         const ext = path.extname(normalizedId).toLowerCase();
         const lang = ext === ".tsx" || ext === ".jsx" ? Lang.Tsx : SgLang.TypeScript;
@@ -151,7 +164,7 @@ export const transformServerFunctions = (code, normalizedId, environment, server
             }
         }
         // Check for default export in the actual module (not re-exports)
-        if (hasDefaultExport(code, normalizedId)) {
+        if (hasDefExport) {
             let method;
             let source = "action";
             const patterns = [

package/dist/vite/transformServerFunctions.test.mjs

@@ -169,6 +169,17 @@ export const getProject = serverQuery([
         SERVER_QUERY_ARRAY_POST_CODE,
     };
     describe("TRANSFORMS", () => {
+        it("preserves client re-exports so serverQuery metadata comes from the defining module", () => {
+            const barrelResult = transformServerFunctions(`
+"use server";
+
+export { getProject } from "./queries";
+`, "/actions.ts", "client", new Set());
+            expect(barrelResult?.code).toContain(`export { getProject } from "./queries";`);
+            expect(barrelResult?.code).not.toContain(`createServerReference("/actions.ts", "getProject")`);
+            const queryResult = transformServerFunctions(SERVER_QUERY_GET_CODE, "/queries.ts", "client", new Set());
+            expect(queryResult?.code).toContain(`createServerReference("/queries.ts", "getProject", "GET", "query")`);
+        });
         for (const [key, CODE] of Object.entries(TEST_CASES)) {
             describe(key, () => {
                 it(`CLIENT`, () => {

package/package.json

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