firstly 0.2.1 → 0.3.0

package/esm/ui/Button.svelte

@@ -1,16 +1,12 @@
 <script lang="ts">
 	import { createTooltip } from '@melt-ui/svelte'
-	import type { Action } from 'svelte/action'
 	import { fade, fly } from 'svelte/transition'
 
-	import { remult } from 'remult'
-
-	import { BaseEnum, tw } from '../internals'
+	import { tw } from '../internals'
 
 	// TODO: extend HTMLButtonAttributes ?
 	interface Props {
 		isLoading?: boolean
-		permission?: BaseEnum[] | BaseEnum | undefined
 		tooltip?: import('svelte').Snippet
 		class?: string
 		children?: import('svelte').Snippet
@@ -21,15 +17,13 @@
 	let {
 		isLoading = false,
 		class: className = '',
-		permission = undefined,
 		children,
 		tooltip,
 		disabled: disabledProp,
 		...rest
 	}: Props = $props()
 
-	let permissionDisabled = $state(false)
-	let disabled = $derived(disabledProp || permissionDisabled || isLoading)
+	let disabled = $derived(disabledProp || isLoading)
 
 	// let's trigger the annimation if it's more than 200ms
 	let triggerAnnimation = $state(false)
@@ -42,43 +36,6 @@
 			}, 200)
 	})
 
-	let updates = (param: { permission: BaseEnum[] | BaseEnum | undefined }) => {
-		if (param && param.permission) {
-			permissionDisabled = !remult.isAllowed(
-				Array.isArray(param.permission) ? param.permission.map((c) => c.id) : param.permission.id,
-			)
-			if (permissionDisabled) {
-				disabledWhy = `Vous n'avez pas la permission: ${Array.isArray(param.permission) ? param.permission.map((c) => `"${c.caption}"`).join(' ou ') : `"${param.permission.caption}"`}`
-			} else {
-				disabledWhy = ''
-			}
-		} else {
-			permissionDisabled = false
-			disabledWhy = ''
-		}
-	}
-
-	let disabledWhy = $state('')
-	const isAllowed: Action<HTMLElement, { permission: BaseEnum[] | BaseEnum | undefined }> = (
-		node,
-		param,
-	) => {
-		// the node has been mounted in the DOM
-		// @ts-ignore
-		updates(param)
-
-		return {
-			update(param) {
-				// the value of `bar` has changed
-				updates(param)
-			},
-
-			destroy() {
-				// the node has been removed from the DOM
-			},
-		}
-	}
-
 	const {
 		elements: { trigger, content, arrow },
 		states: { open },
@@ -98,7 +55,6 @@
 <button
 	{...$trigger}
 	use:trigger
-	use:isAllowed={{ permission }}
 	{...rest}
 	class={tw(['btn', className])}
 	{disabled}
@@ -112,7 +68,7 @@
 	{/if}
 </button>
 
-{#if $open && (disabledWhy || tooltip)}
+{#if $open && tooltip}
 	<div
 		{...$content}
 		use:content
@@ -121,11 +77,7 @@
 	>
 		<div {...$arrow} use:arrow></div>
 		<div class="px-4 py-1">
-			{#if tooltip}
-				{@render tooltip?.()}
-			{:else}
-				{disabledWhy}
-			{/if}
+			{@render tooltip?.()}
 		</div>
 	</div>
 {/if}

package/esm/ui/Button.svelte.d.ts

@@ -1,7 +1,5 @@
-import { BaseEnum } from '../internals';
 interface Props {
     isLoading?: boolean;
-    permission?: BaseEnum[] | BaseEnum | undefined;
     tooltip?: import('svelte').Snippet;
     class?: string;
     children?: import('svelte').Snippet;

package/esm/ui/Field.svelte

@@ -167,7 +167,16 @@
 			}
 		}
 
-		return { items: arr.map((r) => getEntityDisplayValue(metaTypeObj.repoTarget, r)), totalCount }
+		const items = arr.map((r) => getEntityDisplayValue(metaTypeObj.repoTarget, r))
+
+		// Add "nobody" option at the beginning for filters if configured
+		// @ts-ignore
+		const filterNobodyLabel = cell.field?.options.filterNobodyLabel
+		if (mode === 'filtre' && filterNobodyLabel && str === '') {
+			items.unshift({ id: null, caption: filterNobodyLabel })
+		}
+
+		return { items, totalCount }
 	}
 
 	const getMultiValues = (value: any) => {

package/esm/ui/Grid.svelte

@@ -120,7 +120,6 @@
 						<div class="flex justify-end">
 							{#if withAdd}
 								<Button
-									permission={store.getRepo().metadata.options.permissionApiInsert}
 									disabled={!store.getRepo().metadata.apiInsertAllowed()}
 									class="btn btn-square btn-ghost btn-xs"
 									onclick={() => dispatch('add', {})}
@@ -203,13 +202,13 @@
 										<Clipboardable value={t}>
 											<!-- 20 is a cool value ! -->
 											<span class={t.length < 20 ? 'text-nowrap' : ''}>
-												{t}
+												{@html t}
 											</span>
 										</Clipboardable>
 									{:else}
 										<!-- 20 is a cool value ! -->
 										<span class={t.length < 20 ? 'text-nowrap' : ''}>
-											{t}
+											{@html t}
 										</span>
 									{/if}
 								{/if}
@@ -221,7 +220,6 @@
 								<div class="flex justify-end gap-2">
 									{#if withEdit}
 										<Button
-											permission={store.getRepo().metadata.options.permissionApiUpdate}
 											disabled={!store.getRepo().metadata.apiUpdateAllowed()}
 											class="btn btn-square btn-ghost btn-xs"
 											onclick={() => dispatch('edit', row)}
@@ -231,7 +229,6 @@
 									{/if}
 									{#if withDelete}
 										<Button
-											permission={store.getRepo().metadata.options.permissionApiDelete}
 											disabled={!store.getRepo().metadata.apiDeleteAllowed()}
 											class="btn btn-square btn-ghost btn-xs"
 											onclick={() => dispatch('delete', row)}

package/esm/ui/Grid2.svelte

@@ -122,7 +122,6 @@
 						<div class="flex justify-end">
 							{#if withAdd}
 								<Button
-									permission={r.metadata.options.permissionApiInsert}
 									disabled={!r.metadata.apiInsertAllowed()}
 									class="btn btn-square btn-ghost btn-xs"
 									onclick={() => dispatch('add', {})}
@@ -226,8 +225,7 @@
 								<div class="flex justify-end gap-2">
 									{#if withEdit}
 										<Button
-											permission={r.metadata.options.permissionApiUpdate}
-											disabled={!r.metadata.apiUpdateAllowed()}
+											disabled={!r.metadata.apiUpdateAllowed(row)}
 											class="btn btn-square btn-ghost btn-xs"
 											onclick={() => dispatch('edit', row)}
 										>
@@ -236,7 +234,6 @@
 									{/if}
 									{#if withDelete}
 										<Button
-											permission={r.metadata.options.permissionApiDelete}
 											disabled={!r.metadata.apiDeleteAllowed()}
 											class="btn btn-square btn-ghost btn-xs"
 											onclick={() => dispatch('delete', row)}

package/esm/ui/internals/select/MultiSelectMelt.svelte

@@ -23,7 +23,7 @@
 	export let loadOptions:
 		| ((str: string) => Promise<{ items: BaseItem[]; totalCount: number }>)
 		| undefined = undefined
-	export let values: string[] | undefined = undefined
+	export let values: (string | null)[] | undefined = undefined
 	export let clearable = false
 
 	const dispatch = createEventDispatcher()
@@ -42,7 +42,7 @@
 		}
 	})
 
-	const getDefaultValues = (_selectedValue: string[] | undefined) => {
+	const getDefaultValues = (_selectedValue: (string | null)[] | undefined) => {
 		if (!items) {
 			return []
 		}
@@ -99,14 +99,14 @@
 			// Create a map to count occurrences of each element
 			// TODO: switch to: Use SvelteMap instead  svelte/prefer-svelte-reactivity
 			// eslint-disable-next-line
-			const countMap: Map<string, number> = new Map()
+			const countMap: Map<string | null, number> = new Map()
 
 			list.forEach((item) => {
 				countMap.set(item, (countMap.get(item) || 0) + 1)
 			})
 
 			// Filter the list to include only elements that occur exactly once
-			const uniqueList: string[] = list.filter((item) => countMap.get(item) === 1)
+			const uniqueList: (string | null)[] = list.filter((item) => countMap.get(item) === 1)
 
 			const newIds = uniqueList.sort().join(',')
 			const oldSelectedValues = (values ?? []).sort().join(',')

package/esm/ui/internals/select/MultiSelectMelt.svelte.d.ts

@@ -21,7 +21,7 @@ declare const MultiSelectMelt: $$__sveltets_2_IsomorphicComponent<{
         items: BaseItem[];
         totalCount: number;
     }>) | undefined;
-    values?: string[] | undefined;
+    values?: (string | null)[] | undefined;
     clearable?: boolean;
 }, {
     selected: CustomEvent<any>;

package/esm/ui/internals/select/SelectMelt.svelte

@@ -33,7 +33,7 @@
 	export let loadOptions:
 		| ((str: string) => Promise<{ items: BaseItem[]; totalCount: number }>)
 		| undefined = undefined
-	export let value: string | undefined = undefined
+	export let value: string | null | undefined = undefined
 	export let clearable = false
 	export let createOptionWhenNoResult = false
 	export let default_select_if_one_item = false
@@ -70,7 +70,7 @@
 		sync.selected(getDefaultValue(value))
 	})
 
-	const getDefaultValue = (_selectedValue: string | undefined) => {
+	const getDefaultValue = (_selectedValue: string | null | undefined) => {
 		if (!items) {
 			return
 		}
@@ -129,8 +129,15 @@
 			value = v?.value?.id
 		})
 
+	// Helper to strip HTML tags from caption for display in input
+	const stripHtml = (html: string): string => {
+		const tmp = document.createElement('div')
+		tmp.innerHTML = html
+		return tmp.textContent || tmp.innerText || ''
+	}
+
 	$: if (!$open) {
-		$inputValue = $localSelected?.label ?? ''
+		$inputValue = $localSelected?.label ? stripHtml($localSelected.label) : ''
 	}
 
 	$: filteredItems = items
@@ -213,28 +220,30 @@
 				<li
 					{...$option(toOption(item))}
 					use:$option.action
-					class="relative flex cursor-pointer scroll-my-2 items-center rounded-md px-1
+					class="relative flex cursor-pointer scroll-my-2 items-start rounded-md px-1
           py-2
           data-[disabled]:opacity-50
           data-[highlighted]:bg-primary
 					data-[highlighted]:text-primary-content"
 				>
-					{#if $localSelected?.value?.id === item.id}
-						<Icon data={LibIcon_Check} class="w-6"></Icon>
-					{:else}
-						<!-- just to book the place -->
-						<span class="w-6"></span>
-					{/if}
-					{#if item.icon?.data}
-						<Icon
-							data={item.icon.data}
-							class={tw(['flex-shrink-0', item.icon.class])}
-							style={item.icon.style}
-							size={item.icon.size}
-						></Icon>
-					{/if}
+					<div class="flex items-center">
+						{#if $localSelected?.value?.id === item.id}
+							<Icon data={LibIcon_Check} class="w-6"></Icon>
+						{:else}
+							<!-- just to book the place -->
+							<span class="w-6"></span>
+						{/if}
+						{#if item.icon?.data}
+							<Icon
+								data={item.icon.data}
+								class={tw(['flex-shrink-0', item.icon.class])}
+								style={item.icon.style}
+								size={item.icon.size}
+							></Icon>
+						{/if}
+					</div>
 					<div class="pl-2">
-						<span class="font-medium">{item.caption}</span>
+						<span class="font-medium">{@html item.caption}</span>
 					</div>
 				</li>
 			{:else}

package/esm/ui/internals/select/SelectMelt.svelte.d.ts

@@ -22,7 +22,7 @@ declare const SelectMelt: $$__sveltets_2_IsomorphicComponent<{
         items: BaseItem[];
         totalCount: number;
     }>) | undefined;
-    value?: string | undefined;
+    value?: string | null | undefined;
     clearable?: boolean;
     createOptionWhenNoResult?: boolean;
     default_select_if_one_item?: boolean;

package/esm/ui/internals/select/SelectRadio.svelte

@@ -8,7 +8,7 @@
 	export let disabled: boolean = false
 	export let placeholder: string = ''
 	export let items: BaseItem[] = []
-	export let value: string | number | undefined = undefined
+	export let value: string | number | null | undefined = undefined
 
 	const dispatch = createEventDispatcher()
 

package/esm/ui/internals/select/SelectRadio.svelte.d.ts

@@ -17,7 +17,7 @@ declare const SelectRadio: $$__sveltets_2_IsomorphicComponent<{
     disabled?: boolean;
     placeholder?: string;
     items?: BaseItem[];
-    value?: string | number | undefined;
+    value?: string | number | null | undefined;
 }, {
     selected: CustomEvent<any>;
 } & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firstly",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "description": "Firstly, an opinionated Remult setup!",
   "funding": "https://github.com/sponsors/jycouet",
@@ -32,27 +32,22 @@
   },
   "dependencies": {
     "@clack/prompts": "0.11.0",
-    "@kitql/internals": "0.10.5",
+    "@kitql/internals": "0.11.0",
     "@layerstack/svelte-actions": "1.0.0",
     "@layerstack/utils": "1.0.0",
     "@mdi/js": "7.4.47",
-    "@melt-ui/svelte": "0.86.6",
-    "@oslojs/crypto": "1.0.1",
-    "@oslojs/encoding": "1.1.0",
-    "@oslojs/otp": "1.1.0",
     "@types/nodemailer": "7.0.2",
-    "arctic": "3.7.0",
-    "bcryptjs": "3.0.2",
+    "@melt-ui/svelte": "0.86.6",
     "clsx": "2.1.1",
     "cron": "4.4.0",
     "daisyui": "5.5.3",
     "esm-env": "1.2.2",
     "nodemailer": "7.0.4",
     "svelecte": "5.3.0",
-    "tailwind-merge": "2.6.0",
+    "tailwind-merge": "3.5.0",
     "tailwindcss": "4.1.14",
-    "vite-plugin-kit-routes": "1.0.2",
-    "vite-plugin-stripper": "0.9.2"
+    "vite-plugin-kit-routes": "1.0.3",
+    "vite-plugin-stripper": "0.10.0"
   },
   "sideEffects": false,
   "bin": "./esm/bin/cmd.js",
@@ -86,14 +81,6 @@
       "types": "./esm/formats/index.d.ts",
       "default": "./esm/formats/index.js"
     },
-    "./auth": {
-      "types": "./esm/auth/index.d.ts",
-      "default": "./esm/auth/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"

package/esm/auth/AuthController.d.ts

@@ -1,58 +0,0 @@
-import type { AuthServerAbstraction, ProviderConfigured } from './types';
-export declare class AuthController {
-    #private;
-    static _setAbstraction(impl: AuthServerAbstraction): void;
-    /**
-     * Sign out the current user
-     */
-    static signOut(): Promise<import("./types").AuthResponse>;
-    /**
-     * Sign in with a demo account
-     * _(The easiest way to demo & test your application)_
-     */
-    static signInDemo(name: string): Promise<import("./types").AuthResponse>;
-    /**
-     * This is for login / password authentication Invite someone
-     */
-    static invite(email: string): Promise<import("./types").AuthResponse>;
-    /**
-     * This is for login / password authentication SignUp
-     */
-    static signUpPassword(email: string, password: string): Promise<import("./types").AuthResponse>;
-    /**
-     * This is for login / password authentication SignIn
-     */
-    static signInPassword(email: string, password: string): Promise<import("./types").AuthResponse>;
-    /**
-     * Forgot your password ? Send a mail to reset it.
-     */
-    static forgotPassword(email: string): Promise<import("./types").AuthResponse>;
-    /**
-     * Reset your password with a token
-     */
-    static resetPassword(token: string, password: string): Promise<import("./types").AuthResponse>;
-    /** OTP */
-    static signInOTP(email: string): Promise<import("./types").AuthResponse>;
-    /**
-     * Verify the OTP code
-     */
-    static verifyOtp(email: string, otp: string): Promise<import("./types").AuthResponse>;
-    /** OAUTH */
-    /**
-     * The the url to redirect to for the OAuth provider
-     * @param provider Has to mach one of `AUTH_OPTIONS.providers.oAuths` your configured
-     *
-     * To be used like this for example:
-     * ```
-     * const url = await Auth.signInOAuthGetUrl('github')
-     * window.location.href = url
-     * ```
-     *
-     * _(popup example should work too, and a nice example/componant would be appreciated)_
-     */
-    static signInOAuthGetUrl<T extends keyof ProviderConfigured>(o: {
-        provider: T;
-        options?: ProviderConfigured[T];
-        redirect?: string;
-    }): Promise<string>;
-}

package/esm/auth/AuthController.js

@@ -1,114 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { BackendMethod } from 'remult';
-import { FF_Role_Auth } from './Entities';
-export class AuthController {
-    static #server;
-    // Internal setter method that can be used by the module
-    static _setAbstraction(impl) {
-        this.#server = impl;
-    }
-    /**
-     * Sign out the current user
-     */
-    static async signOut() {
-        return await AuthController.#server.signOut();
-    }
-    /**
-     * Sign in with a demo account
-     * _(The easiest way to demo & test your application)_
-     */
-    static async signInDemo(name) {
-        return await AuthController.#server.signInDemo(name);
-    }
-    /**
-     * This is for login / password authentication Invite someone
-     */
-    static async invite(email) {
-        return await AuthController.#server.invite(email);
-    }
-    /**
-     * This is for login / password authentication SignUp
-     */
-    static async signUpPassword(email, password) {
-        return await AuthController.#server.signUpPassword(email, password);
-    }
-    /**
-     * This is for login / password authentication SignIn
-     */
-    static async signInPassword(email, password) {
-        return await AuthController.#server.signInPassword(email, password);
-    }
-    /**
-     * Forgot your password ? Send a mail to reset it.
-     */
-    static async forgotPassword(email) {
-        return await AuthController.#server.forgotPassword(email);
-    }
-    /**
-     * Reset your password with a token
-     */
-    static async resetPassword(token, password) {
-        return await AuthController.#server.resetPassword(token, password);
-    }
-    /** OTP */
-    static async signInOTP(email) {
-        return await AuthController.#server.signInOTP(email);
-    }
-    /**
-     * Verify the OTP code
-     */
-    static async verifyOtp(email, otp) {
-        return await AuthController.#server.verifyOtp(email, otp);
-    }
-    /** OAUTH */
-    /**
-     * The the url to redirect to for the OAuth provider
-     * @param provider Has to mach one of `AUTH_OPTIONS.providers.oAuths` your configured
-     *
-     * To be used like this for example:
-     * ```
-     * const url = await Auth.signInOAuthGetUrl('github')
-     * window.location.href = url
-     * ```
-     *
-     * _(popup example should work too, and a nice example/componant would be appreciated)_
-     */
-    static async signInOAuthGetUrl(o) {
-        return await AuthController.#server.signInOAuthGetUrl(o);
-    }
-}
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "signOut", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "signInDemo", null);
-__decorate([
-    BackendMethod({ allowed: FF_Role_Auth.FF_Role_Auth_Invite })
-], AuthController, "invite", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "signUpPassword", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "signInPassword", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "forgotPassword", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "resetPassword", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "signInOTP", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "verifyOtp", null);
-__decorate([
-    BackendMethod({ allowed: true })
-], AuthController, "signInOAuthGetUrl", null);

package/esm/auth/Entities.d.ts

@@ -1,47 +0,0 @@
-import type { OAuth2Tokens } from 'arctic';
-import { BaseEnum } from '../internals';
-import type { BaseEnumOptions } from '../internals';
-import type { OAuth2UserInfo } from './types';
-export declare const FF_Role_Auth: {
-    readonly FF_Role_Auth_Admin: "FF_Role_Auth.Admin";
-    readonly FF_Role_Auth_Invite: "FF_Role_Auth.Invite";
-};
-export declare class FFAuthUser {
-    id: string;
-    createdAt: Date;
-    updatedAt?: Date;
-    name: string;
-    roles: string[];
-    accounts: FFAuthAccount[];
-    sessions: FFAuthUserSession[];
-}
-export declare class FFAuthAccount {
-    id: string;
-    createdAt: Date;
-    updatedAt?: Date;
-    userId: string;
-    user: FFAuthUser;
-    provider: string;
-    providerUserId: string;
-    email?: string | null;
-    hashPassword?: string;
-    token?: string;
-    expiresAt?: Date;
-    lastVerifiedAt?: Date;
-    metadata?: OAuth2UserInfo & {
-        tokens_data: OAuth2Tokens['data'];
-    };
-}
-export declare class FFAuthUserSession {
-    id: string;
-    expiresAt: Date;
-    userId: string;
-    user: FFAuthUser;
-}
-export declare class FFAuthProvider extends BaseEnum {
-    static DEMO: FFAuthProvider;
-    static PASSWORD: FFAuthProvider;
-    static OTP: FFAuthProvider;
-    static OAUTH: FFAuthProvider;
-    constructor(id: string, o?: BaseEnumOptions);
-}