fix: extract nested slices

packages/@atjson/renderer-hir/test/renderer-hir.test.ts

@@ -468,5 +468,67 @@ describe("@atjson/renderer-hir", () => {
         "This document has a spoiler:\nXXXXXXXXXX"
       );
     });
+
+    test("nested slices and subsequent marks", () => {
+      let atjson = new TestSource({
+        content: "Pre-text\n\nParent Slice\n\nChild Slice\n\nPost-text",
+        annotations: [
+          new Italic({ start: 0, end: 3 }),
+          new SliceAnnotation({ id: "slice1", start: 10, end: 37 }),
+          new SliceAnnotation({ id: "slide2", start: 24, end: 30 }),
+          new Bold({ start: 37, end: 41 }),
+        ],
+      });
+
+      class ConcreteRenderer extends Renderer {
+        *Bold() {
+          let text = (yield).join("");
+          return `__${text}__`;
+        }
+        *Italic() {
+          let text = (yield).join("");
+          return `*${text}*`;
+        }
+        *root() {
+          let results = (yield).join("");
+          return results;
+        }
+      }
+
+      expect(ConcreteRenderer.render(atjson)).toEqual(
+        "*Pre*-text\n\n__Post__-text"
+      );
+    });
+
+    test("overlapping slices and subsequent marks", () => {
+      let atjson = new TestSource({
+        content: "Pre-text\n\nParent Slice\n\nChild Slice\n\nPost-text",
+        annotations: [
+          new Italic({ start: 0, end: 3 }),
+          new SliceAnnotation({ id: "slice1", start: 10, end: 30 }),
+          new SliceAnnotation({ id: "slide2", start: 24, end: 37 }),
+          new Bold({ start: 37, end: 41 }),
+        ],
+      });
+
+      class ConcreteRenderer extends Renderer {
+        *Bold() {
+          let text = (yield).join("");
+          return `__${text}__`;
+        }
+        *Italic() {
+          let text = (yield).join("");
+          return `*${text}*`;
+        }
+        *root() {
+          let results = (yield).join("");
+          return results;
+        }
+      }
+
+      expect(ConcreteRenderer.render(atjson)).toEqual(
+        "*Pre*-text\n\n__Post__-text"
+      );
+    });
   });
 });

packages/@atjson/util/src/index.ts

@@ -145,6 +145,16 @@ export function compareSliceTokens(a: SortableSlice, b: SortableSlice) {
   return 0;
 }
 
+function compareRanges(
+  [start1, end1]: [number, number],
+  [start2, end2]: [number, number]
+) {
+  if (start1 === start2) {
+    return end1 - end2;
+  }
+  return start1 - start2;
+}
+
 /**
  * Extracts slices from a document for the special `slice`
  * type provided by atjson. This function removes slices
@@ -390,6 +400,24 @@ export function extractSlices(value: {
     });
   }
 
+  // Normalize the ranges again, as we may have extended ranges into each other
+  // First sort the ranges
+  rangesToDelete = rangesToDelete.sort(compareRanges).reduce((acc, range) => {
+    // Since they are sorted, check if the current range can be merged into
+    // the previous one
+    const last = acc[acc.length - 1];
+    if (last) {
+      const [, lastEnd] = last;
+      if (range[0] <= lastEnd && lastEnd <= range[1]) {
+        last[1] = range[1];
+        return acc;
+      }
+    }
+    // Otherwise add the range to the list
+    acc.push(range);
+    return acc;
+  }, [] as [number, number][]);
+
   let firstRange = rangesToDelete[0];
   let text = firstRange ? value.text.slice(0, firstRange[0]) : "";
   let lastEnd = firstRange ? firstRange[1] : 0;