better-auth 0.2.8-beta.8 → 0.2.8

package/dist/cli.js

@@ -1,24 +1,17 @@
 #!/usr/bin/env node
-import { Command } from 'commander';
-import 'dotenv/config';
-import { loadConfig } from 'c12';
-import { createConsola } from 'consola';
-import path3 from 'path';
-import babelPresetTypescript from '@babel/preset-typescript';
-import babelPresetReact from '@babel/preset-react';
-import { z } from 'zod';
-import { existsSync } from 'fs';
-import { SqliteDialect, MysqlDialect, PostgresDialect, Kysely } from 'kysely';
-import ora2 from 'ora';
-import chalk from 'chalk';
-import prompts3 from 'prompts';
-import 'oslo';
-import 'nanoid';
-import 'oslo/oauth2';
-import '@antfu/ni';
-import 'execa';
-import fs from 'fs/promises';
 
+// src/cli/index.ts
+import { Command as Command3 } from "commander";
+import "dotenv/config";
+
+// src/cli/commands/migrate.ts
+import { Command } from "commander";
+
+// src/cli/get-config.ts
+import { loadConfig } from "c12";
+
+// src/utils/logger.ts
+import { createConsola } from "consola";
 var consola = createConsola({
   formatOptions: {
     date: false,
@@ -32,32 +25,37 @@ var consola = createConsola({
 var createLogger = (options) => {
   return {
     log: (...args) => {
-      consola.log("", ...args);
+      !options?.disabled && consola.log("", ...args);
     },
     error: (...args) => {
-      consola.error("", ...args);
+      !options?.disabled && consola.error("", ...args);
     },
     warn: (...args) => {
-      consola.warn("", ...args);
+      !options?.disabled && consola.warn("", ...args);
     },
     info: (...args) => {
-      consola.info("", ...args);
+      !options?.disabled && consola.info("", ...args);
     },
     debug: (...args) => {
-      consola.debug("", ...args);
+      !options?.disabled && consola.debug("", ...args);
     },
     box: (...args) => {
-      consola.box("", ...args);
+      !options?.disabled && consola.box("", ...args);
     },
     success: (...args) => {
-      consola.success("", ...args);
+      !options?.disabled && consola.success("", ...args);
     },
     break: (...args) => {
-      console.log("\n");
+      !options?.disabled && console.log("\n");
     }
   };
 };
 var logger = createLogger();
+
+// src/cli/get-config.ts
+import path from "path";
+import babelPresetTypescript from "@babel/preset-typescript";
+import babelPresetReact from "@babel/preset-react";
 var possiblePaths = ["auth.ts", "auth.tsx"];
 possiblePaths = [
   ...possiblePaths,
@@ -84,7 +82,7 @@ async function getConfig({
     let configFile = null;
     if (configPath) {
       const { config } = await loadConfig({
-        configFile: path3.join(cwd, configPath),
+        configFile: path.join(cwd, configPath),
         dotenv: true,
         jitiOptions
       });
@@ -128,6 +126,19 @@ async function getConfig({
     process.exit(1);
   }
 }
+
+// src/cli/commands/migrate.ts
+import { z } from "zod";
+import { existsSync } from "fs";
+import path2 from "path";
+
+// src/adapters/kysely-adapter/dialect.ts
+import { Kysely } from "kysely";
+import {
+  MysqlDialect,
+  PostgresDialect,
+  SqliteDialect
+} from "kysely";
 var createKyselyAdapter = async (config) => {
   const db = config.database;
   let dialect = void 0;
@@ -169,6 +180,14 @@ var createKyselyAdapter = async (config) => {
   };
 };
 
+// src/cli/commands/migrate.ts
+import ora2 from "ora";
+import chalk from "chalk";
+import prompts2 from "prompts";
+
+// src/cli/utils/get-migration.ts
+import "kysely";
+
 // src/db/get-tables.ts
 var getAuthTables = (options) => {
   const pluginSchema = options.plugins?.reduce(
@@ -539,6 +558,16 @@ var BetterAuthError = class extends Error {
   }
 };
 
+// src/cli/utils/install-dep.ts
+import ora from "ora";
+import prompts from "prompts";
+
+// src/cli/utils/get-package-manager.ts
+import { detect } from "@antfu/ni";
+
+// src/cli/utils/install-dep.ts
+import { execa } from "execa";
+
 // src/cli/commands/migrate.ts
 var migrate = new Command("migrate").option(
   "-c, --cwd <cwd>",
@@ -552,7 +581,7 @@ var migrate = new Command("migrate").option(
     cwd: z.string(),
     config: z.string().optional()
   }).parse(opts);
-  const cwd = path3.resolve(options.cwd);
+  const cwd = path2.resolve(options.cwd);
   if (!existsSync(cwd)) {
     logger.error(`The directory "${cwd}" does not exist.`);
     process.exit(1);
@@ -593,7 +622,7 @@ var migrate = new Command("migrate").option(
       chalk.white("table.")
     );
   }
-  const { migrate: migrate2 } = await prompts3({
+  const { migrate: migrate2 } = await prompts2({
     type: "confirm",
     name: "migrate",
     message: "Are you sure you want to run these migrations?",
@@ -610,6 +639,14 @@ var migrate = new Command("migrate").option(
   process.exit(0);
 });
 
+// src/cli/commands/generate.ts
+import { Command as Command2 } from "commander";
+import { z as z2 } from "zod";
+import { existsSync as existsSync3 } from "fs";
+import path4 from "path";
+import ora3 from "ora";
+import prompts3 from "prompts";
+
 // src/adapters/kysely-adapter/index.ts
 function convertWhere(w) {
   if (!w)
@@ -805,7 +842,113 @@ async function getAdapter(options, isCli) {
     }
   });
 }
-var generate = new Command("generate").option(
+
+// src/cli/commands/generate.ts
+import fs2 from "fs/promises";
+import chalk2 from "chalk";
+
+// src/adapters/prisma-adapter/generate-cli.ts
+import { produceSchema } from "@mrleebo/prisma-ast";
+import { existsSync as existsSync2 } from "fs";
+import path3 from "path";
+import fs from "fs/promises";
+
+// src/utils/misc.ts
+function capitalizeFirstLetter(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+// src/adapters/prisma-adapter/generate-cli.ts
+async function generatePrismaSchema({
+  provider,
+  options,
+  file
+}) {
+  const tables = getAuthTables(options);
+  const filePath = file || "./prisma/schema.prisma";
+  const schemaPrismaExist = existsSync2(path3.join(process.cwd(), filePath));
+  let schemaPrisma = "";
+  if (schemaPrismaExist) {
+    schemaPrisma = await fs.readFile(
+      path3.join(process.cwd(), filePath),
+      "utf-8"
+    );
+  } else {
+    schemaPrisma = getNewPrisma(provider);
+  }
+  const schema = produceSchema(schemaPrisma, (builder) => {
+    for (const table in tables) {
+      let getType2 = function(type, isOptional) {
+        if (type === "string") {
+          return isOptional ? "String?" : "String";
+        }
+        if (type === "number") {
+          return isOptional ? "Int?" : "Int";
+        }
+        if (type === "boolean") {
+          return isOptional ? "Boolean?" : "Boolean";
+        }
+        if (type === "date") {
+          return isOptional ? "DateTime?" : "DateTime";
+        }
+      };
+      var getType = getType2;
+      const fields = tables[table].fields;
+      const originalTable = tables[table].tableName;
+      const tableName = capitalizeFirstLetter(originalTable);
+      const prismaModel = builder.findByType("model", {
+        name: tableName
+      });
+      !prismaModel && builder.model(tableName).field("id", "String").attribute("id");
+      for (const field in fields) {
+        const attr = fields[field];
+        if (prismaModel) {
+          const isAlreadyExist = builder.findByType("field", {
+            name: field,
+            within: prismaModel.properties
+          });
+          if (isAlreadyExist) {
+            continue;
+          }
+        }
+        builder.model(tableName).field(field, getType2(attr.type, !attr.required));
+        if (attr.unique) {
+          builder.model(tableName).blockAttribute(`unique([${field}])`);
+        }
+        if (attr.references) {
+          builder.model(tableName).field(
+            `${attr.references.model.toLowerCase()}s`,
+            capitalizeFirstLetter(attr.references.model)
+          ).attribute(
+            `relation(fields: [${field}], references: [${attr.references.field}], onDelete: Cascade)`
+          );
+        }
+      }
+      const hasAttribute = builder.findByType("attribute", {
+        name: "map",
+        within: prismaModel?.properties
+      });
+      if (originalTable !== tableName && !hasAttribute) {
+        builder.model(tableName).blockAttribute("map", originalTable);
+      }
+    }
+  });
+  return {
+    code: schema.trim() === schemaPrisma.trim() ? "" : schema,
+    fileName: filePath
+  };
+}
+var getNewPrisma = (provider) => `generator client {
+    provider = "prisma-client-js"
+  }
+  
+  datasource db {
+    provider = "${provider}"
+    url      = ${provider === "sqlite" ? `"file:./dev.db"` : `env("DATABASE_URL")`}
+  }`;
+
+// src/cli/commands/generate.ts
+var generate = new Command2("generate").option(
   "-c, --cwd <cwd>",
   "the working directory. defaults to the current directory.",
   process.cwd()
@@ -813,14 +956,14 @@ var generate = new Command("generate").option(
   "--config <config>",
   "the path to the configuration file. defaults to the first configuration file found."
 ).option("--output <output>", "the file to output to the generated schema").option("--y", "").action(async (opts) => {
-  const options = z.object({
-    cwd: z.string(),
-    config: z.string().optional(),
-    output: z.string().optional()
+  const options = z2.object({
+    cwd: z2.string(),
+    config: z2.string().optional(),
+    output: z2.string().optional()
   }).parse(opts);
-  const spinner = ora2("preparing schema...").start();
-  const cwd = path3.resolve(options.cwd);
-  if (!existsSync(cwd)) {
+  const spinner = ora3("preparing schema...").start();
+  const cwd = path4.resolve(options.cwd);
+  if (!existsSync3(cwd)) {
     logger.error(`The directory "${cwd}" does not exist.`);
     process.exit(1);
   }
@@ -834,19 +977,34 @@ var generate = new Command("generate").option(
     );
     return;
   }
-  const adapter = await getAdapter(config).catch((e) => {
+  const adapter = await getAdapter(config, true).catch((e) => {
     logger.error(e.message);
     process.exit(1);
   });
-  if (!adapter.createSchema) {
-    logger.error("The adapter does not support schema generation.");
-    process.exit(1);
+  let code = "";
+  let fileName = "";
+  let append = false;
+  let overwrite = false;
+  if (adapter.id === "prisma") {
+    spinner.text = "generating schema...";
+    const result = await generatePrismaSchema({
+      options: config,
+      file: options.output,
+      provider: adapter.options?.provider || "pg"
+    });
+    code = result.code;
+    fileName = result.fileName;
+  } else {
+    if (!adapter.createSchema) {
+      logger.error("The adapter does not support schema generation.");
+      process.exit(1);
+    }
+    const result = await adapter.createSchema(config, options.output);
+    code = result.code;
+    fileName = result.fileName;
+    append = result.append || false;
+    overwrite = result.overwrite || false;
   }
-  spinner.text = "generating schema...";
-  const { code, fileName, append, overwrite } = await adapter.createSchema(
-    config,
-    options.output
-  );
   spinner.stop();
   if (!code) {
     logger.success("Your schema is already up to date.");
@@ -856,15 +1014,15 @@ var generate = new Command("generate").option(
     const { confirm: confirm2 } = await prompts3({
       type: "confirm",
       name: "confirm",
-      message: `The file ${fileName} already exists. Do you want to ${chalk.yellow(
+      message: `The file ${fileName} already exists. Do you want to ${chalk2.yellow(
         `${overwrite ? "overwrite" : "append"}`
       )} the schema to the file?`
     });
     if (confirm2) {
       if (overwrite) {
-        await fs.writeFile(path3.join(cwd, fileName), code);
+        await fs2.writeFile(path4.join(cwd, fileName), code);
       } else {
-        await fs.appendFile(path3.join(cwd, fileName), code);
+        await fs2.appendFile(path4.join(cwd, fileName), code);
       }
       logger.success(`\u{1F680} schema was appended successfully!`);
       process.exit(0);
@@ -876,7 +1034,7 @@ var generate = new Command("generate").option(
   const { confirm } = await prompts3({
     type: "confirm",
     name: "confirm",
-    message: `Do you want to generate the schema to ${chalk.yellow(
+    message: `Do you want to generate the schema to ${chalk2.yellow(
       fileName
     )}?`
   });
@@ -884,20 +1042,20 @@ var generate = new Command("generate").option(
     logger.error("Schema generation aborted.");
     process.exit(1);
   }
-  const dirExist = existsSync(path3.dirname(path3.join(cwd, fileName)));
+  const dirExist = existsSync3(path4.dirname(path4.join(cwd, fileName)));
   if (!dirExist) {
-    await fs.mkdir(path3.dirname(path3.join(cwd, fileName)), {
+    await fs2.mkdir(path4.dirname(path4.join(cwd, fileName)), {
       recursive: true
     });
   }
-  await fs.writeFile(options.output || path3.join(cwd, fileName), code);
+  await fs2.writeFile(options.output || path4.join(cwd, fileName), code);
   logger.success(`\u{1F680} schema was generated successfully!`);
   process.exit(0);
 });
 
 // src/cli/index.ts
 async function main() {
-  const program = new Command().name("better-auth");
+  const program = new Command3().name("better-auth");
   program.addCommand(migrate).addCommand(generate).version("0.0.1").description("Better Auth CLI");
   program.parse();
 }

package/dist/client/plugins.d.ts

@@ -2,14 +2,14 @@ import * as nanostores from 'nanostores';
 import { A as AccessControl, S as StatementsPrimitive, R as Role } from '../statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, e as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber } from '../index-DtRHPoYF.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DtRHPoYF.js';
+import { o as organization, e as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber } from '../index-UOcOxfoL.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-UOcOxfoL.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
 import '../index-JM-i6hLs.js';
 import 'arctic';
 import 'zod';
 import 'better-call';
-import '../index-CKn-Zrry.js';
+import '../index-C9S3KShG.js';
 import 'kysely';
 import 'better-sqlite3';
 import 'mysql2';
@@ -109,6 +109,7 @@ declare const organizationClient: <O extends OrganizationClientOptions>(options?
             }> | null;
             error: null | _better_fetch_fetch.BetterFetchError;
             isPending: boolean;
+            isRefetching: boolean;
         }>;
         listOrganizations: nanostores.PreinitializedWritableAtom<{
             data: {
@@ -121,6 +122,7 @@ declare const organizationClient: <O extends OrganizationClientOptions>(options?
             }[] | null;
             error: null | _better_fetch_fetch.BetterFetchError;
             isPending: boolean;
+            isRefetching: boolean;
         }>;
     };
     atomListeners: ({

package/dist/client/plugins.js

@@ -1,13 +1,5 @@
-import { atom, onMount } from 'nanostores';
-import '@better-fetch/fetch';
-import 'oslo';
-import 'nanoid';
-import { createConsola } from 'consola';
-import 'oslo/oauth2';
-import 'zod';
-import { startAuthentication, startRegistration, WebAuthnError } from '@simplewebauthn/browser';
-
 // src/plugins/organization/client.ts
+import { atom as atom3 } from "nanostores";
 
 // src/plugins/organization/access/src/access.ts
 var ParsingError = class extends Error {
@@ -96,36 +88,41 @@ var defaultStatements = {
   invitation: ["create", "cancel"]
 };
 var defaultAc = createAccessControl(defaultStatements);
-defaultAc.newRole({
+var adminAc = defaultAc.newRole({
   organization: ["update"],
   invitation: ["create", "cancel"],
   member: ["create", "update", "delete"]
 });
-defaultAc.newRole({
+var ownerAc = defaultAc.newRole({
   organization: ["update", "delete"],
   member: ["create", "update", "delete"],
   invitation: ["create", "cancel"]
 });
-defaultAc.newRole({
+var memberAc = defaultAc.newRole({
   organization: [],
   member: [],
   invitation: []
 });
-createConsola({
-  formatOptions: {
-    date: false,
-    colors: true,
-    compact: true
-  },
-  defaults: {
-    tag: "Better Auth"
-  }
-});
+
+// src/client/config.ts
+import { createFetch } from "@better-fetch/fetch";
+import "nanostores";
+
+// src/client/fetch-plugins.ts
+import { betterFetch } from "@better-fetch/fetch";
+
+// src/client/session-atom.ts
+import { atom as atom2 } from "nanostores";
+
+// src/client/query.ts
+import "@better-fetch/fetch";
+import { atom, onMount } from "nanostores";
 var useAuthQuery = (initializedAtom, path, $fetch, options) => {
   const value = atom({
     data: null,
     error: null,
-    isPending: false
+    isPending: false,
+    isRefetching: false
   });
   const fn = () => {
     const opts = typeof options === "function" ? options({
@@ -139,24 +136,27 @@ var useAuthQuery = (initializedAtom, path, $fetch, options) => {
         value.set({
           data: context.data,
           error: null,
-          isPending: false
+          isPending: false,
+          isRefetching: false
         });
         await opts?.onSuccess?.(context);
       },
       async onError(context) {
         value.set({
           error: context.error,
-          data: null,
-          isPending: false
+          data: value.get().data,
+          isPending: false,
+          isRefetching: false
         });
         await opts?.onError?.(context);
       },
       async onRequest(context) {
         const currentValue = value.get();
         value.set({
-          isPending: true,
+          isPending: currentValue.data === null,
           data: currentValue.data,
-          error: currentValue.error
+          error: null,
+          isRefetching: true
         });
         await opts?.onRequest?.(context);
       }
@@ -185,9 +185,9 @@ var useAuthQuery = (initializedAtom, path, $fetch, options) => {
 
 // src/plugins/organization/client.ts
 var organizationClient = (options) => {
-  const activeOrgId = atom(void 0);
-  const _listOrg = atom(false);
-  const _activeOrgSignal = atom(false);
+  const activeOrgId = atom3(void 0);
+  const _listOrg = atom3(false);
+  const _activeOrgSignal = atom3(false);
   return {
     id: "organization",
     $InferServerPlugin: {},
@@ -265,6 +265,14 @@ var usernameClient = () => {
     $InferServerPlugin: {}
   };
 };
+
+// src/plugins/passkey/client.ts
+import {
+  WebAuthnError,
+  startAuthentication,
+  startRegistration
+} from "@simplewebauthn/browser";
+import { atom as atom4 } from "nanostores";
 var getPasskeyActions = ($fetch, {
   _listPasskeys
 }) => {
@@ -386,7 +394,7 @@ var getPasskeyActions = ($fetch, {
   };
 };
 var passkeyClient = () => {
-  const _listPasskeys = atom();
+  const _listPasskeys = atom4();
   return {
     id: "passkey",
     $InferServerPlugin: {},
@@ -485,5 +493,12 @@ var phoneNumberClient = () => {
     ]
   };
 };
-
-export { getPasskeyActions, magicLinkClient, organizationClient, passkeyClient, phoneNumberClient, twoFactorClient, usernameClient };
+export {
+  getPasskeyActions,
+  magicLinkClient,
+  organizationClient,
+  passkeyClient,
+  phoneNumberClient,
+  twoFactorClient,
+  usernameClient
+};

package/dist/client.d.ts

@@ -6,7 +6,7 @@ import { BetterFetch, BetterFetchError, BetterFetchOption } from '@better-fetch/
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 export { AtomListener, InferPluginsFromClient } from './types.js';
-import './index-CKn-Zrry.js';
+import './index-C9S3KShG.js';
 import 'kysely';
 import './index-JM-i6hLs.js';
 import 'arctic';
@@ -39,6 +39,7 @@ declare function createAuthClient<Option extends ClientOptions>(options?: Option
         } | null;
         error: null | _better_fetch_fetch.BetterFetchError;
         isPending: boolean;
+        isRefetching: boolean;
     }>;
     $fetch: _better_fetch_fetch.BetterFetch<{
         plugins: (_better_fetch_fetch.BetterFetchPlugin | {
@@ -268,6 +269,7 @@ declare const useAuthQuery: <T>(initializedAtom: PreinitializedWritableAtom<any>
     data: null | T;
     error: null | BetterFetchError;
     isPending: boolean;
+    isRefetching: boolean;
 }>;
 
 export { BetterAuthClientPlugin, ClientOptions, InferActions, InferAdditionalFromClient, InferClientAPI, InferSessionFromClient, InferUserFromClient, IsSignal, createAuthClient, useAuthQuery };