@onmax/nuxt-better-auth 0.0.2-alpha.22 → 0.0.2-alpha.23

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@onmax/nuxt-better-auth",
-  "version": "0.0.2-alpha.22",
+  "version": "0.0.2-alpha.23",
   "configKey": "auth",
   "compatibility": {
     "nuxt": ">=4.0.0"

package/dist/module.mjs

@@ -10,7 +10,7 @@ import { randomBytes } from 'node:crypto';
 import { isCI, isTest } from 'std-env';
 export { defineClientAuth, defineServerAuth } from '../dist/runtime/config.js';
 
-const version = "0.0.2-alpha.22";
+const version = "0.0.2-alpha.23";
 
 function resolveDatabaseProvider(input) {
   const enabledProviders = Object.entries(input.providers).filter(([_id, provider]) => provider.isEnabled?.(input.context) ?? true);
@@ -235,6 +235,21 @@ async function loadUserAuthConfig(configPath, throwOnError = false) {
   }
 }
 
+function isInsideNodeModules(path) {
+  return path.split(/[\\/]/).includes("node_modules");
+}
+function resolveHubSchemaPath(buildDir, rootDir, dialect, exists = existsSync) {
+  const rootTsPath = join(rootDir, ".nuxt", "better-auth", `schema.${dialect}.ts`);
+  if (isInsideNodeModules(buildDir) && exists(rootTsPath))
+    return rootTsPath;
+  const tsPath = join(buildDir, "better-auth", `schema.${dialect}.ts`);
+  if (exists(tsPath))
+    return tsPath;
+  const mjsPath = join(buildDir, "better-auth", `schema.${dialect}.mjs`);
+  if (exists(mjsPath))
+    return mjsPath;
+  return null;
+}
 async function loadAuthOptions(context) {
   const isProduction = !context.nuxt.options.dev;
   const configFile = `${context.serverConfigPath}.ts`;
@@ -270,19 +285,20 @@ async function setupBetterAuthSchema(nuxt, serverConfigPath, options, consola) {
     await mkdir(schemaDir, { recursive: true });
     await writeFile(schemaPathTs, schemaCode);
     await writeFile(schemaPathMjs, schemaCode);
+    if (isInsideNodeModules(nuxt.options.buildDir)) {
+      const rootSchemaDir = join(nuxt.options.rootDir, ".nuxt", "better-auth");
+      const rootSchemaPathTs = join(rootSchemaDir, `schema.${dialect}.ts`);
+      await mkdir(rootSchemaDir, { recursive: true });
+      await writeFile(rootSchemaPathTs, schemaCode);
+    }
     addTemplate({ filename: `better-auth/schema.${dialect}.ts`, getContents: () => schemaCode, write: true });
     addTemplate({ filename: `better-auth/schema.${dialect}.mjs`, getContents: () => schemaCode, write: true });
     consola.info(`Generated ${dialect} schema (.ts + .mjs)`);
     const nuxtWithHubHooks = nuxt;
     nuxtWithHubHooks.hook("hub:db:schema:extend", ({ paths, dialect: hookDialect }) => {
-      const tsPath = join(nuxt.options.buildDir, "better-auth", `schema.${hookDialect}.ts`);
-      const mjsPath = join(nuxt.options.buildDir, "better-auth", `schema.${hookDialect}.mjs`);
-      if (existsSync(tsPath)) {
-        paths.unshift(tsPath);
-        return;
-      }
-      if (existsSync(mjsPath))
-        paths.unshift(mjsPath);
+      const schemaPath = resolveHubSchemaPath(nuxt.options.buildDir, nuxt.options.rootDir, hookDialect);
+      if (schemaPath)
+        paths.unshift(schemaPath);
     });
   } catch (error) {
     const isProduction = !nuxt.options.dev;
@@ -491,8 +507,14 @@ function registerSharedTypeTemplates(input) {
   addTypeTemplate({
     filename: "types/nuxt-better-auth.d.ts",
     getContents: () => `
+import type { AuthSession, AuthUser } from '${input.runtimeTypesAugmentPath}'
+import type { UserMatch } from '${input.runtimeTypesPath}'
 export * from '${input.runtimeTypesAugmentPath}'
-export type { AuthMeta, AuthMode, AuthRouteRules, UserMatch, RequireSessionOptions, Auth, InferUser, InferSession } from '${input.runtimeTypesPath}'
+export type { AuthMeta, AuthMode, AuthRouteRules, UserMatch, Auth, InferUser, InferSession } from '${input.runtimeTypesPath}'
+export interface RequireSessionOptions {
+  user?: UserMatch<AuthUser>
+  rule?: (ctx: { user: AuthUser, session: AuthSession }) => boolean | Promise<boolean>
+}
 `
   });
   addTypeTemplate({

package/dist/runtime/server/utils/session.d.ts

@@ -1,9 +1,17 @@
+import type { AuthSession, AuthUser } from '#nuxt-better-auth';
 import type { H3Event } from 'h3';
-import type { AuthSession, AuthUser, RequireSessionOptions } from '../../types.js';
+import type { UserMatch } from '../../types.js';
 interface FullSession {
     user: AuthUser;
     session: AuthSession;
 }
+interface RequireUserSessionOptions {
+    user?: UserMatch<AuthUser>;
+    rule?: (ctx: {
+        user: AuthUser;
+        session: AuthSession;
+    }) => boolean | Promise<boolean>;
+}
 export declare function getUserSession(event: H3Event): Promise<FullSession | null>;
-export declare function requireUserSession(event: H3Event, options?: RequireSessionOptions): Promise<FullSession>;
+export declare function requireUserSession(event: H3Event, options?: RequireUserSessionOptions): Promise<FullSession>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@onmax/nuxt-better-auth",
   "type": "module",
-  "version": "0.0.2-alpha.22",
+  "version": "0.0.2-alpha.23",
   "packageManager": "pnpm@10.15.1",
   "description": "Nuxt module for Better Auth integration with NuxtHub, route protection, session management, and role-based access",
   "author": "onmax",