Merge branch 'improved_rollup_and_footer'

Author: RafaelGB

docs/docs/features/Formulas.md

@@ -31,7 +31,7 @@ The root object `db` has the following functions:
 
 - `js` : execute a javascript function that you previously defined in the `js` folder of your table in the database or plugin global settings. (I.E.: `db.js.myFunction( arg1, arg2)`)
 - `dataview`: expose the dataview API. (see [Dataview API](https://github.com/blacksmithgu/obsidian-dataview/blob/master/src/api/plugin-api.ts))
-- `rollup`: expose the rollup functions of the dbfolder plugin.  (see [Rollup documentation](/features/Relations/#rollups))
+- `rollup`: expose the rollup functions of the dbfolder plugin.  (see [Rollup documentation](/obsidian-db-folder/features/Relations/#rollups))
 
 #### Javascript file structure
 To add a javascript file to the `js` folder, it must be a `.js` file and have the following structure:

src/DatabaseView.tsx

@@ -1,4 +1,3 @@
-import { obtainFormulasFromFolder } from "automations/AutomationsHelper";
 import { DatabaseColumn } from "cdm/DatabaseModel";
 import { UpdaterData, ViewEvents } from "cdm/EmitterModel";
 import {
@@ -38,6 +37,7 @@ import {
   Menu,
 } from "obsidian";
 import { createRoot, Root } from "react-dom/client";
+import { DbAutomationService } from "services/AutomationService";
 import DatabaseInfo from "services/DatabaseInfo";
 import { LOGGER } from "services/Logger";
 import { SettingsModal } from "Settings";
@@ -96,6 +96,10 @@ export class DatabaseView extends TextFileView implements HoverParent {
     this.plugin.addView(this, data);
   }
 
+  getIcon() {
+    return DB_ICONS.NAME;
+  }
+
   getViewType(): string {
     return DatabaseCore.FRONTMATTER_KEY;
   }
@@ -132,7 +136,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       .addItem((item) => {
         item
           .setTitle(t("menu_pane_open_db_settings_action"))
-          .setIcon(DB_ICONS.NAME)
+          .setIcon("gear")
           .onClick(this.settingsAction.bind(this));
       })
       .addSeparator();
@@ -168,7 +172,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       );
       this.initial = obtainInitialType(this.columns);
 
-      this.formulas = await obtainFormulasFromFolder(
+      this.formulas = await DbAutomationService.buildFns(
         this.diskConfig.yaml.config
       );
       // Define table properties
@@ -196,7 +200,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
   private initActions(): void {
     // Settings action
     this.addAction(
-      DB_ICONS.NAME,
+      "gear",
       `${t("menu_pane_open_db_settings_action")}`,
       this.settingsAction.bind(this)
     );

src/automations/AutomationsHelper.ts

@@ -2,6 +2,7 @@ import { DEFAULT_SETTINGS, FooterType } from "helpers/Constants";
 import { Literal } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
 import { DateTime } from "luxon";
+import { DbAutomationService } from "services/AutomationService";
 
 export default class Footer {
     constructor(public readonly colValues: Literal[]) { }
@@ -119,10 +120,7 @@ export default class Footer {
      * @returns 
      */
     public sum(): string {
-        const total = this.colValues
-            .map((value) => Number(value))
-            .filter((value) => !isNaN(value))
-            .reduce((acc: number, value: number) => acc + value, 0);
+        const total = DbAutomationService.coreFns.numbers.sum(this.colValues);
         return `Total: ${total}`;
     }
 
@@ -131,10 +129,7 @@ export default class Footer {
      * @returns 
      */
     public min(): string {
-        const min = this.colValues
-            .map((value) => Number(value))
-            .filter((value) => !isNaN(value))
-            .reduce((acc: number, value: number) => Math.min(acc, value), Number.MAX_SAFE_INTEGER);
+        const min = DbAutomationService.coreFns.numbers.min(this.colValues);
         return `Min: ${min}`;
     }
 
@@ -143,10 +138,7 @@ export default class Footer {
      * @returns 
      */
     public max(): string {
-        const max = this.colValues
-            .map((value) => Number(value))
-            .filter((value) => !isNaN(value))
-            .reduce((acc: number, value: number) => Math.max(acc, value), Number.MIN_SAFE_INTEGER);
+        const max = DbAutomationService.coreFns.numbers.max(this.colValues);
         return `Max: ${max}`;
     }
 
@@ -158,10 +150,8 @@ export default class Footer {
      * @returns 
      */
     public earliestDate(): string {
-        const earliest = this.colValues
-            .filter((value) => DateTime.isDateTime(value))
-            .reduce((acc: DateTime, value: DateTime) => acc < value ? acc : value, DateTime.max);
-        return DateTime.isDateTime(earliest) ?
+        const earliest = DbAutomationService.coreFns.luxon.earliest(this.colValues);
+        return earliest.isValid ?
             `Earliest: ${earliest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
             null;
     }
@@ -171,10 +161,8 @@ export default class Footer {
      * @returns 
      */
     public latestDate(): string {
-        const latest = this.colValues
-            .filter((value) => DateTime.isDateTime(value))
-            .reduce((acc: DateTime, value: DateTime) => acc > value ? acc : value, DateTime.min);
-        return DateTime.isDateTime(latest) ?
+        const latest = DbAutomationService.coreFns.luxon.latest(this.colValues);
+        return latest.isValid ?
             `Latest: ${latest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
             null;
     }
@@ -184,15 +172,8 @@ export default class Footer {
      * @returns 
      */
     public rangeDate(): string {
-        const earliest = this.colValues
-            .filter((value) => DateTime.isDateTime(value))
-            .reduce((acc: DateTime, value: DateTime) => acc < value ? acc : value, DateTime.max);
-        const latest = this.colValues
-            .filter((value) => DateTime.isDateTime(value))
-            .reduce((acc: DateTime, value: DateTime) => acc > value ? acc : value, DateTime.min);
-        return DateTime.isDateTime(earliest) && DateTime.isDateTime(latest) ?
-            `Range: ${earliest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)} - ${latest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
-            null;
+        const range = DbAutomationService.coreFns.luxon.range(this.colValues);
+        return `Range: ${range} days`
     }
 
 }

src/automations/Footer.ts

@@ -1,9 +1,6 @@
 import { FormulaFunctions } from "automations/formula_functions/FormulaFunctions";
-import { IGenerateObject } from "automations/IGenerateObject";
+import { IGenerateObject } from "automations/core/IGenerateObject";
 import { LocalSettings } from "cdm/SettingsModel";
-import { Link } from "obsidian-dataview";
-import { DataviewService } from "services/DataviewService";
-import Rollup from "automations/Rollup";
 export class FormulaGenerator implements IGenerateObject {
     public js_functions: FormulaFunctions;
 
@@ -16,13 +13,8 @@ export class FormulaGenerator implements IGenerateObject {
     }
 
     async generate_object(): Promise<Record<string, unknown>> {
-        const final_object: Record<string, unknown> = {};
-        Object.assign(final_object, {
+        return {
             js: await this.generate_js_functions(),
-            dataview: DataviewService.getDataviewAPI(),
-            rollup: (relation: Link[]) => new Rollup(relation)
-        }
-        );
-        return final_object;
+        };
     }
 }

src/automations/FormulaGenerator.ts

@@ -0,0 +1,29 @@
+import { IGenerateObject } from "automations/core/IGenerateObject";
+import { DatabaseFnType } from "cdm/ModulesFnModel";
+import { DbModule } from "./core/DbModule";
+import { LuxonFn } from "./core/modules/LuxonFn";
+import { NumbersFn } from "./core/modules/NumbersFn";
+export class ModulesGenerator implements IGenerateObject {
+    private modules_array: Array<DbModule> = [];
+
+    constructor() {
+        this.modules_array.push(new NumbersFn());
+        this.modules_array.push(new LuxonFn());
+    }
+
+    async init(): Promise<void> {
+        for (const mod of this.modules_array) {
+            await mod.init();
+        }
+    }
+
+    async generate_object(): Promise<DatabaseFnType> {
+        const internal_functions_object: { [key: string]: unknown } = {};
+        for (const mod of this.modules_array) {
+            internal_functions_object[mod.getName()] =
+                await mod.generate_object();
+        }
+
+        return internal_functions_object as DatabaseFnType;
+    }
+}