working on less noisy regex

Author: RafaelGB

src/helpers/FileContent.ts

@@ -9,23 +9,22 @@ export class FileContent {
     }
 
     replaceAll(pattern_to_replace: RegExp, input: string): FileContent {
-        if (input !== '') {
-            if (Array.isArray(pattern_to_replace)) {
-                pattern_to_replace.forEach(
-                    (regex, index) => {
-                        this.value = this.value.replaceAll(
-                            regex,
-                            input[index]
-                        );
-                    }
-                );
-            } else {
-                this.value = this.value.replaceAll(
-                    pattern_to_replace,
-                    input
-                );
-            }
+        if (Array.isArray(pattern_to_replace)) {
+            pattern_to_replace.forEach(
+                (regex, index) => {
+                    this.value = this.value.replaceAll(
+                        regex,
+                        input[index]
+                    );
+                }
+            );
+        } else {
+            this.value = this.value.replaceAll(
+                pattern_to_replace,
+                input
+            );
         }
+
         return this;
     }
 

src/helpers/FileManagement.ts

@@ -74,10 +74,10 @@ export function inline_regex_target_in_function_of(position: string, columnId: s
     let regex_target = "";
     switch (position) {
         case INLINE_POSITION.BOTTOM:
-            regex_target = contentHasFrontmatter ? `$1$2\n${columnId}:: ${newValue}` : `$1\n${columnId}:: ${newValue}`;
+            regex_target = contentHasFrontmatter ? `$1$2${columnId}:: ${newValue}` : `$1${columnId}:: ${newValue}`;
             break;
         default:
-            regex_target = contentHasFrontmatter ? `$1\n${columnId}:: ${newValue}$2` : `${columnId}:: ${newValue}\n$1`;
+            regex_target = contentHasFrontmatter ? `$1${columnId}:: ${newValue}\n$2` : `${columnId}:: ${newValue}\n$1`;
     }
     return regex_target;
 }

src/helpers/VaultManagement.ts

@@ -231,18 +231,16 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
   }
 
   async function persistFrontmatter(deletedColumn?: string): Promise<void> {
-    // If the frontmatter is empty, do not persist it
-    if (Object.keys(rowFields.frontmatter).length > 0 || deletedColumn !== undefined) {
-      const frontmatterGroupRegex = contentHasFrontmatter ? /^---[\s\S]+?---/g : /(^[\s\S]*$)/g;
-      const frontmatterFieldsText = parseFrontmatterFieldsToString(rowFields, ddbbConfig, deletedColumn);
-      const noteObject = {
-        action: 'replace',
-        file: file,
-        regexp: frontmatterGroupRegex,
-        newValue: contentHasFrontmatter ? `${frontmatterFieldsText}` : `${frontmatterFieldsText}\n$1`,
-      };
-      await VaultManagerDB.editNoteContent(noteObject);
-    }
+    console.log('persistFrontmatter');
+    const frontmatterGroupRegex = contentHasFrontmatter ? /^---[\s\S]+?---\n/g : /(^[\s\S]*$)/g;
+    const frontmatterFieldsText = parseFrontmatterFieldsToString(rowFields, ddbbConfig, deletedColumn);
+    const noteObject = {
+      action: 'replace',
+      file: file,
+      regexp: frontmatterGroupRegex,
+      newValue: contentHasFrontmatter ? `${frontmatterFieldsText}` : `${frontmatterFieldsText}\n$1`,
+    };
+    await VaultManagerDB.editNoteContent(noteObject);
   }
 
   /*******************************************************************************************
@@ -288,7 +286,7 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
   }
 
   async function inlineAddColumn(): Promise<void> {
-    const inlineAddRegex = contentHasFrontmatter ? new RegExp(`(^---[\\s\\S]+?---)+([\\s\\S]*$)`, 'g') : new RegExp(`(^[\\s\\S]*$)`, 'g');
+    const inlineAddRegex = contentHasFrontmatter ? new RegExp(`(^---[\\s\\S]+?---\n)+([\\s\\S]*$)`, 'g') : new RegExp(`(^[\\s\\S]*$)`, 'g');
     const noteObject = {
       action: 'replace',
       file: file,

src/parsers/RowDatabaseFieldsToFile.ts

@@ -5,14 +5,15 @@ import { Literal } from "obsidian-dataview/lib/data-model/value";
 import { DataviewService } from "services/DataviewService";
 export const parseFrontmatterFieldsToString = (databaseFields: RowDatabaseFields, localSettings: LocalSettings, deletedColumn?: string): string => {
     const frontmatterFields = databaseFields.frontmatter;
-    const array: string[] = [];
-    array.push(`---`);
+    let array: string[] = [];
     Object.keys(frontmatterFields).forEach(key => {
         if (key !== deletedColumn) {
             array.push(...parseLiteralToString(frontmatterFields[key], 0, localSettings, key));
         }
     });
-    array.push(`---`);
+    if (array.length > 0) {
+        array = [`---`, ...array, `---`];
+    }
     return array.join('\n');
 }