Merge pull request #234 from jcdeichmann/fix-special-chars-in-queries

Fix special queries in dataview queries

Author: RafaelGB

src/helpers/QueryHelper.ts

@@ -4,5 +4,5 @@ import { DatabaseCore } from "helpers/Constants";
 export function generateDataviewTableQuery(columns: Record<string, DatabaseColumn>, fromQuery: string): string {
     return `TABLE ${Object.keys(columns)
         .filter((key) => !key.startsWith("__") && !key.endsWith("__"))
-        .join(",")},${DatabaseCore.DATAVIEW_FILE},${DatabaseCore.FRONTMATTER_KEY} ${fromQuery.replace(/['"]+/g, '')}`
+        .join(",")},${DatabaseCore.DATAVIEW_FILE},${DatabaseCore.FRONTMATTER_KEY} ${fromQuery}`
 }

src/parsers/EscapeHelper.ts

@@ -0,0 +1,11 @@
+export function escapeSpecialCharacters(stringToEscape: string): string {
+    return stringToEscape
+        .replaceAll("\"", "\\\"")
+        .replaceAll("\n", "\\n")
+}
+
+export function unEscapeSpecialCharacters(stringToUnescape: string): string {
+    return stringToUnescape
+        .replaceAll("\\\"", "\"")
+        .replaceAll("\\n", "\n")
+}

src/parsers/handlers/marshall/MarshallConfigHandler.ts

@@ -2,6 +2,7 @@ import { YamlHandlerResponse } from 'cdm/MashallModel';
 import { LocalSettings } from 'cdm/SettingsModel';
 import { SourceDataTypes, CellSizeOptions, DEFAULT_SETTINGS } from 'helpers/Constants';
 import { Literal } from 'obsidian-dataview';
+import { unEscapeSpecialCharacters } from 'parsers/EscapeHelper';
 import { AbstractYamlHandler } from 'parsers/handlers/marshall/AbstractYamlPropertyHandler';
 
 export class MarshallConfigHandler extends AbstractYamlHandler {
@@ -31,7 +32,11 @@ export class MarshallConfigHandler extends AbstractYamlHandler {
     }
 
     loadDefaultConfig<K extends keyof LocalSettings>(key: K, value: Literal, localSettings: LocalSettings): LocalSettings {
-        localSettings[key] = value as any;
+        var unEscapedValue = value
+        if (typeof value === "string") {
+            unEscapedValue = unEscapeSpecialCharacters(value)
+        }
+        localSettings[key] = unEscapedValue as any;
         return localSettings;
     }
 

src/parsers/handlers/unmarshall/UnmarshallConfigHandler.ts

@@ -1,6 +1,7 @@
 import { DiskHandlerResponse } from "cdm/MashallModel";
 import { LocalSettings } from "cdm/SettingsModel";
 import { InputType, YAML_INDENT } from "helpers/Constants";
+import { escapeSpecialCharacters } from "parsers/EscapeHelper";
 import { AbstractDiskHandler } from "parsers/handlers/unmarshall/AbstractDiskPropertyHandler";
 import { DataviewService } from "services/DataviewService";
 
@@ -18,6 +19,8 @@ export class UnmarshallConfigHandler extends AbstractDiskHandler {
                     // Lvl3: config properties
                     this.localDisk.push(`${YAML_INDENT.repeat(2)}${key}: "${parseValue(valueInternal as string, config)}"`);
                 });
+            } else if (typeof valueConfig == "string") {
+                this.localDisk.push(`${YAML_INDENT.repeat(1)}${key}: "${parseValue(escapeSpecialCharacters(valueConfig), config)}"`);
             } else {
                 // Lvl2: config properties
                 this.localDisk.push(`${YAML_INDENT.repeat(1)}${key}: "${parseValue(valueConfig, config)}"`);