@superdoc-dev/cli 0.2.0-next.61 → 0.2.0-next.63

package/dist/index.js

@@ -30514,7 +30514,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-Ba_l6vso.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-C1hZYQNS.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -34892,21 +34892,56 @@ function resolveDocxFontFamily(attributes, docx, toCssFontFamily) {
     return toCssFontFamily(resolved, docx ?? undefined);
   return resolved;
 }
+function resolveEffectiveBandSizes(styleId, translatedLinkedStyles) {
+  const seen = /* @__PURE__ */ new Set;
+  let currentId = styleId;
+  let rowBandSize;
+  let colBandSize;
+  while (currentId && !seen.has(currentId)) {
+    seen.add(currentId);
+    const def = translatedLinkedStyles.styles?.[currentId];
+    const tblProps = def?.tableProperties;
+    if (rowBandSize == null && tblProps?.tableStyleRowBandSize != null)
+      rowBandSize = tblProps.tableStyleRowBandSize;
+    if (colBandSize == null && tblProps?.tableStyleColBandSize != null)
+      colBandSize = tblProps.tableStyleColBandSize;
+    if (rowBandSize != null && colBandSize != null)
+      break;
+    currentId = def?.basedOn;
+  }
+  return {
+    rowBandSize: rowBandSize ?? 1,
+    colBandSize: colBandSize ?? 1
+  };
+}
+function resolveConditionalProps(propertyType, styleType, styleId, translatedLinkedStyles) {
+  const chain = [];
+  const seen = /* @__PURE__ */ new Set;
+  let currentId = styleId;
+  while (currentId && !seen.has(currentId)) {
+    seen.add(currentId);
+    const def = translatedLinkedStyles.styles?.[currentId];
+    const props = def?.tableStyleProperties?.[styleType]?.[propertyType];
+    if (props)
+      chain.push(props);
+    currentId = def?.basedOn;
+  }
+  if (chain.length === 0)
+    return;
+  chain.reverse();
+  return combineProperties(chain);
+}
 function resolveCellStyles(propertyType, tableInfo, translatedLinkedStyles) {
   if (tableInfo == null || !tableInfo.tableProperties?.tableStyleId)
     return [];
   const cellStyleProps = [];
-  if (tableInfo != null && tableInfo.tableProperties.tableStyleId) {
-    const tableStyleDef = translatedLinkedStyles.styles[tableInfo.tableProperties.tableStyleId];
-    const tableStylePropsDef = tableStyleDef?.tableProperties;
-    const rowBandSize = tableStylePropsDef?.tableStyleRowBandSize ?? 1;
-    const colBandSize = tableStylePropsDef?.tableStyleColBandSize ?? 1;
-    determineCellStyleTypes(tableInfo.tableProperties?.tblLook, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize).forEach((styleType) => {
-      const typeProps = tableStyleDef?.tableStyleProperties?.[styleType]?.[propertyType];
-      if (typeProps)
-        cellStyleProps.push(typeProps);
-    });
-  }
+  const tableStyleId = tableInfo.tableProperties.tableStyleId;
+  const { rowBandSize, colBandSize } = resolveEffectiveBandSizes(tableStyleId, translatedLinkedStyles);
+  determineCellStyleTypes(tableInfo.tableProperties?.tblLook ?? DEFAULT_TBL_LOOK, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize, tableInfo.rowCnfStyle, tableInfo.cellCnfStyle).forEach((styleType) => {
+    const typeProps = resolveConditionalProps(propertyType, styleType, tableStyleId, translatedLinkedStyles);
+    if (typeProps)
+      cellStyleProps.push(typeProps);
+  });
   return cellStyleProps;
 }
 function resolveTableCellProperties(inlineProps, tableInfo, translatedLinkedStyles) {
@@ -34920,8 +34955,8 @@ function resolveTableCellProperties(inlineProps, tableInfo, translatedLinkedStyl
     chain.push(inlineProps);
   return combineProperties(chain, { fullOverrideProps: ["shading"] });
 }
-function determineCellStyleTypes(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1) {
-  const styleTypes = ["wholeTable"];
+function determineCellStyleTypes(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1, rowCnfStyle, cellCnfStyle) {
+  const applicable = new Set(["wholeTable"]);
   const normalizedRowBandSize = rowBandSize > 0 ? rowBandSize : 1;
   const normalizedColBandSize = colBandSize > 0 ? colBandSize : 1;
   const bandRowIndex = Math.max(0, rowIndex - (tblLook?.firstRow ? 1 : 0));
@@ -34929,32 +34964,33 @@ function determineCellStyleTypes(tblLook, rowIndex, cellIndex, numRows, numCells
   const rowGroup = Math.floor(bandRowIndex / normalizedRowBandSize);
   const colGroup = Math.floor(bandColIndex / normalizedColBandSize);
   if (!tblLook?.noHBand)
-    if (rowGroup % 2 === 0)
-      styleTypes.push("band1Horz");
-    else
-      styleTypes.push("band2Horz");
+    applicable.add(rowGroup % 2 === 0 ? "band1Horz" : "band2Horz");
   if (!tblLook?.noVBand)
-    if (colGroup % 2 === 0)
-      styleTypes.push("band1Vert");
-    else
-      styleTypes.push("band2Vert");
+    applicable.add(colGroup % 2 === 0 ? "band1Vert" : "band2Vert");
   if (tblLook?.firstRow && rowIndex === 0)
-    styleTypes.push("firstRow");
+    applicable.add("firstRow");
   if (tblLook?.firstColumn && cellIndex === 0)
-    styleTypes.push("firstCol");
+    applicable.add("firstCol");
   if (tblLook?.lastRow && numRows != null && numRows > 0 && rowIndex === numRows - 1)
-    styleTypes.push("lastRow");
+    applicable.add("lastRow");
   if (tblLook?.lastColumn && numCells != null && numCells > 0 && cellIndex === numCells - 1)
-    styleTypes.push("lastCol");
+    applicable.add("lastCol");
   if (rowIndex === 0 && cellIndex === 0)
-    styleTypes.push("nwCell");
+    applicable.add("nwCell");
   if (rowIndex === 0 && numCells != null && numCells > 0 && cellIndex === numCells - 1)
-    styleTypes.push("neCell");
+    applicable.add("neCell");
   if (numRows != null && numRows > 0 && rowIndex === numRows - 1 && cellIndex === 0)
-    styleTypes.push("swCell");
+    applicable.add("swCell");
   if (numRows != null && numRows > 0 && numCells != null && numCells > 0 && rowIndex === numRows - 1 && cellIndex === numCells - 1)
-    styleTypes.push("seCell");
-  return styleTypes;
+    applicable.add("seCell");
+  if (rowCnfStyle || cellCnfStyle)
+    for (const [flag, styleType] of CNF_STYLE_MAP) {
+      const rowFlag = rowCnfStyle?.[flag];
+      const cellFlag = cellCnfStyle?.[flag];
+      if (rowFlag === true || cellFlag === true)
+        applicable.add(styleType);
+    }
+  return TABLE_STYLE_PRECEDENCE.filter((t) => applicable.has(t));
 }
 function encodeMarksFromRPr(runProperties, docx) {
   if (!runProperties || typeof runProperties !== "object")
@@ -49782,7 +49818,7 @@ var isRegExp = (value) => {
   return true;
 }, areAttrsEqual = (attrsA = {}, attrsB = {}) => {
   return objectIncludes(attrsA, attrsB);
-}, TrackInsertMarkName = "trackInsert", TrackDeleteMarkName = "trackDelete", TrackFormatMarkName = "trackFormat", TABLE_STYLE_ID_TABLE_GRID = "TableGrid", TABLE_FALLBACK_BORDER, TABLE_FALLBACK_BORDERS, TABLE_FALLBACK_CELL_PADDING, getToCssFontFamily = () => {
+}, TrackInsertMarkName = "trackInsert", TrackDeleteMarkName = "trackDelete", TrackFormatMarkName = "trackFormat", TABLE_STYLE_ID_TABLE_GRID = "TableGrid", TABLE_FALLBACK_BORDER, TABLE_FALLBACK_BORDERS, TABLE_FALLBACK_CELL_PADDING, DEFAULT_TBL_LOOK, CNF_STYLE_MAP, TABLE_STYLE_PRECEDENCE, getToCssFontFamily = () => {
   return SuperConverter.toCssFontFamily;
 }, SUBSCRIPT_SUPERSCRIPT_SCALE = 0.65, getSpacingStyle = (spacing, isListItem) => {
   let { before, after, line, lineRule, beforeAutospacing, afterAutospacing } = spacing;
@@ -60887,7 +60923,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_Ba_l6vso_es = __esm(() => {
+var init_SuperConverter_C1hZYQNS_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -69073,6 +69109,43 @@ var init_SuperConverter_Ba_l6vso_es = __esm(() => {
     left: 108,
     right: 108
   };
+  DEFAULT_TBL_LOOK = {
+    firstRow: true,
+    lastRow: false,
+    firstColumn: true,
+    lastColumn: false,
+    noHBand: false,
+    noVBand: true
+  };
+  CNF_STYLE_MAP = [
+    ["oddHBand", "band1Horz"],
+    ["evenHBand", "band2Horz"],
+    ["oddVBand", "band1Vert"],
+    ["evenVBand", "band2Vert"],
+    ["firstRow", "firstRow"],
+    ["firstColumn", "firstCol"],
+    ["lastRow", "lastRow"],
+    ["lastColumn", "lastCol"],
+    ["firstRowFirstColumn", "nwCell"],
+    ["firstRowLastColumn", "neCell"],
+    ["lastRowFirstColumn", "swCell"],
+    ["lastRowLastColumn", "seCell"]
+  ];
+  TABLE_STYLE_PRECEDENCE = [
+    "wholeTable",
+    "band1Horz",
+    "band2Horz",
+    "band1Vert",
+    "band2Vert",
+    "firstCol",
+    "lastCol",
+    "firstRow",
+    "lastRow",
+    "nwCell",
+    "neCell",
+    "swCell",
+    "seCell"
+  ];
   SUPPORTED_ALTERNATE_CONTENT_REQUIRES = new Set([
     "wps",
     "wpg",
@@ -105714,9 +105787,9 @@ var init_remark_gfm_CQ3Jg4PR_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-B2ASTVlZ.es.js
-var exports_src_B2ASTVlZ_es = {};
-__export(exports_src_B2ASTVlZ_es, {
+// ../../packages/superdoc/dist/chunks/src-B1yNdREj.es.js
+var exports_src_B1yNdREj_es = {};
+__export(exports_src_B1yNdREj_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -144796,9 +144869,22 @@ function normalizeNewTableAttrs(editor) {
     };
   return {
     tableStyleId: resolved.styleId,
-    tableProperties: { tableStyleId: resolved.styleId }
+    tableProperties: {
+      tableStyleId: resolved.styleId,
+      tblLook: { ...DEFAULT_TBL_LOOK }
+    }
   };
 }
+function computeColumnWidths(editor, columnCount) {
+  const { pageSize = {}, pageMargins = {} } = editor?.converter?.pageStyles ?? {};
+  const { width: pageWidth } = pageSize;
+  const { left: left$1 = 0, right: right$1 = 0 } = pageMargins;
+  if (!pageWidth)
+    return null;
+  const availableWidth = (pageWidth - left$1 - right$1) * 96;
+  const columnWidth = Math.floor(availableWidth / columnCount);
+  return Array(columnCount).fill(columnWidth);
+}
 function cellAround($pos) {
   for (let d = $pos.depth - 1;d > 0; d--)
     if ($pos.node(d).type.spec.tableRole == "row")
@@ -160090,6 +160176,75 @@ var Node$13 = class Node$14 {
         newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node3.nodeSize), formatChangeMark);
     }
   });
+}, findPreviousLiveCharPos = (doc$2, cursorPos, trackDeleteMarkType) => {
+  const $cursor = doc$2.resolve(cursorPos);
+  let paraDepth = $cursor.depth;
+  while (paraDepth > 0 && $cursor.node(paraDepth).type.name !== "paragraph")
+    paraDepth--;
+  if (paraDepth <= 0)
+    return null;
+  const paraStart = $cursor.before(paraDepth) + 1;
+  let lastLiveCharPos = null;
+  doc$2.nodesBetween(paraStart, cursorPos, (node3, pos) => {
+    if (!node3.isText)
+      return;
+    if (node3.marks.some((m$1) => m$1.type === trackDeleteMarkType))
+      return;
+    const nodeEnd = pos + node3.nodeSize;
+    const relevantEnd = Math.min(nodeEnd, cursorPos);
+    if (relevantEnd > pos)
+      lastLiveCharPos = relevantEnd - 1;
+  });
+  return lastLiveCharPos;
+}, replaceAroundStep = ({ state, tr, step, newTr, map: map$22, doc: doc$2, user, date, originalStep, originalStepIndex }) => {
+  if (!(tr.getMeta("inputType") === "deleteContentBackward"))
+    return;
+  const trackDeleteMarkType = state.schema.marks[TrackDeleteMarkName];
+  const deleteFrom = findPreviousLiveCharPos(doc$2, state.selection.from, trackDeleteMarkType);
+  if (deleteFrom === null)
+    return;
+  const charStep = new ReplaceStep(deleteFrom, deleteFrom + 1, Slice.empty);
+  replaceStep2({
+    state,
+    tr,
+    step: charStep,
+    newTr,
+    map: map$22,
+    doc: doc$2,
+    user,
+    date,
+    originalStep: charStep,
+    originalStepIndex
+  });
+  const trackMeta = newTr.getMeta(TrackChangesBasePluginKey) || {};
+  trackMeta.selectionPos = deleteFrom;
+  newTr.setMeta(TrackChangesBasePluginKey, trackMeta);
+  if (trackMeta.deletionMark) {
+    const ourId = trackMeta.deletionMark.attrs.id;
+    const ourEmail = trackMeta.deletionMark.attrs.authorEmail;
+    const ourDate = trackMeta.deletionMark.attrs.date;
+    const searchTo = Math.min(newTr.doc.content.size, deleteFrom + 20);
+    let contiguous = true;
+    newTr.doc.nodesBetween(deleteFrom, searchTo, (node3, pos) => {
+      if (!contiguous)
+        return false;
+      if (!node3.isText)
+        return;
+      const delMark = node3.marks.find((m$1) => m$1.type.name === TrackDeleteMarkName);
+      if (!delMark) {
+        contiguous = false;
+        return;
+      }
+      if (delMark.attrs.id !== ourId && delMark.attrs.authorEmail === ourEmail && delMark.attrs.date === ourDate) {
+        const merged = state.schema.marks[TrackDeleteMarkName].create({
+          ...delMark.attrs,
+          id: ourId
+        });
+        newTr.removeMark(pos, pos + node3.nodeSize, delMark);
+        newTr.addMark(pos, pos + node3.nodeSize, merged);
+      }
+    });
+  }
 }, trackedTransaction = ({ tr, state, user }) => {
   const onlyInputTypeMeta = [
     "inputType",
@@ -160152,6 +160307,19 @@ var Node$13 = class Node$14 {
         user,
         date
       });
+    else if (step instanceof ReplaceAroundStep2)
+      replaceAroundStep({
+        state,
+        tr,
+        step,
+        newTr,
+        map: map$22,
+        doc: doc$2,
+        user,
+        date,
+        originalStep,
+        originalStepIndex
+      });
     else
       newTr.step(step);
   });
@@ -160162,15 +160330,15 @@ var Node$13 = class Node$14 {
   if (tr.getMeta("addToHistory") !== undefined)
     newTr.setMeta("addToHistory", tr.getMeta("addToHistory"));
   const trackMeta = newTr.getMeta(TrackChangesBasePluginKey);
-  if (tr.selectionSet)
-    if (trackMeta?.selectionPos !== undefined && trackMeta?.selectionPos !== null) {
-      const boundedPos = Math.max(0, Math.min(trackMeta.selectionPos, newTr.doc.content.size));
-      const $pos = newTr.doc.resolve(boundedPos);
-      if ($pos.parent.inlineContent)
-        newTr.setSelection(TextSelection2.create(newTr.doc, boundedPos));
-      else
-        newTr.setSelection(TextSelection2.near($pos, -1));
-    } else if (tr.selection instanceof TextSelection2 && (tr.selection.from < state.selection.from || tr.getMeta("inputType") === "deleteContentBackward")) {
+  if (trackMeta?.selectionPos !== undefined && trackMeta?.selectionPos !== null) {
+    const boundedPos = Math.max(0, Math.min(trackMeta.selectionPos, newTr.doc.content.size));
+    const $pos = newTr.doc.resolve(boundedPos);
+    if ($pos.parent.inlineContent)
+      newTr.setSelection(TextSelection2.create(newTr.doc, boundedPos));
+    else
+      newTr.setSelection(TextSelection2.near($pos, -1));
+  } else if (tr.selectionSet)
+    if (tr.selection instanceof TextSelection2 && (tr.selection.from < state.selection.from || tr.getMeta("inputType") === "deleteContentBackward")) {
       const caretPos = map$22.map(tr.selection.from, -1);
       newTr.setSelection(new TextSelection2(newTr.doc.resolve(caretPos)));
     } else if (trackMeta?.insertedTo !== undefined) {
@@ -167091,21 +167259,6 @@ var Node$13 = class Node$14 {
   if (history$1 != null)
     link2.history = history$1;
   return link2;
-}, TRACK_INSERT_MARK = "trackInsert", TRACK_DELETE_MARK = "trackDelete", TRACK_FORMAT_MARK = "trackFormat", TRACK_CHANGE_KIND_MAP, TRACK_CHANGE_PRIORITY, MAX_RUN_MARK_JSON_LENGTH = 1e4, MAX_RUN_MARK_ARRAY_LENGTH = 100, MAX_RUN_MARK_DEPTH = 5, RANDOM_ID_LENGTH = 9, generateRandomBase36Id = (length$1) => {
-  let randomId = "";
-  while (randomId.length < length$1)
-    randomId += Math.random().toString(36).slice(2);
-  return randomId.slice(0, length$1);
-}, validateDepth = (obj, currentDepth = 0) => {
-  if (currentDepth > MAX_RUN_MARK_DEPTH)
-    return false;
-  if (obj && typeof obj === "object") {
-    const values = Array.isArray(obj) ? obj : Object.values(obj);
-    for (const value of values)
-      if (!validateDepth(value, currentDepth + 1))
-        return false;
-  }
-  return true;
 }, parseThemePercentage = (value) => {
   if (typeof value !== "string")
     return;
@@ -167116,13 +167269,13 @@ var Node$13 = class Node$14 {
   if (Number.isNaN(parsed))
     return;
   return Math.max(0, Math.min(parsed / 255, 1));
-}, expandHex = (hex$1) => {
+}, expandHex$1 = (hex$1) => {
   const normalized = hex$1.replace("#", "");
   if (normalized.length === 3)
     return normalized.split("").map((char) => char + char).join("");
   return normalized;
-}, hexToRgb2 = (hex$1) => {
-  const cleaned = expandHex(hex$1);
+}, hexToRgb$1 = (hex$1) => {
+  const cleaned = expandHex$1(hex$1);
   if (cleaned.length !== 6)
     return null;
   const r$1 = Number.parseInt(cleaned.slice(0, 2), 16);
@@ -167145,7 +167298,7 @@ var Node$13 = class Node$14 {
   };
   return `#${toHex$1(value.r)}${toHex$1(value.g)}${toHex$1(value.b)}`;
 }, applyThemeTint = (baseHex, ratio) => {
-  const rgb = hexToRgb2(baseHex);
+  const rgb = hexToRgb$1(baseHex);
   if (!rgb)
     return baseHex;
   return rgbToHex2({
@@ -167154,7 +167307,7 @@ var Node$13 = class Node$14 {
     b: Math.round(rgb.b + (255 - rgb.b) * ratio)
   });
 }, applyThemeShade = (baseHex, ratio) => {
-  const rgb = hexToRgb2(baseHex);
+  const rgb = hexToRgb$1(baseHex);
   if (!rgb)
     return baseHex;
   return rgbToHex2({
@@ -167162,6 +167315,59 @@ var Node$13 = class Node$14 {
     g: Math.round(rgb.g * ratio),
     b: Math.round(rgb.b * ratio)
   });
+}, resolveThemeColorValue = (themeKey, tint, shade, themeColors) => {
+  const key$1 = themeKey.trim();
+  if (!key$1)
+    return;
+  const base$2 = themeColors[key$1];
+  if (!base$2)
+    return;
+  let computed$12 = base$2;
+  const tintRatio = parseThemePercentage(tint);
+  const shadeRatio = parseThemePercentage(shade);
+  if (tintRatio != null)
+    computed$12 = applyThemeTint(computed$12, tintRatio);
+  if (shadeRatio != null)
+    computed$12 = applyThemeShade(computed$12, shadeRatio);
+  return computed$12;
+}, TRACK_INSERT_MARK = "trackInsert", TRACK_DELETE_MARK = "trackDelete", TRACK_FORMAT_MARK = "trackFormat", TRACK_CHANGE_KIND_MAP, TRACK_CHANGE_PRIORITY, MAX_RUN_MARK_JSON_LENGTH = 1e4, MAX_RUN_MARK_ARRAY_LENGTH = 100, MAX_RUN_MARK_DEPTH = 5, RANDOM_ID_LENGTH = 9, generateRandomBase36Id = (length$1) => {
+  let randomId = "";
+  while (randomId.length < length$1)
+    randomId += Math.random().toString(36).slice(2);
+  return randomId.slice(0, length$1);
+}, validateDepth = (obj, currentDepth = 0) => {
+  if (currentDepth > MAX_RUN_MARK_DEPTH)
+    return false;
+  if (obj && typeof obj === "object") {
+    const values = Array.isArray(obj) ? obj : Object.values(obj);
+    for (const value of values)
+      if (!validateDepth(value, currentDepth + 1))
+        return false;
+  }
+  return true;
+}, expandHex = (hex$1) => {
+  const normalized = hex$1.replace("#", "");
+  if (normalized.length === 3)
+    return normalized.split("").map((char) => char + char).join("");
+  return normalized;
+}, hexToRgb2 = (hex$1) => {
+  const cleaned = expandHex(hex$1);
+  if (cleaned.length !== 6)
+    return null;
+  const r$1 = Number.parseInt(cleaned.slice(0, 2), 16);
+  const g$1 = Number.parseInt(cleaned.slice(2, 4), 16);
+  const b$1 = Number.parseInt(cleaned.slice(4, 6), 16);
+  if ([
+    r$1,
+    g$1,
+    b$1
+  ].some((channel) => Number.isNaN(channel)))
+    return null;
+  return {
+    r: r$1,
+    g: g$1,
+    b: b$1
+  };
 }, getLuminance = (hexColor) => {
   const rgb = hexToRgb2(hexColor);
   if (!rgb)
@@ -167182,20 +167388,7 @@ var Node$13 = class Node$14 {
   const rawKey = attrs.themeColor;
   if (typeof rawKey !== "string")
     return;
-  const key$1 = rawKey.trim();
-  if (!key$1)
-    return;
-  const base$2 = themeColors[key$1];
-  if (!base$2)
-    return;
-  const tint = parseThemePercentage(attrs.themeTint);
-  const shade = parseThemePercentage(attrs.themeShade);
-  let computed$12 = base$2;
-  if (tint != null)
-    computed$12 = applyThemeTint(computed$12, tint);
-  if (shade != null)
-    computed$12 = applyThemeShade(computed$12, shade);
-  return computed$12;
+  return resolveThemeColorValue(rawKey, attrs.themeTint, attrs.themeShade, themeColors);
 }, resolveColorFromAttributes = (attrs, themeColors) => {
   if (!attrs)
     return;
@@ -168020,14 +168213,19 @@ var Node$13 = class Node$14 {
   if (!isTableCellNode(cellNode) || !Array.isArray(cellNode.content))
     return null;
   const blocks2 = [];
-  const inlineTcProps = cellNode.attrs?.tableCellProperties;
-  const resolvedTcProps = resolveTableCellProperties(inlineTcProps, tableProperties ? {
+  const rowCnfStyle = args$1.rowCnfStyle ?? null;
+  const cellCnfStyle = cellNode.attrs?.tableCellProperties?.cnfStyle ?? null;
+  const tableInfo = tableProperties ? {
     tableProperties,
     rowIndex,
     cellIndex,
     numCells,
-    numRows
-  } : undefined, context.converterContext?.translatedLinkedStyles);
+    numRows,
+    rowCnfStyle,
+    cellCnfStyle
+  } : undefined;
+  const inlineTcProps = cellNode.attrs?.tableCellProperties;
+  const resolvedTcProps = resolveTableCellProperties(inlineTcProps, tableInfo, context.converterContext?.translatedLinkedStyles);
   const cellBackground = cellNode.attrs?.background;
   let cellBackgroundColor;
   if (cellBackground && typeof cellBackground.color === "string") {
@@ -168038,20 +168236,20 @@ var Node$13 = class Node$14 {
         cellBackgroundColor = normalized;
     }
   }
-  if (!cellBackgroundColor && resolvedTcProps?.shading?.fill) {
-    const fill = resolvedTcProps.shading.fill;
-    if (fill !== "auto")
-      cellBackgroundColor = fill.startsWith("#") ? fill : `#${fill}`;
+  if (!cellBackgroundColor && resolvedTcProps?.shading) {
+    const { fill, themeFill, themeFillTint, themeFillShade } = resolvedTcProps.shading;
+    const normalizedFill = normalizeShadingColor(fill);
+    if (normalizedFill)
+      cellBackgroundColor = normalizedFill;
+    else if (themeFill && context.themeColors) {
+      const normalizedTheme = normalizeShadingColor(resolveThemeColorValue(themeFill, themeFillTint, themeFillShade, context.themeColors));
+      if (normalizedTheme)
+        cellBackgroundColor = normalizedTheme;
+    }
   }
-  const cellConverterContext = tableProperties || cellBackgroundColor ? {
+  const cellConverterContext = tableInfo || cellBackgroundColor ? {
     ...context.converterContext,
-    ...tableProperties && { tableInfo: {
-      tableProperties,
-      rowIndex,
-      cellIndex,
-      numCells,
-      numRows
-    } },
+    ...tableInfo && { tableInfo },
     ...cellBackgroundColor && { backgroundColor: cellBackgroundColor }
   } : context.converterContext;
   const paragraphToFlowBlocks$1 = context.converters.paragraphToFlowBlocks;
@@ -168246,6 +168444,7 @@ var Node$13 = class Node$14 {
   if (!isTableRowNode(rowNode) || !Array.isArray(rowNode.content))
     return null;
   const cells = [];
+  const rowCnfStyle = rowNode.attrs?.tableRowProperties?.cnfStyle;
   rowNode.content.forEach((cellNode, cellIndex) => {
     const parsedCell = parseTableCell({
       cellNode,
@@ -168255,7 +168454,8 @@ var Node$13 = class Node$14 {
       defaultCellPadding,
       tableProperties,
       numCells: rowNode?.content?.length || 1,
-      numRows
+      numRows,
+      rowCnfStyle
     });
     if (parsedCell)
       cells.push(parsedCell);
@@ -177634,7 +177834,7 @@ var Node$13 = class Node$14 {
     from: from$12,
     to
   };
-}, trackInsertClass = "track-insert", TrackInsert, trackDeleteClass = "track-delete", TrackDelete, replaceAroundStep = () => {}, markWrapping = () => {}, parseFormatList = (str) => {
+}, trackInsertClass = "track-insert", TrackInsert, trackDeleteClass = "track-delete", TrackDelete, markWrapping = () => {}, parseFormatList = (str) => {
   if (!str)
     return [];
   let formatList;
@@ -179933,9 +180133,9 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$2, _hoisted_3, _hoisted_4, ContextMenu_default, _hoisted_1$5, BasicUpload_default, _hoisted_1$4, MIN_WIDTH = 200, PPI = 96, alignment = "flex-end", Ruler_default, GenericPopover_default, _hoisted_1$3, _hoisted_2$1, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_HEIGHT_PX = 9, RESIZE_HANDLE_OFFSET_PX = 4, DRAG_OVERLAY_EXTENSION_PX = 1000, MIN_DRAG_OVERLAY_WIDTH_PX = 2000, THROTTLE_INTERVAL_MS = 16, MIN_RESIZE_DELTA_PX = 1, TableResizeOverlay_default, _hoisted_1$2, OVERLAY_EXPANSION_PX = 2000, RESIZE_HANDLE_SIZE_PX = 12, MOUSE_MOVE_THROTTLE_MS = 16, DIMENSION_CHANGE_THRESHOLD_PX = 1, Z_INDEX_OVERLAY = 10, Z_INDEX_HANDLE = 15, Z_INDEX_GUIDELINE = 20, ImageResizeOverlay_default, LINK_CLICK_DEBOUNCE_MS = 300, CURSOR_UPDATE_TIMEOUT_MS = 10, POPOVER_VERTICAL_OFFSET_PX = 15, LinkClickHandler_default, _hoisted_1$1, _hoisted_2, DOCX2 = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", TABLE_RESIZE_HOVER_THRESHOLD = 8, TABLE_RESIZE_THROTTLE_MS = 16, SuperEditor_default, _hoisted_1, SuperInput_default, SlashMenu, Extensions;
-var init_src_B2ASTVlZ_es = __esm(() => {
+var init_src_B1yNdREj_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_Ba_l6vso_es();
+  init_SuperConverter_C1hZYQNS_es();
   init_jszip_ChlR43oI_es();
   init_uuid_2IzDu5nl_es();
   init_constants_CqvgVEDh_es();
@@ -203450,17 +203650,7 @@ function print() { __p += __j.call(arguments, '') }
           }).run();
         },
         insertTable: ({ rows = 3, cols = 3, withHeaderRow = false, columnWidths = null } = {}) => ({ tr, dispatch, editor }) => {
-          let widths = columnWidths;
-          if (!widths) {
-            const { pageSize = {}, pageMargins = {} } = editor.converter?.pageStyles ?? {};
-            const { width: pageWidth } = pageSize;
-            const { left: left$1 = 0, right: right$1 = 0 } = pageMargins;
-            if (pageWidth) {
-              const availableWidth = (pageWidth - left$1 - right$1) * 96;
-              const columnWidth = Math.floor(availableWidth / cols);
-              widths = Array(cols).fill(columnWidth);
-            }
-          }
+          const widths = columnWidths ?? computeColumnWidths(editor, cols);
           const resolved = normalizeNewTableAttrs(editor);
           const tableAttrs = {
             ...resolved.tableStyleId ? { tableStyleId: resolved.tableStyleId } : {},
@@ -203490,11 +203680,16 @@ function print() { __p += __j.call(arguments, '') }
             return false;
           try {
             const genParaId = () => Array.from({ length: 8 }, () => Math.floor(Math.random() * 16).toString(16)).join("").toUpperCase();
+            const widths = computeColumnWidths(editor, columns);
             const rowNodes = [];
             for (let r$1 = 0;r$1 < rows; r$1++) {
               const cellNodes = [];
               for (let c$3 = 0;c$3 < columns; c$3++) {
-                const cell2 = tableCellType.createAndFill({ paraId: genParaId() });
+                const cellAttrs = {
+                  paraId: genParaId(),
+                  ...widths ? { colwidth: [widths[c$3]] } : {}
+                };
+                const cell2 = tableCellType.createAndFill(cellAttrs);
                 if (!cell2)
                   return false;
                 cellNodes.push(cell2);
@@ -211240,8 +211435,8 @@ function print() { __p += __j.call(arguments, '') }
     return isObjectLike_default(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
   };
   stubFalse_default = stubFalse;
-  freeExports$2 = typeof exports_src_B2ASTVlZ_es == "object" && exports_src_B2ASTVlZ_es && !exports_src_B2ASTVlZ_es.nodeType && exports_src_B2ASTVlZ_es;
-  freeModule$2 = freeExports$2 && typeof module_src_B2ASTVlZ_es == "object" && module_src_B2ASTVlZ_es && !module_src_B2ASTVlZ_es.nodeType && module_src_B2ASTVlZ_es;
+  freeExports$2 = typeof exports_src_B1yNdREj_es == "object" && exports_src_B1yNdREj_es && !exports_src_B1yNdREj_es.nodeType && exports_src_B1yNdREj_es;
+  freeModule$2 = freeExports$2 && typeof module_src_B1yNdREj_es == "object" && module_src_B1yNdREj_es && !module_src_B1yNdREj_es.nodeType && module_src_B1yNdREj_es;
   Buffer$1 = freeModule$2 && freeModule$2.exports === freeExports$2 ? _root_default.Buffer : undefined;
   isBuffer_default = (Buffer$1 ? Buffer$1.isBuffer : undefined) || stubFalse_default;
   typedArrayTags = {};
@@ -211249,8 +211444,8 @@ function print() { __p += __j.call(arguments, '') }
   typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] = typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag] = typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] = typedArrayTags[objectTag$3] = typedArrayTags[regexpTag$1] = typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] = typedArrayTags[weakMapTag$1] = false;
   _baseIsTypedArray_default = baseIsTypedArray;
   _baseUnary_default = baseUnary;
-  freeExports$1 = typeof exports_src_B2ASTVlZ_es == "object" && exports_src_B2ASTVlZ_es && !exports_src_B2ASTVlZ_es.nodeType && exports_src_B2ASTVlZ_es;
-  freeModule$1 = freeExports$1 && typeof module_src_B2ASTVlZ_es == "object" && module_src_B2ASTVlZ_es && !module_src_B2ASTVlZ_es.nodeType && module_src_B2ASTVlZ_es;
+  freeExports$1 = typeof exports_src_B1yNdREj_es == "object" && exports_src_B1yNdREj_es && !exports_src_B1yNdREj_es.nodeType && exports_src_B1yNdREj_es;
+  freeModule$1 = freeExports$1 && typeof module_src_B1yNdREj_es == "object" && module_src_B1yNdREj_es && !module_src_B1yNdREj_es.nodeType && module_src_B1yNdREj_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -211355,8 +211550,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_B2ASTVlZ_es == "object" && exports_src_B2ASTVlZ_es && !exports_src_B2ASTVlZ_es.nodeType && exports_src_B2ASTVlZ_es;
-  freeModule = freeExports && typeof module_src_B2ASTVlZ_es == "object" && module_src_B2ASTVlZ_es && !module_src_B2ASTVlZ_es.nodeType && module_src_B2ASTVlZ_es;
+  freeExports = typeof exports_src_B1yNdREj_es == "object" && exports_src_B1yNdREj_es && !exports_src_B1yNdREj_es.nodeType && exports_src_B1yNdREj_es;
+  freeModule = freeExports && typeof module_src_B1yNdREj_es == "object" && module_src_B1yNdREj_es && !module_src_B1yNdREj_es.nodeType && module_src_B1yNdREj_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -219436,8 +219631,8 @@ var init_zipper_Cnk_HjM2_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_B2ASTVlZ_es();
-  init_SuperConverter_Ba_l6vso_es();
+  init_src_B1yNdREj_es();
+  init_SuperConverter_C1hZYQNS_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_CqvgVEDh_es();
@@ -261172,28 +261367,62 @@ function resolveDocxFontFamily2(attributes, docx, toCssFontFamily2) {
   }
   return resolved;
 }
+function resolveEffectiveBandSizes2(styleId, translatedLinkedStyles) {
+  const seen = new Set;
+  let currentId = styleId;
+  let rowBandSize;
+  let colBandSize;
+  while (currentId && !seen.has(currentId)) {
+    seen.add(currentId);
+    const def2 = translatedLinkedStyles.styles?.[currentId];
+    const tblProps = def2?.tableProperties;
+    if (rowBandSize == null && tblProps?.tableStyleRowBandSize != null) {
+      rowBandSize = tblProps.tableStyleRowBandSize;
+    }
+    if (colBandSize == null && tblProps?.tableStyleColBandSize != null) {
+      colBandSize = tblProps.tableStyleColBandSize;
+    }
+    if (rowBandSize != null && colBandSize != null)
+      break;
+    currentId = def2?.basedOn;
+  }
+  return { rowBandSize: rowBandSize ?? 1, colBandSize: colBandSize ?? 1 };
+}
+function resolveConditionalProps2(propertyType, styleType, styleId, translatedLinkedStyles) {
+  const chain = [];
+  const seen = new Set;
+  let currentId = styleId;
+  while (currentId && !seen.has(currentId)) {
+    seen.add(currentId);
+    const def2 = translatedLinkedStyles.styles?.[currentId];
+    const props = def2?.tableStyleProperties?.[styleType]?.[propertyType];
+    if (props)
+      chain.push(props);
+    currentId = def2?.basedOn;
+  }
+  if (chain.length === 0)
+    return;
+  chain.reverse();
+  return combineProperties2(chain);
+}
 function resolveCellStyles2(propertyType, tableInfo, translatedLinkedStyles) {
   if (tableInfo == null || !tableInfo.tableProperties?.tableStyleId) {
     return [];
   }
   const cellStyleProps = [];
-  if (tableInfo != null && tableInfo.tableProperties.tableStyleId) {
-    const tableStyleDef = translatedLinkedStyles.styles[tableInfo.tableProperties.tableStyleId];
-    const tableStylePropsDef = tableStyleDef?.tableProperties;
-    const rowBandSize = tableStylePropsDef?.tableStyleRowBandSize ?? 1;
-    const colBandSize = tableStylePropsDef?.tableStyleColBandSize ?? 1;
-    const cellStyleTypes = determineCellStyleTypes2(tableInfo.tableProperties?.tblLook, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize);
-    cellStyleTypes.forEach((styleType) => {
-      const typeProps = tableStyleDef?.tableStyleProperties?.[styleType]?.[propertyType];
-      if (typeProps) {
-        cellStyleProps.push(typeProps);
-      }
-    });
-  }
+  const tableStyleId = tableInfo.tableProperties.tableStyleId;
+  const { rowBandSize, colBandSize } = resolveEffectiveBandSizes2(tableStyleId, translatedLinkedStyles);
+  const cellStyleTypes = determineCellStyleTypes2(tableInfo.tableProperties?.tblLook ?? DEFAULT_TBL_LOOK2, tableInfo.rowIndex, tableInfo.cellIndex, tableInfo.numRows, tableInfo.numCells, rowBandSize, colBandSize, tableInfo.rowCnfStyle, tableInfo.cellCnfStyle);
+  cellStyleTypes.forEach((styleType) => {
+    const typeProps = resolveConditionalProps2(propertyType, styleType, tableStyleId, translatedLinkedStyles);
+    if (typeProps) {
+      cellStyleProps.push(typeProps);
+    }
+  });
   return cellStyleProps;
 }
-function determineCellStyleTypes2(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1) {
-  const styleTypes = ["wholeTable"];
+function determineCellStyleTypes2(tblLook, rowIndex, cellIndex, numRows, numCells, rowBandSize = 1, colBandSize = 1, rowCnfStyle, cellCnfStyle) {
+  const applicable = new Set(["wholeTable"]);
   const normalizedRowBandSize = rowBandSize > 0 ? rowBandSize : 1;
   const normalizedColBandSize = colBandSize > 0 ? colBandSize : 1;
   const bandRowIndex = Math.max(0, rowIndex - (tblLook?.firstRow ? 1 : 0));
@@ -261201,47 +261430,86 @@ function determineCellStyleTypes2(tblLook, rowIndex, cellIndex, numRows, numCell
   const rowGroup = Math.floor(bandRowIndex / normalizedRowBandSize);
   const colGroup = Math.floor(bandColIndex / normalizedColBandSize);
   if (!tblLook?.noHBand) {
-    if (rowGroup % 2 === 0) {
-      styleTypes.push("band1Horz");
-    } else {
-      styleTypes.push("band2Horz");
-    }
+    applicable.add(rowGroup % 2 === 0 ? "band1Horz" : "band2Horz");
   }
   if (!tblLook?.noVBand) {
-    if (colGroup % 2 === 0) {
-      styleTypes.push("band1Vert");
-    } else {
-      styleTypes.push("band2Vert");
-    }
+    applicable.add(colGroup % 2 === 0 ? "band1Vert" : "band2Vert");
   }
   if (tblLook?.firstRow && rowIndex === 0) {
-    styleTypes.push("firstRow");
+    applicable.add("firstRow");
   }
   if (tblLook?.firstColumn && cellIndex === 0) {
-    styleTypes.push("firstCol");
+    applicable.add("firstCol");
   }
   if (tblLook?.lastRow && numRows != null && numRows > 0 && rowIndex === numRows - 1) {
-    styleTypes.push("lastRow");
+    applicable.add("lastRow");
   }
   if (tblLook?.lastColumn && numCells != null && numCells > 0 && cellIndex === numCells - 1) {
-    styleTypes.push("lastCol");
+    applicable.add("lastCol");
   }
   if (rowIndex === 0 && cellIndex === 0) {
-    styleTypes.push("nwCell");
+    applicable.add("nwCell");
   }
   if (rowIndex === 0 && numCells != null && numCells > 0 && cellIndex === numCells - 1) {
-    styleTypes.push("neCell");
+    applicable.add("neCell");
   }
   if (numRows != null && numRows > 0 && rowIndex === numRows - 1 && cellIndex === 0) {
-    styleTypes.push("swCell");
+    applicable.add("swCell");
   }
   if (numRows != null && numRows > 0 && numCells != null && numCells > 0 && rowIndex === numRows - 1 && cellIndex === numCells - 1) {
-    styleTypes.push("seCell");
+    applicable.add("seCell");
   }
-  return styleTypes;
+  if (rowCnfStyle || cellCnfStyle) {
+    for (const [flag, styleType] of CNF_STYLE_MAP2) {
+      const rowFlag = rowCnfStyle?.[flag];
+      const cellFlag = cellCnfStyle?.[flag];
+      if (rowFlag === true || cellFlag === true) {
+        applicable.add(styleType);
+      }
+    }
+  }
+  return TABLE_STYLE_PRECEDENCE2.filter((t) => applicable.has(t));
 }
+var DEFAULT_TBL_LOOK2, CNF_STYLE_MAP2, TABLE_STYLE_PRECEDENCE2;
 var init_ooxml = __esm(() => {
   init_table_style_selection();
+  DEFAULT_TBL_LOOK2 = {
+    firstRow: true,
+    lastRow: false,
+    firstColumn: true,
+    lastColumn: false,
+    noHBand: false,
+    noVBand: true
+  };
+  CNF_STYLE_MAP2 = [
+    ["oddHBand", "band1Horz"],
+    ["evenHBand", "band2Horz"],
+    ["oddVBand", "band1Vert"],
+    ["evenVBand", "band2Vert"],
+    ["firstRow", "firstRow"],
+    ["firstColumn", "firstCol"],
+    ["lastRow", "lastRow"],
+    ["lastColumn", "lastCol"],
+    ["firstRowFirstColumn", "nwCell"],
+    ["firstRowLastColumn", "neCell"],
+    ["lastRowFirstColumn", "swCell"],
+    ["lastRowLastColumn", "seCell"]
+  ];
+  TABLE_STYLE_PRECEDENCE2 = [
+    "wholeTable",
+    "band1Horz",
+    "band2Horz",
+    "band1Vert",
+    "band2Vert",
+    "firstCol",
+    "lastCol",
+    "firstRow",
+    "lastRow",
+    "nwCell",
+    "neCell",
+    "swCell",
+    "seCell"
+  ];
 });
 
 // ../../packages/super-editor/src/core/super-converter/v3/handlers/wp/helpers/textbox-content-helpers.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.61",
+  "version": "0.2.0-next.63",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -19,21 +19,21 @@
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
-    "@superdoc/super-editor": "0.0.1",
+    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/document-api": "0.0.1",
-    "superdoc": "1.16.0",
-    "@superdoc/pm-adapter": "0.0.0"
+    "@superdoc/super-editor": "0.0.1",
+    "superdoc": "1.16.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.61",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.61",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.61",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.61",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.61"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.63",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.63",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.63",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.63",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.63"
   },
   "scripts": {
     "dev": "bun run src/index.ts",