firstly 0.0.11 → 0.0.13

package/esm/ui/link/LinkPlus.svelte

@@ -17,40 +17,38 @@ const hasSomethingToDisplay = (item2) => {
 </script>
 
 <div class="flex items-center gap-4">
-  {#if item}
-    {#if item.icon?.data && !noIcon}
-      {#if item.icon.caption}
-        <Tooltip text={item.icon.caption}>
-          <Icon {...item.icon} />
-        </Tooltip>
-      {:else}
-        <Icon {...item.icon} />
-      {/if}
-    {/if}
+	{#if item}
+		{#if item.icon?.data && !noIcon}
+			{#if item.icon.caption}
+				<Tooltip text={item.icon.caption}>
+					<Icon {...item.icon} />
+				</Tooltip>
+			{:else}
+				<Icon {...item.icon} />
+			{/if}
+		{/if}
 
-    {#if hasSomethingToDisplay(item)}
-      <div class="flex flex-col items-start">
-        {#if item.href}
-          <div>
-            <Link href={item.href}>{item.caption}</Link>
-            {#if item.captionSub && captionSubStyle === 'inline'}
-              <span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
-            {/if}
-          </div>
-        {:else}
-          <!-- 20 is a cool value ! -->
-          <span
-            class="text-base-content {item.class} {(item.caption ?? '').length < 20
-              ? 'text-nowrap'
-              : ''}"
-          >
-            {item.caption ?? '-'}
-          </span>
-        {/if}
-        {#if item.captionSub && captionSubStyle === 'under'}
-          <span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
-        {/if}
-      </div>
-    {/if}
-  {/if}
+		{#if hasSomethingToDisplay(item)}
+			<div class="flex flex-col items-start">
+				{#if item.href}
+					<div>
+						<Link href={item.href}>{item.caption}</Link>
+						{#if item.captionSub && captionSubStyle === 'inline'}
+							<span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
+						{/if}
+					</div>
+				{:else}
+					<!-- 20 is a cool value ! -->
+					<span
+						class="text-base-content {item.class} {(item.caption ?? '').length < 20 ? 'text-nowrap' : ''}"
+					>
+						{item.caption ?? '-'}
+					</span>
+				{/if}
+				{#if item.captionSub && captionSubStyle === 'under'}
+					<span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
+				{/if}
+			</div>
+		{/if}
+	{/if}
 </div>

package/esm/vite/index.js

@@ -1,34 +1,33 @@
-import { mergeConfig } from 'vite';
+import {} from 'vite';
 import { kitRoutes } from 'vite-plugin-kit-routes';
 import { stripper } from 'vite-plugin-stripper';
 // import { Log } from '@kitql/helpers'
-// const toRemove = ['oslo/password', 'oslo', '@node-rs/argon2', '@node-rs/bcrypt']
+// const toRemove = ['@node-rs/argon2', '@node-rs/bcrypt']
 // oslo needs to be in the dependencies (not devDependencies) !!
-const toRemove = ['oslo/password', 'oslo'];
+// const toRemove = ['oslo/password', 'oslo']
 export function firstly(options) {
-    // const log = new Log('firstly')
-    // console.log(`toRemove`, toRemove)
+    // @ts-ignore
     return [
-        {
-            name: 'vite-plugin-firstly',
-            enforce: 'pre',
-            config: async (a) => {
-                return mergeConfig(a, {
-                    build: {
-                        // THE ERROR:
-                        // RollupError: Unexpected character '�' or Unexpected character '\u{7f}'
-                        // This code (A) is to fix in `build` mode
-                        rollupOptions: {
-                            external: toRemove,
-                        },
-                    },
-                    // This code (B) is to fix in `dev` mode
-                    optimizeDeps: {
-                        exclude: toRemove,
-                    },
-                });
-            },
-        },
+        // {
+        //   name: 'vite-plugin-firstly',
+        //   enforce: 'pre',
+        //   config: async (a) => {
+        //     return mergeConfig(a, {
+        //       build: {
+        //         // THE ERROR:
+        //         // RollupError: Unexpected character '�' or Unexpected character '\u{7f}'
+        //         // This code (A) is to fix in `build` mode
+        //         rollupOptions: {
+        //           external: toRemove,
+        //         },
+        //       },
+        //       // This code (B) is to fix in `dev` mode
+        //       optimizeDeps: {
+        //         exclude: toRemove,
+        //       },
+        //     })
+        //   },
+        // },
         // @ts-ignore
         ...kitRoutes({
             ...(options?.kitRoutes ?? {}),

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "firstly",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "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": "2.7.27",
+    "remult": "2.7.31",
     "svelte": ">=4.2.18"
   },
   "dependencies": {
-    "@clack/prompts": "^0.7.0",
-    "@kitql/internals": "0.9.9",
-    "@mdi/js": "^7.4.47",
-    "@melt-ui/svelte": "^0.84.0",
-    "@types/nodemailer": "^6.4.15",
-    "arctic": "^1.8.0",
-    "clsx": "^2.1.1",
-    "cron": "^3.1.7",
-    "daisyui": "^4.12.14",
-    "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"
+    "@clack/prompts": "0.10.0",
+    "@kitql/internals": "0.10.3",
+    "@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",
+    "bcryptjs": "3.0.2",
+    "clsx": "2.1.1",
+    "cron": "4.1.0",
+    "daisyui": "4.12.14",
+    "esm-env": "1.2.2",
+    "nodemailer": "6.10.0",
+    "svelty-email": "0.0.11",
+    "tailwind-merge": "2.6.0",
+    "tailwindcss": "3.4.4",
+    "vite": "5.4.1",
+    "vite-plugin-kit-routes": "0.8.3",
+    "vite-plugin-stripper": "0.6.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"
@@ -65,33 +65,41 @@
       "types": "./esm/formats/index.d.ts",
       "default": "./esm/formats/index.js"
     },
-    "./auth": {
+    "./auth/client": {
       "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"
     },
-    "./auth/providers": {
-      "types": "./esm/auth/providers/index.d.ts",
-      "default": "./esm/auth/providers/index.js"
+    "./changeLog/client": {
+      "types": "./esm/changeLog/index.d.ts",
+      "default": "./esm/changeLog/index.js"
     },
-    "./feedback": {
+    "./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/client": {
       "types": "./esm/feedback/index.d.ts",
       "default": "./esm/feedback/index.js"
     },
-    "./changeLog": {
-      "types": "./esm/changeLog/index.d.ts",
-      "default": "./esm/changeLog/index.js"
+    "./feedback/server": {
+      "types": "./esm/feedback/server/index.d.ts",
+      "default": "./esm/feedback/server/index.js"
     },
-    "./mail": {
+    "./mail/client": {
       "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"
     }
   },
   "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-BEFYPjis.d.ts

@@ -1,4 +0,0 @@
-export { v as default };
-declare class v extends l {
-}
-import { S as l } from "./index-QypqCYwC.js";

package/esm/auth/static/assets/Page-BEFYPjis.js

@@ -1 +0,0 @@
-import{S as l,b as d,a as f,d as i,h as m,M as p,t as u,n as r,z as h}from"./index-QypqCYwC.js";function c(s){let e;const n={c:function(){e=p("Hello from admin")},l:function(t){throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option")},m:function(t,o){u(t,e,o)},p:r,i:r,o:r,d:function(t){t&&h(e)}};return i("SvelteRegisterBlock",{block:n,id:c.name,type:"component",source:"",ctx:s}),n}function w(s,e){let{$$slots:n={},$$scope:a}=e;m("Page",n,[]);const t=[];return Object.keys(e).forEach(o=>{!~t.indexOf(o)&&o.slice(0,2)!=="$$"&&o!=="slot"&&console.warn(`<Page> was created with unknown prop '${o}'`)}),[]}class v extends l{constructor(e){super(e),d(this,e,w,c,f,{}),i("SvelteRegisterComponent",{component:this,tagName:"Page",options:e,id:c.name})}}export{v as default};

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";