@harbour-enterprises/superdoc 1.3.0-next.2 → 1.3.0-next.4

package/dist/chunks/{SuperConverter-DOTz2R8L.cjs → SuperConverter-qB6m0K1X.cjs}

@@ -7490,134 +7490,200 @@ const INLINE_OVERRIDE_PROPERTIES = [
   "italic",
   "strike",
   "underline",
-  "letterSpacing",
-  "vertAlign",
-  "position"
+  "letterSpacing"
 ];
 const DEFAULT_FONT_SIZE_HALF_POINTS = 20;
-const SUBSCRIPT_SUPERSCRIPT_SCALE = 0.65;
-const resolveRunProperties = (params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => {
+function isObject(item) {
+  return item != null && typeof item === "object" && !Array.isArray(item);
+}
+function combineProperties$1(propertiesArray, options = {}) {
+  const { fullOverrideProps = [], specialHandling = {} } = options;
+  if (!propertiesArray || propertiesArray.length === 0) {
+    return {};
+  }
+  const merge = (target, source) => {
+    const output = { ...target };
+    if (isObject(target) && isObject(source)) {
+      for (const key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          const handler2 = specialHandling[key];
+          if (handler2 && typeof handler2 === "function") {
+            output[key] = handler2(output, source);
+          } else if (!fullOverrideProps.includes(key) && isObject(source[key])) {
+            if (key in target && isObject(target[key])) {
+              output[key] = merge(target[key], source[key]);
+            } else {
+              output[key] = source[key];
+            }
+          } else {
+            output[key] = source[key];
+          }
+        }
+      }
+    }
+    return output;
+  };
+  return propertiesArray.reduce((acc, current) => merge(acc, current ?? {}), {});
+}
+function combineRunProperties$1(propertiesArray) {
+  return combineProperties$1(propertiesArray, {
+    fullOverrideProps: ["fontFamily", "color"]
+  });
+}
+function applyInlineOverrides(finalProps, inlineProps, overrideKeys = INLINE_OVERRIDE_PROPERTIES) {
+  if (!inlineProps) return finalProps;
+  for (const prop of overrideKeys) {
+    if (inlineProps[prop] != null) {
+      finalProps[prop] = inlineProps[prop];
+    }
+  }
+  return finalProps;
+}
+function isValidFontSize(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0;
+}
+function resolveFontSizeWithFallback(value, defaultProps, normalProps) {
+  if (isValidFontSize(value)) {
+    return value;
+  }
+  if (defaultProps && isValidFontSize(defaultProps.fontSize)) {
+    return defaultProps.fontSize;
+  }
+  if (normalProps && isValidFontSize(normalProps.fontSize)) {
+    return normalProps.fontSize;
+  }
+  return DEFAULT_FONT_SIZE_HALF_POINTS;
+}
+function orderDefaultsAndNormal(defaultProps, normalProps, isNormalDefault) {
+  if (isNormalDefault) {
+    return [defaultProps, normalProps];
+  } else {
+    return [normalProps, defaultProps];
+  }
+}
+function createFirstLineIndentHandler() {
+  return (target, source) => {
+    if (target.hanging != null && source.firstLine != null) {
+      delete target.hanging;
+    }
+    return source.firstLine;
+  };
+}
+function combineIndentProperties(indentChain) {
+  const indentOnly = indentChain.map((props) => props.indent != null ? { indent: props.indent } : {});
+  return combineProperties$1(indentOnly, {
+    specialHandling: {
+      firstLine: createFirstLineIndentHandler()
+    }
+  });
+}
+function createOoxmlResolver(translators) {
+  return {
+    resolveRunProperties: (params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => resolveRunProperties$1(translators, params, inlineRpr, resolvedPpr, isListNumber, numberingDefinedInline),
+    resolveParagraphProperties: (params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) => resolveParagraphProperties$1(translators, params, inlineProps, insideTable, overrideInlineStyleId, tableStyleId),
+    getDefaultProperties,
+    getStyleProperties,
+    resolveStyleChain,
+    getNumberingProperties: (params, ilvl, numId, translator2, tries = 0) => getNumberingProperties(translators, params, ilvl, numId, translator2, tries)
+  };
+}
+function resolveRunProperties$1(translators, params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) {
   const paragraphStyleId = resolvedPpr?.styleId;
-  const paragraphStyleProps = resolveStyleChain(params, paragraphStyleId, translator$1O);
-  const defaultProps = getDefaultProperties(params, translator$1O);
-  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translator$1O);
+  const paragraphStyleProps = resolveStyleChain(params, paragraphStyleId, translators.rPr);
+  const defaultProps = getDefaultProperties(params, translators.rPr);
+  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translators.rPr);
   let runStyleProps = {};
   if (!paragraphStyleId?.startsWith("TOC")) {
-    runStyleProps = inlineRpr.styleId ? resolveStyleChain(params, inlineRpr.styleId, translator$1O) : {};
+    runStyleProps = inlineRpr?.styleId ? resolveStyleChain(params, inlineRpr.styleId, translators.rPr) : {};
   }
+  const defaultsChain = orderDefaultsAndNormal(defaultProps, normalProps, isNormalDefault);
+  const inlineRprSafe = inlineRpr ?? {};
   let styleChain;
-  if (isNormalDefault) {
-    styleChain = [defaultProps, normalProps];
-  } else {
-    styleChain = [normalProps, defaultProps];
-  }
+  let inlineOverrideSource = inlineRprSafe;
   if (isListNumber) {
     let numberingProps = {};
-    const numId = resolvedPpr?.numberingProperties?.numId;
+    const numberingProperties = resolvedPpr?.numberingProperties;
+    const numId = numberingProperties?.numId;
     if (numId != null && numId !== 0 && numId !== "0") {
       numberingProps = getNumberingProperties(
+        translators,
         params,
-        resolvedPpr.numberingProperties.ilvl ?? 0,
+        numberingProperties?.ilvl ?? 0,
         numId,
-        translator$1O
+        translators.rPr
       );
     }
-    if (!numberingDefinedInline) {
-      inlineRpr = {};
-    }
-    if (inlineRpr?.underline) {
-      delete inlineRpr.underline;
+    const inlineRprForList = numberingDefinedInline ? inlineRprSafe : {};
+    if (inlineRprForList?.underline) {
+      delete inlineRprForList.underline;
     }
-    styleChain = [...styleChain, paragraphStyleProps, runStyleProps, inlineRpr, numberingProps];
+    styleChain = [...defaultsChain, paragraphStyleProps, runStyleProps, inlineRprForList, numberingProps];
+    inlineOverrideSource = inlineRprForList;
   } else {
-    styleChain = [...styleChain, paragraphStyleProps, runStyleProps, inlineRpr];
-  }
-  const finalProps = combineProperties(styleChain, ["fontFamily", "color"]);
-  for (const prop of INLINE_OVERRIDE_PROPERTIES) {
-    if (inlineRpr?.[prop] != null) {
-      finalProps[prop] = inlineRpr[prop];
-    }
-  }
-  if (finalProps.fontSize == null || typeof finalProps.fontSize !== "number" || !Number.isFinite(finalProps.fontSize) || finalProps.fontSize <= 0) {
-    let defaultFontSize = DEFAULT_FONT_SIZE_HALF_POINTS;
-    if (defaultProps?.fontSize != null && typeof defaultProps.fontSize === "number" && Number.isFinite(defaultProps.fontSize) && defaultProps.fontSize > 0) {
-      defaultFontSize = defaultProps.fontSize;
-    } else if (normalProps?.fontSize != null && typeof normalProps.fontSize === "number" && Number.isFinite(normalProps.fontSize) && normalProps.fontSize > 0) {
-      defaultFontSize = normalProps.fontSize;
-    }
-    finalProps.fontSize = defaultFontSize;
+    styleChain = [...defaultsChain, paragraphStyleProps, runStyleProps, inlineRprSafe];
   }
+  const finalProps = combineRunProperties$1(styleChain);
+  applyInlineOverrides(finalProps, inlineOverrideSource);
+  finalProps.fontSize = resolveFontSizeWithFallback(finalProps.fontSize, defaultProps, normalProps);
   return finalProps;
-};
-function resolveParagraphProperties(params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
-  const defaultProps = getDefaultProperties(params, translator$14);
-  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translator$14);
-  let styleId = inlineProps?.styleId;
-  let styleProps = inlineProps?.styleId ? resolveStyleChain(params, inlineProps?.styleId, translator$14) : {};
+}
+function resolveParagraphProperties$1(translators, params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
+  const defaultProps = getDefaultProperties(params, translators.pPr);
+  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translators.pPr);
+  const inlinePropsSafe = inlineProps ?? {};
+  let styleId = inlinePropsSafe?.styleId;
+  let styleProps = inlinePropsSafe?.styleId ? resolveStyleChain(params, inlinePropsSafe.styleId, translators.pPr) : {};
   let numberingProps = {};
-  let ilvl = inlineProps?.numberingProperties?.ilvl ?? styleProps?.numberingProperties?.ilvl;
-  let numId = inlineProps?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
-  let numberingDefinedInline = inlineProps?.numberingProperties?.numId != null;
-  const inlineNumIdDisablesNumbering = inlineProps?.numberingProperties?.numId === 0 || inlineProps?.numberingProperties?.numId === "0";
+  const ilvl = inlinePropsSafe?.numberingProperties?.ilvl ?? styleProps?.numberingProperties?.ilvl;
+  let numId = inlinePropsSafe?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
+  let numberingDefinedInline = inlinePropsSafe?.numberingProperties?.numId != null;
+  const inlineNumId = inlinePropsSafe?.numberingProperties?.numId;
+  const inlineNumIdDisablesNumbering = inlineNumId === 0 || inlineNumId === "0";
   if (inlineNumIdDisablesNumbering) {
     numId = null;
   }
   const isList2 = numId != null && numId !== 0 && numId !== "0";
   if (isList2) {
-    ilvl = ilvl != null ? ilvl : 0;
-    numberingProps = getNumberingProperties(params, ilvl, numId, translator$14);
+    const ilvlNum = ilvl != null ? ilvl : 0;
+    numberingProps = getNumberingProperties(translators, params, ilvlNum, numId, translators.pPr);
     if (overrideInlineStyleId && numberingProps.styleId) {
       styleId = numberingProps.styleId;
-      styleProps = resolveStyleChain(params, styleId, translator$14);
-      if (inlineProps) {
-        inlineProps.styleId = styleId;
-        if (styleProps.numberingProperties?.ilvl === inlineProps.numberingProperties?.ilvl && styleProps.numberingProperties?.numId === inlineProps.numberingProperties?.numId) {
-          delete inlineProps.numberingProperties;
+      styleProps = resolveStyleChain(params, styleId, translators.pPr);
+      if (inlinePropsSafe) {
+        inlinePropsSafe.styleId = styleId;
+        const inlineNumProps = inlinePropsSafe.numberingProperties;
+        if (styleProps.numberingProperties?.ilvl === inlineNumProps?.ilvl && styleProps.numberingProperties?.numId === inlineNumProps?.numId) {
+          delete inlinePropsSafe.numberingProperties;
           numberingDefinedInline = false;
         }
       }
     }
   }
-  const tableProps = tableStyleId ? resolveStyleChain(params, tableStyleId, translator$14) : {};
-  let defaultsChain;
-  if (isNormalDefault) {
-    defaultsChain = [defaultProps, normalProps];
-  } else {
-    defaultsChain = [normalProps, defaultProps];
-  }
-  const propsChain = [...defaultsChain, tableProps, numberingProps, styleProps, inlineProps];
+  const tableProps = tableStyleId ? resolveStyleChain(params, tableStyleId, translators.pPr) : {};
+  const defaultsChain = orderDefaultsAndNormal(defaultProps, normalProps, isNormalDefault);
+  const propsChain = [...defaultsChain, tableProps, numberingProps, styleProps, inlinePropsSafe];
   let indentChain;
   if (isList2) {
     if (numberingDefinedInline) {
-      indentChain = [...defaultsChain, styleProps, numberingProps, inlineProps];
+      indentChain = [...defaultsChain, styleProps, numberingProps, inlinePropsSafe];
     } else {
-      styleProps = resolveStyleChain(params, styleId, translator$14, false);
-      indentChain = [...defaultsChain, numberingProps, styleProps, inlineProps];
+      styleProps = resolveStyleChain(params, styleId, translators.pPr, false);
+      indentChain = [...defaultsChain, numberingProps, styleProps, inlinePropsSafe];
     }
   } else {
-    indentChain = [...defaultsChain, numberingProps, styleProps, inlineProps];
+    indentChain = [...defaultsChain, numberingProps, styleProps, inlinePropsSafe];
   }
-  let finalProps = combineProperties(propsChain);
-  let finalIndent = combineProperties(
-    indentChain.map((props) => props.indent != null ? { indent: props.indent } : {}),
-    [],
-    {
-      firstLine: (target, source) => {
-        if (target.hanging != null && source.firstLine != null) {
-          delete target.hanging;
-        }
-        return source.firstLine;
-      }
-    }
-  );
+  const finalProps = combineProperties$1(propsChain);
+  const finalIndent = combineIndentProperties(indentChain);
   finalProps.indent = finalIndent.indent;
-  if (insideTable && !inlineProps?.spacing && !styleProps.spacing) {
+  if (insideTable && !inlinePropsSafe?.spacing && !styleProps?.spacing) {
     finalProps.spacing = void 0;
   }
   return finalProps;
 }
-const resolveStyleChain = (params, styleId, translator2, followBasedOnChain = true) => {
-  let styleProps = {}, basedOn = null;
+function resolveStyleChain(params, styleId, translator2, followBasedOnChain = true) {
+  let styleProps = {};
+  let basedOn = void 0;
   if (styleId && styleId !== "Normal") {
     ({ properties: styleProps, basedOn } = getStyleProperties(params, styleId, translator2));
   }
@@ -7629,7 +7695,7 @@ const resolveStyleChain = (params, styleId, translator2, followBasedOnChain = tr
       break;
     }
     seenStyles.add(basedOn);
-    const result = getStyleProperties(params, basedOn, translator2);
+    const result = getStyleProperties(params, nextBasedOn, translator2);
     const basedOnProps = result.properties;
     nextBasedOn = result.basedOn;
     if (basedOnProps && Object.keys(basedOnProps).length) {
@@ -7638,120 +7704,151 @@ const resolveStyleChain = (params, styleId, translator2, followBasedOnChain = tr
     basedOn = nextBasedOn;
   }
   styleChain = styleChain.reverse();
-  const combinedStyleProps = combineProperties(styleChain);
-  return combinedStyleProps;
-};
+  return combineProperties$1(styleChain);
+}
 function getDefaultProperties(params, translator2) {
-  const { docx } = params;
-  const styles = docx["word/styles.xml"];
+  const docx = params?.docx;
+  const styles = docx?.["word/styles.xml"];
   const rootElements = styles?.elements?.[0]?.elements;
   if (!rootElements?.length) {
     return {};
   }
   const defaults = rootElements.find((el) => el.name === "w:docDefaults");
   const xmlName = translator2.xmlName;
-  const elementPrDefault = defaults?.elements?.find((el) => el.name === `${xmlName}Default`) || {};
-  const elementPr = elementPrDefault?.elements?.find((el) => el.name === xmlName);
+  const defaultsElements = defaults?.elements;
+  const elementPrDefault = defaultsElements?.find((el) => el.name === `${xmlName}Default`);
+  const elementPrDefaultElements = elementPrDefault?.elements;
+  const elementPr = elementPrDefaultElements?.find((el) => el.name === xmlName);
   if (!elementPr) {
     return {};
   }
-  const result = translator2.encode({ ...params, nodes: [elementPr] }) || {};
-  return result;
+  return translator2.encode({ ...params, nodes: [elementPr] }) || {};
 }
 function getStyleProperties(params, styleId, translator2) {
-  const { docx } = params;
-  const emptyResult = { properties: {}, isDefault: false, basedOn: null };
+  const emptyResult = { properties: {}, isDefault: false, basedOn: void 0 };
   if (!styleId) return emptyResult;
-  const styles = docx["word/styles.xml"];
+  const docx = params?.docx;
+  const styles = docx?.["word/styles.xml"];
   const rootElements = styles?.elements?.[0]?.elements;
   if (!rootElements?.length) {
     return emptyResult;
   }
-  const style = rootElements.find((el) => el.name === "w:style" && el.attributes["w:styleId"] === styleId);
-  let basedOn = style?.elements?.find((el) => el.name === "w:basedOn");
-  if (basedOn) {
-    basedOn = basedOn?.attributes?.["w:val"];
-  }
-  const elementPr = style?.elements?.find((el) => el.name === translator2.xmlName);
+  const style = rootElements.find(
+    (el) => el.name === "w:style" && el.attributes?.["w:styleId"] === styleId
+  );
+  const styleElements = style?.elements;
+  const basedOnElement = styleElements?.find((el) => el.name === "w:basedOn");
+  const basedOn = basedOnElement?.attributes?.["w:val"];
+  const elementPr = styleElements?.find((el) => el.name === translator2.xmlName);
   if (!elementPr) {
     return { ...emptyResult, basedOn };
   }
   const result = translator2.encode({ ...params, nodes: [elementPr] }) || {};
-  return { properties: result, isDefault: style?.attributes?.["w:default"] === "1", basedOn };
+  const isDefault = style?.attributes?.["w:default"] === "1";
+  return { properties: result, isDefault, basedOn };
 }
-function getNumberingProperties(params, ilvl, numId, translator2, tries = 0) {
-  const { numbering: allDefinitions } = params;
-  if (!allDefinitions) return {};
-  const { definitions, abstracts } = allDefinitions;
+function getNumberingProperties(translators, params, ilvl, numId, translator2, tries = 0) {
+  const numbering = params?.numbering;
+  if (!numbering) return {};
+  const { definitions, abstracts } = numbering;
+  if (!definitions || !abstracts) return {};
   const propertiesChain = [];
   const numDefinition = definitions[numId];
   if (!numDefinition) return {};
-  const lvlOverride = numDefinition?.elements?.find(
-    (element) => element.name === "w:lvlOverride" && element.attributes["w:ilvl"] == ilvl
+  const numDefElements = numDefinition.elements;
+  const lvlOverride = numDefElements?.find(
+    (element) => element.name === "w:lvlOverride" && element.attributes?.["w:ilvl"] == ilvl
   );
-  const overridePr = lvlOverride?.elements?.find((el) => el.name === translator2.xmlName);
+  const lvlOverrideElements = lvlOverride?.elements;
+  const overridePr = lvlOverrideElements?.find((el) => el.name === translator2.xmlName);
   if (overridePr) {
     const overrideProps = translator2.encode({ ...params, nodes: [overridePr] }) || {};
     propertiesChain.push(overrideProps);
   }
-  const abstractNumId = numDefinition.elements?.find((item) => item.name === "w:abstractNumId")?.attributes?.["w:val"];
+  const abstractNumIdElement = numDefElements?.find((item) => item.name === "w:abstractNumId");
+  const abstractNumId = abstractNumIdElement?.attributes?.["w:val"];
   const listDefinitionForThisNumId = abstracts[abstractNumId];
   if (!listDefinitionForThisNumId) return {};
-  const numStyleLink = listDefinitionForThisNumId.elements?.find((item) => item.name === "w:numStyleLink");
+  const listDefElements = listDefinitionForThisNumId.elements;
+  const numStyleLink = listDefElements?.find((item) => item.name === "w:numStyleLink");
   const styleId = numStyleLink?.attributes?.["w:val"];
   if (styleId && tries < 1) {
-    const { properties: styleProps } = getStyleProperties(params, styleId, translator$14);
-    if (styleProps?.numberingProperties?.numId) {
-      return getNumberingProperties(params, ilvl, styleProps.numberingProperties.numId, translator2, tries + 1);
+    const { properties: styleProps } = getStyleProperties(params, styleId, translators.pPr);
+    const numIdFromStyle = styleProps?.numberingProperties?.numId;
+    if (numIdFromStyle) {
+      return getNumberingProperties(
+        translators,
+        params,
+        ilvl,
+        numIdFromStyle,
+        translator2,
+        tries + 1
+      );
     }
   }
-  const levelDefinition = listDefinitionForThisNumId?.elements?.find(
-    (element) => element.name === "w:lvl" && element.attributes["w:ilvl"] == ilvl
+  const levelDefinition = listDefElements?.find(
+    (element) => element.name === "w:lvl" && element.attributes?.["w:ilvl"] == ilvl
   );
   if (!levelDefinition) return {};
-  const abstractElementPr = levelDefinition?.elements?.find((el) => el.name === translator2.xmlName);
+  const levelDefElements = levelDefinition.elements;
+  const abstractElementPr = levelDefElements?.find((el) => el.name === translator2.xmlName);
   if (!abstractElementPr) return {};
   const abstractProps = translator2.encode({ ...params, nodes: [abstractElementPr] }) || {};
-  const pStyleElement = levelDefinition?.elements?.find((el) => el.name === "w:pStyle");
+  const pStyleElement = levelDefElements?.find((el) => el.name === "w:pStyle");
   if (pStyleElement) {
-    const pStyleId = pStyleElement?.attributes?.["w:val"];
+    const pStyleId = pStyleElement.attributes?.["w:val"];
     abstractProps.styleId = pStyleId;
   }
   propertiesChain.push(abstractProps);
   propertiesChain.reverse();
-  const result = combineProperties(propertiesChain);
-  return result;
+  return combineProperties$1(propertiesChain);
 }
-const combineProperties = (propertiesArray, fullOverrideProps = [], specialHandling = {}) => {
-  if (!propertiesArray || propertiesArray.length === 0) {
-    return {};
-  }
-  const isObject = (item) => item && typeof item === "object" && !Array.isArray(item);
-  const merge = (target, source) => {
-    const output = { ...target };
-    if (isObject(target) && isObject(source)) {
-      for (const key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          if (!fullOverrideProps.includes(key) && isObject(source[key])) {
-            if (key in target && isObject(target[key])) {
-              output[key] = merge(target[key], source[key]);
-            } else {
-              output[key] = source[key];
-            }
-          } else {
-            const handler2 = specialHandling[key];
-            if (handler2 && typeof handler2 === "function") {
-              output[key] = handler2(output, source);
-            } else {
-              output[key] = source[key];
-            }
-          }
-        }
-      }
+function resolveDocxFontFamily(attributes, docx, toCssFontFamily) {
+  if (!attributes || typeof attributes !== "object") return null;
+  const ascii = attributes["w:ascii"] ?? attributes["ascii"];
+  const themeAscii = attributes["w:asciiTheme"] ?? attributes["asciiTheme"];
+  let resolved = ascii;
+  if (docx && themeAscii) {
+    const theme = docx["word/theme/theme1.xml"];
+    const themeElements = theme?.elements;
+    if (themeElements?.length) {
+      const topElement = themeElements[0];
+      const topElementElements = topElement?.elements;
+      const themeElementsNode = topElementElements?.find((el) => el.name === "a:themeElements");
+      const themeElementsElements = themeElementsNode?.elements;
+      const fontScheme = themeElementsElements?.find((el) => el.name === "a:fontScheme");
+      const fontSchemeElements = fontScheme?.elements;
+      const prefix = themeAscii.startsWith("minor") ? "minor" : "major";
+      const font = fontSchemeElements?.find((el) => el.name === `a:${prefix}Font`);
+      const fontElements = font?.elements;
+      const latin = fontElements?.find((el) => el.name === "a:latin");
+      const typeface = latin?.attributes?.typeface;
+      resolved = typeface || resolved;
     }
-    return output;
-  };
-  return propertiesArray.reduce((acc, current) => merge(acc, current), {});
+  }
+  if (!resolved) return null;
+  if (toCssFontFamily) {
+    return toCssFontFamily(resolved, docx ?? void 0);
+  }
+  return resolved;
+}
+const ooxmlResolver = createOoxmlResolver({ pPr: translator$14, rPr: translator$1O });
+const getToCssFontFamily = () => {
+  return SuperConverter.toCssFontFamily;
+};
+const SUBSCRIPT_SUPERSCRIPT_SCALE = 0.65;
+const resolveRunProperties = (params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => ooxmlResolver.resolveRunProperties(params, inlineRpr, resolvedPpr, isListNumber, numberingDefinedInline);
+function resolveParagraphProperties(params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
+  return ooxmlResolver.resolveParagraphProperties(
+    params,
+    inlineProps,
+    insideTable,
+    overrideInlineStyleId,
+    tableStyleId
+  );
+}
+const combineProperties = (propertiesArray, fullOverrideProps = [], specialHandling = {}) => {
+  return combineProperties$1(propertiesArray, { fullOverrideProps, specialHandling });
 };
 const combineRunProperties = (propertiesArray) => {
   return combineProperties(propertiesArray, ["fontFamily", "color"]);
@@ -7810,9 +7907,9 @@ function encodeMarksFromRPr(runProperties, docx) {
         textStyleAttrs[key] = `${spacing}pt`;
         break;
       case "fontFamily":
-        const fontFamily = getFontFamilyValue$1(value, docx);
+        const fontFamily = resolveDocxFontFamily(value, docx, getToCssFontFamily());
         textStyleAttrs[key] = fontFamily;
-        const eastAsiaFamily = value["eastAsia"];
+        const eastAsiaFamily = typeof value === "object" && value !== null ? value["eastAsia"] : void 0;
         if (eastAsiaFamily) {
           const eastAsiaCss = getFontFamilyValue$1({ "w:ascii": eastAsiaFamily }, docx);
           if (!fontFamily || eastAsiaCss !== textStyleAttrs.fontFamily) {
@@ -8067,11 +8164,11 @@ function encodeCSSFromRPr(runProperties, docx) {
       }
       case "fontFamily": {
         if (!value) break;
-        const fontFamily = getFontFamilyValue$1(value, docx);
+        const fontFamily = resolveDocxFontFamily(value, docx, getToCssFontFamily());
         if (fontFamily) {
           css["font-family"] = fontFamily;
         }
-        const eastAsiaFamily = value["eastAsia"];
+        const eastAsiaFamily = typeof value === "object" && value !== null ? value["eastAsia"] : void 0;
         if (eastAsiaFamily) {
           const eastAsiaCss = getFontFamilyValue$1({ "w:ascii": eastAsiaFamily }, docx);
           if (eastAsiaCss && (!fontFamily || eastAsiaCss !== fontFamily)) {
@@ -25221,8 +25318,9 @@ function translateFieldAnnotation(params) {
     hash: attrs.hash
   };
   const annotationAttrsJson = JSON.stringify(annotationAttrs);
+  const sanitizedDisplayLabel = attrs.displayLabel === "undefined" || attrs.displayLabel === void 0 ? "" : attrs.displayLabel;
   const sdtPrElements = [
-    { name: "w:alias", attributes: { "w:val": attrs.displayLabel } },
+    { name: "w:alias", attributes: { "w:val": sanitizedDisplayLabel } },
     { name: "w:tag", attributes: { "w:val": annotationAttrsJson } },
     { name: "w:id", attributes: { "w:val": id } }
   ];
@@ -27295,7 +27393,8 @@ const encode$1 = (params, encodedAttrs = {}) => {
       text = text.replace(/^[ \t\n\r]+/, "").replace(/[ \t\n\r]+$/, "");
     }
     text = text.replace(/\[\[sdspace\]\]/g, "");
-    if (xmlSpace !== "preserve" && typeof text === "string" && !text.trim()) {
+    const isWhitespaceOnly = /^[ \t\n\r]*$/.test(text);
+    if (xmlSpace !== "preserve" && isWhitespaceOnly) {
       return null;
     }
   } else if (!elements.length && encodedAttrs.xmlSpace === "preserve") {
@@ -30840,7 +30939,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.2") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.4") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**
@@ -31521,11 +31620,13 @@ exports.changeListLevel = changeListLevel;
 exports.convertMarkdownToHTML = convertMarkdownToHTML;
 exports.createDocFromHTML = createDocFromHTML;
 exports.createDocFromMarkdown = createDocFromMarkdown;
+exports.createOoxmlResolver = createOoxmlResolver;
 exports.decodeRPrFromMarks = decodeRPrFromMarks;
 exports.docxNumberingHelpers = docxNumberingHelpers;
 exports.dropPoint = dropPoint;
 exports.encodeCSSFromPPr = encodeCSSFromPPr;
 exports.encodeCSSFromRPr = encodeCSSFromRPr;
+exports.encodeMarksFromRPr = encodeMarksFromRPr;
 exports.findParentNode = findParentNode;
 exports.findParentNodeClosestToPos = findParentNodeClosestToPos;
 exports.generateDocxRandomId = generateDocxRandomId;
@@ -31544,8 +31645,10 @@ exports.liftTarget = liftTarget;
 exports.objectIncludes = objectIncludes;
 exports.registeredHandlers = registeredHandlers;
 exports.replaceStep = replaceStep;
-exports.resolveParagraphProperties = resolveParagraphProperties;
+exports.resolveDocxFontFamily = resolveDocxFontFamily;
 exports.resolveRunProperties = resolveRunProperties;
+exports.translator = translator$14;
+exports.translator$1 = translator$1O;
 exports.unflattenListsInHtml = unflattenListsInHtml;
 exports.updateNumberingProperties = updateNumberingProperties;
 exports.wrapTextsInRuns = wrapTextsInRuns;