differ with booleans and numbers quotes

Author: RafaelGB

src/components/reducers/DatabaseDispatch.tsx

@@ -191,7 +191,8 @@ export function databaseReducer(state: TableDataType, action: ActionType) {
         ...row,
         [action.columnId]: DataviewService.parseLiteral(
           row[action.columnId],
-          action.dataType // Destination type to parse
+          action.dataType, // Destination type to parse
+          state.view.diskConfig.yaml.config
         ),
       }));
       // Update state

src/helpers/VaultManagement.ts

@@ -78,7 +78,7 @@ export async function adapterTFilesToRows(folderPath: string, columns: TableColu
   }
   folderFiles.map((page) => {
     const noteInfo = new NoteInfo(page, ++id);
-    rows.push(noteInfo.getRowDataType(columns));
+    rows.push(noteInfo.getRowDataType(columns, dbYaml.config));
   });
 
   LOGGER.debug(`<= adapterTFilesToRows.  number of rows:${rows.length}`);
@@ -199,7 +199,7 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
 
     // Check if the column is already in the frontmatter
     // assign an empty value to the new key
-    rowFields.frontmatter[DataviewService.parseLiteral(newValue, DataTypes.TEXT) as string] = rowFields.frontmatter[columnId] ?? "";
+    rowFields.frontmatter[DataviewService.parseLiteral(newValue, DataTypes.TEXT, state.view.diskConfig.yaml.config) as string] = rowFields.frontmatter[columnId] ?? "";
     delete rowFields.frontmatter[columnId];
     await persistFrontmatter(columnId);
   }
@@ -243,7 +243,7 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
       action: 'replace',
       file: file,
       regexp: inlineFieldRegex,
-      newValue: `$1 ${DataviewService.parseLiteral(newValue, DataTypes.MARKDOWN) as string, true}`
+      newValue: `$1 ${DataviewService.parseLiteral(newValue, DataTypes.MARKDOWN, state.view.diskConfig.yaml.config) as string, true}`
     };
     await VaultManagerDB.editNoteContent(noteObject);
     await persistFrontmatter();

src/parsers/RowDatabaseFieldsToFile.ts

@@ -35,16 +35,9 @@ function parseLiteralToString(literal: Literal, level: number, localSettings: Lo
         });
     }
     else if (key) {
-        literalBlock.push(`${" ".repeat(level)}${key}: ${wrapWithQuotes(DataviewService.parseLiteral(literal, DataTypes.MARKDOWN), localSettings.frontmatter_quote_wrap)}`);
+        literalBlock.push(`${" ".repeat(level)}${key}: ${DataviewService.parseLiteral(literal, DataTypes.MARKDOWN, localSettings)}`);
     } else {
-        literalBlock.push(`${" ".repeat(level)}- ${wrapWithQuotes(DataviewService.parseLiteral(literal, DataTypes.MARKDOWN), localSettings.frontmatter_quote_wrap)}`);
+        literalBlock.push(`${" ".repeat(level)}- ${DataviewService.parseLiteral(literal, DataTypes.MARKDOWN, localSettings)}`);
     }
     return literalBlock;
-}
-
-function wrapWithQuotes(literal: Literal, isWrapActivated: boolean): string {
-    if (!literal.toString().startsWith('"') && !literal.toString().endsWith('"') && isWrapActivated) {
-        return `\"${literal.toString()}\"`;
-    }
-    return literal.toString();
 }

src/services/DataviewService.ts

@@ -5,6 +5,7 @@ import { DataviewApi, getAPI, isPluginEnabled } from "obsidian-dataview";
 import { Literal, WrappedLiteral } from "obsidian-dataview/lib/data-model/value";
 import { DateTime } from "luxon";
 import { LOGGER } from "services/Logger";
+import { LocalSettings } from "cdm/SettingsModel";
 class DataviewProxy {
 
     private static instance: DataviewProxy;
@@ -64,7 +65,7 @@ class DataviewProxy {
         return this.getDataviewAPI().value.wrapValue(literal);
     }
 
-    parseLiteral(literal: Literal, dataTypeDst: string, isInline?: boolean): Literal {
+    parseLiteral(literal: Literal, dataTypeDst: string, localSettings: LocalSettings, isInline?: boolean): Literal {
         let parsedLiteral: Literal = literal;
         if (!this.getDataviewAPI().value.isTruthy(literal.toString())) {
             return "";
@@ -79,7 +80,7 @@ class DataviewProxy {
                 parsedLiteral = this.parseToString(wrapped);
                 break;
             case DataTypes.MARKDOWN:
-                parsedLiteral = this.parseToMarkdown(wrapped, isInline);
+                parsedLiteral = this.parseToMarkdown(wrapped, localSettings, isInline);
                 break;
             case DataTypes.TAGS:
                 parsedLiteral = this.parseToOptionsArray(wrapped);
@@ -151,16 +152,23 @@ class DataviewProxy {
         return wrapped.type === 'number' ? wrapped.value : Number(adjustedValue);
     }
 
-    private parseToMarkdown(wrapped: WrappedLiteral, isInline: boolean): string {
+    private parseToMarkdown(wrapped: WrappedLiteral, localSettings: LocalSettings, isInline: boolean): string {
         let auxMarkdown = '';
-        if (wrapped.type === 'array') {
-            auxMarkdown = wrapped.value
-                .map(v => this.parseToMarkdown(this.getDataviewAPI().value.wrapValue(v), isInline))
-                .join(', ');
-        } else {
-            auxMarkdown = this.parseToString(wrapped) as string;
-            // Check possible markdown breakers
-            auxMarkdown = this.handleMarkdownBreaker(auxMarkdown, isInline);
+        switch (wrapped.type) {
+            case 'boolean':
+            case 'number':
+                // Do nothing
+                auxMarkdown = wrapped.value.toString();
+                break;
+            case 'array':
+                auxMarkdown = wrapped.value
+                    .map(v => this.parseToMarkdown(this.getDataviewAPI().value.wrapValue(v), localSettings, isInline))
+                    .join(', ');
+                break;
+            default:
+                auxMarkdown = this.parseToString(wrapped) as string;
+                // Check possible markdown breakers
+                auxMarkdown = this.handleMarkdownBreaker(auxMarkdown, localSettings, isInline);
         }
         return auxMarkdown;
     }
@@ -172,14 +180,15 @@ class DataviewProxy {
         return wrapped.value;
     }
 
-    private handleMarkdownBreaker(value: string, isInline?: boolean): string {
+    private handleMarkdownBreaker(value: string, localSettings: LocalSettings, isInline?: boolean): string {
         if (isInline || (value.startsWith('"') && value.endsWith('"'))) {
             return value;
         }
         // Check possible markdown breakers of the yaml
         if (MarkdownBreakerRules.INIT_CHARS.some(c => value.startsWith(c)) ||
             MarkdownBreakerRules.BETWEEN_CHARS.some(rule => value.includes(rule)) ||
-            MarkdownBreakerRules.UNIQUE_CHARS.some(c => value === c)) {
+            MarkdownBreakerRules.UNIQUE_CHARS.some(c => value === c) ||
+            localSettings.frontmatter_quote_wrap) {
             value = value.replaceAll(`"`, `\\"`);
             return `"${value}"`;
         }

src/services/NoteInfo.ts

@@ -5,6 +5,7 @@ import { VaultManagerDB } from "services/FileManagerService";
 import { DateTime } from "luxon";
 import { DataviewService } from "./DataviewService";
 import { Literal } from "obsidian-dataview/lib/data-model/value";
+import { LocalSettings } from "cdm/SettingsModel";
 /**
  * Keep info about a note and offer methods to manipulate it
  */
@@ -18,7 +19,7 @@ export default class NoteInfo {
         this.id = id;
     }
 
-    getRowDataType(columns: TableColumn[]): RowDataType {
+    getRowDataType(columns: TableColumn[], config: LocalSettings): RowDataType {
         /** Mandatory fields */
         const aFile: RowDataType = {
             id: this.id,
@@ -37,7 +38,7 @@ export default class NoteInfo {
         /** Parse data with the type of column */
         columns.forEach(column => {
             if (aFile[column.key] !== undefined) {
-                aFile[column.key] = DataviewService.parseLiteral((aFile[column.key]) as Literal, column.dataType, column.config.isInline);
+                aFile[column.key] = DataviewService.parseLiteral((aFile[column.key]) as Literal, column.dataType, config, column.config.isInline);
             }
         });
         return aFile;