@axium/server 0.11.4 → 0.12.0

package/dist/auth.d.ts

@@ -1,8 +1,8 @@
 import type { Passkey, Session, Verification } from '@axium/core/api';
 import type { User } from '@axium/core/user';
 import type { RequestEvent } from '@sveltejs/kit';
-import { type Schema } from './database.js';
 import type { Insertable } from 'kysely';
+import { type Schema } from './database.js';
 export interface UserInternal extends User {
     isAdmin: boolean;
     /** Tags are internal, roles are public */

package/dist/auth.js

@@ -1,6 +1,5 @@
-import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { randomBytes, randomUUID } from 'node:crypto';
-import { connect, database as db } from './database.js';
+import { connect, database as db, userFromId } from './database.js';
 export async function getUser(id) {
     connect();
     return await db.selectFrom('users').selectAll().where('id', '=', id).executeTakeFirstOrThrow();
@@ -30,7 +29,7 @@ export async function getSessionAndUser(token) {
     const result = await db
         .selectFrom('sessions')
         .selectAll()
-        .select(eb => jsonObjectFrom(eb.selectFrom('users').selectAll().whereRef('users.id', '=', 'sessions.userId')).as('user'))
+        .select(userFromId)
         .where('sessions.token', '=', token)
         .where('sessions.expires', '>', new Date())
         .executeTakeFirstOrThrow();

package/dist/database.d.ts

@@ -1,7 +1,9 @@
 import type { Preferences } from '@axium/core';
 import type { AuthenticatorTransportFuture, CredentialDeviceType } from '@simplewebauthn/server';
-import { Kysely, type GeneratedAlways } from 'kysely';
-import type { VerificationRole } from './auth.js';
+import type * as Kys from 'kysely';
+import type { GeneratedAlways } from 'kysely';
+import { Kysely } from 'kysely';
+import type { UserInternal, VerificationRole } from './auth.js';
 export interface Schema {
     users: {
         id: string;
@@ -44,12 +46,22 @@ export interface Schema {
 export type Database = Kysely<Schema> & AsyncDisposable;
 export declare let database: Database;
 export declare function connect(): Database;
+export declare function count<const T extends keyof Schema>(table: T): Promise<number>;
+export type TablesMatching<T> = (string & keyof Schema) & keyof {
+    [K in keyof Schema as Schema[K] extends T ? K : never]: null;
+};
+type TableWithId = TablesMatching<{
+    userId: string;
+}>;
+/**
+ * Select the user with the id from the userId column of a table, placing it in the `user` property.
+ */
+export declare function userFromId(eb: Kys.ExpressionBuilder<Schema, TableWithId>): Kys.AliasedRawBuilder<UserInternal, 'user'>;
 export interface Stats {
     users: number;
     passkeys: number;
     sessions: number;
 }
-export declare function count<const T extends keyof Schema>(table: T): Promise<number>;
 export declare function status(): Promise<Stats>;
 export declare function statusText(): Promise<string>;
 export interface OpOptions {
@@ -73,3 +85,4 @@ export declare function uninstall(opt: OpOptions): Promise<void>;
  * Removes all data from tables.
  */
 export declare function wipe(opt: OpOptions): Promise<void>;
+export {};

package/dist/database.js

@@ -51,6 +51,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 import { Kysely, PostgresDialect, sql } from 'kysely';
+import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { randomBytes } from 'node:crypto';
 import { readFileSync, writeFileSync } from 'node:fs';
 import pg from 'pg';
@@ -75,12 +76,22 @@ export function connect() {
     globalThis[sym] = database;
     return database;
 }
+// Helpers
 export async function count(table) {
     const db = connect();
     return (await db.selectFrom(table)
         .select(db.fn.countAll().as('count'))
         .executeTakeFirstOrThrow()).count;
 }
+/**
+ * Select the user with the id from the userId column of a table, placing it in the `user` property.
+ */
+export function userFromId(eb) {
+    return jsonObjectFrom(eb.selectFrom('users').selectAll().whereRef('id', '=', 'userId'))
+        .$notNull()
+        .$castTo()
+        .as('user');
+}
 export async function status() {
     return {
         users: await count('users'),

package/dist/plugins.d.ts

@@ -12,7 +12,7 @@ export declare const Plugin: z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     routes: z.ZodOptional<z.ZodString>;
     statusText: z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.core.$ZodTuple<[], null>, z.ZodString>, z.core.$InferInnerFunctionTypeAsync<z.core.$ZodTuple<[], null>, z.ZodString>>;
-    hooks: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodLiteral<"remove" | "db_init" | "db_wipe" | "clean">, z.ZodNever]>, z.ZodCustom<(...args: any[]) => any, (...args: any[]) => any>>>;
+    hooks: z.ZodOptional<z.ZodRecord<z.ZodLiteral<"remove" | "db_init" | "db_wipe" | "clean"> & z.core.$partial, z.ZodCustom<(...args: any[]) => any, (...args: any[]) => any>>>;
 }, z.core.$loose>;
 declare const kSpecifier: unique symbol;
 export type Plugin = z.infer<typeof Plugin>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.11.4",
+	"version": "0.12.0",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"funding": {
 		"type": "individual",
@@ -44,14 +44,14 @@
 		"@axium/client": ">=0.1.0",
 		"@axium/core": ">=0.4.0",
 		"utilium": "^2.3.8",
-		"zod": "^3.25.61"
+		"zod": "^3.25.76"
 	},
 	"dependencies": {
 		"@axium/server": "file:.",
 		"@simplewebauthn/server": "^13.1.1",
 		"@sveltejs/kit": "^2.20.2",
 		"@types/pg": "^8.11.11",
-		"commander": "^13.1.0",
+		"commander": "^14.0.0",
 		"cookie": "^1.0.2",
 		"kysely": "^0.28.0",
 		"logzen": "^0.7.0",