firstly 0.0.16-next.2 → 0.1.0-next.3

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

@@ -1,5 +1,5 @@
 import { CronJob } from 'cron';
-import { Module } from '../../server';
+import { Module } from 'remult/server';
 export declare const jobs: Record<string, {
     job: CronJob<null, unknown> | null;
     concurrentInProgress: number;
@@ -29,18 +29,43 @@ export declare const cronTime: {
      */
     every_friday_morning: string;
 };
+/**
+ * Type for onTick function that must return a Record<string, any>
+ */
+export type CronOnTick = () => Record<string, any> | Promise<Record<string, any>>;
+/**
+ * Type for cron job parameters with enforced onTick return type
+ */
+export type CronJobParams = {
+    cronTime: string | Date;
+    onTick: CronOnTick;
+    topic: string;
+    concurrent?: number;
+    logs?: {
+        starting?: boolean;
+        ended?: boolean;
+    };
+    start?: boolean;
+    runOnInit?: boolean;
+    timeZone?: string;
+    utcOffset?: string | number;
+    onComplete?: () => void;
+};
 /**
  * usage:
  *
  * ```ts
- * import { cron, cronTime } from 'firstly/cron'
+ * import { cron, cronTime } from '..'
  *
  * export const api = firstly({
  *   modules: [
  *     cron([{
  *       topic: 'first_cron',
  *       cronTime: cronTime.every_second,
- *       onTick: () => { console.log('hello') },
+ *       onTick: () => {
+ *         console.log('hello')
+ *         return { status: 'success' }
+ *       },
  *       start: !dev, // Start in production
  *       // runOnInit: dev, // nice in dev environement
  *     }])
@@ -50,11 +75,4 @@ export declare const cronTime: {
  *
  * using [cron](https://www.npmjs.com/package/cron) library under the hood
  */
-export declare const cron: (jobsInfos: (Parameters<typeof CronJob.from>[0] & {
-    topic: string;
-    concurrent?: number;
-    logs?: {
-        starting?: boolean;
-        ended?: boolean;
-    };
-})[]) => Module;
+export declare const cron: (jobsInfos: CronJobParams[]) => Module<unknown>;

package/esm/cron/server/index.js

@@ -1,6 +1,9 @@
 import { CronJob } from 'cron';
+import { repo } from 'remult';
+import { Module } from 'remult/server';
 import { green, magenta, red, yellow } from '@kitql/helpers';
-import { Module } from '../../server';
+import { log } from '..';
+import { Cron } from '../Cron';
 export const jobs = {};
 /**
  * Link to a nice Cheatsheet TODO
@@ -31,14 +34,17 @@ export const cronTime = {
  * usage:
  *
  * ```ts
- * import { cron, cronTime } from 'firstly/cron'
+ * import { cron, cronTime } from '..'
  *
  * export const api = firstly({
  *   modules: [
  *     cron([{
  *       topic: 'first_cron',
  *       cronTime: cronTime.every_second,
- *       onTick: () => { console.log('hello') },
+ *       onTick: () => {
+ *         console.log('hello')
+ *         return { status: 'success' }
+ *       },
  *       start: !dev, // Start in production
  *       // runOnInit: dev, // nice in dev environement
  *     }])
@@ -50,7 +56,8 @@ export const cronTime = {
  */
 export const cron = (jobsInfos) => {
     const m = new Module({
-        name: 'cron',
+        key: 'cron',
+        entities: [Cron],
     });
     const logJobs = (topic, job, message, with_metadata = true, isSuccess = true) => {
         const l = [];
@@ -61,36 +68,45 @@ export const cron = (jobsInfos) => {
             l.push(`(${job.isActive ? green('running') : red('stopped')}, next at ${yellow(job.nextDate().toISO())})`);
         }
         if (isSuccess) {
-            m.log.success(l.join(' '));
+            log.success(l.join(' '));
         }
         else {
-            m.log.info(l.join(' '));
+            log.info(l.join(' '));
         }
     };
     m.initApi = async () => {
         jobsInfos.forEach((infos) => {
-            const { topic, runOnInit, logs, concurrent, ...params } = infos;
+            const { topic, runOnInit, logs, concurrent, onTick: originalOnTick, ...params } = infos;
             const concurrentToUse = concurrent ?? 1;
-            const onTickSaved = params.onTick;
-            const fullOnTick = async () => {
+            // Create a wrapper that converts the return type to void for CronJob
+            const wrappedOnTick = async () => {
                 if (jobs[topic].concurrentInProgress < concurrentToUse) {
                     jobs[topic].concurrentInProgress = jobs[topic].concurrentInProgress + 1;
+                    const rCron = await repo(Cron).insert({ topic });
                     if (logs?.starting === undefined || logs?.starting === true) {
                         logJobs(topic, job, 'starting...', false, false);
                     }
-                    // @ts-ignore
-                    await onTickSaved();
+                    const res = await originalOnTick();
+                    log.info(`[${topic}] result:`, res);
+                    rCron.result = res;
+                    rCron.endedAt = new Date();
+                    rCron.status = 'ended';
+                    await repo(Cron).save(rCron);
                     if (logs?.ended === undefined || logs?.ended === true) {
                         logJobs(topic, job, 'done');
                     }
                     jobs[topic].concurrentInProgress = jobs[topic].concurrentInProgress - 1;
                 }
                 else {
+                    const rCron = await repo(Cron).insert({ topic, status: 'skipped' });
                     logJobs(topic, job, `skipped because of concurrent limit (${yellow(concurrentToUse.toString())})`, false, false);
                 }
             };
-            params.onTick = fullOnTick;
-            const job = CronJob.from(params);
+            // Use type assertion to bypass complex generic type issues
+            const job = CronJob.from({
+                ...params,
+                onTick: wrappedOnTick,
+            });
             jobs[topic] = { job, concurrentInProgress: 0 };
             logJobs(topic, job, 'setup done');
             // If not it will be done too early

package/esm/feedback/FeedbackController.d.ts

@@ -19,15 +19,17 @@ export declare class FeedbackController {
             who?: string;
             createdAt: Date;
             public: boolean;
+            title: string;
         }[];
         labels: any;
         highlight: any;
+        title: any;
     }>;
     static createIssue(milestoneId: string, title: string, body: string, page: string): Promise<{
         id: string;
         number: number;
     }>;
-    static addCommentOnIssue(issueId: string, body: string, page: string, labels: {
+    static addCommentOnIssue(issueId: string, issueNumber: number, title: string, body: string, page: string, labels: {
         id: string;
         name: string;
     }[]): Promise<string>;

package/esm/feedback/FeedbackController.js

@@ -162,6 +162,7 @@ export class FeedbackController {
 						createdAt
 						bodyHTML
 						state
+						title
             labels(first: 25){
               nodes{
                 id
@@ -196,6 +197,7 @@ export class FeedbackController {
             bodyHTML: data.repository.issue.bodyHTML,
             createdAt: data.repository.issue.createdAt,
             public: true,
+            title: data.repository.issue.title,
         };
         items.push(firstItem);
         const comments = data.repository.issue.comments.nodes;
@@ -211,6 +213,7 @@ export class FeedbackController {
                     bodyHTML: comments[i].bodyHTML,
                     createdAt: new Date(comments[i].createdAt),
                     public: nbEye && nbEye > 0 ? true : false,
+                    title: data.repository.issue.title,
                 });
             }
         }
@@ -223,6 +226,7 @@ export class FeedbackController {
             items: items.filter((c) => c.public),
             labels: data.repository.issue.labels.nodes,
             highlight: hasWaitingForAnswerLabel,
+            title: data.repository.issue.title,
         };
         return toRet;
     }
@@ -265,9 +269,18 @@ export class FeedbackController {
         });
         const toRet = newIssue.createIssue.issue;
         await addMetaData(toRet.id, remult.user?.name, page);
+        remult.context.feedbackOptions.saved?.({
+            number: toRet.number,
+            title: title,
+            body,
+            metadata: {
+                author: JSON.stringify(remult.user?.name),
+                page,
+            },
+        });
         return toRet;
     }
-    static async addCommentOnIssue(issueId, body, page, labels) {
+    static async addCommentOnIssue(issueId, issueNumber, title, body, page, labels) {
         const inputComment = {
             subjectId: issueId,
             body,
@@ -297,6 +310,15 @@ export class FeedbackController {
             inputIssue,
         });
         await addMetaData(issueId, remult.user?.name, page);
+        remult.context.feedbackOptions.saved?.({
+            number: issueNumber,
+            title,
+            body,
+            metadata: {
+                author: JSON.stringify(remult.user?.name),
+                page,
+            },
+        });
         return 'done';
     }
     static async close(issueId, labels) {

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

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

package/esm/feedback/server/index.js

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

package/esm/feedback/types.d.ts

@@ -10,5 +10,11 @@ export type FeedbackOptions = {
     };
     highlight_label?: string;
     create_label?: string;
+    saved?: (args: {
+        number: number;
+        title: string;
+        body: string;
+        metadata: Record<string, any>;
+    }) => Promise<void>;
 };
 export declare const FEEDBACK_OPTIONS: FeedbackOptions;

package/esm/feedback/ui/DialogIssue.svelte

@@ -41,7 +41,14 @@
 			const result = await FeedbackController.createIssue(milestoneId, title, content, p)
 			issueNumber = result.number
 		} else {
-			await FeedbackController.addCommentOnIssue(issue.id, content, p, issue.labels)
+			await FeedbackController.addCommentOnIssue(
+				issue.id,
+				issueNumber!,
+				issue.title,
+				content,
+				p,
+				issue.labels,
+			)
 		}
 
 		content = ''

package/esm/feedback/ui/DialogIssues.svelte

@@ -86,7 +86,7 @@
 		>
 			<div class="flex w-full justify-center justify-items-center text-left">
 				<div class="flex-grow">
-					<span class="text-base-content/60 mr-2 inline-block w-8 text-right text-xs italic"
+					<span class="mr-2 inline-block w-8 text-right text-xs italic text-base-content/60"
 						>#{issue.number}</span
 					>
 					{@html issue.titleHTML}

package/esm/formats/index.d.ts

@@ -1,4 +1,4 @@
 export { displayCurrency, displayCurrencyK, displayPercent, displayCurrencyWOSuffix, } from './numbers.js';
-export { formatNumber, extractMailInfo } from './strings.js';
+export { formatNumber, extractMailInfo, slugify, nameify, displayPhone, suffixWithS, arrToStr, mask, toTitleCase, } from './strings.js';
 export { offsetedToPlainDate, plainDateCompare, isBetween, dateISOToPlainDate } from './dates.js';
 export type { KitPlainDateRange } from './dates.js';

package/esm/formats/index.js

@@ -1,3 +1,3 @@
 export { displayCurrency, displayCurrencyK, displayPercent, displayCurrencyWOSuffix, } from './numbers.js';
-export { formatNumber, extractMailInfo } from './strings.js';
+export { formatNumber, extractMailInfo, slugify, nameify, displayPhone, suffixWithS, arrToStr, mask, toTitleCase, } from './strings.js';
 export { offsetedToPlainDate, plainDateCompare, isBetween, dateISOToPlainDate } from './dates.js';

package/esm/formats/strings.d.ts

@@ -9,3 +9,5 @@ export declare const extractMailInfo: (mail: string, withThrow?: boolean) => {
     lastName: string;
     email: string;
 };
+export declare function slugify(str: string | undefined): string | undefined;
+export declare function nameify(str: string | undefined): string | undefined;

package/esm/formats/strings.js

@@ -96,3 +96,25 @@ export const extractMailInfo = (mail, withThrow = true) => {
         email: '',
     };
 };
+export function slugify(str) {
+    if (str === undefined)
+        return undefined;
+    return str
+        .toLowerCase()
+        .trim()
+        .replace(/[^\w.-]+/g, '-')
+        .replace(/[\s_-]+/g, '-')
+        .replace(/^-+|-+$/g, '');
+}
+export function nameify(str) {
+    if (str === undefined)
+        return undefined;
+    return str
+        .toLowerCase()
+        .trim()
+        .replace(/\./g, ' ')
+        .replace(/\s+/g, ' ')
+        .replace(/(?:^|\s|-)\S/g, (match) => match.toUpperCase())
+        .trim()
+        .split('@')[0];
+}

package/esm/index.d.ts

@@ -44,8 +44,6 @@ export { getEntityDisplayValue, isError, getFieldLinkDisplayValue, getEnum, getE
 export { buildWhere, getPlaceholder, buildSearchWhere, cellsBuildor, cellBuildor, fieldsOf, containsWords, } from './cellsBuildor.js';
 export { storeItem };
 export { storeList };
-export { displayPhone, arrToStr } from './formats/strings.js';
-export { displayCurrency } from './formats/numbers.js';
 export { tw } from './utils/tailwind.js';
 export { FilterEntity } from './virtual/FilterEntity.js';
 export { UIEntity } from './virtual/UIEntity.js';
@@ -68,6 +66,7 @@ declare module 'remult' {
             onSuccess: (entity: entityType, newItem: any) => Promise<void>;
             onError?: () => void;
         };
+        default_select_if_one_item?: boolean;
         multiSelect?: boolean;
         skipForDefaultField?: boolean;
     }

package/esm/index.js

@@ -35,8 +35,6 @@ export { getEntityDisplayValue, isError, getFieldLinkDisplayValue, getEnum, getE
 export { buildWhere, getPlaceholder, buildSearchWhere, cellsBuildor, cellBuildor, fieldsOf, containsWords, } from './cellsBuildor.js';
 export { storeItem };
 export { storeList };
-export { displayPhone, arrToStr } from './formats/strings.js';
-export { displayCurrency } from './formats/numbers.js';
 export { tw } from './utils/tailwind.js';
 // Hummm... I don't know if we should keep it...
 export { FilterEntity } from './virtual/FilterEntity.js';

package/esm/mail/Mail.d.ts

@@ -0,0 +1,13 @@
+declare const statuses: readonly ["transport_not_configured", "sent", "error"];
+type StatusType = (typeof statuses)[number];
+export declare class Mail {
+    id?: string;
+    createdAt: Date;
+    topic: string;
+    to: string;
+    metadata: Record<string, any>;
+    html: string;
+    status: StatusType;
+    errorInfo: string;
+}
+export {};

package/esm/mail/Mail.js

@@ -0,0 +1,51 @@
+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 { Entity, Fields } from 'remult';
+import { Role_Mail } from './Role_Mail';
+const statuses = ['transport_not_configured', 'sent', 'error'];
+let Mail = class Mail {
+    id;
+    createdAt = new Date();
+    topic;
+    to;
+    metadata = {};
+    html = '';
+    status = 'sent';
+    errorInfo = '';
+};
+__decorate([
+    Fields.cuid()
+], Mail.prototype, "id", void 0);
+__decorate([
+    Fields.createdAt()
+], Mail.prototype, "createdAt", void 0);
+__decorate([
+    Fields.string({ required: true })
+], Mail.prototype, "topic", void 0);
+__decorate([
+    Fields.string({ required: true })
+], Mail.prototype, "to", void 0);
+__decorate([
+    Fields.json()
+], Mail.prototype, "metadata", void 0);
+__decorate([
+    Fields.string()
+], Mail.prototype, "html", void 0);
+__decorate([
+    Fields.literal(() => statuses)
+], Mail.prototype, "status", void 0);
+__decorate([
+    Fields.string()
+], Mail.prototype, "errorInfo", void 0);
+Mail = __decorate([
+    Entity('_ff_mails', {
+        caption: 'Mails',
+        allowApiCrud: Role_Mail.Mail_Admin,
+        defaultOrderBy: { createdAt: 'desc' },
+    })
+], Mail);
+export { Mail };

package/esm/mail/Role_Mail.d.ts

@@ -0,0 +1,3 @@
+export declare const Role_Mail: {
+    readonly Mail_Admin: "mail.admin";
+};

package/esm/mail/Role_Mail.js

@@ -0,0 +1,3 @@
+export const Role_Mail = {
+    Mail_Admin: 'mail.admin',
+};

package/esm/mail/index.d.ts

@@ -1,2 +1,7 @@
-import { default as DefaultMail } from './templates/DefaultMail.svelte';
-export { DefaultMail };
+import { Log } from '@kitql/helpers';
+import { Mail } from './Mail';
+export declare const key = "mail";
+export declare const log: Log;
+export declare const mailEntities: {
+    Mail: typeof Mail;
+};

package/esm/mail/index.js

@@ -1,2 +1,7 @@
-import { default as DefaultMail } from './templates/DefaultMail.svelte';
-export { DefaultMail };
+import { Log } from '@kitql/helpers';
+import { Mail } from './Mail';
+export const key = 'mail';
+export const log = new Log(key);
+export const mailEntities = {
+    Mail,
+};

package/esm/mail/server/formatMailHelper.d.ts

@@ -0,0 +1,16 @@
+export type MailStyle = {
+    service: string;
+    primaryColor: string;
+    secondaryColor: string;
+    subject: string;
+    title: string;
+    sections: {
+        html: string;
+        cta?: {
+            html: string;
+            link: string;
+        } | undefined;
+    }[];
+    footer: string;
+};
+export declare const toHtml: (args: MailStyle) => string;

package/esm/mail/server/formatMailHelper.js

@@ -0,0 +1,113 @@
+export const toHtml = (args) => {
+    const { service, primaryColor, secondaryColor, title, footer, sections } = args;
+    return `<body style="background-color: #f4f4f4; margin: 0 !important; padding: 0 !important; color: black">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td bgcolor="${primaryColor}" align="center">
+      <table border="0" cellpadding="0" cellspacing="0" width="480">
+        <tr>
+          <td align="center" valign="top" style="padding: 30px 10px 30px 10px;">
+            <div
+              style="display: block; font-family: Helvetica, Arial, sans-serif; color: #ffffff; font-size: 18px;"
+              border="0"
+            >
+              ${service}
+            </div>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td bgcolor="${primaryColor}" align="center" style="padding: 0px 35px 0px 35px;">
+      <table border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+          <td
+            bgcolor="#ffffff"
+            align="left"
+            valign="top"
+            style="padding: 30px 30px 20px 30px; border-radius: 20px 20px 0px 0px; color: #111111; font-family: Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;"
+          >
+            <h1 style="font-size: 32px; font-weight: 400; margin: 0;">${title}</h1>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td bgcolor="#f4f4f4" align="center" style="padding: 0px 35px 0px 35px;">
+      <table border="0" cellpadding="0" cellspacing="0" width="100%">
+          ${sections.map((section, i) => sectionToHtml(i, primaryColor, secondaryColor, section))
+        .join(`
+`)}
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <td bgcolor="#f4f4f4" align="center" style="padding: 0px 10px 0px 10px;">
+        <table border="0" cellpadding="0" cellspacing="0" width="480">
+          <tr>
+            <td
+              bgcolor="#f4f4f4"
+              align="left"
+              style="padding: 30px 30px 30px 30px; color: #666666; font-family: Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 18px;"
+            >
+              <center>
+                ${footer}
+              </center>
+            </td>
+          </tr>
+        </table>
+      </td>
+		</tr>
+	</table>
+</body>
+`;
+};
+const sectionToHtml = (i, primaryColor, secondaryColor, section) => `
+<tr>
+  <td bgcolor="#ffffff" align="left">
+    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td
+          bgcolor="#ffffff"
+          align="left"
+          style="padding: 30px 30px 30px 30px; ${i > 0 ? `border-top:1px solid ${primaryColor};` : ''}"
+        >
+          ${section.html}
+					${section.cta ? ctaToHtml(secondaryColor, section.cta.html, section.cta.link) : ''}
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+`;
+const ctaToHtml = (secondaryColor, html, href) => `
+<tr>
+  <td bgcolor="#ffffff" align="center">
+    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td
+          bgcolor="#ffffff"
+          align="center"
+          style="padding: 0 0 30px 0;"
+        >
+          <table border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td align="left" style="border-radius: 3px;" bgcolor="${secondaryColor}">
+                <!-- CTA -->
+                <a
+                  href="${href}"
+                  target="_blank"
+                  style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; color: #ffffff; text-decoration: none; padding: 11px 22px; border-radius: 2px; display: inline-block;"
+                  >${html}</a
+                >
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+`;