firstly 0.2.0 → 0.3.0

package/esm/feedback/FeedbackController.js

@@ -32,31 +32,31 @@ async function getGitHub(query, variables) {
     }
     return null;
 }
-async function addMetaData(issueId, author, page) {
+async function addMetaData(issueId, obj) {
     if (import.meta.env.SSR) {
         const commentToMinimize = await getGitHub(`mutation AddComment($input: AddCommentInput!) {
-			addComment(input: $input) {
-				commentEdge {
-					node {
-						id
-					}
-				}
-			}
-		}
-		`, {
+      addComment(input: $input) {
+        commentEdge {
+          node {
+            id
+          }
+        }
+      }
+    }
+    `, {
             input: {
                 subjectId: issueId,
-                body: `<pre>\n${JSON.stringify({ author, page }, null, 2)}\n</pre>`,
+                body: `<pre>\n${JSON.stringify(obj, null, 2)}\n</pre>`,
             },
         });
         await getGitHub(`mutation MinimizeComment($input: MinimizeCommentInput!) {
-			minimizeComment(input: $input) {
-				minimizedComment {
-					isMinimized
-				}
-			}
-		}
-		`, {
+      minimizeComment(input: $input) {
+        minimizedComment {
+          isMinimized
+        }
+      }
+    }
+    `, {
             input: {
                 subjectId: commentToMinimize.addComment.commentEdge.node.id,
                 classifier: 'OFF_TOPIC',
@@ -67,26 +67,26 @@ async function addMetaData(issueId, author, page) {
 export class FeedbackController {
     static async getMilestones() {
         const data = await getGitHub(`query Milestones(
-			$repository: String!
-			$owner: String!
-			$filter: String
-			$take: Int = 25
-			$cursor: String
-		) {
-			repository(name: $repository, owner: $owner) {
-				milestones(query: $filter, last: $take, after: $cursor, states: OPEN) {
-					pageInfo {
-						endCursor
-					}
-					nodes {
-						id
-						number
-						title
-					}
-				}
-			}
-		}
-		`, {
+      $repository: String!
+      $owner: String!
+      $filter: String
+      $take: Int = 25
+      $cursor: String
+    ) {
+      repository(name: $repository, owner: $owner) {
+        milestones(query: $filter, last: $take, after: $cursor, states: OPEN) {
+          pageInfo {
+            endCursor
+          }
+          nodes {
+            id
+            number
+            title
+          }
+        }
+      }
+    }
+    `, {
             repository: remult.context.feedbackOptions.repo.name,
             owner: remult.context.feedbackOptions.repo.owner,
             filter: remult.context.feedbackOptions.milestones?.title_filter ?? '',
@@ -105,33 +105,33 @@ export class FeedbackController {
             ? { field: 'UPDATED_AT', direction: 'DESC' } // When close, the last issue updated.
             : null; // When open take milestone order
         const data = await getGitHub(`query Issues(
-				$repository: String!
-				$owner: String!
-				$filters: IssueFilters
-				$milestoneNumber: Int!
-				$take: Int = 25
-				$cursor: String
-				$issueOrder: IssueOrder
-			) {
-				repository(name: $repository, owner: $owner) {
-					milestone(number: $milestoneNumber) {
-						issues(first: $take, after: $cursor, filterBy: $filters, orderBy: $issueOrder) {
-							nodes {
-								id
-								number
-								titleHTML
-								state
+        $repository: String!
+        $owner: String!
+        $filters: IssueFilters
+        $milestoneNumber: Int!
+        $take: Int = 25
+        $cursor: String
+        $issueOrder: IssueOrder
+      ) {
+        repository(name: $repository, owner: $owner) {
+          milestone(number: $milestoneNumber) {
+            issues(first: $take, after: $cursor, filterBy: $filters, orderBy: $issueOrder) {
+              nodes {
+                id
+                number
+                titleHTML
+                state
                 labels(first:10){
                   nodes {
                     name
                   }
                 }
-							}
-						}
-					}
-				}
-			}			
-		`, {
+              }
+            }
+          }
+        }
+      }			
+    `, {
             repository: remult.context.feedbackOptions.repo.name,
             owner: remult.context.feedbackOptions.repo.owner,
             milestoneNumber,
@@ -156,38 +156,38 @@ export class FeedbackController {
     }
     static async getIssue(issueNumber) {
         const data = await getGitHub(`query Issue($repository: String!, $owner: String!, $issueNumber: Int!) {
-				repository(name: $repository, owner: $owner) {
-					issue(number: $issueNumber) {
-						id
-						createdAt
-						bodyHTML
-						state
-						title
-            labels(first: 25){
-              nodes{
-                id
-                name
-              }
-            }
-						comments(first: 100) {
-							nodes {
-								id
-								isMinimized
-								createdAt
-								body
-								bodyHTML
-								reactionGroups {
-									content
-									reactors(first: 1) {
-										totalCount
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		`, {
+repository(name: $repository, owner: $owner) {
+  issue(number: $issueNumber) {
+    id
+    createdAt
+    bodyHTML
+    state
+    title
+    labels(first: 25){
+      nodes{
+        id
+        name
+      }
+    }
+    comments(first: 100) {
+      nodes {
+        id
+        isMinimized
+        createdAt
+        body
+        bodyHTML
+        reactionGroups {
+          content
+          reactors(first: 1) {
+            totalCount
+          }
+        }
+      }
+    }
+  }
+}
+}
+    `, {
             repository: remult.context.feedbackOptions.repo.name,
             owner: remult.context.feedbackOptions.repo.owner,
             issueNumber,
@@ -204,7 +204,7 @@ export class FeedbackController {
         for (let i = 0; i < comments.length; i++) {
             if (comments[i].isMinimized) {
                 const parsed = JSON.parse(comments[i].body.replaceAll('<pre>\n', '').replaceAll('\n</pre>', ''));
-                items[items.length - 1].who = parsed.author;
+                items[items.length - 1].who = parsed?.author ?? '???';
                 items[items.length - 1].public = true;
             }
             else {
@@ -230,35 +230,35 @@ export class FeedbackController {
         };
         return toRet;
     }
-    static async createIssue(milestoneId, title, body, page) {
+    static async createIssue(milestoneId, title, body, metadata) {
         const repoInfo = await getGitHub(`query RepoInfo(
-				$repository: String!
-				$owner: String!
-			) {
-				repository(name: $repository, owner: $owner) {
-					id
+        $repository: String!
+        $owner: String!
+      ) {
+        repository(name: $repository, owner: $owner) {
+          id
           labels(first: 25){
             nodes{
               id
               name
             }
           }
-				}
-			}`, {
+        }
+      }`, {
             repository: remult.context.feedbackOptions.repo.name,
             owner: remult.context.feedbackOptions.repo.owner,
         });
         const repoInfoData = repoInfo.repository;
         const create_label = repoInfoData.labels.nodes.find((c) => c.name === remult.context.feedbackOptions.create_label);
         const newIssue = await getGitHub(`mutation CreateIssue($input: CreateIssueInput!) {
-			createIssue(input: $input) {
-				issue {
-					id
-					number
-				}
-			}
-		}
-		`, {
+      createIssue(input: $input) {
+        issue {
+          id
+          number
+        }
+      }
+    }
+    `, {
             input: {
                 repositoryId: repoInfoData.id,
                 milestoneId: milestoneId,
@@ -268,19 +268,20 @@ export class FeedbackController {
             },
         });
         const toRet = newIssue.createIssue.issue;
-        await addMetaData(toRet.id, remult.user?.name, page);
+        const feedbackMetadata = remult.context.feedbackOptions.transformMetadata?.({
+            user: remult.user,
+            metadata,
+        }) ?? metadata;
+        await addMetaData(toRet.id, feedbackMetadata);
         remult.context.feedbackOptions.saved?.({
             number: toRet.number,
             title: title,
             body,
-            metadata: {
-                author: JSON.stringify(remult.user?.name),
-                page,
-            },
+            metadata: feedbackMetadata,
         });
         return toRet;
     }
-    static async addCommentOnIssue(issueId, issueNumber, title, body, page, labels) {
+    static async addCommentOnIssue(issueId, issueNumber, title, body, metadata, labels) {
         const inputComment = {
             subjectId: issueId,
             body,
@@ -292,32 +293,33 @@ export class FeedbackController {
                 : labels).map((c) => c.id),
         };
         await getGitHub(`mutation AddComment($inputComment: AddCommentInput!, $inputIssue: UpdateIssueInput!) {
-				addComment(input: $inputComment) {
-					commentEdge {
-						node {
-							id
-						}
-					}
-				}
+        addComment(input: $inputComment) {
+          commentEdge {
+            node {
+              id
+            }
+          }
+        }
         updateIssue(input: $inputIssue) {
           issue {
             id
           }
         }
-			}
-			`, {
+      }
+      `, {
             inputComment,
             inputIssue,
         });
-        await addMetaData(issueId, remult.user?.name, page);
+        const feedbackMetadata = remult.context.feedbackOptions.transformMetadata?.({
+            user: remult.user,
+            metadata,
+        }) ?? metadata;
+        await addMetaData(issueId, feedbackMetadata);
         remult.context.feedbackOptions.saved?.({
             number: issueNumber,
             title,
             body,
-            metadata: {
-                author: JSON.stringify(remult.user?.name),
-                page,
-            },
+            metadata: feedbackMetadata,
         });
         return 'done';
     }
@@ -337,13 +339,13 @@ export class FeedbackController {
             id
           }
         }
-				closeIssue(input: $inputClose) {
-					issue {
-						id
-					}
-				}
-			}
-			`, {
+        closeIssue(input: $inputClose) {
+          issue {
+            id
+          }
+        }
+      }
+      `, {
             inputIssue,
             inputClose,
         });
@@ -354,13 +356,13 @@ export class FeedbackController {
             issueId,
         };
         await getGitHub(`mutation ReOpenIssue($input: ReopenIssueInput!) {
-				reopenIssue(input: $input) {
-					issue {
-						id
-					}
-				}
-			}
-			`, {
+        reopenIssue(input: $input) {
+          issue {
+            id
+          }
+        }
+      }
+      `, {
             input,
         });
         return 'done';

package/esm/feedback/server/index.d.ts

@@ -1,6 +1,6 @@
-import { ModuleFF } from '../../server';
+import { Module } from 'remult/server';
 import type { FeedbackOptions } from '../types';
-export declare const feedback: (o: FeedbackOptions) => ModuleFF;
+export declare const feedback: (o: FeedbackOptions) => Module<unknown>;
 declare module 'remult' {
     interface RemultContext {
         feedbackOptions: FeedbackOptions;

package/esm/feedback/server/index.js

@@ -1,9 +1,9 @@
 import { remult } from 'remult';
-import { ModuleFF } from '../../server';
+import { Module } from 'remult/server';
 import { FeedbackController } from '../FeedbackController';
 export const feedback = (o) => {
-    return new ModuleFF({
-        name: 'feedback',
+    return new Module({
+        key: 'feedback',
         controllers: [FeedbackController],
         initRequest: async (kitEvent, op) => {
             remult.context.feedbackOptions = o;

package/esm/feedback/types.d.ts

@@ -1,3 +1,4 @@
+import type { UserInfo } from 'remult';
 export type FeedbackOptions = {
     GITHUB_API_TOKEN: string;
     repo: {
@@ -10,6 +11,10 @@ export type FeedbackOptions = {
     };
     highlight_label?: string;
     create_label?: string;
+    transformMetadata?: (o: {
+        user: UserInfo | undefined;
+        metadata: Record<string, any>;
+    }) => Record<string, any>;
     saved?: (args: {
         number: number;
         title: string;

package/esm/feedback/ui/DialogIssue.svelte

@@ -45,7 +45,7 @@
 
 		const p = $page.url.pathname + $page.url.search
 		if (!issue?.id) {
-			const result = await FeedbackController.createIssue(milestoneId, title, content, p)
+			const result = await FeedbackController.createIssue(milestoneId, title, content, { page: p })
 			issueNumber = result.number
 		} else {
 			await FeedbackController.addCommentOnIssue(
@@ -53,7 +53,7 @@
 				issueNumber!,
 				issue.title,
 				content,
-				p,
+				{ page: p },
 				issue.labels,
 			)
 		}
@@ -126,7 +126,7 @@
 
 		{#if issue?.state === 'CLOSED'}
 			<div class="flex justify-end">
-				<Button on:click={reOpen} class="btn-neutral">Re Ouvrir</Button>
+				<Button onclick={reOpen} class="btn-neutral">Re Ouvrir</Button>
 			</div>
 		{:else}
 			{#if issueNumber === null}
@@ -138,11 +138,11 @@
 			></Textarea>
 			<div class="flex justify-between">
 				{#if issueNumber}
-					<Button on:click={close} tabIndex={-1} class="btn-outline btn-error">Clore le feedback</Button>
+					<Button onclick={close} tabindex={-1} class="btn-error">Clore le feedback</Button>
 				{:else}
 					<div></div>
 				{/if}
-				<Button on:click={send} disabled={disableButton(issueNumber, title, content)}>Envoyer</Button>
+				<Button onclick={send} disabled={disableButton(issueNumber, title, content)}>Envoyer</Button>
 			</div>
 		{/if}
 	{/if}

package/esm/feedback/ui/DialogIssues.svelte

@@ -42,16 +42,16 @@
 		<div>
 			<Button
 				class={issueState === 'OPEN' ? 'btn-primary' : 'btn-ghost'}
-				on:click={() => update('OPEN')}>En cours</Button
+				onclick={() => update('OPEN')}>En cours</Button
 			>
 			<Button
 				class={issueState === 'CLOSED' ? 'btn-primary' : 'btn-ghost'}
-				on:click={() => update('CLOSED')}>Clos</Button
+				onclick={() => update('CLOSED')}>Clos</Button
 			>
 		</div>
 
 		<Button
-			on:click={async () => {
+			onclick={async () => {
 				await dialog.show({
 					component: DialogIssue,
 					classes: { root: 'overflow-auto w-[80vh] h-[80vh]' },
@@ -70,7 +70,7 @@
 
 	{#each issues as issue}
 		<Button
-			on:click={async () => {
+			onclick={async () => {
 				await dialog.show({
 					component: DialogIssue,
 					classes: { root: 'overflow-auto w-[80vh] h-[80vh]' },
@@ -86,7 +86,7 @@
 		>
 			<div class="flex w-full justify-center justify-items-center text-left">
 				<div class="flex-grow">
-					<span class="mr-2 inline-block w-8 text-right text-xs italic text-base-content/60"
+					<span class="mr-2 inline-block w-8 text-right text-xs text-base-content/60 italic"
 						>#{issue.number}</span
 					>
 					{@html issue.titleHTML}

package/esm/feedback/ui/DialogMilestones.svelte

@@ -20,7 +20,7 @@
 <div class="mb-4 grid gap-4">
 	{#each milestones as milestone}
 		<Button
-			on:click={() =>
+			onclick={() =>
 				dialog.show({
 					component: DialogIssues,
 					classes: { root: 'overflow-auto w-[85vh] h-[85vh]' },

package/esm/internals/BaseEnum.d.ts

@@ -1,4 +1,5 @@
 import type { FindOptionsBase, Repository } from 'remult';
+export type BaseItemLight = Partial<BaseItem>;
 export type FF_Icon = {
     data?: string | string[];
     size?: string | number;
@@ -7,7 +8,7 @@ export type FF_Icon = {
     caption?: string;
 };
 export type BaseItem = BaseEnumOptions & {
-    id: string;
+    id: string | null;
     captionSub?: string | (string | undefined)[];
     href?: string;
     repo?: Repository<any>;

package/esm/internals/FF_Entity.js

@@ -1,21 +1,5 @@
 import { Entity } from 'remult';
 import { withChangeLog } from '../changeLog';
-const toAllow = (permission) => {
-    if (permission) {
-        if (Array.isArray(permission)) {
-            return permission.map((p) => p.id);
-        }
-        return permission.id;
-    }
-    return undefined;
-};
 export function FF_Entity(key, options) {
-    return Entity(key, withChangeLog({
-        ...options,
-        allowApiCrud: options?.allowApiCrud ?? toAllow(options?.permissionApiCrud),
-        allowApiDelete: options?.allowApiDelete ?? toAllow(options?.permissionApiDelete),
-        allowApiInsert: options?.allowApiInsert ?? toAllow(options?.permissionApiInsert),
-        allowApiRead: options?.allowApiRead ?? toAllow(options?.permissionApiRead),
-        allowApiUpdate: options?.allowApiUpdate ?? toAllow(options?.permissionApiUpdate),
-    }));
+    return Entity(key, withChangeLog({ ...options }));
 }

package/esm/internals/FF_Fields.d.ts

@@ -1,10 +1,11 @@
-import { type ClassType, type FieldOptions, type StringFieldOptions } from 'remult';
+import { type ClassType, type FieldOptions } from 'remult';
 import type { BaseEnum } from './BaseEnum';
 export declare class FF_Fields {
-    static string<entityType = unknown, valueType = string>(o?: StringFieldOptions<entityType, valueType>): import("remult").ClassFieldDecorator<entityType, valueType | undefined>;
     static currency<entityType = unknown>(o?: FieldOptions<entityType, number>): import("remult").ClassFieldDecorator<entityType, number | undefined>;
-    static dateOnly<entityType = any>(o?: FieldOptions<entityType, Date>): import("remult").ClassFieldDecorator<entityType, Date | undefined>;
     static arrayEnum<enumType = any, entityType = any>(enumClass: enumType, o?: FieldOptions<entityType, any[]>): import("remult").ClassFieldDecorator<entityType, any[] | undefined>;
     static arrayEnumToGql<enumType = any, entityType = any>(enumClass: enumType, o?: FieldOptions<entityType, any[]>): import("remult").ClassFieldDecorator<entityType, any[] | undefined>;
     static arrayValueList<enumType = any, entityType = any>(enumClass: ClassType<BaseEnum<any>>, o?: FieldOptions<entityType, any[]>): import("remult").ClassFieldDecorator<entityType, any[] | undefined>;
+    static vector32<entityType = unknown>(...options: (FieldOptions<entityType, number[]> & {
+        dimensions?: number;
+    })[]): import("remult").ClassFieldDecorator<entityType, number[] | undefined>;
 }

package/esm/internals/FF_Fields.js

@@ -1,4 +1,4 @@
-import { Fields, Validators, } from 'remult';
+import { Fields, Validators } from 'remult';
 import { displayCurrency } from '../formats';
 import { getEnums } from './helper';
 // Translate default messages
@@ -6,52 +6,7 @@ import { getEnums } from './helper';
 // It look like I have 2 remult loaded... But even trying to remove one, I still have the issue
 Validators.unique.defaultMessage = 'Existe déjà!';
 Validators.required.defaultMessage = 'Obligatoire!';
-// export function addValidators(
-//   validators: FieldOptions['validate'],
-//   newValidator: FieldOptions['validate'],
-//   atStart = false,
-// ) {
-//   if (!newValidator) return validators
-//   const newValidators = Array.isArray(newValidator) ? newValidator : [newValidator]
-//   const validatorsArray = Array.isArray(validators) ? validators : validators ? [validators] : []
-//   return atStart ? [...newValidators, ...validatorsArray] : [...validatorsArray, ...newValidators]
-// }
-// REMULT P2: A/ Add in the doc that allowNull is false by default
-//            B/ Would be great to have a Validators.required automatically when allowNull is not true.
-//            C/ WARNING Validators.required is also checking for empty string
-const validate_update_when_not_allow_null = (o) => {
-    const validate = [];
-    if (o.includeInApi !== false &&
-        o.serverExpression === undefined &&
-        o.sqlExpression === undefined &&
-        (o.allowNull === undefined || o.allowNull === false) &&
-        // if require: false is explicitly set, then we don't need to add required validator
-        o.required !== false) {
-        // addValidators(o.validate, [Validators.required], true)
-        validate.push(Validators.required);
-    }
-    // let's add original validate if any
-    if (o.validate) {
-        if (Array.isArray(o.validate)) {
-            validate.push(...o.validate);
-        }
-        else {
-            validate.push(o.validate);
-        }
-    }
-    return validate;
-};
 export class FF_Fields {
-    static string(o) {
-        if (o === undefined) {
-            o = {};
-        }
-        // let's return the field
-        return Fields.string({
-            ...o,
-            validate: validate_update_when_not_allow_null(o),
-        });
-    }
     static currency(o) {
         // let's return the field
         return Fields.number({
@@ -80,15 +35,6 @@ export class FF_Fields {
             },
         });
     }
-    static dateOnly(o) {
-        // empty if there is nothing coming here.
-        if (o === undefined) {
-            o = {};
-        }
-        o.inputType = 'dateOnly';
-        // let's return the field
-        return Fields.dateOnly({ ...o, validate: validate_update_when_not_allow_null(o) });
-    }
     static arrayEnum(enumClass, o) {
         return Fields.json(() => Array, {
             ...o,
@@ -182,4 +128,17 @@ export class FF_Fields {
             },
         });
     }
+    static vector32(...options) {
+        const dimensions = options[0].dimensions ?? 1024;
+        return Fields.object({
+            valueConverter: {
+                fieldTypeInDb: `F32_BLOB(${dimensions})`,
+                toDb: (val) => JSON.stringify(val),
+                // TODO: remove ts-ignore when remult@3.3.0-next.1 is released (that has toDbSql)
+                // @ts-ignore
+                toDbSql: (val) => `vector32(${val})`,
+                fromDb: (val) => Array.from(new Float32Array(val)),
+            },
+        }, ...options);
+    }
 }