@fedify/sqlite 2.0.0-dev.1604 → 2.0.0-dev.161

package/dist/sqlite.node.cjs

@@ -0,0 +1,44 @@
+
+        const { Temporal } = require("@js-temporal/polyfill");
+      
+const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
+const node_sqlite = require_rolldown_runtime.__toESM(require("node:sqlite"));
+
+//#region src/sqlite.node.ts
+var SqliteDatabase = class {
+	constructor(db) {
+		this.db = db;
+	}
+	prepare(sql) {
+		return new SqliteStatement(this.db.prepare(sql));
+	}
+	exec(sql) {
+		this.db.exec(sql);
+	}
+	close() {
+		this.db.close();
+	}
+};
+var SqliteStatement = class {
+	constructor(stmt) {
+		this.stmt = stmt;
+	}
+	run(...params) {
+		const result = this.stmt.run(...params);
+		return {
+			changes: Number(result.changes),
+			lastInsertRowid: Number(result.lastInsertRowid)
+		};
+	}
+	get(...params) {
+		return this.stmt.get(...params);
+	}
+	all(...params) {
+		return this.stmt.all(...params);
+	}
+};
+
+//#endregion
+exports.PlatformDatabase = node_sqlite.DatabaseSync;
+exports.SqliteDatabase = SqliteDatabase;
+exports.SqliteStatement = SqliteStatement;

package/dist/sqlite.node.d.cts

@@ -0,0 +1,23 @@
+import { SqliteDatabaseAdapter, SqliteStatementAdapter } from "./adapter.cjs";
+import { DatabaseSync, StatementSync } from "node:sqlite";
+
+//#region src/sqlite.node.d.ts
+declare class SqliteDatabase implements SqliteDatabaseAdapter {
+  private readonly db;
+  constructor(db: DatabaseSync);
+  prepare(sql: string): SqliteStatementAdapter;
+  exec(sql: string): void;
+  close(): void;
+}
+declare class SqliteStatement implements SqliteStatementAdapter {
+  private readonly stmt;
+  constructor(stmt: StatementSync);
+  run(...params: unknown[]): {
+    changes: number;
+    lastInsertRowid: number;
+  };
+  get(...params: unknown[]): unknown | undefined;
+  all(...params: unknown[]): unknown[];
+}
+//#endregion
+export { DatabaseSync as PlatformDatabase, StatementSync as PlatformStatement, SqliteDatabase, SqliteStatement };

package/dist/sqlite.node.js

@@ -1,6 +1,6 @@
 
-      import { Temporal } from "@js-temporal/polyfill";
-    
+        import { Temporal } from "@js-temporal/polyfill";
+      
 import { DatabaseSync } from "node:sqlite";
 
 //#region src/sqlite.node.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/sqlite",
-  "version": "2.0.0-dev.1604+23a1ea67",
+  "version": "2.0.0-dev.161+b505ad7a",
   "description": "SQLite drivers for Fedify",
   "keywords": [
     "fedify",
@@ -22,18 +22,28 @@
     "https://github.com/sponsors/dahlia"
   ],
   "type": "module",
-  "main": "./dist/mod.js",
+  "main": "./dist/mod.cjs",
   "module": "./dist/mod.js",
   "types": "./dist/mod.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/mod.d.ts",
+      "types": {
+        "import": "./dist/mod.d.ts",
+        "require": "./dist/mod.d.cts",
+        "default": "./dist/mod.d.ts"
+      },
       "import": "./dist/mod.js",
+      "require": "./dist/mod.cjs",
       "default": "./dist/mod.js"
     },
     "./kv": {
-      "types": "./dist/kv.d.ts",
+      "types": {
+        "import": "./dist/kv.d.ts",
+        "require": "./dist/kv.d.cts",
+        "default": "./dist/kv.d.ts"
+      },
       "import": "./dist/kv.js",
+      "require": "./dist/kv.cjs",
       "default": "./dist/kv.js"
     },
     "./package.json": "./package.json"
@@ -47,17 +57,17 @@
     }
   },
   "dependencies": {
-    "@logtape/logtape": "^1.0.0",
+    "@js-temporal/polyfill": "^0.5.1",
+    "@logtape/logtape": "^1.3.5",
     "es-toolkit": "^1.31.0"
   },
   "peerDependencies": {
-    "@fedify/fedify": "^2.0.0-dev.1604+23a1ea67"
+    "@fedify/fedify": "^2.0.0-dev.161+b505ad7a"
   },
   "devDependencies": {
-    "@js-temporal/polyfill": "^0.5.1",
     "@std/async": "npm:@jsr/std__async@^1.0.13",
     "tsdown": "^0.12.9",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "build": "tsdown",

package/src/kv.test.ts

@@ -1,9 +1,9 @@
 import { PlatformDatabase } from "#sqlite";
+import { SqliteKvStore } from "@fedify/sqlite/kv";
 import * as temporal from "@js-temporal/polyfill";
 import { delay } from "@std/async/delay";
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import { SqliteKvStore } from "./kv.ts";
 
 let Temporal: typeof temporal.Temporal;
 if ("Temporal" in globalThis) {
@@ -31,7 +31,7 @@ test("SqliteKvStore.initialize()", async () => {
   try {
     await store.initialize();
     const result = await db.prepare(`
-      SELECT name FROM sqlite_master 
+      SELECT name FROM sqlite_master
       WHERE type='table' AND name=?
     `).get(tableName);
     assert(result !== undefined);
@@ -180,7 +180,7 @@ test("SqliteKvStore.drop()", async () => {
   try {
     await store.drop();
     const result = await db.prepare(`
-      SELECT name FROM sqlite_master 
+      SELECT name FROM sqlite_master
       WHERE type='table' AND name=?
     `).get(tableName);
     // Bun returns null, Node returns undefined
@@ -310,3 +310,96 @@ test("SqliteKvStore.set() - preserves created timestamp on update", async () =>
     await db.close();
   }
 });
+
+test("SqliteKvStore.list()", async () => {
+  const { db, store } = getStore();
+  try {
+    await store.set(["prefix", "a"], "value-a");
+    await store.set(["prefix", "b"], "value-b");
+    await store.set(["prefix", "nested", "c"], "value-c");
+    await store.set(["other", "x"], "value-x");
+
+    const entries: { key: readonly string[]; value: unknown }[] = [];
+    for await (const entry of store.list(["prefix"])) {
+      entries.push({ key: entry.key, value: entry.value });
+    }
+
+    assert.strictEqual(entries.length, 3);
+    assert(
+      entries.some((e) => e.key[1] === "a" && e.value === "value-a"),
+    );
+    assert(entries.some((e) => e.key[1] === "b"));
+    assert(entries.some((e) => e.key[1] === "nested"));
+  } finally {
+    await store.drop();
+    await db.close();
+  }
+});
+
+test("SqliteKvStore.list() - excludes expired", async () => {
+  const { db, tableName, store } = getStore();
+  try {
+    await store.initialize();
+    const now = Temporal.Now.instant().epochMilliseconds;
+
+    // Insert expired entry directly
+    db.prepare(`
+      INSERT INTO "${tableName}" (key, value, created, expires)
+      VALUES (?, ?, ?, ?)
+    `).run(
+      JSON.stringify(["list-test", "expired"]),
+      JSON.stringify("expired-value"),
+      now - 1000,
+      now - 500,
+    );
+    await store.set(["list-test", "valid"], "valid-value");
+
+    const entries: { key: readonly string[]; value: unknown }[] = [];
+    for await (const entry of store.list(["list-test"])) {
+      entries.push({ key: entry.key, value: entry.value });
+    }
+
+    assert.strictEqual(entries.length, 1);
+    assert.deepStrictEqual(entries[0].key, ["list-test", "valid"]);
+  } finally {
+    await store.drop();
+    await db.close();
+  }
+});
+
+test("SqliteKvStore.list() - single element key", async () => {
+  const { db, store } = getStore();
+  try {
+    await store.set(["a"], "value-a");
+    await store.set(["b"], "value-b");
+
+    const entries: { key: readonly string[]; value: unknown }[] = [];
+    for await (const entry of store.list(["a"])) {
+      entries.push({ key: entry.key, value: entry.value });
+    }
+
+    assert.strictEqual(entries.length, 1);
+  } finally {
+    await store.drop();
+    await db.close();
+  }
+});
+
+test("SqliteKvStore.list() - empty prefix", async () => {
+  const { db, store } = getStore();
+  try {
+    await store.set(["a"], "value-a");
+    await store.set(["b", "c"], "value-bc");
+    await store.set(["d", "e", "f"], "value-def");
+
+    const entries: { key: readonly string[]; value: unknown }[] = [];
+    for await (const entry of store.list()) {
+      entries.push({ key: entry.key, value: entry.value });
+    }
+
+    assert.strictEqual(entries.length, 3);
+  } finally {
+    await store.drop();
+    await db.close();
+  }
+});

package/src/kv.ts

@@ -1,6 +1,10 @@
 import { type PlatformDatabase, SqliteDatabase } from "#sqlite";
-import type { KvKey, KvStore, KvStoreSetOptions } from "@fedify/fedify";
-import { Temporal } from "@js-temporal/polyfill";
+import type {
+  KvKey,
+  KvStore,
+  KvStoreListEntry,
+  KvStoreSetOptions,
+} from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
 import { isEqual } from "es-toolkit";
 import type { SqliteDatabaseAdapter } from "./adapter.ts";
@@ -81,8 +85,8 @@ export class SqliteKvStore implements KvStore {
 
     const result = this.#db
       .prepare(`
-      SELECT value 
-      FROM "${this.#tableName}" 
+      SELECT value
+      FROM "${this.#tableName}"
       WHERE key = ? AND (expires IS NULL OR expires > ?)
     `)
       .get(encodedKey, now);
@@ -170,8 +174,8 @@ export class SqliteKvStore implements KvStore {
 
       const currentResult = this.#db
         .prepare(`
-          SELECT value 
-          FROM "${this.#tableName}" 
+          SELECT value
+          FROM "${this.#tableName}"
           WHERE key = ? AND (expires IS NULL OR expires > ?)
         `)
         .get(encodedKey, now) as { value: string } | undefined;
@@ -213,6 +217,51 @@ export class SqliteKvStore implements KvStore {
     }
   }
 
+  /**
+   * {@inheritDoc KvStore.list}
+   * @since 1.10.0
+   */
+  async *list(prefix?: KvKey): AsyncIterable<KvStoreListEntry> {
+    this.initialize();
+
+    const now = Temporal.Now.instant().epochMilliseconds;
+
+    let results: { key: string; value: string }[];
+
+    if (prefix == null || prefix.length === 0) {
+      // Empty prefix: return all entries
+      results = this.#db
+        .prepare(`
+          SELECT key, value
+          FROM "${this.#tableName}"
+          WHERE expires IS NULL OR expires > ?
+          ORDER BY key
+        `)
+        .all(now) as { key: string; value: string }[];
+    } else {
+      // JSON pattern: '["prefix","' matches keys starting with prefix
+      const pattern = JSON.stringify(prefix).slice(0, -1) + ",%";
+      const exactKey = JSON.stringify(prefix);
+
+      results = this.#db
+        .prepare(`
+          SELECT key, value
+          FROM "${this.#tableName}"
+          WHERE (key LIKE ? ESCAPE '\\' OR key = ?)
+            AND (expires IS NULL OR expires > ?)
+          ORDER BY key
+        `)
+        .all(pattern, exactKey, now) as { key: string; value: string }[];
+    }
+
+    for (const row of results) {
+      yield {
+        key: this.#decodeKey(row.key),
+        value: this.#decodeValue(row.value),
+      };
+    }
+  }
+
   /**
    * Creates the table used by the key–value store if it does not already exist.
    * Does nothing if the table already exists.
@@ -236,7 +285,7 @@ export class SqliteKvStore implements KvStore {
     `);
 
     this.#db.exec(`
-      CREATE INDEX IF NOT EXISTS "idx_${this.#tableName}_expires" 
+      CREATE INDEX IF NOT EXISTS "idx_${this.#tableName}_expires"
       ON "${this.#tableName}" (expires)
     `);
 

package/tsdown.config.ts

@@ -4,6 +4,7 @@ export default defineConfig({
   entry: ["src/mod.ts", "src/kv.ts", "src/sqlite.node.ts", "src/sqlite.bun.ts"],
   dts: true,
   unbundle: true,
+  format: ["esm", "cjs"],
   platform: "node",
   inputOptions: {
     onwarn(warning, defaultHandler) {
@@ -16,9 +17,16 @@ export default defineConfig({
       defaultHandler(warning);
     },
   },
-  outputOptions: {
-    intro: `
-      import { Temporal } from "@js-temporal/polyfill";
-    `,
+  outputOptions(outputOptions, format) {
+    if (format === "cjs") {
+      outputOptions.intro = `
+        const { Temporal } = require("@js-temporal/polyfill");
+      `;
+    } else {
+      outputOptions.intro = `
+        import { Temporal } from "@js-temporal/polyfill";
+      `;
+    }
+    return outputOptions;
   },
 });