persisting entire objects

Author: RafaelGB

package.json

@@ -51,10 +51,10 @@
 	"dependencies": {
 		"@emotion/styled": "11.10.4",
 		"@mui/icons-material": "5.10.6",
-		"@mui/material": "5.10.6",
+		"@mui/material": "5.10.8",
 		"@popperjs/core": "2.11.6",
-		"@tanstack/match-sorter-utils": "8.1.1",
-		"@tanstack/react-table": "8.5.13",
+		"@tanstack/match-sorter-utils": "8.5.14",
+		"@tanstack/react-table": "8.5.15",
 		"eventemitter3": "4.0.7",
 		"fuse.js": "6.6.2",
 		"luxon": "3.0.4",

src/components/cellTypes/TextCell.tsx

@@ -3,8 +3,9 @@ import { renderMarkdown } from "components/obsidianArq/MarkdownRenderer";
 import React, { MouseEventHandler, useEffect, useRef } from "react";
 import { useState } from "react";
 import EditorCell from "components/cellTypes/EditorCell";
-import { TableColumn } from "cdm/FolderModel";
+import { RowDataType, TableColumn } from "cdm/FolderModel";
 import { c, getAlignmentClassname } from "helpers/StylesHelper";
+import { Literal } from "obsidian-dataview";
 
 const TextCell = (props: CellComponentProps) => {
   const { defaultCell } = props;
@@ -25,7 +26,7 @@ const TextCell = (props: CellComponentProps) => {
     (state) => state.actions
   );
 
-  const textCell = textRow[column.id]?.toString();
+  const textCell = parseTextRowToString(textRow, column.id);
   /** Ref to cell container */
   const containerCellRef = useRef<HTMLDivElement>();
   const [dirtyCell, setDirtyCell] = useState(false);
@@ -51,10 +52,11 @@ const TextCell = (props: CellComponentProps) => {
 
   const persistChange = (changedValue: string) => {
     if (changedValue !== undefined && changedValue !== textCell) {
+      const newCell = parseStringToTextRow(textRow, column.id, changedValue);
       dataActions.updateCell(
         row.index,
         tableColumn,
-        changedValue.trim(),
+        newCell,
         columnsInfo.getAllColumns(),
         configInfo.getLocalSettings()
       );
@@ -80,4 +82,29 @@ const TextCell = (props: CellComponentProps) => {
   );
 };
 
+function parseTextRowToString(row: RowDataType, columnId: string) {
+  const cellRoot = row[columnId];
+  let textCell = "";
+  if (typeof cellRoot === "object") {
+    textCell = JSON.stringify(cellRoot);
+  } else {
+    textCell = cellRoot?.toString();
+  }
+  return textCell;
+}
+
+function parseStringToTextRow(
+  row: RowDataType,
+  columnId: string,
+  newValue: string
+): Literal {
+  const cellRoot = row[columnId];
+  if (typeof cellRoot === "object") {
+    // TODO control anidated values in function of columnId spliting by "."
+    return JSON.parse(newValue);
+  } else {
+    return newValue.trim();
+  }
+}
+
 export default TextCell;

src/services/ParseService.ts

@@ -1,5 +1,5 @@
 import { InputType, MarkdownBreakerRules } from "helpers/Constants";
-import { Literal, WrappedLiteral } from "obsidian-dataview/lib/data-model/value";
+import { DataObject, Literal, WrappedLiteral } from "obsidian-dataview/lib/data-model/value";
 import { DateTime } from "luxon";
 import { LOGGER } from "services/Logger";
 import { DataviewService } from "services/DataviewService";
@@ -27,9 +27,6 @@ class Parse {
             .type} to ${dataTypeDst}`);
         // Check empty or undefined literals
         switch (dataTypeDst) {
-            case InputType.TEXT:
-                parsedLiteral = this.parseToString(wrapped);
-                break;
             case InputType.MARKDOWN:
                 parsedLiteral = this.parseToMarkdown(wrapped, localSettings, isInline);
                 break;
@@ -56,7 +53,7 @@ class Parse {
                 // Do nothing
                 break;
             default:
-                parsedLiteral = parsedLiteral = this.parseToString(wrapped);
+                parsedLiteral = this.parseToText(wrapped, localSettings);
 
         }
         LOGGER.debug(`<=parseLiteral`);
@@ -96,13 +93,18 @@ class Parse {
         }
     }
 
-    private parseToString(wrapped: WrappedLiteral): string {
-        if (DateTime.isDateTime(wrapped.value)) {
-            LOGGER.debug("adapting DateTime to string...");
-            // Values of dataview parse to md friendly strings
-            return wrapped.value.toFormat("yyyy-MM-dd");
-        } else {
-            return DataviewService.getDataviewAPI().value.toString(wrapped.value);
+    private parseToText(wrapped: WrappedLiteral, localSettings: LocalSettings): string | DataObject {
+        switch (wrapped.type) {
+            case 'object':
+                if (DateTime.isDateTime(wrapped.value)) {
+                    return wrapped.value.toFormat(localSettings.datetime_format);
+                } else {
+                    // nested metadata exposed as DataObject
+                    return wrapped.value;
+                }
+            // Else go to default
+            default:
+                return DataviewService.getDataviewAPI().value.toString(wrapped.value);
         }
     }
 
@@ -129,9 +131,9 @@ class Parse {
         switch (wrapped.type) {
             case 'boolean':
             case 'number':
-                // Do nothing
                 auxMarkdown = wrapped.value.toString();
                 break;
+
             case 'array':
                 auxMarkdown = wrapped.value
                     .map(v => this.parseToMarkdown(DataviewService.getDataviewAPI().value.wrapValue(v), localSettings, isInline))
@@ -145,7 +147,6 @@ class Parse {
                 } else {
                     // Parse datetime
                     auxMarkdown = wrapped.value.toFormat(localSettings.datetime_format);
-                    auxMarkdown = this.handleMarkdownBreaker(auxMarkdown, localSettings, isInline);
                 }
                 break;
             case 'object':
@@ -154,11 +155,10 @@ class Parse {
                 }
             // Else go to default
             default:
-                auxMarkdown = this.parseToString(wrapped) as string;
-                // Check possible markdown breakers
-                auxMarkdown = this.handleMarkdownBreaker(auxMarkdown, localSettings, isInline);
+                auxMarkdown = DataviewService.getDataviewAPI().value.toString(wrapped.value);
         }
-        return auxMarkdown;
+        // Check possible markdown breakers
+        return this.handleYamlBreaker(auxMarkdown, localSettings, isInline);;
     }
 
     private parseToOptionsArray(wrapped: WrappedLiteral): Literal {
@@ -168,7 +168,7 @@ class Parse {
         return wrapped.value;
     }
 
-    private handleMarkdownBreaker(value: string, localSettings: LocalSettings, isInline?: boolean): string {
+    private handleYamlBreaker(value: string, localSettings: LocalSettings, isInline?: boolean): string {
         // Do nothing if is inline
         if (isInline) {
             return value;
@@ -191,6 +191,7 @@ class Parse {
 
         return value;
     }
+
     /**
      * Singleton instance
      * @returns {VaultManager}