feat: 🎸 add cnt field to all footnotes to track their order

streamich · Feb 27, 2019 · 61b0788 · 61b0788
1 parent 9314a3a
commit 61b0788
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/__tests__/mdastToFlat.spec.ts b/src/__tests__/mdastToFlat.spec.ts
@@ -44,6 +44,7 @@ describe('structure', () => {
       contents: [],
       definitions: {},
       footnotes: {},
+      footnoteOrder: [],
     });
   });
 
@@ -103,6 +104,7 @@ describe('structure', () => {
       contents: [1, 3],
       definitions: {},
       footnotes: {},
+      footnoteOrder: [],
     });
   });
 
@@ -170,6 +172,7 @@ describe('structure', () => {
         click: 4,
       },
       footnotes: {},
+      footnoteOrder: [],
     });
   });
 
@@ -229,6 +232,7 @@ describe('structure', () => {
         },
         {
           type: 'footnoteDefinition',
+          cnt: 1,
           children: [5],
         },
         {
@@ -373,7 +377,7 @@ describe('structure', () => {
         {type: 'text'},
         {type: 'footnoteReference'},
         {type: 'text'},
-        {type: 'footnoteDefinition'},
+        {type: 'footnoteDefinition', cnt: 1},
         {type: 'paragraph'},
         {type: 'text'},
         {type: 'heading'},
@@ -382,7 +386,7 @@ describe('structure', () => {
         {type: 'paragraph'},
         {type: 'text'},
         {type: 'footnoteReference'},
-        {type: 'footnoteDefinition'},
+        {type: 'footnoteDefinition', cnt: 2},
         {type: 'paragraph'},
         {type: 'text'},
         {type: 'heading'},

diff --git a/src/__tests__/replace.spec.ts b/src/__tests__/replace.spec.ts
@@ -121,6 +121,7 @@ merge here
           children: [10],
           identifier: 'foot',
           idx: 9,
+          cnt: 1,
         },
         {type: 'paragraph', children: [11], idx: 10},
         {type: 'text', value: 'This is footnote 1', idx: 11},
@@ -150,7 +151,7 @@ merge here
           url: 'mailto:gg@bets.com',
           idx: 19,
         },
-        {type: 'footnoteDefinition', children: [21], identifier: 'note', idx: 20},
+        {type: 'footnoteDefinition', children: [21], identifier: 'note', idx: 20, cnt: 2},
         {type: 'paragraph', children: [22], idx: 21},
         {type: 'text', value: 'is dis…', idx: 22},
       ],

diff --git a/src/mdastToFlat.ts b/src/mdastToFlat.ts
@@ -7,6 +7,7 @@ export const mdastToFlat: MdastToFlat = (mdast) => {
   const definitions: FlatDefinitions = {};
   const footnotes: FlatFootnotes = {};
   const footnoteOrder: number[] = [];
+  let footnoteCounter = 0;
   const doc = {
     nodes,
     contents,
@@ -39,6 +40,7 @@ export const mdastToFlat: MdastToFlat = (mdast) => {
         definitions[node.identifier] = idx;
         return -1;
       case 'footnoteDefinition':
+        (node as any).cnt = ++footnoteCounter;
         footnotes[node.identifier] = idx;
         footnoteOrder.push(idx);
         return -1;

diff --git a/src/replace.ts b/src/replace.ts
@@ -38,11 +38,17 @@ export const replace = (into: Flat, at: number, what: Flat): Flat => {
   Object.keys(what.definitions).forEach(
     (identifier) => (merged.definitions[identifier] = what.definitions[identifier] + mergeIdx),
   );
+
+  // MERGE FOOTNOTES.
   Object.keys(what.footnotes).forEach(
     (identifier) => (merged.footnotes[identifier] = what.footnotes[identifier] + mergeIdx),
   );
+  let footnoteCount = into.footnoteOrder.length;
   for (const footnoteIndex of what.footnoteOrder) {
-    merged.footnoteOrder.push(footnoteIndex + mergeIdx);
+    const index = footnoteIndex + mergeIdx
+    footnoteCount++;
+    merged.footnoteOrder.push(index);
+    (merged.nodes[index] as any).cnt = footnoteCount;
   }
 
   return merged;