@aster-editor/word 0.4.3 → 0.5.0

package/dist/docx/compare/model-paragraph.js

@@ -0,0 +1,309 @@
+import { allNamed, childNamed, wordAttribute } from '../preprocess/xml-utils';
+import { toVariableName } from '../preprocess/names';
+import { emuToPx } from '../reader/units';
+/** `{{nom}}`, blancs intérieurs tolérés, pour lister les champs du texte canonique. */
+const PLACEHOLDER = /\{\{\s*([^{}]*?)\s*\}\}/g;
+/**
+ * Instruction `MERGEFIELD nom` ou `MERGEFIELD "nom composé"`, options (`\* MERGEFORMAT`)
+ * ignorées : même lecture que `preprocess/fields.ts` (`parseMergeField`, non exporté).
+ */
+const MERGEFIELD_INSTR = /^\s*MERGEFIELD\s+(?:"([^"]*)"|(\S+))/iu;
+/** Nom brut et normalisé d'une instruction `MERGEFIELD`, `null` pour toute autre instruction. */
+function parseMergeField(instruction) {
+    const match = MERGEFIELD_INSTR.exec(instruction);
+    if (!match)
+        return null;
+    const raw = (match[1] ?? match[2] ?? '').trim();
+    const name = toVariableName(raw);
+    return name === null ? null : { raw, name };
+}
+function newSegment() {
+    return {
+        text: '',
+        placeholderText: '',
+        pageBreakAfter: false,
+        runs: [],
+        images: [],
+        notes: [],
+        mergeFields: new Map(),
+    };
+}
+function readImage(element) {
+    if (element.localName === 'pict') {
+        return allNamed(element, 'imagedata').length > 0 ? { kind: 'pict' } : null;
+    }
+    if (allNamed(element, 'blip').length === 0)
+        return null;
+    const container = childNamed(element, 'anchor') ?? childNamed(element, 'inline') ?? element;
+    const extent = childNamed(container, 'extent');
+    const cx = Number(extent?.getAttribute('cx') ?? '');
+    const cy = Number(extent?.getAttribute('cy') ?? '');
+    return {
+        kind: 'drawing',
+        ...(cx > 0 ? { widthPx: emuToPx(cx) } : {}),
+        ...(cy > 0 ? { heightPx: emuToPx(cy) } : {}),
+    };
+}
+/** Clé de fusion de deux runs voisins : mêmes propriétés résolues. */
+function runKey(props) {
+    return JSON.stringify(props, Object.keys(props).sort());
+}
+/**
+ * Champs de fusion d'un texte canonique, dans l'ordre (`{{a}} … {{b}}` → `[a, b]`). Un
+ * `{{nom}}` qui commence à une position enregistrée dans `mergeFields` est un vrai champ
+ * (nom brut de l'instruction) ; tout autre est un `{{}}` en clair, dont le nom brut est
+ * l'intérieur des accolades et le nom normalisé celui des variables de l'import
+ * (`Numero Facture` → `numero_facture`), pour qu'il vaille le `MERGEFIELD` dont Aster l'a écrit.
+ */
+export function placeholderFields(placeholderText, mergeFields = new Map()) {
+    const fields = [];
+    for (const match of placeholderText.matchAll(PLACEHOLDER)) {
+        const field = mergeFields.get(match.index);
+        if (field) {
+            fields.push({ raw: field.raw, name: field.name, literal: false });
+            continue;
+        }
+        const raw = match[1] ?? '';
+        if (raw === '')
+            continue;
+        fields.push({ raw, name: toVariableName(raw) ?? raw, literal: true });
+    }
+    return fields;
+}
+/** Vrai pour un segment sans contenu visible (texte, image, note). */
+function isEmpty(segment) {
+    return segment.text === '' && segment.images.length === 0 && segment.notes.length === 0;
+}
+/**
+ * Lit un `w:p` : un paragraphe par segment séparé par un saut de page explicite. Le dernier
+ * segment, vide, est omis (« a<br page> » : Word ne rend rien après le saut) ; un paragraphe
+ * réduit à un saut donne un segment vide marqué `pageBreakAfter`, que `readBlocks` replie
+ * sur le paragraphe précédent.
+ */
+export function readParagraphs(p, ctx) {
+    const pPr = childNamed(p, 'pPr');
+    const props = ctx.styles.paragraph(pPr);
+    const segments = [];
+    let current = newSegment();
+    const openFields = [];
+    let capture;
+    /** Vrai quand le prochain texte ne doit pas fusionner avec le run précédent (borne de champ). */
+    let breakRun = false;
+    const inInstruction = () => openFields.some((field) => !field.inResult);
+    const pushText = (runProps, text) => {
+        if (text === '' || inInstruction())
+            return;
+        current.text += text;
+        if (!capture)
+            current.placeholderText += text;
+        const key = runKey(runProps);
+        const last = current.runs[current.runs.length - 1];
+        if (last && last.key === key && !breakRun)
+            last.text += text;
+        else
+            current.runs.push({ text, props: runProps, key });
+        breakRun = false;
+    };
+    const startCapture = (field, runProps) => {
+        capture = {
+            field,
+            runStart: current.runs.length,
+            textStart: current.text.length,
+            props: runProps,
+        };
+        breakRun = true;
+    };
+    /**
+     * Clôt la capture : les runs du résultat deviennent un run `{{nom}}` aux propriétés du
+     * premier, fusionné avec ses voisins comme n'importe quel texte, pour que le `{{nom}}`
+     * écrit en clair par Aster donne les mêmes runs.
+     */
+    const endCapture = () => {
+        if (!capture)
+            return;
+        const first = current.runs[capture.runStart];
+        const runProps = first?.props ?? capture.props;
+        current.runs.splice(capture.runStart);
+        const placeholder = `{{${capture.field.name}}}`;
+        const key = runKey(runProps);
+        const last = current.runs[current.runs.length - 1];
+        if (last && last.key === key)
+            last.text += placeholder;
+        else
+            current.runs.push({ text: placeholder, props: runProps, key });
+        current.mergeFields.set(current.placeholderText.length, capture.field);
+        current.placeholderText += placeholder;
+        capture = undefined;
+        breakRun = false;
+    };
+    const pageBreak = () => {
+        current.pageBreakAfter = true;
+        segments.push(current);
+        current = newSegment();
+        breakRun = false;
+    };
+    const readFieldChar = (child, runProps) => {
+        const type = wordAttribute(child, 'fldCharType');
+        const top = openFields[openFields.length - 1];
+        if (type === 'begin') {
+            openFields.push({ instruction: '', inResult: false, capturing: false });
+        }
+        else if (type === 'separate' && top) {
+            top.inResult = true;
+            const field = parseMergeField(top.instruction);
+            if (field !== null && !capture) {
+                top.capturing = true;
+                startCapture(field, runProps);
+            }
+        }
+        else if (type === 'end' && top) {
+            openFields.pop();
+            if (top.capturing) {
+                endCapture();
+            }
+            else if (!top.inResult) {
+                // Champ sans `separate` (jamais mis à jour) : Word n'affiche rien, le nom compte.
+                const field = parseMergeField(top.instruction);
+                if (field !== null && !capture) {
+                    startCapture(field, runProps);
+                    endCapture();
+                }
+            }
+        }
+    };
+    const readRun = (run) => {
+        const resolved = ctx.styles.run(childNamed(run, 'rPr'), props);
+        for (const child of Array.from(run.children)) {
+            switch (child.localName) {
+                case 't':
+                    pushText(resolved, child.textContent ?? '');
+                    break;
+                case 'instrText': {
+                    const top = openFields[openFields.length - 1];
+                    if (top && !top.inResult)
+                        top.instruction += child.textContent ?? '';
+                    break;
+                }
+                case 'tab':
+                case 'ptab':
+                    pushText(resolved, '\t');
+                    break;
+                case 'br':
+                    if (wordAttribute(child, 'type') === 'page' && !capture && !inInstruction())
+                        pageBreak();
+                    else
+                        pushText(resolved, '\n');
+                    break;
+                case 'cr':
+                    pushText(resolved, '\n');
+                    break;
+                case 'noBreakHyphen':
+                    pushText(resolved, String.fromCharCode(0x2011));
+                    break;
+                case 'softHyphen':
+                    pushText(resolved, String.fromCharCode(0xad));
+                    break;
+                case 'sym': {
+                    const code = Number.parseInt(wordAttribute(child, 'char'), 16);
+                    if (Number.isFinite(code))
+                        pushText(resolved, String.fromCodePoint(code));
+                    break;
+                }
+                case 'fldChar':
+                    readFieldChar(child, resolved);
+                    break;
+                case 'drawing':
+                case 'pict': {
+                    const image = inInstruction() ? null : readImage(child);
+                    if (image)
+                        current.images.push(image);
+                    break;
+                }
+                case 'footnoteReference':
+                case 'endnoteReference': {
+                    const kind = child.localName === 'footnoteReference' ? 'footnote' : 'endnote';
+                    const id = wordAttribute(child, 'id');
+                    if (id && !inInstruction()) {
+                        current.notes.push({ kind, text: ctx.notes.get(`${kind}:${id}`) ?? '' });
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    };
+    const walk = (parent) => {
+        for (const child of Array.from(parent.children)) {
+            switch (child.localName) {
+                case 'r':
+                    readRun(child);
+                    break;
+                case 'del':
+                case 'moveFrom':
+                case 'pPr':
+                case 'bookmarkStart':
+                case 'bookmarkEnd':
+                case 'proofErr':
+                case 'commentRangeStart':
+                case 'commentRangeEnd':
+                    break;
+                case 'sdt': {
+                    const content = childNamed(child, 'sdtContent');
+                    if (content)
+                        walk(content);
+                    break;
+                }
+                case 'fldSimple': {
+                    const field = parseMergeField(wordAttribute(child, 'instr'));
+                    if (field !== null && !capture && !inInstruction()) {
+                        startCapture(field, ctx.styles.run(null, props));
+                        walk(child);
+                        endCapture();
+                    }
+                    else {
+                        walk(child);
+                    }
+                    break;
+                }
+                default:
+                    // `w:hyperlink`, `w:ins`, `w:smartTag`… : conteneurs traversés.
+                    walk(child);
+            }
+        }
+    };
+    walk(p);
+    segments.push(current);
+    if (segments.length > 1 && !current.pageBreakAfter && isEmpty(current))
+        segments.pop();
+    const numbering = props.numbering;
+    const level = numbering
+        ? ctx.numbering.definition(numbering.numId)?.levels.find((l) => l.level === numbering.level)
+        : undefined;
+    const revisionIds = Array.from(p.attributes)
+        .filter((attr) => attr.localName.startsWith('rsid'))
+        .map((attr) => `${attr.localName}=${attr.value}`)
+        .sort()
+        .join(' ');
+    return segments.map((segment) => ({
+        kind: 'paragraph',
+        text: segment.text,
+        placeholderText: segment.placeholderText,
+        fields: placeholderFields(segment.placeholderText, segment.mergeFields),
+        props,
+        ...(level ? { listFormat: `${level.format}|${level.text}|${String(level.start)}` } : {}),
+        ...(segment.pageBreakAfter ? { pageBreakAfter: true } : {}),
+        runs: segment.runs.map(({ text, props: runProps }) => ({ text, props: runProps })),
+        images: segment.images,
+        notes: segment.notes,
+        revisionIds,
+    }));
+}
+/** Vrai pour un paragraphe sans contenu visible : seul un saut de page le justifie. */
+export function isBlankParagraph(paragraph) {
+    return (paragraph.text === '' &&
+        paragraph.images.length === 0 &&
+        paragraph.notes.length === 0 &&
+        paragraph.fields.length === 0);
+}
+//# sourceMappingURL=model-paragraph.js.map

package/dist/docx/compare/model-paragraph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-paragraph.js","sourceRoot":"","sources":["../../../src/docx/compare/model-paragraph.ts"],"names":[],"mappings":"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"}

package/dist/docx/compare/model-sections.d.ts

@@ -0,0 +1,11 @@
+import type { BlockModel, ModelContext, SectionModel } from './model';
+/**
+ * Sections du modèle comparable : chaque `w:sectPr` du corps (fins de section dans les
+ * `w:pPr`, puis le final) avec format de page, marges, colonnes, première page différente
+ * et les en-têtes et pieds qu'il référence, lus avec le même lecteur de blocs que le corps.
+ */
+/** Lecteur de blocs injecté par `model.ts`, pour ne pas créer de cycle d'imports. */
+export type BlockReader = (container: Element, ctx: ModelContext) => BlockModel[];
+/** Toutes les sections du corps, dans l'ordre du document. */
+export declare function readSections(body: Element, ctx: ModelContext, readBlocks: BlockReader): Promise<SectionModel[]>;
+//# sourceMappingURL=model-sections.d.ts.map

package/dist/docx/compare/model-sections.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-sections.d.ts","sourceRoot":"","sources":["../../../src/docx/compare/model-sections.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,UAAU,EAGV,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB;;;;GAIG;AAEH,qFAAqF;AACrF,MAAM,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,KAAK,UAAU,EAAE,CAAC;AAuFlF,8DAA8D;AAC9D,wBAAsB,YAAY,CAChC,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,YAAY,EACjB,UAAU,EAAE,WAAW,GACtB,OAAO,CAAC,YAAY,EAAE,CAAC,CAMzB"}

package/dist/docx/compare/model-sections.js

@@ -0,0 +1,97 @@
+import { allNamed, childNamed, wordAttribute } from '../preprocess/xml-utils';
+import { relationshipAttribute } from '../reader/images';
+import { twipsToPt } from '../reader/units';
+import { numericAttribute } from '../reader/units-blocks';
+function attributesOf(element, names) {
+    const out = {};
+    if (!element)
+        return out;
+    for (const name of names) {
+        const value = numericAttribute(element, name);
+        if (value !== undefined)
+            out[name] = twipsToPt(value);
+    }
+    return out;
+}
+async function readSection(sectPr, ctx, readBlocks) {
+    const pgSz = childNamed(sectPr, 'pgSz');
+    // `w:orient` absent vaut portrait ; `w:cols` à une colonne vaut l'absence de colonnes.
+    const orient = (pgSz ? wordAttribute(pgSz, 'orient') : '') || 'portrait';
+    const colsElement = childNamed(sectPr, 'cols');
+    const cols = colsElement && (numericAttribute(colsElement, 'num') ?? 1) >= 2 ? colsElement : null;
+    const type = childNamed(sectPr, 'type');
+    const rels = await ctx.pkg.rels(ctx.part);
+    const headers = {};
+    const footers = {};
+    for (const reference of Array.from(sectPr.children)) {
+        const target = reference.localName === 'headerReference'
+            ? headers
+            : reference.localName === 'footerReference'
+                ? footers
+                : null;
+        if (!target)
+            continue;
+        const kind = wordAttribute(reference, 'type') || 'default';
+        if (kind !== 'default' && kind !== 'first' && kind !== 'even')
+            continue;
+        const rel = rels.get(relationshipAttribute(reference, 'id'));
+        if (!rel || rel.external)
+            continue;
+        const doc = await ctx.pkg.part(rel.target);
+        if (doc) {
+            target[kind] = { blocks: readBlocks(doc.documentElement, { ...ctx, part: rel.target }) };
+        }
+    }
+    return {
+        ...(type ? { type: wordAttribute(type, 'val') } : {}),
+        ...(pgSz ? { pageSize: { ...attributesOf(pgSz, ['w', 'h']), orient } } : {}),
+        ...(childNamed(sectPr, 'pgMar')
+            ? {
+                margins: attributesOf(childNamed(sectPr, 'pgMar'), [
+                    'top',
+                    'right',
+                    'bottom',
+                    'left',
+                    'header',
+                    'footer',
+                    'gutter',
+                ]),
+            }
+            : {}),
+        ...(cols
+            ? {
+                columns: {
+                    num: numericAttribute(cols, 'num') ?? 1,
+                    space: twipsToPt(numericAttribute(cols, 'space') ?? 0),
+                    equalWidth: wordAttribute(cols, 'equalWidth') !== '0',
+                },
+            }
+            : {}),
+        titlePage: childNamed(sectPr, 'titlePg') !== null,
+        headers,
+        footers,
+    };
+}
+/** Tous les `w:sectPr` du corps dans l'ordre : fins de section dans les `w:pPr`, puis le final. */
+function sectionProperties(body) {
+    const result = [];
+    for (const p of allNamed(body, 'p')) {
+        const pPr = childNamed(p, 'pPr');
+        const sectPr = pPr ? childNamed(pPr, 'sectPr') : null;
+        if (sectPr)
+            result.push(sectPr);
+    }
+    const last = childNamed(body, 'sectPr');
+    if (last)
+        result.push(last);
+    return result;
+}
+/** Toutes les sections du corps, dans l'ordre du document. */
+export async function readSections(body, ctx, readBlocks) {
+    const sections = [];
+    for (const sectPr of sectionProperties(body)) {
+        sections.push(await readSection(sectPr, ctx, readBlocks));
+    }
+    return sections;
+}
+//# sourceMappingURL=model-sections.js.map

package/dist/docx/compare/model-sections.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-sections.js","sourceRoot":"","sources":["../../../src/docx/compare/model-sections.ts"],"names":[],"mappings":"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"}

package/dist/docx/compare/model.d.ts

@@ -0,0 +1,113 @@
+import type { CellVerticalAlign } from '@aster-editor/core';
+import type { DocxPackage, NumberingResolver, ResolvedParagraphProps, ResolvedRunProps, StyleResolver } from '../reader/types';
+import { type EffectiveBorders } from './model-borders';
+/**
+ * Modèle comparable d'un document Word : blocs du corps (paragraphes et tableaux, `w:sdt`
+ * aplatis) avec leurs propriétés **résolues** par le lecteur, sections avec leurs en-têtes
+ * et pieds. Les `Document` du paquet ne sont jamais modifiés. Les `w:rsid*`,
+ * `w:lastRenderedPageBreak`, `w:proofErr` et signets ne sont pas lus, sauf les
+ * identifiants de révision du paragraphe, exposés pour l'option `ignoreRevisionIds: false`.
+ * Les bordures et largeurs de cellules sont celles que Word rend (`model-borders.ts`), les
+ * sauts de page et champs de fusion sont modélisés par `model-paragraph.ts`.
+ */
+export interface RunModel {
+    readonly text: string;
+    readonly props: ResolvedRunProps;
+}
+export interface ImageModel {
+    readonly kind: 'drawing' | 'pict';
+    readonly widthPx?: number;
+    readonly heightPx?: number;
+}
+export interface NoteModel {
+    readonly kind: 'footnote' | 'endnote';
+    readonly text: string;
+}
+/**
+ * Champ de fusion d'un paragraphe : vrai `MERGEFIELD` ou `{{nom}}` écrit en clair. Le nom
+ * brut distingue `MERGEFIELD "Nom Client"`, `nom_client` et `"NOM CLIENT"`, trois colonnes
+ * de source de données (R30-04) ; le nom normalisé ne sert que face à un `{{}}` littéral,
+ * celui qu'Aster écrit à l'import.
+ */
+export interface FieldModel {
+    /** Nom brut : celui de l'instruction (guillemets retirés) ou l'intérieur du `{{}}`, blancs rognés. */
+    readonly raw: string;
+    /** Nom de variable normalisé comme à l'import (`Nom Client` → `nom_client`). */
+    readonly name: string;
+    /** Vrai pour un `{{nom}}` en clair, faux pour un champ `MERGEFIELD` (simple ou complexe). */
+    readonly literal: boolean;
+}
+export interface ParagraphModel {
+    readonly kind: 'paragraph';
+    /** Texte tel que Word l'affiche : résultat des champs, tabulations et sauts de ligne compris. */
+    readonly text: string;
+    /** Texte canonique : chaque champ de fusion remplacé par `{{nom}}` normalisé, pour l'alignement et l'équivalence. */
+    readonly placeholderText: string;
+    /** Champs de fusion dans l'ordre, `MERGEFIELD` et `{{nom}}` en clair distingués par `literal`. */
+    readonly fields: readonly FieldModel[];
+    readonly props: ResolvedParagraphProps;
+    /** Format résolu du niveau de liste (`decimal|%1.|1`), `undefined` sans numérotation connue. */
+    readonly listFormat?: string;
+    /** Saut de page explicite (`w:br w:type="page"`) à la fin de ce paragraphe. */
+    readonly pageBreakAfter?: true;
+    readonly runs: readonly RunModel[];
+    readonly images: readonly ImageModel[];
+    readonly notes: readonly NoteModel[];
+    /** Attributs `w:rsid*` du paragraphe, triés, pour `ignoreRevisionIds: false`. */
+    readonly revisionIds: string;
+}
+export interface CellModel {
+    readonly colspan: number;
+    readonly vMerge?: 'restart' | 'continue';
+    /** Largeur effective : `w:tcW` en twips, sinon la somme des colonnes de grille couvertes. */
+    readonly widthPt?: number;
+    /** Bordures effectives (style, tableau selon la position, cellule), côtés visibles seulement. */
+    readonly borders?: EffectiveBorders;
+    readonly shading?: string;
+    readonly verticalAlign?: CellVerticalAlign;
+    readonly blocks: readonly BlockModel[];
+}
+export interface TableModel {
+    readonly kind: 'table';
+    readonly text: string;
+    readonly placeholderText: string;
+    readonly styleId?: string;
+    readonly width?: string;
+    readonly align?: string;
+    /** Bordures extérieures effectives (style puis `w:tblBorders`), côtés visibles seulement. */
+    readonly borders?: EffectiveBorders;
+    readonly columnWidthsPt: readonly number[];
+    readonly rows: readonly (readonly CellModel[])[];
+}
+export type BlockModel = ParagraphModel | TableModel;
+export interface HeaderFooterModel {
+    readonly blocks: readonly BlockModel[];
+}
+export type HeaderFooterType = 'default' | 'first' | 'even';
+export interface SectionModel {
+    readonly type?: string;
+    readonly pageSize?: Record<string, string | number>;
+    readonly margins?: Record<string, number>;
+    readonly columns?: Record<string, string | number | boolean>;
+    readonly titlePage: boolean;
+    readonly headers: Partial<Record<HeaderFooterType, HeaderFooterModel>>;
+    readonly footers: Partial<Record<HeaderFooterType, HeaderFooterModel>>;
+}
+export interface DocumentModel {
+    readonly blocks: readonly BlockModel[];
+    readonly sections: readonly SectionModel[];
+    readonly lang?: string;
+}
+/** Contexte de lecture d'une partie : paquet, chemin de la partie, résolveurs, textes des notes. */
+export interface ModelContext {
+    readonly pkg: DocxPackage;
+    readonly part: string;
+    readonly styles: StyleResolver;
+    readonly numbering: NumberingResolver;
+    readonly notes: ReadonlyMap<string, string>;
+}
+/** Texte brut d'une suite de blocs, paragraphes séparés par des sauts de ligne. */
+export declare function blocksText(blocks: readonly BlockModel[]): string;
+/** Lit le modèle comparable d'un paquet ouvert. Lève si la partie principale est illisible. */
+export declare function readDocumentModel(pkg: DocxPackage, styles: StyleResolver, numbering: NumberingResolver): Promise<DocumentModel>;
+//# sourceMappingURL=model.d.ts.map

package/dist/docx/compare/model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/docx/compare/model.ts"],"names":[],"mappings":"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"}