QOL logs

Author: RafaelGB

src/DatabaseView.tsx

@@ -37,7 +37,7 @@ import {
   Menu,
 } from "obsidian";
 import { createRoot, Root } from "react-dom/client";
-import { DbAutomationService } from "services/AutomationService";
+import { Db } from "services/CoreService";
 import DatabaseInfo from "services/DatabaseInfo";
 import { LOGGER } from "services/Logger";
 import { SettingsModal } from "Settings";
@@ -172,9 +172,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       );
       this.initial = obtainInitialType(this.columns);
 
-      this.formulas = await DbAutomationService.buildFns(
-        this.diskConfig.yaml.config
-      );
+      this.formulas = await Db.buildFns(this.diskConfig.yaml.config);
       // Define table properties
       this.shadowColumns = this.columns.filter((col) => col.skipPersist);
       const tableProps: TableDataType = {

src/automations/Footer.ts

@@ -1,7 +1,7 @@
 import { DEFAULT_SETTINGS, FooterType } from "helpers/Constants";
 import { Literal } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
-import { DbAutomationService } from "services/AutomationService";
+import { Db } from "services/CoreService";
 
 export default class Footer {
     constructor(public readonly colValues: Literal[]) { }
@@ -119,7 +119,7 @@ export default class Footer {
      * @returns 
      */
     public sum(): string {
-        const total = DbAutomationService.coreFns.numbers.sum(this.colValues);
+        const total = Db.coreFns.numbers.sum(this.colValues);
         return `Total: ${total}`;
     }
 
@@ -128,7 +128,7 @@ export default class Footer {
      * @returns 
      */
     public min(): string {
-        const min = DbAutomationService.coreFns.numbers.min(this.colValues);
+        const min = Db.coreFns.numbers.min(this.colValues);
         return `Min: ${min}`;
     }
 
@@ -137,7 +137,7 @@ export default class Footer {
      * @returns 
      */
     public max(): string {
-        const max = DbAutomationService.coreFns.numbers.max(this.colValues);
+        const max = Db.coreFns.numbers.max(this.colValues);
         return `Max: ${max}`;
     }
 
@@ -149,7 +149,7 @@ export default class Footer {
      * @returns 
      */
     public earliestDate(): string {
-        const earliest = DbAutomationService.coreFns.luxon.earliest(this.colValues);
+        const earliest = Db.coreFns.luxon.earliest(this.colValues);
         return earliest.isValid ?
             `Earliest: ${earliest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
             null;
@@ -160,7 +160,7 @@ export default class Footer {
      * @returns 
      */
     public latestDate(): string {
-        const latest = DbAutomationService.coreFns.luxon.latest(this.colValues);
+        const latest = Db.coreFns.luxon.latest(this.colValues);
         return latest.isValid ?
             `Latest: ${latest.toFormat(DEFAULT_SETTINGS.local_settings.datetime_format)}` :
             null;
@@ -171,7 +171,7 @@ export default class Footer {
      * @returns 
      */
     public rangeDate(): string {
-        const range = DbAutomationService.coreFns.luxon.range(this.colValues);
+        const range = Db.coreFns.luxon.range(this.colValues);
         return `Range: ${range} days`
     }
 

src/automations/Rollup.ts

@@ -1,7 +1,7 @@
 import { LocalSettings } from "cdm/SettingsModel";
 import { DEFAULT_SETTINGS, InputType, ROLLUP_ACTIONS } from "helpers/Constants";
 import { Link, Literal, SMarkdownPage } from "obsidian-dataview";
-import { DbAutomationService } from "services/AutomationService";
+import { Db } from "services/CoreService";
 import { DataviewService } from "services/DataviewService";
 import { LOGGER } from "services/Logger";
 import { ParseService } from "services/ParseService";
@@ -97,7 +97,7 @@ class Rollup {
             return NaN;
         }
         const rawValues = this.rawValues(key);
-        return DbAutomationService.coreFns.numbers.sum(rawValues)
+        return Db.coreFns.numbers.sum(rawValues)
     }
 
     /**

src/main.ts

@@ -36,6 +36,7 @@ import { DatabaseHelperCreationModal } from 'commands/addDatabaseHelper/database
 import { generateDbConfiguration, generateNewDatabase } from 'helpers/CommandsHelper';
 import { registerDateFnLocale, t } from 'lang/helpers';
 import ProjectAPI from 'api/obsidian-projects-api';
+import { Db } from "services/CoreService";
 
 interface WindowRegistry {
 	viewMap: Map<string, DatabaseView>;
@@ -72,6 +73,7 @@ export default class DBFolderPlugin extends Plugin {
 
 	async onload(): Promise<void> {
 		await this.load_settings();
+		await this.loadServices();
 		addIcon(DB_ICONS.NAME, DB_ICONS.ICON);
 		this.registerEvent(
 			app.workspace.on('window-open', (_: any, win: Window) => {
@@ -156,6 +158,10 @@ export default class DBFolderPlugin extends Plugin {
 		loadServicesThatRequireSettings(this.settings);
 	}
 
+	async loadServices() {
+		await Db.init();
+	}
+
 	public registerPriorityCodeblockPostProcessor(
 		language: string,
 		priority: number,

src/services/AutomationService.ts src/services/CoreService.tssrc/services/AutomationService.ts renamed to src/services/CoreService.ts

@@ -6,10 +6,16 @@ import { LocalSettings } from "cdm/SettingsModel";
 import { Link } from "obsidian-dataview/lib/data-model/value";
 import { DataviewService } from "./DataviewService";
 
-class AutomationService {
-    private static instance: AutomationService;
+class CoreService {
+    private static instance: CoreService;
     public coreFns: DatabaseFnType;
 
+    async init() {
+        const modulesGenerator = await new ModulesGenerator();
+        await modulesGenerator.init();
+        this.coreFns = await modulesGenerator.generate_object();
+    }
+
     async buildFns(config: LocalSettings) {
         const final_object: Record<string, unknown> = {};
         const jsObject = await new FormulaGenerator(config).generate_object();
@@ -20,31 +26,21 @@ class AutomationService {
                 dataview: DataviewService.getDataviewAPI(),
                 rollup: (relation: Link[]) => new Rollup(relation)
             },
-            await this.getCoreFns()
+            this.coreFns
         );
         return final_object;
     }
 
-    async getCoreFns(): Promise<DatabaseFnType> {
-        if (!this.coreFns) {
-            const modulesGenerator = await new ModulesGenerator();
-            await modulesGenerator.init();
-            this.coreFns = await modulesGenerator.generate_object();
-        }
-
-        return this.coreFns;
-    }
-
     /**
      * Singleton instance
      * @returns {VaultManager}
      */
-    public static getInstance(): AutomationService {
+    public static getInstance(): CoreService {
         if (!this.instance) {
-            this.instance = new AutomationService();
+            this.instance = new CoreService();
         }
         return this.instance;
     }
 }
 
-export const DbAutomationService = AutomationService.getInstance();
+export const Db = CoreService.getInstance();

src/services/Logger.ts

@@ -1,8 +1,8 @@
 export interface LogInterface {
-    debug(primaryMessage: string, ...supportingData: unknown[]): void;
-    info(primaryMessage: string, ...supportingData: unknown[]): void;
-    warn(primaryMessage: string, ...supportingData: unknown[]): void;
-    error(primaryMessage: string, ...supportingData: unknown[]): void;
+    debug(...args: unknown[]): void;
+    info(...args: unknown[]): void;
+    warn(...args: unknown[]): void;
+    error(...args: unknown[]): void;
     setDebugMode(isDebugModeEnabled: boolean): void;
     setLevelInfo(value: string): void;
 }
@@ -13,42 +13,56 @@ const LevelInfoRecord: Record<string, number> = {
     warn: 1,
     error: 0
 };
+
 class Log implements LogInterface {
     private static instance: LogInterface;
     private isDebugModeEnabled: boolean;
     private levelInfo: number;
+    public debug: (...args: unknown[]) => void;
+    public info: (...args: unknown[]) => void;
+    public warn: (...args: unknown[]) => void;
+    public error: (...args: unknown[]) => void;
+
     private constructor() {
         this.isDebugModeEnabled = false;
         this.levelInfo = 0;
     }
 
-    public debug(primaryMessage: string, ...supportingData: unknown[]) {
-        if (this.levelInfo >= LevelInfoRecord.debug) {
-            this.emitLogMessage("debug", primaryMessage, ...supportingData);
-        }
-    }
-    public info(primaryMessage: string, ...supportingData: unknown[]) {
-        if (this.levelInfo >= LevelInfoRecord.info) {
-            this.emitLogMessage("info", primaryMessage, ...supportingData);
-        }
-    }
-    public warn(primaryMessage: string, ...supportingData: unknown[]) {
-        if (this.levelInfo >= LevelInfoRecord.warn) {
-            this.emitLogMessage("warn", primaryMessage, ...supportingData);
-        }
-    }
-    public error(primaryMessage: string, ...supportingData: unknown[]) {
-        if (this.levelInfo >= LevelInfoRecord.error) {
-            this.emitLogMessage("error", primaryMessage, ...supportingData);
-        }
-    }
-
     public setDebugMode(isDebugModeEnabled: boolean) {
         this.isDebugModeEnabled = isDebugModeEnabled;
+        this.configureLogger();
     }
 
     public setLevelInfo(value: string) {
         this.levelInfo = LevelInfoRecord[value];
+        this.configureLogger();
+
+    }
+
+    private configureLogger() {
+        if (this.levelInfo >= LevelInfoRecord.debug && this.isDebugModeEnabled) {
+            this.debug = console.log.bind(window.console, `[debug] ${new Date().toISOString()}`);
+        } else {
+            this.debug = () => { };
+        }
+
+        if (this.levelInfo >= LevelInfoRecord.info && this.isDebugModeEnabled) {
+            this.info = console.log.bind(window.console, `[info] ${new Date().toISOString()}`);
+        } else {
+            this.info = () => { };
+        }
+
+        if (this.levelInfo >= LevelInfoRecord.warn && this.isDebugModeEnabled) {
+            this.warn = console.log.bind(window.console, `[warn] ${new Date().toISOString()}`);
+        } else {
+            this.warn = () => { };
+        }
+
+        if (this.levelInfo >= LevelInfoRecord.error && this.isDebugModeEnabled) {
+            this.error = console.log.bind(window.console, `[error] ${new Date().toISOString()}`);
+        } else {
+            this.error = () => { };
+        }
     }
 
     public static getInstance(): LogInterface {

src/stateManagement/automations/handlers/LoadFormulasHandlerAction.ts

@@ -1,12 +1,12 @@
 import { AutomationState, TableActionResponse } from "cdm/TableStateInterface";
-import { DbAutomationService } from "services/AutomationService";
+import { Db } from "services/CoreService";
 import { AbstractTableAction } from "stateManagement/AbstractTableAction";
 
 export default class LoadFormulasHandlerAction extends AbstractTableAction<AutomationState> {
     handle(tableActionResponse: TableActionResponse<AutomationState>): TableActionResponse<AutomationState> {
         const { set, implementation } = tableActionResponse;
         implementation.actions.loadFormulas = async (ddbbConfig) => {
-            const formulas = await DbAutomationService.buildFns(ddbbConfig);
+            const formulas = await Db.buildFns(ddbbConfig);
             set({ formula: formulas });
         };