firstly 0.0.10 → 0.0.12

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "firstly",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "type": "module",
   "description": "Firstly, an opinionated Remult setup!",
+  "funding": "https://github.com/sponsors/jycouet",
+  "homepage": "https://firstly.fun/",
   "repository": {
     "type": "git",
     "url": "https://github.com/jycouet/firstly",
@@ -14,46 +16,44 @@
   },
   "peerDependencies": {
     "@sveltejs/kit": ">=1.0.0 <3.0.0",
-    "remult": "0.27.20",
+    "remult": "2.7.29",
     "svelte": ">=4.2.18"
   },
   "dependencies": {
-    "@clack/prompts": "^0.7.0",
+    "@clack/prompts": "0.7.0",
     "@kitql/internals": "0.9.9",
-    "@mdi/js": "^7.4.47",
-    "@melt-ui/svelte": "^0.83.0",
-    "@types/nodemailer": "^6.4.15",
-    "arctic": "^1.8.0",
-    "clsx": "^2.1.1",
-    "cron": "^3.1.7",
-    "daisyui": "^4.12.10",
-    "esm-env": "^1.0.0",
-    "lucia": "^3.2.0",
-    "nodemailer": "^6.9.13",
-    "oslo": "1.2.1",
-    "svelty-email": "^0.0.11",
-    "tailwind-merge": "^2.3.0",
-    "tailwindcss": "^3.4.3",
-    "vite": "^5.4.1",
-    "vite-plugin-kit-routes": "^0.6.10",
-    "vite-plugin-stripper": "^0.5.4"
+    "@mdi/js": "7.4.47",
+    "@melt-ui/svelte": "0.86.3",
+    "@oslojs/crypto": "1.0.1",
+    "@oslojs/encoding": "1.1.0",
+    "@oslojs/otp": "1.1.0",
+    "@types/nodemailer": "6.4.14",
+    "arctic": "3.5.0",
+    "bcrypt": "5.1.1",
+    "clsx": "2.1.1",
+    "cron": "3.1.7",
+    "daisyui": "4.12.14",
+    "esm-env": "1.0.0",
+    "nodemailer": "6.9.14",
+    "svelty-email": "0.0.11",
+    "tailwind-merge": "2.3.0",
+    "tailwindcss": "3.4.4",
+    "vite": "5.4.1",
+    "vite-plugin-kit-routes": "0.8.3",
+    "vite-plugin-stripper": "0.5.4"
   },
   "sideEffects": false,
   "bin": "./esm/bin/cmd.js",
   "exports": {
     ".": {
       "types": "./esm/index.d.ts",
-      "default": "./esm/index.js",
-      "svelte": "./esm/index.js"
+      "svelte": "./esm/index.js",
+      "default": "./esm/index.js"
     },
     "./api": {
       "types": "./esm/api/index.d.ts",
       "default": "./esm/api/index.js"
     },
-    "./handle": {
-      "types": "./esm/handle/index.d.ts",
-      "default": "./esm/handle/index.js"
-    },
     "./vite": {
       "types": "./esm/vite/index.d.ts",
       "default": "./esm/vite/index.js"
@@ -69,29 +69,41 @@
       "types": "./esm/auth/index.d.ts",
       "default": "./esm/auth/index.js"
     },
-    "./auth/client": {
-      "types": "./esm/auth/client/index.d.ts",
-      "default": "./esm/auth/client/index.js"
+    "./auth/server": {
+      "types": "./esm/auth/server/index.d.ts",
+      "default": "./esm/auth/server/index.js"
+    },
+    "./changeLog": {
+      "types": "./esm/changeLog/index.d.ts",
+      "default": "./esm/changeLog/index.js"
     },
-    "./auth/providers": {
-      "types": "./esm/auth/providers/index.d.ts",
-      "default": "./esm/auth/providers/index.js"
+    "./changeLog/server": {
+      "types": "./esm/changeLog/server/index.d.ts",
+      "default": "./esm/changeLog/server/index.js"
+    },
+    "./cron/server": {
+      "types": "./esm/cron/server/index.d.ts",
+      "default": "./esm/cron/server/index.js"
     },
     "./feedback": {
       "types": "./esm/feedback/index.d.ts",
       "default": "./esm/feedback/index.js"
     },
-    "./changeLogs": {
-      "types": "./esm/changeLogs/index.d.ts",
-      "default": "./esm/changeLogs/index.js"
+    "./feedback/server": {
+      "types": "./esm/feedback/server/index.d.ts",
+      "default": "./esm/feedback/server/index.js"
     },
     "./mail": {
       "types": "./esm/mail/index.d.ts",
       "default": "./esm/mail/index.js"
     },
-    "./cron": {
-      "types": "./esm/cron/index.d.ts",
-      "default": "./esm/cron/index.js"
+    "./mail/server": {
+      "types": "./esm/mail/server/index.d.ts",
+      "default": "./esm/mail/server/index.js"
+    },
+    "./sveltekit/server": {
+      "types": "./esm/sveltekit/server/index.d.ts",
+      "default": "./esm/sveltekit/server/index.js"
     }
   },
   "keywords": [

package/esm/auth/Adapter.d.ts

@@ -1,10 +0,0 @@
-import type { Adapter, DatabaseSession, DatabaseUser } from 'lucia';
-export declare class RemultLuciaAdapter implements Adapter {
-    getSessionAndUser(sessionId: string): Promise<[session: DatabaseSession | null, user: DatabaseUser | null]>;
-    getUserSessions(userId: string): Promise<DatabaseSession[]>;
-    setSession(session: DatabaseSession): Promise<void>;
-    updateSessionExpiration(sessionId: string, expiresAt: Date): Promise<void>;
-    deleteSession(sessionId: string): Promise<void>;
-    deleteUserSessions(userId: string): Promise<void>;
-    deleteExpiredSessions(): Promise<void>;
-}

package/esm/auth/Adapter.js

@@ -1,50 +0,0 @@
-import { remult } from 'remult';
-import { getSafeOptions } from './index.js';
-export class RemultLuciaAdapter {
-    async getSessionAndUser(sessionId) {
-        const oSafe = getSafeOptions();
-        const session = await remult.repo(oSafe.Session).findId(sessionId);
-        if (session) {
-            const user = await remult.repo(oSafe.User).findId(session.userId);
-            if (user) {
-                return [
-                    { ...session, attributes: {} },
-                    { ...user, attributes: oSafe.transformDbUserToClientUser(session, user) },
-                ];
-            }
-        }
-        return [null, null];
-    }
-    async getUserSessions(userId) {
-        const oSafe = getSafeOptions();
-        return (await remult.repo(oSafe.Session).find({ where: { userId } })).map((s) => {
-            return { ...s, attributes: {} };
-        });
-    }
-    async setSession(session) {
-        const oSafe = getSafeOptions();
-        await remult.repo(oSafe.Session).insert(session);
-    }
-    async updateSessionExpiration(sessionId, expiresAt) {
-        const oSafe = getSafeOptions();
-        await remult.repo(oSafe.Session).update(sessionId, { expiresAt });
-    }
-    async deleteSession(sessionId) {
-        const oSafe = getSafeOptions();
-        await remult.repo(oSafe.Session).delete(sessionId);
-    }
-    async deleteUserSessions(userId) {
-        const oSafe = getSafeOptions();
-        const all = await remult.repo(oSafe.Session).find({ where: { userId } });
-        for (const s of all) {
-            await remult.repo(oSafe.Session).delete(s);
-        }
-    }
-    async deleteExpiredSessions() {
-        const oSafe = getSafeOptions();
-        const all = await remult.repo(oSafe.Session).find({ where: { expiresAt: { $lt: new Date() } } });
-        for (const s of all) {
-            await remult.repo(oSafe.Session).delete(s);
-        }
-    }
-}

package/esm/auth/client/index.d.ts

@@ -1,7 +0,0 @@
-import { Log } from '@kitql/helpers';
-import { Auth } from './Auth';
-import { FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession } from './Entities';
-export declare const logAuth: Log;
-export { FF_Role_Auth } from './Entities';
-export { Auth };
-export { FFAuthUser, FFAuthAccount, FFAuthProvider, FFAuthUserSession };

package/esm/auth/client/index.js

@@ -1,7 +0,0 @@
-import { Log } from '@kitql/helpers';
-import { Auth } from './Auth';
-import { FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession } from './Entities';
-export const logAuth = new Log('firstly | auth');
-export { FF_Role_Auth } from './Entities';
-export { Auth };
-export { FFAuthUser, FFAuthAccount, FFAuthProvider, FFAuthUserSession };

package/esm/auth/helper.d.ts

@@ -1,6 +0,0 @@
-import type { Session } from 'lucia';
-/**
- * Create or extend a session for a user.
- * If you pass a session, it will extend it.
- */
-export declare function createOrExtendSession(userId: string, session?: Session): Promise<void>;

package/esm/auth/helper.js

@@ -1,14 +0,0 @@
-import { remult } from 'remult';
-import { lucia } from '.';
-/**
- * Create or extend a session for a user.
- * If you pass a session, it will extend it.
- */
-export async function createOrExtendSession(userId, session) {
-    const sessionToUser = session ? session : await lucia.createSession(userId, {});
-    const sessionCookie = lucia.createSessionCookie(sessionToUser.id);
-    remult.context.setCookie(sessionCookie.name, sessionCookie.value, {
-        path: '/',
-        ...sessionCookie.attributes,
-    });
-}

package/esm/auth/providers/strava.d.ts

@@ -1,30 +0,0 @@
-import { Strava } from 'arctic';
-import { type FFOAuth2Provider } from '../';
-/**
- * ## Strava OAuth2 provider
- *
- * 1. Get your **id** & **secret** from [Strava (direct link)](https://www.strava.com/settings/api).
- * 2. In Strava, set your callback url to
- * - [ ] dev: `http://localhost:5173/api/auth_callback`
- * - [ ] prod: `https://MY_SUPER_SITE/api/auth_callback`
- * 3. In your project add a `.env` file with the following:
- * ```bash
- * STRAVA_CLIENT_ID = 'your-client-id'
- * STRAVA_CLIENT_SECRET = 'your-client-secret'
- * # STRAVA_REDIRECT_URI = '' # optional, will default to "${origin}/api/auth_callback"
- * ```
- * 4. In your frontend, under a button click call something like:
- * ```ts
- * async function oauth() {
- *   window.location.href = await Auth.signInOAuthGetUrl({ provider: 'strava', redirect: window.location.pathname })
- * }
- * ```
- * 5. Enjoy 🥳
- */
-export declare function strava(options?: {
-    STRAVA_CLIENT_ID?: string;
-    STRAVA_CLIENT_SECRET?: string;
-    STRAVA_REDIRECT_URI?: string;
-    authorizationURLOptions?: ReturnType<FFOAuth2Provider<'strava', Strava>['authorizationURLOptions']>;
-    log?: boolean;
-}): FFOAuth2Provider<'strava', Strava>;

package/esm/auth/providers/strava.js

@@ -1,60 +0,0 @@
-import { Strava } from 'arctic';
-import { remult } from 'remult';
-import { env } from '$env/dynamic/private';
-import { checkOAuthConfig } from '.';
-import {} from '../';
-import { logAuth } from '../client';
-/**
- * ## Strava OAuth2 provider
- *
- * 1. Get your **id** & **secret** from [Strava (direct link)](https://www.strava.com/settings/api).
- * 2. In Strava, set your callback url to
- * - [ ] dev: `http://localhost:5173/api/auth_callback`
- * - [ ] prod: `https://MY_SUPER_SITE/api/auth_callback`
- * 3. In your project add a `.env` file with the following:
- * ```bash
- * STRAVA_CLIENT_ID = 'your-client-id'
- * STRAVA_CLIENT_SECRET = 'your-client-secret'
- * # STRAVA_REDIRECT_URI = '' # optional, will default to "${origin}/api/auth_callback"
- * ```
- * 4. In your frontend, under a button click call something like:
- * ```ts
- * async function oauth() {
- *   window.location.href = await Auth.signInOAuthGetUrl({ provider: 'strava', redirect: window.location.pathname })
- * }
- * ```
- * 5. Enjoy 🥳
- */
-export function strava(options) {
-    const name = 'strava';
-    const clientID = options?.STRAVA_CLIENT_ID ?? env.STRAVA_CLIENT_ID ?? '';
-    const secret = options?.STRAVA_CLIENT_SECRET ?? env.STRAVA_CLIENT_SECRET ?? '';
-    const urlForKeys = 'https://www.strava.com/settings/api';
-    checkOAuthConfig(name, clientID, secret, urlForKeys, false);
-    return {
-        name,
-        isPKCE: false,
-        getArcticProvider: () => {
-            const redirectURI = options?.STRAVA_REDIRECT_URI ??
-                env.STRAVA_REDIRECT_URI ??
-                `${remult.context.url.origin}/api/auth_callback`;
-            checkOAuthConfig(name, clientID, secret, urlForKeys, true);
-            return new Strava(clientID, secret, redirectURI);
-        },
-        authorizationURLOptions: () => {
-            return options?.authorizationURLOptions ?? { scopes: [] };
-        },
-        getUserInfo: async (tokens) => {
-            const res = await fetch('https://www.strava.com/api/v3/athlete', {
-                headers: {
-                    Authorization: `Bearer ${tokens.accessToken}`,
-                },
-            });
-            const user = await res.json();
-            if (options?.log) {
-                logAuth.info(`user`, user);
-            }
-            return { raw: user, providerUserId: String(user.id), nameOptions: [user.login] };
-        },
-    };
-}

package/esm/auth/static/assets/Page-BGTO8LC5.css

@@ -1 +0,0 @@
-form.s-KT008SdmQprk,form.s-N0DaQgJ_T5_C,form.s-85Tmcm64bnMI{display:flex;flex-direction:column}.message.s-85Tmcm64bnMI:empty{display:none}.message.s-85Tmcm64bnMI{background:var(--pico-muted-border-color);padding:var(--pico-form-element-spacing-vertical) var(--pico-form-element-spacing-horizontal);border-radius:var(--pico-border-radius);margin-bottom:calc(var(--pico-typography-spacing-vertical) * 2)}.message.error.s-85Tmcm64bnMI{background:var(--pico-del-color);color:#4c1513}form.s-FRwn6sVlvC6z{display:flex;flex-direction:column}.message.s-FRwn6sVlvC6z:empty{display:none}.message.s-FRwn6sVlvC6z{background:var(--pico-muted-border-color);padding:var(--pico-form-element-spacing-vertical) var(--pico-form-element-spacing-horizontal);border-radius:var(--pico-border-radius);margin-bottom:calc(var(--pico-typography-spacing-vertical) * 2)}.message.error.s-FRwn6sVlvC6z{background:var(--pico-del-color);color:#4c1513}.wrapper.s-NO-a_LAEXXH5{min-height:100vh;display:flex;justify-content:center;align-items:center;margin:0 auto}.form.s-NO-a_LAEXXH5{padding:1rem;max-width:360px;width:100%}.form-footer.s-NO-a_LAEXXH5{margin-top:1rem;display:flex;flex-direction:column;justify-content:center;align-items:center}.fallback.s-NO-a_LAEXXH5{display:flex;justify-content:center;align-items:center}

package/esm/auth/static/assets/Page-Cfysx_UV.d.ts

@@ -1,6 +0,0 @@
-export { Ca as default };
-declare class Ca extends Ye {
-    set firstlyData(e: void);
-    get firstlyData(): void;
-}
-import { S as Ye } from "./index-QypqCYwC.js";