remove duplication in handle-error, escape link sources for qmds

Author: Al Manning

src/publish/confluence/confluence.ts

@@ -29,6 +29,7 @@ import {
   ContentAncestor,
   ContentBody,
   ContentBodyRepresentation,
+  ContentChange,
   ContentChangeType,
   ContentCreate,
   ContentProperty,
@@ -721,18 +722,31 @@ async function publish(
       }
     };
 
+    const handleChangeError = (
+      label: string,
+      currentChange: ConfluenceSpaceChange,
+      error: any
+    ) => {
+      console.info(label, currentChange);
+      if (isContentUpdate(currentChange) || isContentCreate(currentChange)) {
+        console.info("currentChange.fileName", currentChange.fileName);
+        // console.info("Value to Update", currentChange.body.storage.value);
+      }
+      console.error(error);
+      if (EXIT_ON_ERROR) {
+        throw error;
+      }
+    };
+
     for (let currentChange of changeList) {
       try {
         await doChange(currentChange);
       } catch (error: any) {
-        console.info("Error Performing Change Pass 1", currentChange);
-        if (isContentUpdate(currentChange) || isContentCreate(currentChange)) {
-          console.info("Value to Update", currentChange.body.storage.value);
-        }
-        console.error(error);
-        if (EXIT_ON_ERROR) {
-          throw error;
-        }
+        handleChangeError(
+          "Error Performing Change Pass 1",
+          currentChange,
+          error
+        );
       }
     }
 
@@ -755,18 +769,11 @@ async function publish(
         try {
           await doChange(currentChange, false);
         } catch (error: any) {
-          //TODO remove duplication
-          console.info("Error Performing Change Pass 2", currentChange);
-          if (
-            isContentUpdate(currentChange) ||
-            isContentCreate(currentChange)
-          ) {
-            console.info("Value to Update", currentChange.body.storage.value);
-          }
-          console.error(error);
-          if (EXIT_ON_ERROR) {
-            throw error;
-          }
+          handleChangeError(
+            "Error Performing Change Pass 2",
+            currentChange,
+            error
+          );
         }
       }
     }

src/resources/extensions/quarto/confluence/overrides.lua

@@ -38,7 +38,7 @@ function dumpObject(o)
   end
 end
 
-function dump(object, label)
+function dump(label, object)
   print(label or '' .. ': ', dumpObject(object))
 end
 
@@ -108,14 +108,13 @@ function LinkConfluence(source, target, title, attr)
   if(not startsWith(target,"http") and (not string.find(target, ".qmd"))) then
     return interpolate {
     LINK_ATTACHMENT_SNIPPET,
-    source = source,
+    source = escape(source),
     target = target,
     doubleBraket = "]]"
   }
   end
-
-    return "<a href='" .. escape(target,true) .. "' title='" ..
-            escape(title,true) .. "'>" .. escape(source, false) .. "</a>"
+  return "<a href='" .. escape(target,true) .. "' title='" ..
+          escape(title,true) .. "'>" .. escape(source, false) .. "</a>"
 end
 
 function CodeBlockConfluence(codeValue, languageValue)