@modusoperandi/licit-import-utils 0.1.1 → 0.1.2

package/licit-elements.d.ts

@@ -108,6 +108,9 @@ interface LicitTableAttrsJSON extends LicitElementAttrsJSON {
     marginLeft: null;
     vignette: boolean;
 }
+interface LicitTableRowAttrsJSON extends LicitElementAttrsJSON {
+    rowHeight: string;
+}
 interface LicitTableCellAttrsJSON extends LicitElementAttrsJSON {
     colspan: number;
     rowspan: number;
@@ -134,6 +137,7 @@ interface LicitTableCellImageJSON extends LicitElementJSON {
 }
 interface LicitTableRowJSON extends LicitElementJSON {
     type: 'table_row';
+    attrs: LicitTableRowAttrsJSON;
     content: LicitTableCellJSON[];
 }
 export interface LicitTableJSON extends LicitElementJSON {
@@ -159,6 +163,15 @@ interface LicitOrderedListJSON extends LicitElementJSON {
     attrs: LicitBulletListAttrsJSON;
     content: LicitBulletListItemJSON[];
 }
+interface CellStyleInfo {
+    className?: string;
+    id?: string;
+    marginTop?: string;
+    marginBottom?: string;
+    fontSize?: string;
+    letterSpacing?: string;
+    cellWidth?: string;
+}
 export interface LicitDocumentJSON extends LicitElementJSON {
     type: 'doc';
     attrs: LicitDocumentAttrsJSON;
@@ -627,7 +640,8 @@ export declare class LicitTableCellParagraph extends LicitElement {
     colWidth: [number];
     content: any[];
     vAlign: string;
-    constructor(node: HTMLElement, bgColor?: string, colwidth?: [number], vericalAlignment?: string);
+    cellStyleInfo?: CellStyleInfo;
+    constructor(node: HTMLElement, bgColor?: string, colwidth?: [number], vericalAlignment?: string, cellStyleInfo?: CellStyleInfo);
     render(): {
         type: string;
         attrs: {
@@ -684,7 +698,8 @@ export declare class LicitTableCellImageElement extends LicitElement {
     alt: string;
     fillImg: number;
     fitToParent: number;
-    constructor(src: string, fillImg: number, fitToParent: number, bgColor?: string, imgHeight?: string, colWidth?: [number], alt?: string);
+    cellStyleInfo?: CellStyleInfo;
+    constructor(src: string, fillImg: number, fitToParent: number, bgColor?: string, imgHeight?: string, colWidth?: [number], alt?: string, cellStyleInfo?: CellStyleInfo);
     render(): LicitTableCellImageJSON;
 }
 export declare class LicitVignetteElement extends LicitElement {
@@ -747,7 +762,8 @@ export declare class LicitTableCellParaElement extends LicitElement {
     vAlign: string;
     isTableHeader: boolean;
     isTransparentTable: boolean;
-    constructor(node: HTMLElement, bgColor?: string, colwidth?: [number], vericalAlignment?: string, isTableHeader?: boolean, isTransparentTable?: boolean);
+    cellStyleInfo?: CellStyleInfo;
+    constructor(node: HTMLElement, bgColor?: string, colwidth?: [number], vericalAlignment?: string, isTableHeader?: boolean, isTransparentTable?: boolean, cellStyleInfo?: CellStyleInfo);
     ConvertElements(node: HTMLElement): void;
     processChildNode(childNode: ChildNode): void;
     processChildOL(childNode: ChildNode): void;
@@ -759,6 +775,8 @@ export declare class LicitTableCellParaElement extends LicitElement {
     render(): LicitTableCellJSON;
 }
 export declare class LicitTableRowElement extends LicitElement {
+    height?: string;
+    rowHeight?: string;
     getBaseElement(): LicitTableRowJSON;
     cells: LicitTableCellElement[];
     addCell(cell: LicitTableCellElement): void;
@@ -769,6 +787,8 @@ export declare class LicitTableElement extends LicitElement {
     rows: LicitTableRowElement[];
     isVignette: boolean;
     capco?: string;
+    noOfColumns?: number;
+    tableHeight?: string;
     constructor(isVignette?: boolean, capco?: string);
     addRow(row: LicitTableRowElement): void;
     render(): LicitTableJSON;

package/licit-elements.js

@@ -1876,11 +1876,13 @@ export class LicitTableCellParagraph extends LicitElement {
     colWidth;
     content = [];
     vAlign;
-    constructor(node, bgColor, colwidth, vericalAlignment) {
+    cellStyleInfo;
+    constructor(node, bgColor, colwidth, vericalAlignment, cellStyleInfo) {
         super();
         this.bgColor = bgColor;
         this.colWidth = colwidth;
         this.vAlign = vericalAlignment;
+        this.cellStyleInfo = cellStyleInfo;
         const paragraph = new NewLicitParagraphElement(node, null);
         if (paragraph) {
             this.content.push(paragraph.render());
@@ -1996,7 +1998,8 @@ export class LicitTableCellImageElement extends LicitElement {
     alt;
     fillImg;
     fitToParent;
-    constructor(src, fillImg, fitToParent, bgColor, imgHeight, colWidth, alt) {
+    cellStyleInfo;
+    constructor(src, fillImg, fitToParent, bgColor, imgHeight, colWidth, alt, cellStyleInfo) {
         super();
         this.src = src;
         this.bgColor = bgColor;
@@ -2005,6 +2008,7 @@ export class LicitTableCellImageElement extends LicitElement {
         this.alt = alt;
         this.fillImg = fillImg;
         this.fitToParent = fitToParent;
+        this.cellStyleInfo = cellStyleInfo;
     }
     render() {
         const element = this.getBaseElement();
@@ -2165,6 +2169,12 @@ export class LicitTableCellParaElement extends LicitElement {
                 colwidth: this.colWidth || defaultColWidth,
                 background: this.bgColor || defaultBgColor,
                 vAlign: this.vAlign || 'middle',
+                cellWidth: this.cellStyleInfo?.cellWidth ?? null,
+                cellStyle: this.cellStyleInfo?.className ?? null,
+                fontSize: this.cellStyleInfo?.fontSize ?? null,
+                letterSpacing: this.cellStyleInfo?.letterSpacing ?? null,
+                marginTop: this.cellStyleInfo?.marginTop ?? null,
+                marginBottom: this.cellStyleInfo?.marginBottom ?? null,
             },
             content: [],
         };
@@ -2178,13 +2188,15 @@ export class LicitTableCellParaElement extends LicitElement {
     vAlign;
     isTableHeader;
     isTransparentTable;
-    constructor(node, bgColor, colwidth, vericalAlignment, isTableHeader, isTransparentTable) {
+    cellStyleInfo;
+    constructor(node, bgColor, colwidth, vericalAlignment, isTableHeader, isTransparentTable, cellStyleInfo) {
         super();
         this.bgColor = bgColor;
         this.colWidth = colwidth;
         this.vAlign = vericalAlignment;
         this.isTableHeader = isTableHeader;
         this.isTransparentTable = isTransparentTable;
+        this.cellStyleInfo = cellStyleInfo;
         this.ConvertElements(node);
     }
     ConvertElements(node) {
@@ -2299,9 +2311,14 @@ export class LicitTableCellParaElement extends LicitElement {
     }
 }
 export class LicitTableRowElement extends LicitElement {
+    height;
+    rowHeight;
     getBaseElement() {
         return {
             type: 'table_row',
+            attrs: {
+                rowHeight: this.rowHeight,
+            },
             content: [],
         };
     }
@@ -2325,6 +2342,8 @@ export class LicitTableElement extends LicitElement {
                 marginLeft: null,
                 vignette: this.isVignette,
                 capco: this.capco,
+                noOfColumns: this.noOfColumns ?? null,
+                tableHeight: this.tableHeight ?? null,
             },
             content: [],
         };
@@ -2332,6 +2351,8 @@ export class LicitTableElement extends LicitElement {
     rows = [];
     isVignette = false;
     capco;
+    noOfColumns;
+    tableHeight;
     constructor(isVignette, capco) {
         super();
         this.isVignette = isVignette;

package/licit-transform.d.ts

@@ -151,7 +151,29 @@ export declare class LicitConverter {
     private parseTableContent;
     private parseTableContentInnerLoopHelper;
     private addCell;
-    private checkCellStyle;
+    /**
+     * Extracts style information from a table cell element per the ingest requirements.
+     * Captures: margins (top/bottom), font-size overrides, and letter-spacing for non-breaking spaces.
+     *
+     * @param cell - The HTMLTableCellElement to extract styles from
+     * @returns Object containing extracted style information
+     */
+    private extractCellStyles;
+    /**
+     * Extracts margin and font-size properties from a style string.
+     *
+     * @param style - The style attribute string
+     * @param styleInfo - The style info object to populate
+     */
+    private extractParagraphStyles;
+    /**
+     * Extracts the first letter-spacing value from spans containing non-breaking spaces.
+     *
+     * @param spans - NodeList of span elements with letter-spacing styles
+     * @param styleInfo - The style info object to populate
+     */
+    private extractLetterSpacing;
+    checkCellStyle(style: string | null): string | null;
     private addTableImageCell;
     private ParseNestedList;
     /**

package/licit-transform.js

@@ -964,6 +964,7 @@ export class LicitConverter {
     renderDocTable(e, licitDocument) {
         const licitTable = new LicitTableElement();
         const colWidthsArray = this.getColWidthArray(e.node);
+        licitTable.noOfColumns = colWidthsArray?.length ?? 0;
         const tableHead = e.node.querySelector('thead');
         const table = e.node.querySelector('tbody');
         licitTable.capco = getCapcoFromNode(table);
@@ -1175,6 +1176,7 @@ export class LicitConverter {
      */
     parseTableContent(_e, tableTag, querySel, isChapterHeader, licitTable, widthArray, isTransparent) {
         const rows = tableTag.querySelectorAll('tr');
+        let totalTableHeight = 0;
         for (let i = 0; i < rows.length; i++) {
             if (!isTransparent &&
                 i == 0 &&
@@ -1183,11 +1185,21 @@ export class LicitConverter {
                 isChapterHeader = true;
             }
             const licitRow = new LicitTableRowElement();
+            // ** Capture row height **
+            const rowHeight = rows[i].getAttribute('height');
+            if (rowHeight) {
+                licitRow.height = rowHeight;
+                licitRow.rowHeight = rowHeight;
+                totalTableHeight += parseFloat(rowHeight);
+            }
             const cells = rows[i].querySelectorAll(querySel);
             this.parseTableContentInnerLoopHelper(cells, i, isChapterHeader, licitRow, widthArray, isTransparent);
             licitTable.addRow(licitRow);
             isChapterHeader = false;
         }
+        if (totalTableHeight > 0) {
+            licitTable.tableHeight = `${totalTableHeight}px`;
+        }
     }
     parseTableContentInnerLoopHelper(cells, _cellIndex, isChapterHeader, licitRow, widthArray, isTransparent) {
         for (let j = 0; j < cells.length; j++) {
@@ -1233,13 +1245,19 @@ export class LicitConverter {
         let colWidth;
         let licitCell = null;
         const text = cell.textContent ?? '';
+        // Extract cell-level style information**
+        const cellStyleInfo = this.extractCellStyles(cell);
+        if (widthArray?.length > 0) {
+            const computedWidth = this.setCellWidth(colspan, cellIndex, widthArray);
+            cellStyleInfo.cellWidth = computedWidth?.join(',');
+        }
         if (cell.childNodes?.length <= 0) {
             //condition
-            licitCell = new LicitTableCellParaElement(cell, bgColor, null, verAlign, isChapterHeader, isTransparent);
+            licitCell = new LicitTableCellParaElement(cell, bgColor, null, verAlign, isChapterHeader, isTransparent, cellStyleInfo);
         }
         else if ('' === text &&
             cell.childNodes[0].querySelector('img')) {
-            ({ licitCell } = this.addTableImageCell(cell, bgColor, isChapterHeader, licitCell, verAlign));
+            ({ licitCell } = this.addTableImageCell(cell, bgColor, isChapterHeader, licitCell, verAlign, cellStyleInfo));
         }
         else {
             if (isChapterHeader) {
@@ -1247,7 +1265,7 @@ export class LicitConverter {
                 cell.align = 'center'; // NOSONAR used by Licit parser (depricated)
                 cell.setAttribute('classname', 'LC-Center');
             }
-            licitCell = new LicitTableCellParaElement(cell, bgColor, colWidth, verAlign, isChapterHeader, isTransparent);
+            licitCell = new LicitTableCellParaElement(cell, bgColor, colWidth, verAlign, isChapterHeader, isTransparent, cellStyleInfo);
         }
         licitCell.rowspan = rowspan;
         licitCell.colspan = colspan;
@@ -1256,6 +1274,80 @@ export class LicitConverter {
         }
         licitRow.addCell(licitCell);
     }
+    /**
+     * Extracts style information from a table cell element per the ingest requirements.
+     * Captures: margins (top/bottom), font-size overrides, and letter-spacing for non-breaking spaces.
+     *
+     * @param cell - The HTMLTableCellElement to extract styles from
+     * @returns Object containing extracted style information
+     */
+    extractCellStyles(cell) {
+        const styleInfo = {};
+        // Capture class and ID from the paragraph inside the cell
+        const paragraph = cell.querySelector('p');
+        if (paragraph) {
+            if (paragraph.className) {
+                styleInfo.className = paragraph.className;
+            }
+            if (paragraph.id) {
+                styleInfo.id = paragraph.id;
+            }
+            // Extract style attributes from the paragraph's style attribute
+            const style = paragraph.getAttribute('style');
+            if (style) {
+                this.extractParagraphStyles(style, styleInfo);
+            }
+            // Extract letter-spacing for non-breaking spaces
+            const spans = paragraph.querySelectorAll('span[style*="letter-spacing"]');
+            this.extractLetterSpacing(spans, styleInfo);
+        }
+        return styleInfo;
+    }
+    /**
+     * Extracts margin and font-size properties from a style string.
+     *
+     * @param style - The style attribute string
+     * @param styleInfo - The style info object to populate
+     */
+    extractParagraphStyles(style, styleInfo) {
+        const styleProps = style.split(';');
+        for (const prop of styleProps) {
+            const trimmedProp = prop.trim();
+            if (trimmedProp.startsWith('margin-top')) {
+                styleInfo.marginTop = trimmedProp.split(':')[1]?.trim();
+            }
+            else if (trimmedProp.startsWith('margin-bottom')) {
+                styleInfo.marginBottom = trimmedProp.split(':')[1]?.trim();
+            }
+            else if (trimmedProp.startsWith('font-size')) {
+                styleInfo.fontSize = trimmedProp.split(':')[1]?.trim();
+            }
+        }
+    }
+    /**
+     * Extracts the first letter-spacing value from spans containing non-breaking spaces.
+     *
+     * @param spans - NodeList of span elements with letter-spacing styles
+     * @param styleInfo - The style info object to populate
+     */
+    extractLetterSpacing(spans, styleInfo) {
+        const letterSpacingRegex = /letter-spacing\s{0,1000}:\s{0,1000}([^;]{1,1000})/;
+        for (const span of Array.from(spans)) {
+            // Check if this span contains a non-breaking space
+            const content = span.innerHTML;
+            if (content.includes('&#160;') || content.includes('&nbsp;')) {
+                const spanStyle = span.getAttribute('style');
+                if (spanStyle) {
+                    const match = letterSpacingRegex.exec(spanStyle);
+                    if (match) {
+                        // Store the first letter-spacing value found
+                        styleInfo.letterSpacing = match[1].trim();
+                        break;
+                    }
+                }
+            }
+        }
+    }
     checkCellStyle(style) {
         let borderColor = null;
         if (style != null) {
@@ -1274,7 +1366,7 @@ export class LicitConverter {
         }
         return borderColor;
     }
-    addTableImageCell(cell, bgColor, isChapterHeader, licitCell, verAlign) {
+    addTableImageCell(cell, bgColor, isChapterHeader, licitCell, verAlign, cellStyleInfo) {
         const image = cell.childNodes[0].querySelector('img');
         let altText = null;
         let imgHeight = null;
@@ -1295,10 +1387,10 @@ export class LicitConverter {
         const source = image?.getAttribute('srcRelative') ?? image?.src;
         if (source) {
             // seybi excluded image
-            licitCell = new LicitTableCellImageElement(source, fillImg, fitoParent, bgColor, imgHeight, colWidth, altText);
+            licitCell = new LicitTableCellImageElement(source, fillImg, fitoParent, bgColor, imgHeight, colWidth, altText, cellStyleInfo);
         }
         else {
-            licitCell = new LicitTableCellParagraph(cell, bgColor, colWidth, verAlign);
+            licitCell = new LicitTableCellParagraph(cell, bgColor, colWidth, verAlign, cellStyleInfo);
         }
         return { bgColor, isChapterHeader, licitCell };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit-import-utils",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "type": "module",
   "subversion": "1",
@@ -37,11 +37,11 @@
     "uuid": "^13.0.0"
   },
   "devDependencies": {
-    "@modusoperandi/mammoth": "^1.7.0-6",
+    "@modusoperandi/mammoth": "^1.7.0-8",
     "@modusoperandi/eslint-config": "^3.0.3",
     "@types/jest": "^30.0.0",
     "jszip": "^3.10.1",
-    "eslint": "^9.39.2",
+    "eslint": "^9.39.3",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "jest-junit": "^16.0.0",