Fixed invalid canvas file if empty. Reduced risk of corrupting canvas

Author: Developer-Mike

src/canvas-extensions/advanced-styles/edge-styles.ts

@@ -85,12 +85,13 @@ export default class EdgeStylesExtension extends CanvasExtension {
     for (const edge of selectedEdges) {
       const edgeData = edge.getData()
 
+      const newStyleAttributes = { ...edgeData.styleAttributes }
+      if (value !== null) newStyleAttributes[attribute.datasetKey] = value
+      else delete newStyleAttributes[attribute.datasetKey]
+
       edge.setData({
         ...edgeData,
-        styleAttributes: {
-          ...edgeData.styleAttributes,
-          [attribute.datasetKey]: value
-        }
+        styleAttributes: newStyleAttributes
       })
     }
 

src/canvas-extensions/advanced-styles/node-styles.ts

@@ -47,12 +47,13 @@ export default class NodeStylesExtension extends CanvasExtension {
       // Only apply the attribute if the node type is allowed
       if (attribute.nodeTypes && !attribute.nodeTypes.includes(nodeData.type)) continue
 
+      const newStyleAttributes = { ...nodeData.styleAttributes }
+      if (value !== null) newStyleAttributes[attribute.datasetKey] = value
+      else delete newStyleAttributes[attribute.datasetKey]
+
       node.setData({
         ...nodeData,
-        styleAttributes: {
-          ...nodeData.styleAttributes,
-          [attribute.datasetKey]: value
-        }
+        styleAttributes: newStyleAttributes
       })
     }
 

src/canvas-extensions/portals-canvas-extension.ts

@@ -363,7 +363,10 @@ export default class PortalsCanvasExtension extends CanvasExtension {
       return addedData
     }
 
-    const portalFileData = JSON.parse(await this.plugin.app.vault.cachedRead(portalFile))
+    const portalFileDataString = await this.plugin.app.vault.cachedRead(portalFile)
+    if (portalFileDataString === '') return addedData
+
+    const portalFileData = JSON.parse(portalFileDataString) as CanvasData
     if (!portalFileData) {
       portalNodeData.portalToFile = undefined
       return addedData
@@ -412,6 +415,8 @@ export default class PortalsCanvasExtension extends CanvasExtension {
       const toRefNode = Object.entries(portalNodeData.portalIdMaps.nodeIdMap)
         .find(([_refNodeId, nodeId]) => nodeId === edgeDataFromPortal.toNode)?.[0]
 
+      if (!fromRefNode || !toRefNode) continue
+
       addedData.edges.push({
         ...edgeDataFromPortal,
         id: refEdgeId,

src/core/canvas-patcher.ts

@@ -45,17 +45,17 @@ export default class CanvasPatcher {
         return JSON.stringify(canvasData, null, 2)
       },
       setViewData: (next: any) => function (json: string, ...args: any) {
-        let validJson = json
+        let validJson = json !== '' ? json : '{}'
         let parsedJson
 
         // Check for SyntaxError
-        try { parsedJson = JSON.parse(json) }
+        try { parsedJson = JSON.parse(validJson) }
         catch (e) {
           // Invalid JSON
           that.plugin.createFileSnapshot(this.file.path, json)
 
           // Try to parse it with trailing commas
-          parsedJson = JSONC.parse(json)
+          parsedJson = JSONC.parse(validJson)
           validJson = JSON.stringify(parsedJson, null, 2)
         }