« get me outta code hell

content: transformContent: output processed-link, processed-image - hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2024-03-01 07:42:44 -0400
committer(quasar) nebula <qznebula@protonmail.com>2024-03-31 19:08:10 -0300
commit4cb8b3d3bec5c262ffe930666616ea3b982f6127 (patch)
treef7c89172b0ff60601f91d72f15ea8b1bd8e46069
parentf500eb7b8cc8b17785dd098934505bfcbca4e98f (diff)
content: transformContent: output processed-link, processed-image
These are somewhat different structures than the link and image
nodes returned by the replacer. They refer to essentially the same
things, but the data structures themselves shouldn't be conflated.
-rw-r--r--src/content/dependencies/transformContent.js16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/content/dependencies/transformContent.js b/src/content/dependencies/transformContent.js
index faae35aa..ae78ec1a 100644
--- a/src/content/dependencies/transformContent.js
+++ b/src/content/dependencies/transformContent.js
@@ -114,7 +114,7 @@ export default {
 
             data.hash = enteredHash ?? null;
 
-            return {i: node.i, iEnd: node.iEnd, type: 'link', data};
+            return {i: node.i, iEnd: node.iEnd, type: 'internal-link', data};
           }
 
           // This will be another {type: 'tag'} node which gets processed in
@@ -238,7 +238,7 @@ export default {
 
             if (node.inline) {
               return {
-                type: 'image',
+                type: 'processed-image',
                 inline: true,
                 data:
                   html.tag('img',
@@ -255,7 +255,7 @@ export default {
             const image = relations.images[imageIndex++];
 
             return {
-              type: 'image',
+              type: 'processed-image',
               inline: false,
               data:
                 html.tag('div', {class: 'content-image-container'},
@@ -322,7 +322,7 @@ export default {
               link.setSlot('tooltipStyle', 'none');
             }
 
-            return {type: 'link', data: link};
+            return {type: 'processed-link', data: link};
           }
 
           case 'tag': {
@@ -358,7 +358,9 @@ export default {
     // access to its slots.
 
     if (slots.mode === 'single-link') {
-      const link = contentFromNodes.find(node => node.type === 'link');
+      const link =
+        contentFromNodes.find(node =>
+          node.type === 'processed-link');
 
       if (!link) {
         return html.blank();
@@ -390,7 +392,7 @@ export default {
             'data-type': node.type,
           });
 
-          if (node.type === 'image') {
+          if (node.type === 'processed-image') {
             attributes.set('data-inline', node.inline);
           }
 
@@ -426,7 +428,7 @@ export default {
         // the surrounding <p> tag that marked generates. The HTML parser
         // treats a <div> that starts inside a <p> as a Crocker-class
         // misgiving, and will treat you very badly if you feed it that.
-        if (attributes.get('data-type') === 'image') {
+        if (attributes.get('data-type') === 'processed-image') {
           if (!attributes.get('data-inline')) {
             tags[tags.length - 1] = tags[tags.length - 1].replace(/<p>$/, '');
             deleteParagraph = true;