@fedify/sqlite 2.0.0-pr.451.1731 → 2.0.0-pr.457.1754

package/deno.json

@@ -1,14 +1,12 @@
 {
   "name": "@fedify/sqlite",
-  "version": "2.0.0-pr.451.1731+0cd4ea65",
+  "version": "2.0.0-pr.457.1754+e2ece3ba",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",
     "./kv": "./src/kv.ts"
   },
   "imports": {
-    "@fedify/sqlite": "./src/mod.ts",
-    "@fedify/sqlite/": "./src/",
     "#sqlite": "./src/sqlite.node.ts"
   },
   "exclude": [

package/dist/kv.cjs

@@ -3,7 +3,6 @@
       
 const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
 const __sqlite = require_rolldown_runtime.__toESM(require("#sqlite"));
-const __js_temporal_polyfill = require_rolldown_runtime.__toESM(require("@js-temporal/polyfill"));
 const __logtape_logtape = require_rolldown_runtime.__toESM(require("@logtape/logtape"));
 const es_toolkit = require_rolldown_runtime.__toESM(require("es-toolkit"));
 
@@ -54,10 +53,10 @@ var SqliteKvStore = class SqliteKvStore {
 	async get(key) {
 		this.initialize();
 		const encodedKey = this.#encodeKey(key);
-		const now = __js_temporal_polyfill.Temporal.Now.instant().epochMilliseconds;
+		const now = Temporal.Now.instant().epochMilliseconds;
 		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);
 		if (!result) return void 0;
@@ -71,7 +70,7 @@ var SqliteKvStore = class SqliteKvStore {
 		if (value === void 0) return;
 		const encodedKey = this.#encodeKey(key);
 		const encodedValue = this.#encodeValue(value);
-		const now = __js_temporal_polyfill.Temporal.Now.instant().epochMilliseconds;
+		const now = Temporal.Now.instant().epochMilliseconds;
 		const expiresAt = options?.ttl !== void 0 ? now + options.ttl.total({ unit: "milliseconds" }) : null;
 		this.#db.prepare(`INSERT INTO "${this.#tableName}" (key, value, created, expires)
         VALUES (?, ?, ?, ?)
@@ -99,13 +98,13 @@ var SqliteKvStore = class SqliteKvStore {
 	async cas(key, expectedValue, newValue, options) {
 		this.initialize();
 		const encodedKey = this.#encodeKey(key);
-		const now = __js_temporal_polyfill.Temporal.Now.instant().epochMilliseconds;
+		const now = Temporal.Now.instant().epochMilliseconds;
 		const expiresAt = options?.ttl !== void 0 ? now + options.ttl.total({ unit: "milliseconds" }) : null;
 		try {
 			this.#db.exec("BEGIN IMMEDIATE");
 			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);
 			const currentValue = currentResult === void 0 ? void 0 : this.#decodeValue(currentResult.value);
@@ -150,14 +149,14 @@ var SqliteKvStore = class SqliteKvStore {
       )
     `);
 		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)
     `);
 		this.#initialized = true;
 		logger.debug("Initialized the key–value store table {tableName}.", { tableName: this.#tableName });
 	}
 	#expire() {
-		const now = __js_temporal_polyfill.Temporal.Now.instant().epochMilliseconds;
+		const now = Temporal.Now.instant().epochMilliseconds;
 		this.#db.prepare(`
       DELETE FROM "${this.#tableName}"
       WHERE expires IS NOT NULL AND expires <= ?

package/dist/kv.js

@@ -2,7 +2,6 @@
         import { Temporal } from "@js-temporal/polyfill";
       
 import { SqliteDatabase } from "#sqlite";
-import { Temporal } from "@js-temporal/polyfill";
 import { getLogger } from "@logtape/logtape";
 import { isEqual } from "es-toolkit";
 
@@ -55,8 +54,8 @@ var SqliteKvStore = class SqliteKvStore {
 		const encodedKey = this.#encodeKey(key);
 		const now = Temporal.Now.instant().epochMilliseconds;
 		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);
 		if (!result) return void 0;
@@ -103,8 +102,8 @@ var SqliteKvStore = class SqliteKvStore {
 		try {
 			this.#db.exec("BEGIN IMMEDIATE");
 			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);
 			const currentValue = currentResult === void 0 ? void 0 : this.#decodeValue(currentResult.value);
@@ -149,7 +148,7 @@ var SqliteKvStore = class SqliteKvStore {
       )
     `);
 		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)
     `);
 		this.#initialized = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/sqlite",
-  "version": "2.0.0-pr.451.1731+0cd4ea65",
+  "version": "2.0.0-pr.457.1754+e2ece3ba",
   "description": "SQLite drivers for Fedify",
   "keywords": [
     "fedify",
@@ -62,7 +62,7 @@
     "es-toolkit": "^1.31.0"
   },
   "peerDependencies": {
-    "@fedify/fedify": "^2.0.0-pr.451.1731+0cd4ea65"
+    "@fedify/fedify": "^2.0.0-pr.457.1754+e2ece3ba"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",

package/src/kv.test.ts

@@ -3,7 +3,7 @@ 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";
+import { SqliteKvStore } from "@fedify/sqlite/kv";
 
 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

package/src/kv.ts

@@ -1,6 +1,5 @@
 import { type PlatformDatabase, SqliteDatabase } from "#sqlite";
 import type { KvKey, KvStore, KvStoreSetOptions } from "@fedify/fedify";
-import { Temporal } from "@js-temporal/polyfill";
 import { getLogger } from "@logtape/logtape";
 import { isEqual } from "es-toolkit";
 import type { SqliteDatabaseAdapter } from "./adapter.ts";
@@ -81,8 +80,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 +169,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;
@@ -236,7 +235,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)
     `);