@extend-ai/react-docx 0.8.2 → 0.8.3

package/dist/index.d.cts

@@ -417,6 +417,17 @@ interface NumberingLevelDefinition {
     format?: string;
     text?: string;
     suffix?: "tab" | "space" | "nothing";
+    /**
+     * `w:lvlRestart`: one-based level whose use restarts this level; 0 means the
+     * level never restarts. Absent means the OOXML default (restart when any
+     * shallower level is used).
+     */
+    lvlRestart?: number;
+    /**
+     * `w:isLgl`: legal numbering — every placeholder in this level's text
+     * renders as decimal regardless of the referenced levels' formats.
+     */
+    isLgl?: boolean;
     indent?: ParagraphIndent;
     runStyle?: TextStyle;
     bulletFontFamily?: string;

package/dist/index.d.ts

@@ -417,6 +417,17 @@ interface NumberingLevelDefinition {
     format?: string;
     text?: string;
     suffix?: "tab" | "space" | "nothing";
+    /**
+     * `w:lvlRestart`: one-based level whose use restarts this level; 0 means the
+     * level never restarts. Absent means the OOXML default (restart when any
+     * shallower level is used).
+     */
+    lvlRestart?: number;
+    /**
+     * `w:isLgl`: legal numbering — every placeholder in this level's text
+     * renders as decimal regardless of the referenced levels' formats.
+     */
+    isLgl?: boolean;
     indent?: ParagraphIndent;
     runStyle?: TextStyle;
     bulletFontFamily?: string;

package/dist/index.js

@@ -15135,14 +15135,53 @@ function resolveListParagraphIndent(paragraph, numberingDefinitions) {
     hangingTwips: nextHangingTwips
   };
 }
-function resolveNumberingMarkerBoxWidthPx(paragraph, numberingDefinitions, numberingLabel) {
+function numberingIndentCandidateWidthPx(paragraph, numberingDefinitions) {
   const resolvedIndent = resolveListParagraphIndent(
     paragraph,
     numberingDefinitions
   );
   const hangingIndentPx = twipsToSignedPixels(resolvedIndent?.hangingTwips);
   const firstLineIndentPx = twipsToSignedPixels(resolvedIndent?.firstLineTwips);
-  const candidateWidthPx = Number.isFinite(hangingIndentPx) && Math.abs(hangingIndentPx) > 0 ? Math.abs(hangingIndentPx) : Number.isFinite(firstLineIndentPx) && firstLineIndentPx < 0 ? Math.abs(firstLineIndentPx) : void 0;
+  return Number.isFinite(hangingIndentPx) && Math.abs(hangingIndentPx) > 0 ? Math.abs(hangingIndentPx) : Number.isFinite(firstLineIndentPx) && firstLineIndentPx < 0 ? Math.abs(firstLineIndentPx) : void 0;
+}
+function resolvedNumberingLevelForParagraph(paragraph, numberingDefinitions) {
+  const numbering = paragraph.style?.numbering;
+  if (!numberingDefinitions || !numbering || !Number.isFinite(numbering.numId) || numbering.numId <= 0) {
+    return void 0;
+  }
+  const effectiveNumId = effectiveNumberingNumIdForParagraph(paragraph, numberingDefinitions) ?? numbering.numId;
+  return findNumberingLevelDefinition(
+    numberingDefinitions,
+    effectiveNumId,
+    Math.max(0, Math.round(numbering.ilvl ?? 0))
+  );
+}
+function numberingTabAdvanceWidthPx(paragraph, numberingDefinitions, numberingLabel) {
+  if (!numberingLabel?.text || numberingLabel.imageSrc || isTableOfContentsParagraph(paragraph)) {
+    return void 0;
+  }
+  const level = resolvedNumberingLevelForParagraph(
+    paragraph,
+    numberingDefinitions
+  );
+  const suffix = level?.suffix ?? "tab";
+  if (suffix !== "tab") {
+    return void 0;
+  }
+  const labelWidthPx = Math.ceil(
+    measureTextWidthPx2(
+      numberingLabel.text.replace(/\t/g, " ").replace(/\u00a0/g, " "),
+      numberingLabel.style,
+      paragraphBaseFontSizePx(paragraph)
+    )
+  );
+  return (Math.floor(labelWidthPx / DEFAULT_TAB_STOP_PX) + 1) * DEFAULT_TAB_STOP_PX;
+}
+function resolveNumberingMarkerBoxWidthPx(paragraph, numberingDefinitions, numberingLabel) {
+  const candidateWidthPx = numberingIndentCandidateWidthPx(
+    paragraph,
+    numberingDefinitions
+  );
   const labelTextForWidth = numberingLabel?.imageSrc ? numberingLabel.trailingText ?? "" : numberingLabel?.text ?? "";
   const normalizedLabelTextForWidth = labelTextForWidth.replace(/\t/g, " ").replace(/\u00a0/g, " ");
   const measuredLabelWidthPx = normalizedLabelTextForWidth.length > 0 ? Math.ceil(
@@ -15168,6 +15207,18 @@ function resolveNumberingMarkerBoxWidthPx(paragraph, numberingDefinitions, numbe
     tocMarkerTargetWidthPx
   );
   if (!Number.isFinite(candidateWidthPx) || candidateWidthPx < 8) {
+    const tabAdvanceWidthPx = numberingTabAdvanceWidthPx(
+      paragraph,
+      numberingDefinitions,
+      numberingLabel
+    );
+    if (tabAdvanceWidthPx !== void 0) {
+      return clampNumber(
+        Math.round(Math.max(tabAdvanceWidthPx, minimumVisualWidthPx)),
+        8,
+        220
+      );
+    }
     return minimumVisualWidthPx > 0 ? clampNumber(Math.round(minimumVisualWidthPx), 8, 220) : void 0;
   }
   return Math.max(
@@ -15182,11 +15233,16 @@ function numberingMarkerStyle(paragraph, numberingDefinitions, numberingLabel, b
     numberingLabel
   );
   const markerGapPx = isTableOfContentsParagraph(paragraph) ? 6 : markerBoxWidthPx ? 0 : 2;
+  const tabSynthesized = markerBoxWidthPx !== void 0 && numberingIndentCandidateWidthPx(paragraph, numberingDefinitions) === void 0 && numberingTabAdvanceWidthPx(
+    paragraph,
+    numberingDefinitions,
+    numberingLabel
+  ) !== void 0;
   return {
     ...baseStyle ?? {},
     display: "inline-flex",
     alignItems: "baseline",
-    justifyContent: "flex-end",
+    justifyContent: tabSynthesized ? "flex-start" : "flex-end",
     verticalAlign: "baseline",
     width: markerBoxWidthPx ? `${markerBoxWidthPx}px` : void 0,
     minWidth: markerBoxWidthPx ? `${markerBoxWidthPx}px` : "1.1em",
@@ -18209,40 +18265,157 @@ function numberToLetters(value) {
   if (!Number.isFinite(value) || value <= 0) {
     return "";
   }
-  let remaining = Math.floor(value);
-  let output = "";
-  while (remaining > 0) {
-    const offset = (remaining - 1) % 26;
-    output = String.fromCharCode(65 + offset) + output;
-    remaining = Math.floor((remaining - 1) / 26);
+  const rounded = Math.floor(value);
+  const letter = String.fromCharCode(65 + (rounded - 1) % 26);
+  return letter.repeat(Math.floor((rounded - 1) / 26) + 1);
+}
+var CARDINAL_ONES = [
+  "zero",
+  "one",
+  "two",
+  "three",
+  "four",
+  "five",
+  "six",
+  "seven",
+  "eight",
+  "nine",
+  "ten",
+  "eleven",
+  "twelve",
+  "thirteen",
+  "fourteen",
+  "fifteen",
+  "sixteen",
+  "seventeen",
+  "eighteen",
+  "nineteen"
+];
+var CARDINAL_TENS = [
+  "",
+  "",
+  "twenty",
+  "thirty",
+  "forty",
+  "fifty",
+  "sixty",
+  "seventy",
+  "eighty",
+  "ninety"
+];
+var ORDINAL_ONES = [
+  "zeroth",
+  "first",
+  "second",
+  "third",
+  "fourth",
+  "fifth",
+  "sixth",
+  "seventh",
+  "eighth",
+  "ninth",
+  "tenth",
+  "eleventh",
+  "twelfth",
+  "thirteenth",
+  "fourteenth",
+  "fifteenth",
+  "sixteenth",
+  "seventeenth",
+  "eighteenth",
+  "nineteenth"
+];
+var ORDINAL_TENS = [
+  "",
+  "",
+  "twentieth",
+  "thirtieth",
+  "fortieth",
+  "fiftieth",
+  "sixtieth",
+  "seventieth",
+  "eightieth",
+  "ninetieth"
+];
+function numberToCardinalText(value) {
+  if (value < 20) {
+    return CARDINAL_ONES[value];
+  }
+  if (value < 100) {
+    const tens = Math.floor(value / 10);
+    const ones = value % 10;
+    return ones === 0 ? CARDINAL_TENS[tens] : `${CARDINAL_TENS[tens]}-${CARDINAL_ONES[ones]}`;
+  }
+  if (value < 1e3) {
+    const hundreds = Math.floor(value / 100);
+    const rest = value % 100;
+    const head = `${CARDINAL_ONES[hundreds]} hundred`;
+    return rest === 0 ? head : `${head} ${numberToCardinalText(rest)}`;
+  }
+  return String(value);
+}
+function numberToOrdinalText(value) {
+  if (value < 20) {
+    return ORDINAL_ONES[value];
+  }
+  if (value < 100) {
+    const tens = Math.floor(value / 10);
+    const ones = value % 10;
+    return ones === 0 ? ORDINAL_TENS[tens] : `${CARDINAL_TENS[tens]}-${ORDINAL_ONES[ones]}`;
+  }
+  if (value < 1e3) {
+    const hundreds = Math.floor(value / 100);
+    const rest = value % 100;
+    return rest === 0 ? `${CARDINAL_ONES[hundreds]} hundredth` : `${CARDINAL_ONES[hundreds]} hundred ${numberToOrdinalText(rest)}`;
+  }
+  return String(value);
+}
+function numberToOrdinalDigits(value) {
+  const mod100 = value % 100;
+  if (mod100 >= 11 && mod100 <= 13) {
+    return `${value}th`;
+  }
+  switch (value % 10) {
+    case 1:
+      return `${value}st`;
+    case 2:
+      return `${value}nd`;
+    case 3:
+      return `${value}rd`;
+    default:
+      return `${value}th`;
   }
-  return output;
 }
 function formatNumberingCounter(format, value) {
-  if (!Number.isFinite(value) || value <= 0) {
+  if (!Number.isFinite(value) || value < 0) {
     return "";
   }
+  const rounded = Math.round(value);
   switch ((format ?? "decimal").toLowerCase()) {
     case "decimal":
-      return String(value);
+      return String(rounded);
+    case "decimalzero":
+      return rounded < 10 ? `0${rounded}` : String(rounded);
     case "upperroman":
-      return numberToRoman(value);
+      return rounded === 0 ? String(rounded) : numberToRoman(rounded);
     case "lowerroman":
-      return numberToRoman(value).toLowerCase();
+      return rounded === 0 ? String(rounded) : numberToRoman(rounded).toLowerCase();
     case "upperletter":
-      return numberToLetters(value);
+      return rounded === 0 ? String(rounded) : numberToLetters(rounded);
     case "lowerletter":
-      return numberToLetters(value).toLowerCase();
+      return rounded === 0 ? String(rounded) : numberToLetters(rounded).toLowerCase();
     case "ordinal":
+      return numberToOrdinalDigits(rounded);
     case "cardinaltext":
+      return numberToCardinalText(rounded);
     case "ordinaltext":
-      return String(value);
+      return numberToOrdinalText(rounded);
     case "bullet":
       return "\u2022";
     case "none":
       return "";
     default:
-      return String(value);
+      return String(rounded);
   }
 }
 function formatPageFieldValue(value, format) {
@@ -18357,10 +18530,10 @@ function numberingStartValue(numbering, numId, ilvl) {
   const instance = numbering.instances.find((item) => item.numId === numId);
   const override = instance?.levelStartOverrides?.[String(ilvl)];
   if (Number.isFinite(override)) {
-    return Math.max(1, Math.round(override));
+    return Math.max(0, Math.round(override));
   }
   const level = findNumberingLevelDefinition(numbering, numId, ilvl);
-  if (Number.isFinite(level?.start) && level?.start > 0) {
+  if (Number.isFinite(level?.start) && level?.start >= 0) {
     return Math.round(level?.start);
   }
   return 1;
@@ -18431,14 +18604,27 @@ function buildParagraphNumberingLabels(model) {
     if (!template || template.trim().length === 0) {
       return;
     }
+    const restartTriggerCeiling = (levelIndex) => {
+      const rawRestart = findNumberingLevelDefinition(
+        numbering,
+        numId,
+        levelIndex
+      )?.lvlRestart;
+      if (rawRestart === void 0 || !Number.isFinite(rawRestart) || Math.round(rawRestart) > levelIndex) {
+        return levelIndex - 1;
+      }
+      const restart = Math.round(rawRestart);
+      return restart <= 0 ? -1 : restart - 1;
+    };
+    const currentRestartCeiling = restartTriggerCeiling(ilvl);
     const counters = countersByNumId.get(numId) ?? [];
     const sharedAbstractCounters = Number.isFinite(abstractNumId) ? abstractCountersByAbstractNumId.get(abstractNumId) ?? [] : void 0;
     let parentCountersChanged = false;
     for (let index = 0; index < ilvl; index += 1) {
-      const abstractCounterValue = sharedAbstractCounters && Number.isFinite(sharedAbstractCounters[index]) ? Math.max(1, Math.round(sharedAbstractCounters[index])) : void 0;
+      const abstractCounterValue = sharedAbstractCounters && Number.isFinite(sharedAbstractCounters[index]) ? Math.max(0, Math.round(sharedAbstractCounters[index])) : void 0;
       if (abstractCounterValue !== void 0) {
         const previousCounter = counters[index];
-        if (!Number.isFinite(previousCounter) || Math.max(1, Math.round(previousCounter)) !== abstractCounterValue) {
+        if ((!Number.isFinite(previousCounter) || Math.max(0, Math.round(previousCounter)) !== abstractCounterValue) && index <= currentRestartCeiling) {
           parentCountersChanged = true;
         }
         counters[index] = abstractCounterValue;
@@ -18451,7 +18637,9 @@ function buildParagraphNumberingLabels(model) {
     const currentValue = parentCountersChanged ? void 0 : counters[ilvl];
     counters[ilvl] = Number.isFinite(currentValue) ? currentValue + 1 : numberingStartValue(numbering, numId, ilvl);
     for (let index = ilvl + 1; index < counters.length; index += 1) {
-      counters[index] = void 0;
+      if (ilvl <= restartTriggerCeiling(index)) {
+        counters[index] = void 0;
+      }
     }
     countersByNumId.set(numId, counters);
     if (sharedAbstractCounters && Number.isFinite(abstractNumId)) {
@@ -18459,7 +18647,9 @@ function buildParagraphNumberingLabels(model) {
         sharedAbstractCounters[index] = counters[index];
       }
       for (let index = ilvl + 1; index < sharedAbstractCounters.length; index += 1) {
-        sharedAbstractCounters[index] = void 0;
+        if (ilvl <= restartTriggerCeiling(index)) {
+          sharedAbstractCounters[index] = void 0;
+        }
       }
       abstractCountersByAbstractNumId.set(
         abstractNumId,
@@ -18469,12 +18659,8 @@ function buildParagraphNumberingLabels(model) {
     const label = template.replaceAll(/%(\d+)/g, (_, rawLevel) => {
       const levelIndex = Math.max(0, Number(rawLevel) - 1);
       const levelValue = counters[levelIndex];
-      const safeValue = Number.isFinite(levelValue) ? Math.max(1, Math.round(levelValue)) : numberingStartValue(numbering, numId, levelIndex);
-      const levelFormat = findNumberingLevelDefinition(
-        numbering,
-        numId,
-        levelIndex
-      )?.format;
+      const safeValue = Number.isFinite(levelValue) ? Math.max(0, Math.round(levelValue)) : numberingStartValue(numbering, numId, levelIndex);
+      const levelFormat = level?.isLgl ? "decimal" : findNumberingLevelDefinition(numbering, numId, levelIndex)?.format;
       return formatNumberingCounter(levelFormat, safeValue);
     });
     if (!label || label.trim().length === 0) {