ropegeo-common 1.24.0 → 1.24.1

package/dist/models/betaSections/betaSection.d.ts

@@ -3,13 +3,15 @@ import { BetaSectionExcerpt } from './betaSectionExcerpt';
 import { BetaSectionImage } from './betaSectionImage';
 /**
  * An excerpt split into its verbatim `body` and the surrounding section
- * context. Consumers render `before` and `after` de-emphasized (e.g. faded)
- * relative to `body`; concatenating the three yields well-formed HTML.
+ * context. Each of `before`, `body`, and `after` is independently well-formed
+ * HTML, so consumers can render them as separate (e.g. stacked) blocks and
+ * de-emphasize the context relative to the body. `before`/`after` are omitted
+ * when there is no surrounding context (or it would be empty/whitespace).
  */
 export type ExcerptHtml = {
-    before: string;
+    before?: string;
     body: string;
-    after: string;
+    after?: string;
 };
 export declare function registerBetaSectionParser(fetchType: FetchType, parse: (body: unknown) => BetaSection): void;
 export declare abstract class BetaSection {

package/dist/models/betaSections/betaSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"betaSection.d.ts","sourceRoot":"","sources":["../../../src/models/betaSections/betaSection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAUtD;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAIF,wBAAgB,yBAAyB,CACrC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,WAAW,GACtC,IAAI,CAEN;AAED,8BAAsB,WAAW;IAC7B,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,IAAI,CAAC;IACzB,mEAAmE;IACnE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAElB,SAAS,aACL,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,IAAI,EACxB,EAAE,GAAE,MAAM,GAAG,IAAW;IAS5B;;;OAGG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,kBAAkB;IAWtE;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW;IA0CvD,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,WAAW;IA0B1E,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9E,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9E,SAAS,CAAC,MAAM,CAAC,uBAAuB,CACpC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,GAAG,EAAE,MAAM,GACZ,IAAI;IAeP,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAClC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,SAAS,GAC7B,IAAI;IAcP,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAgB3C,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAC7B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,GAAG,EAAE,MAAM,EACX,iBAAiB,EAAE,SAAS,GAC7B,gBAAgB,EAAE;IAYrB,SAAS,CAAC,MAAM,CAAC,oBAAoB,CACjC,MAAM,EAAE,gBAAgB,EAAE,EAC1B,SAAS,EAAE,OAAO,GACnB,IAAI;CAeV"}
+{"version":3,"file":"betaSection.d.ts","sourceRoot":"","sources":["../../../src/models/betaSections/betaSection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAUtD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAIF,wBAAgB,yBAAyB,CACrC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,WAAW,GACtC,IAAI,CAEN;AAED,8BAAsB,WAAW;IAC7B,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,IAAI,CAAC;IACzB,mEAAmE;IACnE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAElB,SAAS,aACL,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,IAAI,EACxB,EAAE,GAAE,MAAM,GAAG,IAAW;IAS5B;;;OAGG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,kBAAkB;IAWtE;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW;IA8CvD,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,WAAW;IA0B1E,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9E,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9E,SAAS,CAAC,MAAM,CAAC,uBAAuB,CACpC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,GAAG,EAAE,MAAM,GACZ,IAAI;IAeP,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAClC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,SAAS,GAC7B,IAAI;IAcP,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAgB3C,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAC7B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,GAAG,EAAE,MAAM,EACX,iBAAiB,EAAE,SAAS,GAC7B,gBAAgB,EAAE;IAYrB,SAAS,CAAC,MAAM,CAAC,oBAAoB,CACjC,MAAM,EAAE,gBAAgB,EAAE,EAC1B,SAAS,EAAE,OAAO,GACnB,IAAI;CAeV"}

package/dist/models/betaSections/betaSection.js

@@ -47,20 +47,31 @@ class BetaSection {
             (0, formatExcerptHtml_1.isSafeTextBoundary)(this.text, excerpt.start) &&
             (0, formatExcerptHtml_1.isSafeTextBoundary)(this.text, excerpt.end);
         if (!validOffsets)
-            return { before: '', body: excerpt.toHtml(), after: '' };
+            return { body: excerpt.toHtml() };
         const excerptStart = excerpt.start;
         const excerptEnd = excerpt.end;
         const characters = (0, formatExcerptHtml_1.visibleCharacters)(this.text);
         const structuredContext = (0, formatExcerptHtml_1.listContext)(this.text, excerptStart, excerptEnd, characters);
-        const before = structuredContext?.before ??
-            this.text.slice((0, formatExcerptHtml_1.previousSentenceStart)(this.text, excerptStart, characters), excerptStart);
-        const after = structuredContext?.after ??
-            this.text.slice(excerptEnd, (0, formatExcerptHtml_1.nextSentenceEnd)(this.text, excerptEnd, characters));
-        return (0, normalizeExcerptHtml_1.normalizeExcerptListHtmlParts)({
-            before,
+        const parts = structuredContext ?? {
+            before: this.text
+                .slice((0, formatExcerptHtml_1.previousSentenceStart)(this.text, excerptStart, characters), excerptStart)
+                .trim(),
             body: excerpt.text,
-            after,
-        });
+            after: this.text
+                .slice(excerptEnd, (0, formatExcerptHtml_1.nextSentenceEnd)(this.text, excerptEnd, characters))
+                .trim(),
+        };
+        // We have the source list here, so keep ordered lists ordered; their
+        // `start` ordinals are already aligned to the source by `listContext`.
+        const options = { preserveOrderedLists: true };
+        const result = { body: (0, normalizeExcerptHtml_1.normalizeExcerptListHtml)(parts.body, options) };
+        const before = (0, normalizeExcerptHtml_1.normalizeExcerptListHtml)(parts.before, options);
+        if (before.trim().length > 0)
+            result.before = before;
+        const after = (0, normalizeExcerptHtml_1.normalizeExcerptListHtml)(parts.after, options);
+        if (after.trim().length > 0)
+            result.after = after;
+        return result;
     }
     static fromResponseBody(body, fetchType) {
         if (body == null || typeof body !== 'object') {

package/dist/models/betaSections/formatExcerptHtml.d.ts

@@ -7,8 +7,16 @@ export declare function visibleCharacters(html: string): VisibleCharacter[];
 export declare function isSafeTextBoundary(html: string, offset: number): boolean;
 export declare function previousSentenceStart(html: string, anchor: number, characters: VisibleCharacter[]): number;
 export declare function nextSentenceEnd(html: string, anchor: number, characters: VisibleCharacter[]): number;
+/**
+ * When an excerpt is a run of list items, returns the excerpt and its adjacent
+ * context split into three independently well-formed HTML fragments. Each
+ * fragment stands on its own: the surrounding list items (or the sentence
+ * before/after the list) become complete lists/prose so they can be rendered as
+ * separate stacked blocks.
+ */
 export declare function listContext(html: string, excerptStart: number, excerptEnd: number, characters: VisibleCharacter[]): {
     before: string;
+    body: string;
     after: string;
 } | null;
 export {};

package/dist/models/betaSections/formatExcerptHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatExcerptHtml.d.ts","sourceRoot":"","sources":["../../../src/models/betaSections/formatExcerptHtml.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAsBzD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAuBlE;AAYD,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAsCxE;AAuCD,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,gBAAgB,EAAE,GAC/B,MAAM,CAkBR;AAED,wBAAgB,eAAe,CAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,gBAAgB,EAAE,GAC/B,MAAM,CAuBR;AAyCD,wBAAgB,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,gBAAgB,EAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA0C1C"}
+{"version":3,"file":"formatExcerptHtml.d.ts","sourceRoot":"","sources":["../../../src/models/betaSections/formatExcerptHtml.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAsBzD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAuBlE;AAYD,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAsCxE;AAuCD,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,gBAAgB,EAAE,GAC/B,MAAM,CAkBR;AAED,wBAAgB,eAAe,CAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,gBAAgB,EAAE,GAC/B,MAAM,CAuBR;AAoED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,gBAAgB,EAAE,GAC/B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAwDxD"}

package/dist/models/betaSections/formatExcerptHtml.js

@@ -183,6 +183,33 @@ function findContainingList(html, excerptStart, excerptEnd) {
     }
     return (ranges.sort((a, b) => b.openStart - a.openStart || a.closeEnd - b.closeEnd)[0] ?? null);
 }
+/** `ul` or `ol`, parsed from a list's opening tag. */
+function listContainerTag(openTag) {
+    return /^<\s*ol\b/i.test(openTag) ? 'ol' : 'ul';
+}
+/** The 1-based ordinal an ordered list's first item renders as (`start`, default 1). */
+function listStartIndex(openTag) {
+    const match = openTag.match(/\bstart\s*=\s*["']?\s*(-?\d+)/i);
+    const parsed = match != null ? Number.parseInt(match[1], 10) : Number.NaN;
+    return Number.isFinite(parsed) ? parsed : 1;
+}
+/**
+ * Wraps list items in a standalone `<ul>`/`<ol>`. Ordered lists carry a `start`
+ * attribute (whenever the first item is not ordinal 1) so numbering lines up
+ * with the source list even when the excerpt parts are rendered as separate
+ * blocks.
+ */
+function wrapListItems(tag, itemsHtml, startOrdinal) {
+    const startAttr = tag === 'ol' && startOrdinal !== 1 ? ` start="${startOrdinal}"` : '';
+    return `<${tag}${startAttr}>${itemsHtml}</${tag}>`;
+}
+/**
+ * When an excerpt is a run of list items, returns the excerpt and its adjacent
+ * context split into three independently well-formed HTML fragments. Each
+ * fragment stands on its own: the surrounding list items (or the sentence
+ * before/after the list) become complete lists/prose so they can be rendered as
+ * separate stacked blocks.
+ */
 function listContext(html, excerptStart, excerptEnd, characters) {
     const excerpt = html.slice(excerptStart, excerptEnd).trim();
     if (!/^<li\b/i.test(excerpt) || !/<\/li\s*>$/i.test(excerpt)) {
@@ -191,6 +218,10 @@ function listContext(html, excerptStart, excerptEnd, characters) {
     const range = findContainingList(html, excerptStart, excerptEnd);
     if (range == null)
         return null;
+    const openTag = html.slice(range.openStart, range.openEnd);
+    const tag = listContainerTag(openTag);
+    // Ordinal of the list's first item so ordered excerpts line up with the source.
+    const baseOrdinal = tag === 'ol' ? listStartIndex(openTag) : 1;
     const listBody = html.slice(range.openEnd, range.closeStart);
     const items = [...listBody.matchAll(/<li\b[^>]*>[\s\S]*?<\/li\s*>/gi)].map((match) => ({
         start: range.openEnd + match.index,
@@ -198,13 +229,17 @@ function listContext(html, excerptStart, excerptEnd, characters) {
     }));
     const previous = items.filter(({ end }) => end <= excerptStart).at(-1);
     const next = items.find(({ start }) => start >= excerptEnd);
+    const firstBodyIndex = items.findIndex(({ start }) => start >= excerptStart);
+    const body = wrapListItems(tag, html.slice(excerptStart, excerptEnd), baseOrdinal + firstBodyIndex);
     const before = previous != null
-        ? html.slice(range.openStart, range.openEnd) +
-            html.slice(previous.start, previous.end)
-        : html.slice(previousSentenceStart(html, range.openStart, characters), range.openEnd);
+        ? wrapListItems(tag, html.slice(previous.start, previous.end), baseOrdinal + items.indexOf(previous))
+        : html
+            .slice(previousSentenceStart(html, range.openStart, characters), range.openStart)
+            .trim();
     const after = next != null
-        ? html.slice(next.start, next.end) +
-            html.slice(range.closeStart, range.closeEnd)
-        : html.slice(range.closeStart, nextSentenceEnd(html, range.closeEnd, characters));
-    return { before, after };
+        ? wrapListItems(tag, html.slice(next.start, next.end), baseOrdinal + items.indexOf(next))
+        : html
+            .slice(range.closeEnd, nextSentenceEnd(html, range.closeEnd, characters))
+            .trim();
+    return { before, body, after };
 }

package/dist/models/betaSections/normalizeExcerptHtml.d.ts

@@ -1,18 +1,15 @@
-/** Leading/trailing context around an excerpt body, split for independent styling. */
-export type ExcerptHtmlParts = {
-    before: string;
-    body: string;
-    after: string;
+export type NormalizeExcerptListOptions = {
+    /**
+     * When true, an unpaired closing `</ol>` is repaired by prepending an
+     * opening `<ol>` (preserving the ordered list). When false (the default,
+     * used for excerpt-only text with no known source order), it is converted
+     * to `</ul>` and an opening `<ul>` is prepended instead.
+     */
+    preserveOrderedLists?: boolean;
 };
-/**
- * Repairs the list fragments Ropewiki excerpts commonly produce, distributing
- * any added opening tags to `before` and closing tags to `after` so the three
- * parts remain a well-formed list when concatenated as `before + body + after`.
- */
-export declare function normalizeExcerptListHtmlParts(parts: ExcerptHtmlParts): ExcerptHtmlParts;
 /**
  * Repairs the list fragments Ropewiki excerpts commonly produce without
- * otherwise rewriting the source HTML.
+ * otherwise rewriting the source HTML, so the result is well-formed on its own.
  */
-export declare function normalizeExcerptListHtml(html: string): string;
+export declare function normalizeExcerptListHtml(html: string, { preserveOrderedLists }?: NormalizeExcerptListOptions): string;
 //# sourceMappingURL=normalizeExcerptHtml.d.ts.map

package/dist/models/betaSections/normalizeExcerptHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeExcerptHtml.d.ts","sourceRoot":"","sources":["../../../src/models/betaSections/normalizeExcerptHtml.ts"],"names":[],"mappings":"AAIA,sFAAsF;AACtF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,CAkCvF;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQ7D"}
+{"version":3,"file":"normalizeExcerptHtml.d.ts","sourceRoot":"","sources":["../../../src/models/betaSections/normalizeExcerptHtml.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,2BAA2B,GAAG;IACtC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,MAAM,EACZ,EAAE,oBAA4B,EAAE,GAAE,2BAAgC,GACnE,MAAM,CA+BR"}

package/dist/models/betaSections/normalizeExcerptHtml.js

@@ -1,59 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeExcerptListHtmlParts = normalizeExcerptListHtmlParts;
 exports.normalizeExcerptListHtml = normalizeExcerptListHtml;
 function countTags(html, pattern) {
     return html.match(pattern)?.length ?? 0;
 }
 /**
- * Repairs the list fragments Ropewiki excerpts commonly produce, distributing
- * any added opening tags to `before` and closing tags to `after` so the three
- * parts remain a well-formed list when concatenated as `before + body + after`.
+ * Repairs the list fragments Ropewiki excerpts commonly produce without
+ * otherwise rewriting the source HTML, so the result is well-formed on its own.
  */
-function normalizeExcerptListHtmlParts(parts) {
-    let { before, body, after } = parts;
-    const combined = () => before + body + after;
-    const olOpenCount = countTags(combined(), /<ol\b[^>]*>/gi);
-    const olCloseCount = countTags(combined(), /<\/ol\s*>/gi);
-    if (olOpenCount === 0 && olCloseCount > 0) {
-        before = before.replace(/<\/ol\s*>/gi, '</ul>');
-        body = body.replace(/<\/ol\s*>/gi, '</ul>');
-        after = after.replace(/<\/ol\s*>/gi, '</ul>');
-        before = '<ul>'.repeat(olCloseCount) + before;
+function normalizeExcerptListHtml(html, { preserveOrderedLists = false } = {}) {
+    if (html.length === 0)
+        return html;
+    let normalized = html;
+    const olOpenCount = countTags(normalized, /<ol\b[^>]*>/gi);
+    const olCloseCount = countTags(normalized, /<\/ol\s*>/gi);
+    if (!preserveOrderedLists && olOpenCount === 0 && olCloseCount > 0) {
+        normalized = normalized.replace(/<\/ol\s*>/gi, '</ul>');
+        normalized = '<ul>'.repeat(olCloseCount) + normalized;
     }
     else if (olOpenCount > olCloseCount) {
-        after += '</ol>'.repeat(olOpenCount - olCloseCount);
+        normalized += '</ol>'.repeat(olOpenCount - olCloseCount);
     }
     else if (olCloseCount > olOpenCount) {
-        before = '<ol>'.repeat(olCloseCount - olOpenCount) + before;
+        normalized = '<ol>'.repeat(olCloseCount - olOpenCount) + normalized;
     }
-    const ulOpenCount = countTags(combined(), /<ul\b[^>]*>/gi);
-    const ulCloseCount = countTags(combined(), /<\/ul\s*>/gi);
+    const ulOpenCount = countTags(normalized, /<ul\b[^>]*>/gi);
+    const ulCloseCount = countTags(normalized, /<\/ul\s*>/gi);
     if (ulOpenCount > ulCloseCount) {
-        after += '</ul>'.repeat(ulOpenCount - ulCloseCount);
+        normalized += '</ul>'.repeat(ulOpenCount - ulCloseCount);
     }
     else if (ulCloseCount > ulOpenCount) {
-        before = '<ul>'.repeat(ulCloseCount - ulOpenCount) + before;
+        normalized = '<ul>'.repeat(ulCloseCount - ulOpenCount) + normalized;
     }
-    const hasListItem = /<li\b[^>]*>/i.test(combined());
-    const hasListContainer = /<\/?(?:ul|ol)\b[^>]*>/i.test(combined());
+    const hasListItem = /<li\b[^>]*>/i.test(normalized);
+    const hasListContainer = /<\/?(?:ul|ol)\b[^>]*>/i.test(normalized);
     if (hasListItem && !hasListContainer) {
-        before = `<ul>${before}`;
-        after = `${after}</ul>`;
+        normalized = `<ul>${normalized}</ul>`;
     }
-    return { before, body, after };
-}
-/**
- * Repairs the list fragments Ropewiki excerpts commonly produce without
- * otherwise rewriting the source HTML.
- */
-function normalizeExcerptListHtml(html) {
-    if (html.length === 0)
-        return html;
-    const { before, body, after } = normalizeExcerptListHtmlParts({
-        before: '',
-        body: html,
-        after: '',
-    });
-    return before + body + after;
+    return normalized;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ropegeo-common",
-    "version": "1.24.0",
+    "version": "1.24.1",
     "description": "Shared domain models and helpers for RopeGeo and WebScraper",
     "license": "ISC",
     "repository": {