@auth/d1-adapter 1.1.0 → 1.3.0

package/index.d.ts

@@ -20,31 +20,12 @@
  */
 import type { D1Database as WorkerDatabase } from "@cloudflare/workers-types";
 import type { D1Database as MiniflareD1Database } from "@miniflare/d1";
-import type { Adapter } from "@auth/core/adapters";
+import { type Adapter } from "@auth/core/adapters";
 export { up } from "./migrations.js";
 /**
  * @type @cloudflare/workers-types.D1Database | @miniflare/d1.D1Database
  */
 export type D1Database = WorkerDatabase | MiniflareD1Database;
-export declare const CREATE_USER_SQL = "INSERT INTO users (id, name, email, emailVerified, image) VALUES (?, ?, ?, ?, ?)";
-export declare const GET_USER_BY_ID_SQL = "SELECT * FROM users WHERE id = ?";
-export declare const GET_USER_BY_EMAIL_SQL = "SELECT * FROM users WHERE email = ?";
-export declare const GET_USER_BY_ACCOUNTL_SQL = "\n  SELECT u.*\n  FROM users u JOIN accounts a ON a.userId = u.id\n  WHERE a.providerAccountId = ? AND a.provider = ?";
-export declare const UPDATE_USER_BY_ID_SQL = "\n  UPDATE users \n  SET name = ?, email = ?, emailVerified = ?, image = ?\n  WHERE id = ? ";
-export declare const DELETE_USER_SQL = "DELETE FROM users WHERE id = ?";
-export declare const CREATE_SESSION_SQL = "INSERT INTO sessions (id, sessionToken, userId, expires) VALUES (?,?,?,?)";
-export declare const GET_SESSION_BY_TOKEN_SQL = "\n  SELECT id, sessionToken, userId, expires\n  FROM sessions\n  WHERE sessionToken = ?";
-export declare const UPDATE_SESSION_BY_SESSION_TOKEN_SQL = "UPDATE sessions SET expires = ? WHERE sessionToken = ?";
-export declare const DELETE_SESSION_SQL = "DELETE FROM sessions WHERE sessionToken = ?";
-export declare const DELETE_SESSION_BY_USER_ID_SQL = "DELETE FROM sessions WHERE userId = ?";
-export declare const CREATE_ACCOUNT_SQL = "\n  INSERT INTO accounts (\n    id, userId, type, provider, \n    providerAccountId, refresh_token, access_token, \n    expires_at, token_type, scope, id_token, session_state,\n    oauth_token, oauth_token_secret\n  ) \n  VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-export declare const GET_ACCOUNT_BY_ID_SQL = "SELECT * FROM accounts WHERE id = ? ";
-export declare const GET_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = "SELECT * FROM accounts WHERE provider = ? AND providerAccountId = ?";
-export declare const DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = "DELETE FROM accounts WHERE provider = ? AND providerAccountId = ?";
-export declare const DELETE_ACCOUNT_BY_USER_ID_SQL = "DELETE FROM accounts WHERE userId = ?";
-export declare const GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL = "SELECT * FROM verification_tokens WHERE identifier = ? AND token = ?";
-export declare const CREATE_VERIFICATION_TOKEN_SQL = "INSERT INTO verification_tokens (identifier, expires, token) VALUES (?,?,?)";
-export declare const DELETE_VERIFICATION_TOKEN_SQL = "DELETE FROM verification_tokens WHERE identifier = ? and token = ?";
 export declare function createRecord<RecordType>(db: D1Database, CREATE_SQL: string, bindings: any[], GET_SQL: string, getBindings: any[]): Promise<RecordType | null>;
 export declare function getRecord<RecordType>(db: D1Database, SQL: string, bindings: any[]): Promise<RecordType | null>;
 export declare function updateRecord(db: D1Database, SQL: string, bindings: any[]): Promise<import("@miniflare/d1").D1Result<unknown> | import("@cloudflare/workers-types").D1Result<unknown>>;

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,KAAK,EAAE,UAAU,IAAI,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACtE,OAAO,KAAK,EACV,OAAO,EAKR,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAA;AAEpC;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,mBAAmB,CAAA;AAI7D,eAAO,MAAM,eAAe,qFAAqF,CAAA;AACjH,eAAO,MAAM,kBAAkB,qCAAqC,CAAA;AACpE,eAAO,MAAM,qBAAqB,wCAAwC,CAAA;AAC1E,eAAO,MAAM,wBAAwB,0HAGc,CAAA;AACnD,eAAO,MAAM,qBAAqB,gGAGlB,CAAA;AAChB,eAAO,MAAM,eAAe,mCAAmC,CAAA;AAG/D,eAAO,MAAM,kBAAkB,8EAC8C,CAAA;AAC7E,eAAO,MAAM,wBAAwB,4FAGZ,CAAA;AACzB,eAAO,MAAM,mCAAmC,2DAA2D,CAAA;AAC3G,eAAO,MAAM,kBAAkB,gDAAgD,CAAA;AAC/E,eAAO,MAAM,6BAA6B,0CAA0C,CAAA;AAGpF,eAAO,MAAM,kBAAkB,uQAOQ,CAAA;AACvC,eAAO,MAAM,qBAAqB,yCAAyC,CAAA;AAC3E,eAAO,MAAM,mDAAmD,wEAAwE,CAAA;AACxI,eAAO,MAAM,sDAAsD,sEAAsE,CAAA;AACzI,eAAO,MAAM,6BAA6B,0CAA0C,CAAA;AAGpF,eAAO,MAAM,kDAAkD,yEAAyE,CAAA;AACxI,eAAO,MAAM,6BAA6B,gFAAgF,CAAA;AAC1H,eAAO,MAAM,6BAA6B,uEAAuE,CAAA;AAiCjH,wBAAsB,YAAY,CAAC,UAAU,EAC3C,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,GAAG,EAAE,EACf,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,GAAG,EAAE,8BAanB;AAED,wBAAsB,SAAS,CAAC,UAAU,EACxC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,EAAE,GACd,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAgB5B;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,EAAE,8GAYhB;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,EAAE,iBAahB;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CA0LjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,KAAK,EAAE,UAAU,IAAI,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACtE,OAAO,EACL,KAAK,OAAO,EAMb,MAAM,qBAAqB,CAAA;AAsB5B,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAA;AAEpC;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,mBAAmB,CAAA;AAuB7D,wBAAsB,YAAY,CAAC,UAAU,EAC3C,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,GAAG,EAAE,EACf,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,GAAG,EAAE,8BAanB;AAED,wBAAsB,SAAS,CAAC,UAAU,EACxC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,EAAE,GACd,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAgB5B;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,EAAE,8GAYhB;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,GAAG,EAAE,iBAahB;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAoLjD"}

package/index.js

@@ -18,53 +18,9 @@
  *
  * @module @auth/d1-adapter
  */
+import { isDate, } from "@auth/core/adapters";
+import { CREATE_ACCOUNT_SQL, CREATE_SESSION_SQL, CREATE_USER_SQL, CREATE_VERIFICATION_TOKEN_SQL, DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL, DELETE_ACCOUNT_BY_USER_ID_SQL, DELETE_SESSION_BY_USER_ID_SQL, DELETE_SESSION_SQL, DELETE_USER_SQL, DELETE_VERIFICATION_TOKEN_SQL, GET_ACCOUNT_BY_ID_SQL, GET_SESSION_BY_TOKEN_SQL, GET_USER_BY_ACCOUNTL_SQL, GET_USER_BY_EMAIL_SQL, GET_USER_BY_ID_SQL, GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL, UPDATE_SESSION_BY_SESSION_TOKEN_SQL, UPDATE_USER_BY_ID_SQL, } from "./queries.js";
 export { up } from "./migrations.js";
-// all the sqls
-// USER
-export const CREATE_USER_SQL = `INSERT INTO users (id, name, email, emailVerified, image) VALUES (?, ?, ?, ?, ?)`;
-export const GET_USER_BY_ID_SQL = `SELECT * FROM users WHERE id = ?`;
-export const GET_USER_BY_EMAIL_SQL = `SELECT * FROM users WHERE email = ?`;
-export const GET_USER_BY_ACCOUNTL_SQL = `
-  SELECT u.*
-  FROM users u JOIN accounts a ON a.userId = u.id
-  WHERE a.providerAccountId = ? AND a.provider = ?`;
-export const UPDATE_USER_BY_ID_SQL = `
-  UPDATE users 
-  SET name = ?, email = ?, emailVerified = ?, image = ?
-  WHERE id = ? `;
-export const DELETE_USER_SQL = `DELETE FROM users WHERE id = ?`;
-// SESSION
-export const CREATE_SESSION_SQL = "INSERT INTO sessions (id, sessionToken, userId, expires) VALUES (?,?,?,?)";
-export const GET_SESSION_BY_TOKEN_SQL = `
-  SELECT id, sessionToken, userId, expires
-  FROM sessions
-  WHERE sessionToken = ?`;
-export const UPDATE_SESSION_BY_SESSION_TOKEN_SQL = `UPDATE sessions SET expires = ? WHERE sessionToken = ?`;
-export const DELETE_SESSION_SQL = `DELETE FROM sessions WHERE sessionToken = ?`;
-export const DELETE_SESSION_BY_USER_ID_SQL = `DELETE FROM sessions WHERE userId = ?`;
-// ACCOUNT
-export const CREATE_ACCOUNT_SQL = `
-  INSERT INTO accounts (
-    id, userId, type, provider, 
-    providerAccountId, refresh_token, access_token, 
-    expires_at, token_type, scope, id_token, session_state,
-    oauth_token, oauth_token_secret
-  ) 
-  VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)`;
-export const GET_ACCOUNT_BY_ID_SQL = `SELECT * FROM accounts WHERE id = ? `;
-export const GET_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `SELECT * FROM accounts WHERE provider = ? AND providerAccountId = ?`;
-export const DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `DELETE FROM accounts WHERE provider = ? AND providerAccountId = ?`;
-export const DELETE_ACCOUNT_BY_USER_ID_SQL = `DELETE FROM accounts WHERE userId = ?`;
-// VERIFICATION_TOKEN
-export const GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL = `SELECT * FROM verification_tokens WHERE identifier = ? AND token = ?`;
-export const CREATE_VERIFICATION_TOKEN_SQL = `INSERT INTO verification_tokens (identifier, expires, token) VALUES (?,?,?)`;
-export const DELETE_VERIFICATION_TOKEN_SQL = `DELETE FROM verification_tokens WHERE identifier = ? and token = ?`;
-// helper functions
-// isDate is borrowed from the supabase adapter, graciously
-// depending on error messages ("Invalid Date") is always precarious, but probably fine for a built in native like Date
-function isDate(date) {
-    return (new Date(date).toString() !== "Invalid Date" && !isNaN(Date.parse(date)));
-}
 // format is borrowed from the supabase adapter, graciously
 function format(obj) {
     for (const [key, value] of Object.entries(obj)) {
@@ -188,7 +144,6 @@ export function D1Adapter(db) {
                     params.id,
                 ]);
                 if (res.success) {
-                    // we could probably just return
                     const user = await getRecord(db, GET_USER_BY_ID_SQL, [
                         params.id,
                     ]);
@@ -200,8 +155,7 @@ export function D1Adapter(db) {
             throw new Error("Error updating user: Failed to run the update SQL.");
         },
         async deleteUser(userId) {
-            // this should probably be in a db.batch but batch has problems right now in miniflare
-            // no multi line sql statements
+            // miniflare doesn't support batch operations or multiline sql statements
             await deleteRecord(db, DELETE_ACCOUNT_BY_USER_ID_SQL, [userId]);
             await deleteRecord(db, DELETE_SESSION_BY_USER_ID_SQL, [userId]);
             await deleteRecord(db, DELETE_USER_SQL, [userId]);
@@ -243,10 +197,8 @@ export function D1Adapter(db) {
         },
         async getSessionAndUser(sessionToken) {
             const session = await getRecord(db, GET_SESSION_BY_TOKEN_SQL, [sessionToken]);
-            // no session?  no user!
             if (session === null)
                 return null;
-            // this shouldnt happen, but just in case
             const user = await getRecord(db, GET_USER_BY_ID_SQL, [
                 session.userId,
             ]);
@@ -255,8 +207,6 @@ export function D1Adapter(db) {
             return { session, user };
         },
         async updateSession({ sessionToken, expires }) {
-            // kinda strange that we have to deal with an undefined expires,
-            // we dont have any policy to enforce, lets just expire it now.
             if (expires === undefined) {
                 await deleteRecord(db, DELETE_SESSION_SQL, [sessionToken]);
                 return null;

package/migrations.d.ts

@@ -1,9 +1,6 @@
-import type { D1Database } from ".";
+import type { D1Database } from "./index.js";
 export declare const upSQLStatements: string[];
 export declare const down: string[];
-/**
- * @param db
- */
 declare function up(db: D1Database): Promise<void>;
 export { up };
 //# sourceMappingURL=migrations.d.ts.map

package/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["src/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,GAAG,CAAA;AAEnC,eAAO,MAAM,eAAe,UAuC3B,CAAA;AAED,eAAO,MAAM,IAAI,UAKhB,CAAA;AAED;;GAEG;AACH,iBAAe,EAAE,CAAC,EAAE,EAAE,UAAU,iBAS/B;AAED,OAAO,EAAE,EAAE,EAAE,CAAA"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["src/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,eAAe,UAuC3B,CAAA;AAED,eAAO,MAAM,IAAI,UAKhB,CAAA;AAED,iBAAe,EAAE,CAAC,EAAE,EAAE,UAAU,iBAQ/B;AAED,OAAO,EAAE,EAAE,EAAE,CAAA"}

package/migrations.js

@@ -42,16 +42,12 @@ export const down = [
     `DROP TABLE IF EXISTS "accounts";`,
     `DROP TABLE IF EXISTS "sessions";`,
     `DROP TABLE IF EXISTS "users";`,
-    `DROP TABLE IF EXISTS "verification_token";`,
+    `DROP TABLE IF EXISTS "verification_tokens";`,
 ];
-/**
- * @param db
- */
 async function up(db) {
-    // run the migration
     upSQLStatements.forEach(async (sql) => {
         try {
-            const res = await db.prepare(sql).run();
+            await db.prepare(sql).run();
         }
         catch (e) {
             console.error(e.cause?.message, e.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auth/d1-adapter",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "A Cloudflare D1 adapter for Auth.js",
   "homepage": "https://authjs.dev",
   "repository": "https://github.com/nextauthjs/next-auth",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@auth/core": "0.31.0"
+    "@auth/core": "0.33.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230321.0",

package/queries.d.ts

@@ -0,0 +1,20 @@
+export declare const CREATE_USER_SQL = "INSERT INTO users (id, name, email, emailVerified, image) VALUES (?, ?, ?, ?, ?)";
+export declare const GET_USER_BY_ID_SQL = "SELECT * FROM users WHERE id = ?";
+export declare const GET_USER_BY_EMAIL_SQL = "SELECT * FROM users WHERE email = ?";
+export declare const GET_USER_BY_ACCOUNTL_SQL = "\n  SELECT u.*\n  FROM users u JOIN accounts a ON a.userId = u.id\n  WHERE a.providerAccountId = ? AND a.provider = ?";
+export declare const UPDATE_USER_BY_ID_SQL = "\n  UPDATE users \n  SET name = ?, email = ?, emailVerified = ?, image = ?\n  WHERE id = ? ";
+export declare const DELETE_USER_SQL = "DELETE FROM users WHERE id = ?";
+export declare const CREATE_SESSION_SQL = "INSERT INTO sessions (id, sessionToken, userId, expires) VALUES (?,?,?,?)";
+export declare const GET_SESSION_BY_TOKEN_SQL = "\n  SELECT id, sessionToken, userId, expires\n  FROM sessions\n  WHERE sessionToken = ?";
+export declare const UPDATE_SESSION_BY_SESSION_TOKEN_SQL = "UPDATE sessions SET expires = ? WHERE sessionToken = ?";
+export declare const DELETE_SESSION_SQL = "DELETE FROM sessions WHERE sessionToken = ?";
+export declare const DELETE_SESSION_BY_USER_ID_SQL = "DELETE FROM sessions WHERE userId = ?";
+export declare const CREATE_ACCOUNT_SQL = "\n  INSERT INTO accounts (\n    id, userId, type, provider, \n    providerAccountId, refresh_token, access_token, \n    expires_at, token_type, scope, id_token, session_state,\n    oauth_token, oauth_token_secret\n  ) \n  VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+export declare const GET_ACCOUNT_BY_ID_SQL = "SELECT * FROM accounts WHERE id = ? ";
+export declare const GET_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = "SELECT * FROM accounts WHERE provider = ? AND providerAccountId = ?";
+export declare const DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = "DELETE FROM accounts WHERE provider = ? AND providerAccountId = ?";
+export declare const DELETE_ACCOUNT_BY_USER_ID_SQL = "DELETE FROM accounts WHERE userId = ?";
+export declare const GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL = "SELECT * FROM verification_tokens WHERE identifier = ? AND token = ?";
+export declare const CREATE_VERIFICATION_TOKEN_SQL = "INSERT INTO verification_tokens (identifier, expires, token) VALUES (?,?,?)";
+export declare const DELETE_VERIFICATION_TOKEN_SQL = "DELETE FROM verification_tokens WHERE identifier = ? and token = ?";
+//# sourceMappingURL=queries.d.ts.map

package/queries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["src/queries.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,eAAe,qFAAqF,CAAA;AACjH,eAAO,MAAM,kBAAkB,qCAAqC,CAAA;AACpE,eAAO,MAAM,qBAAqB,wCAAwC,CAAA;AAC1E,eAAO,MAAM,wBAAwB,0HAGc,CAAA;AACnD,eAAO,MAAM,qBAAqB,gGAGlB,CAAA;AAChB,eAAO,MAAM,eAAe,mCAAmC,CAAA;AAG/D,eAAO,MAAM,kBAAkB,8EAC8C,CAAA;AAC7E,eAAO,MAAM,wBAAwB,4FAGZ,CAAA;AACzB,eAAO,MAAM,mCAAmC,2DAA2D,CAAA;AAC3G,eAAO,MAAM,kBAAkB,gDAAgD,CAAA;AAC/E,eAAO,MAAM,6BAA6B,0CAA0C,CAAA;AAGpF,eAAO,MAAM,kBAAkB,uQAOQ,CAAA;AACvC,eAAO,MAAM,qBAAqB,yCAAyC,CAAA;AAC3E,eAAO,MAAM,mDAAmD,wEAAwE,CAAA;AACxI,eAAO,MAAM,sDAAsD,sEAAsE,CAAA;AACzI,eAAO,MAAM,6BAA6B,0CAA0C,CAAA;AAGpF,eAAO,MAAM,kDAAkD,yEAAyE,CAAA;AACxI,eAAO,MAAM,6BAA6B,gFAAgF,CAAA;AAC1H,eAAO,MAAM,6BAA6B,uEAAuE,CAAA"}

package/queries.js

@@ -0,0 +1,39 @@
+// USER
+export const CREATE_USER_SQL = `INSERT INTO users (id, name, email, emailVerified, image) VALUES (?, ?, ?, ?, ?)`;
+export const GET_USER_BY_ID_SQL = `SELECT * FROM users WHERE id = ?`;
+export const GET_USER_BY_EMAIL_SQL = `SELECT * FROM users WHERE email = ?`;
+export const GET_USER_BY_ACCOUNTL_SQL = `
+  SELECT u.*
+  FROM users u JOIN accounts a ON a.userId = u.id
+  WHERE a.providerAccountId = ? AND a.provider = ?`;
+export const UPDATE_USER_BY_ID_SQL = `
+  UPDATE users 
+  SET name = ?, email = ?, emailVerified = ?, image = ?
+  WHERE id = ? `;
+export const DELETE_USER_SQL = `DELETE FROM users WHERE id = ?`;
+// SESSION
+export const CREATE_SESSION_SQL = "INSERT INTO sessions (id, sessionToken, userId, expires) VALUES (?,?,?,?)";
+export const GET_SESSION_BY_TOKEN_SQL = `
+  SELECT id, sessionToken, userId, expires
+  FROM sessions
+  WHERE sessionToken = ?`;
+export const UPDATE_SESSION_BY_SESSION_TOKEN_SQL = `UPDATE sessions SET expires = ? WHERE sessionToken = ?`;
+export const DELETE_SESSION_SQL = `DELETE FROM sessions WHERE sessionToken = ?`;
+export const DELETE_SESSION_BY_USER_ID_SQL = `DELETE FROM sessions WHERE userId = ?`;
+// ACCOUNT
+export const CREATE_ACCOUNT_SQL = `
+  INSERT INTO accounts (
+    id, userId, type, provider, 
+    providerAccountId, refresh_token, access_token, 
+    expires_at, token_type, scope, id_token, session_state,
+    oauth_token, oauth_token_secret
+  ) 
+  VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)`;
+export const GET_ACCOUNT_BY_ID_SQL = `SELECT * FROM accounts WHERE id = ? `;
+export const GET_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `SELECT * FROM accounts WHERE provider = ? AND providerAccountId = ?`;
+export const DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `DELETE FROM accounts WHERE provider = ? AND providerAccountId = ?`;
+export const DELETE_ACCOUNT_BY_USER_ID_SQL = `DELETE FROM accounts WHERE userId = ?`;
+// VERIFICATION_TOKEN
+export const GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL = `SELECT * FROM verification_tokens WHERE identifier = ? AND token = ?`;
+export const CREATE_VERIFICATION_TOKEN_SQL = `INSERT INTO verification_tokens (identifier, expires, token) VALUES (?,?,?)`;
+export const DELETE_VERIFICATION_TOKEN_SQL = `DELETE FROM verification_tokens WHERE identifier = ? and token = ?`;

package/src/index.ts

@@ -21,13 +21,34 @@
 
 import type { D1Database as WorkerDatabase } from "@cloudflare/workers-types"
 import type { D1Database as MiniflareD1Database } from "@miniflare/d1"
-import type {
-  Adapter,
-  AdapterSession,
-  AdapterUser,
-  AdapterAccount,
-  VerificationToken as AdapterVerificationToken,
+import {
+  type Adapter,
+  type AdapterSession,
+  type AdapterUser,
+  type AdapterAccount,
+  type VerificationToken as AdapterVerificationToken,
+  isDate,
 } from "@auth/core/adapters"
+import {
+  CREATE_ACCOUNT_SQL,
+  CREATE_SESSION_SQL,
+  CREATE_USER_SQL,
+  CREATE_VERIFICATION_TOKEN_SQL,
+  DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL,
+  DELETE_ACCOUNT_BY_USER_ID_SQL,
+  DELETE_SESSION_BY_USER_ID_SQL,
+  DELETE_SESSION_SQL,
+  DELETE_USER_SQL,
+  DELETE_VERIFICATION_TOKEN_SQL,
+  GET_ACCOUNT_BY_ID_SQL,
+  GET_SESSION_BY_TOKEN_SQL,
+  GET_USER_BY_ACCOUNTL_SQL,
+  GET_USER_BY_EMAIL_SQL,
+  GET_USER_BY_ID_SQL,
+  GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL,
+  UPDATE_SESSION_BY_SESSION_TOKEN_SQL,
+  UPDATE_USER_BY_ID_SQL,
+} from "./queries.js"
 
 export { up } from "./migrations.js"
 
@@ -36,61 +57,6 @@ export { up } from "./migrations.js"
  */
 export type D1Database = WorkerDatabase | MiniflareD1Database
 
-// all the sqls
-// USER
-export const CREATE_USER_SQL = `INSERT INTO users (id, name, email, emailVerified, image) VALUES (?, ?, ?, ?, ?)`
-export const GET_USER_BY_ID_SQL = `SELECT * FROM users WHERE id = ?`
-export const GET_USER_BY_EMAIL_SQL = `SELECT * FROM users WHERE email = ?`
-export const GET_USER_BY_ACCOUNTL_SQL = `
-  SELECT u.*
-  FROM users u JOIN accounts a ON a.userId = u.id
-  WHERE a.providerAccountId = ? AND a.provider = ?`
-export const UPDATE_USER_BY_ID_SQL = `
-  UPDATE users 
-  SET name = ?, email = ?, emailVerified = ?, image = ?
-  WHERE id = ? `
-export const DELETE_USER_SQL = `DELETE FROM users WHERE id = ?`
-
-// SESSION
-export const CREATE_SESSION_SQL =
-  "INSERT INTO sessions (id, sessionToken, userId, expires) VALUES (?,?,?,?)"
-export const GET_SESSION_BY_TOKEN_SQL = `
-  SELECT id, sessionToken, userId, expires
-  FROM sessions
-  WHERE sessionToken = ?`
-export const UPDATE_SESSION_BY_SESSION_TOKEN_SQL = `UPDATE sessions SET expires = ? WHERE sessionToken = ?`
-export const DELETE_SESSION_SQL = `DELETE FROM sessions WHERE sessionToken = ?`
-export const DELETE_SESSION_BY_USER_ID_SQL = `DELETE FROM sessions WHERE userId = ?`
-
-// ACCOUNT
-export const CREATE_ACCOUNT_SQL = `
-  INSERT INTO accounts (
-    id, userId, type, provider, 
-    providerAccountId, refresh_token, access_token, 
-    expires_at, token_type, scope, id_token, session_state,
-    oauth_token, oauth_token_secret
-  ) 
-  VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)`
-export const GET_ACCOUNT_BY_ID_SQL = `SELECT * FROM accounts WHERE id = ? `
-export const GET_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `SELECT * FROM accounts WHERE provider = ? AND providerAccountId = ?`
-export const DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `DELETE FROM accounts WHERE provider = ? AND providerAccountId = ?`
-export const DELETE_ACCOUNT_BY_USER_ID_SQL = `DELETE FROM accounts WHERE userId = ?`
-
-// VERIFICATION_TOKEN
-export const GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL = `SELECT * FROM verification_tokens WHERE identifier = ? AND token = ?`
-export const CREATE_VERIFICATION_TOKEN_SQL = `INSERT INTO verification_tokens (identifier, expires, token) VALUES (?,?,?)`
-export const DELETE_VERIFICATION_TOKEN_SQL = `DELETE FROM verification_tokens WHERE identifier = ? and token = ?`
-
-// helper functions
-
-// isDate is borrowed from the supabase adapter, graciously
-// depending on error messages ("Invalid Date") is always precarious, but probably fine for a built in native like Date
-function isDate(date: any) {
-  return (
-    new Date(date).toString() !== "Invalid Date" && !isNaN(Date.parse(date))
-  )
-}
-
 // format is borrowed from the supabase adapter, graciously
 function format<T>(obj: Record<string, any>): T {
   for (const [key, value] of Object.entries(obj)) {
@@ -242,7 +208,6 @@ export function D1Adapter(db: D1Database): Adapter {
           params.id,
         ])
         if (res.success) {
-          // we could probably just return
           const user = await getRecord<AdapterUser>(db, GET_USER_BY_ID_SQL, [
             params.id,
           ])
@@ -255,8 +220,7 @@ export function D1Adapter(db: D1Database): Adapter {
       throw new Error("Error updating user: Failed to run the update SQL.")
     },
     async deleteUser(userId) {
-      // this should probably be in a db.batch but batch has problems right now in miniflare
-      // no multi line sql statements
+      // miniflare doesn't support batch operations or multiline sql statements
       await deleteRecord(db, DELETE_ACCOUNT_BY_USER_ID_SQL, [userId])
       await deleteRecord(db, DELETE_SESSION_BY_USER_ID_SQL, [userId])
       await deleteRecord(db, DELETE_USER_SQL, [userId])
@@ -317,10 +281,8 @@ export function D1Adapter(db: D1Database): Adapter {
         GET_SESSION_BY_TOKEN_SQL,
         [sessionToken]
       )
-      // no session?  no user!
       if (session === null) return null
 
-      // this shouldnt happen, but just in case
       const user = await getRecord<AdapterUser>(db, GET_USER_BY_ID_SQL, [
         session.userId,
       ])
@@ -329,8 +291,6 @@ export function D1Adapter(db: D1Database): Adapter {
       return { session, user }
     },
     async updateSession({ sessionToken, expires }) {
-      // kinda strange that we have to deal with an undefined expires,
-      // we dont have any policy to enforce, lets just expire it now.
       if (expires === undefined) {
         await deleteRecord(db, DELETE_SESSION_SQL, [sessionToken])
         return null

package/src/migrations.ts

@@ -1,4 +1,4 @@
-import type { D1Database } from "."
+import type { D1Database } from "./index.js"
 
 export const upSQLStatements = [
   `CREATE TABLE IF NOT EXISTS "accounts" (
@@ -45,17 +45,13 @@ export const down = [
   `DROP TABLE IF EXISTS "accounts";`,
   `DROP TABLE IF EXISTS "sessions";`,
   `DROP TABLE IF EXISTS "users";`,
-  `DROP TABLE IF EXISTS "verification_token";`,
+  `DROP TABLE IF EXISTS "verification_tokens";`,
 ]
 
-/**
- * @param db
- */
 async function up(db: D1Database) {
-  // run the migration
   upSQLStatements.forEach(async (sql) => {
     try {
-      const res = await db.prepare(sql).run()
+      await db.prepare(sql).run()
     } catch (e: any) {
       console.error(e.cause?.message, e.message)
     }

package/src/queries.ts

@@ -0,0 +1,43 @@
+// USER
+export const CREATE_USER_SQL = `INSERT INTO users (id, name, email, emailVerified, image) VALUES (?, ?, ?, ?, ?)`
+export const GET_USER_BY_ID_SQL = `SELECT * FROM users WHERE id = ?`
+export const GET_USER_BY_EMAIL_SQL = `SELECT * FROM users WHERE email = ?`
+export const GET_USER_BY_ACCOUNTL_SQL = `
+  SELECT u.*
+  FROM users u JOIN accounts a ON a.userId = u.id
+  WHERE a.providerAccountId = ? AND a.provider = ?`
+export const UPDATE_USER_BY_ID_SQL = `
+  UPDATE users 
+  SET name = ?, email = ?, emailVerified = ?, image = ?
+  WHERE id = ? `
+export const DELETE_USER_SQL = `DELETE FROM users WHERE id = ?`
+
+// SESSION
+export const CREATE_SESSION_SQL =
+  "INSERT INTO sessions (id, sessionToken, userId, expires) VALUES (?,?,?,?)"
+export const GET_SESSION_BY_TOKEN_SQL = `
+  SELECT id, sessionToken, userId, expires
+  FROM sessions
+  WHERE sessionToken = ?`
+export const UPDATE_SESSION_BY_SESSION_TOKEN_SQL = `UPDATE sessions SET expires = ? WHERE sessionToken = ?`
+export const DELETE_SESSION_SQL = `DELETE FROM sessions WHERE sessionToken = ?`
+export const DELETE_SESSION_BY_USER_ID_SQL = `DELETE FROM sessions WHERE userId = ?`
+
+// ACCOUNT
+export const CREATE_ACCOUNT_SQL = `
+  INSERT INTO accounts (
+    id, userId, type, provider, 
+    providerAccountId, refresh_token, access_token, 
+    expires_at, token_type, scope, id_token, session_state,
+    oauth_token, oauth_token_secret
+  ) 
+  VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)`
+export const GET_ACCOUNT_BY_ID_SQL = `SELECT * FROM accounts WHERE id = ? `
+export const GET_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `SELECT * FROM accounts WHERE provider = ? AND providerAccountId = ?`
+export const DELETE_ACCOUNT_BY_PROVIDER_AND_PROVIDER_ACCOUNT_ID_SQL = `DELETE FROM accounts WHERE provider = ? AND providerAccountId = ?`
+export const DELETE_ACCOUNT_BY_USER_ID_SQL = `DELETE FROM accounts WHERE userId = ?`
+
+// VERIFICATION_TOKEN
+export const GET_VERIFICATION_TOKEN_BY_IDENTIFIER_AND_TOKEN_SQL = `SELECT * FROM verification_tokens WHERE identifier = ? AND token = ?`
+export const CREATE_VERIFICATION_TOKEN_SQL = `INSERT INTO verification_tokens (identifier, expires, token) VALUES (?,?,?)`
+export const DELETE_VERIFICATION_TOKEN_SQL = `DELETE FROM verification_tokens WHERE identifier = ? and token = ?`