ts-visio 1.0.2 → 1.2.0

package/dist/ShapeModifier.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShapeModifier = void 0;
-const fast_xml_parser_1 = require("fast-xml-parser");
 const RelsManager_1 = require("./core/RelsManager");
 const StyleHelpers_1 = require("./utils/StyleHelpers");
 const VisioConstants_1 = require("./core/VisioConstants");
+const VisioTypes_1 = require("./types/VisioTypes");
 const ForeignShapeBuilder_1 = require("./shapes/ForeignShapeBuilder");
 const ShapeBuilder_1 = require("./shapes/ShapeBuilder");
 const ConnectorBuilder_1 = require("./shapes/ConnectorBuilder");
 const ContainerBuilder_1 = require("./shapes/ContainerBuilder");
+const XmlHelper_1 = require("./utils/XmlHelper");
 class ShapeModifier {
     // ...
     async addContainer(pageId, props) {
-        const pagePath = this.getPagePath(pageId);
-        let content = this.pkg.getFileText(pagePath);
-        const parsed = this.parser.parse(content);
-        // Ensure Shapes container...
+        const parsed = this.getParsed(pageId);
         if (!parsed.PageContents.Shapes)
             parsed.PageContents.Shapes = { Shape: [] };
         let topLevelShapes = parsed.PageContents.Shapes.Shape;
@@ -23,20 +21,15 @@ class ShapeModifier {
             topLevelShapes = topLevelShapes ? [topLevelShapes] : [];
             parsed.PageContents.Shapes.Shape = topLevelShapes;
         }
-        let newId = props.id || this.getNextId(parsed);
+        const newId = props.id || this.getNextId(parsed);
         const containerShape = ContainerBuilder_1.ContainerBuilder.createContainerShape(newId, props);
         topLevelShapes.push(containerShape);
-        const newXml = this.builder.build(parsed);
-        this.pkg.updateFile(pagePath, newXml);
-        return newId;
-        this.pkg.updateFile(pagePath, newXml);
+        this.getShapeMap(parsed).set(newId, containerShape);
+        this.saveParsed(pageId, parsed);
         return newId;
     }
     async addList(pageId, props, direction = 'vertical') {
-        const pagePath = this.getPagePath(pageId);
-        let content = this.pkg.getFileText(pagePath);
-        const parsed = this.parser.parse(content);
-        // Ensure Shapes container...
+        const parsed = this.getParsed(pageId);
         if (!parsed.PageContents.Shapes)
             parsed.PageContents.Shapes = { Shape: [] };
         let topLevelShapes = parsed.PageContents.Shapes.Shape;
@@ -44,57 +37,66 @@ class ShapeModifier {
             topLevelShapes = topLevelShapes ? [topLevelShapes] : [];
             parsed.PageContents.Shapes.Shape = topLevelShapes;
         }
-        let newId = props.id || this.getNextId(parsed);
+        const newId = props.id || this.getNextId(parsed);
         const listShape = ContainerBuilder_1.ContainerBuilder.createContainerShape(newId, props);
         ContainerBuilder_1.ContainerBuilder.makeList(listShape, direction);
         topLevelShapes.push(listShape);
-        const newXml = this.builder.build(parsed);
-        this.pkg.updateFile(pagePath, newXml);
+        this.getShapeMap(parsed).set(newId, listShape);
+        this.saveParsed(pageId, parsed);
         return newId;
     }
+    /**
+     * Register the resolved OPC part path for a page ID.
+     * Must be called before any operation on a loaded file to ensure the
+     * correct file is targeted rather than the ID-derived fallback name.
+     */
+    registerPage(pageId, xmlPath) {
+        this.pagePathRegistry.set(pageId, xmlPath);
+    }
     constructor(pkg) {
         this.pkg = pkg;
         this.pageCache = new Map();
         this.dirtyPages = new Set();
+        this.shapeCache = new WeakMap();
+        this.pagePathRegistry = new Map();
         this.autoSave = true;
-        this.parser = new fast_xml_parser_1.XMLParser({
-            ignoreAttributes: false,
-            attributeNamePrefix: "@_"
-        });
-        this.builder = new fast_xml_parser_1.XMLBuilder({
-            ignoreAttributes: false,
-            attributeNamePrefix: "@_",
-            format: true
-        });
+        this.parser = (0, XmlHelper_1.createXmlParser)();
+        this.builder = (0, XmlHelper_1.createXmlBuilder)();
         this.relsManager = new RelsManager_1.RelsManager(pkg);
     }
     getPagePath(pageId) {
-        return `visio/pages/page${pageId}.xml`;
+        return this.pagePathRegistry.get(pageId) ?? `visio/pages/page${pageId}.xml`;
     }
-    getAllShapes(parsed) {
-        let topLevelShapes = parsed.PageContents.Shapes ? parsed.PageContents.Shapes.Shape : [];
-        if (!Array.isArray(topLevelShapes)) {
-            topLevelShapes = topLevelShapes ? [topLevelShapes] : [];
-        }
-        const all = [];
-        const gather = (shapeList) => {
-            for (const s of shapeList) {
-                all.push(s);
-                if (s.Shapes && s.Shapes.Shape) {
-                    const children = Array.isArray(s.Shapes.Shape) ? s.Shapes.Shape : [s.Shapes.Shape];
-                    gather(children);
-                }
+    getShapeMap(parsed) {
+        if (!this.shapeCache.has(parsed)) {
+            const map = new Map();
+            let topLevelShapes = parsed.PageContents.Shapes ? parsed.PageContents.Shapes.Shape : [];
+            if (!Array.isArray(topLevelShapes)) {
+                topLevelShapes = topLevelShapes ? [topLevelShapes] : [];
             }
-        };
-        gather(topLevelShapes);
-        return all;
+            const gather = (shapeList) => {
+                for (const s of shapeList) {
+                    map.set(s['@_ID'], s);
+                    if (s.Shapes && s.Shapes.Shape) {
+                        const children = Array.isArray(s.Shapes.Shape) ? s.Shapes.Shape : [s.Shapes.Shape];
+                        gather(children);
+                    }
+                }
+            };
+            gather(topLevelShapes);
+            this.shapeCache.set(parsed, map);
+        }
+        return this.shapeCache.get(parsed);
+    }
+    getAllShapes(parsed) {
+        return Array.from(this.getShapeMap(parsed).values());
     }
     getNextId(parsed) {
         // Updates PageSheet.NextShapeID to prevent ID conflicts.
         // Calculates the next ID from existing shapes and increments the counter.
-        const allShapes = this.getAllShapes(parsed);
+        const shapeMap = this.getShapeMap(parsed);
         let maxId = 0;
-        for (const s of allShapes) {
+        for (const s of shapeMap.values()) {
             const id = parseInt(s['@_ID']);
             if (!isNaN(id) && id > maxId)
                 maxId = id;
@@ -169,7 +171,7 @@ class ShapeModifier {
         this.performSave(pagePath, parsed);
     }
     performSave(pagePath, parsed) {
-        const newXml = this.builder.build(parsed);
+        const newXml = (0, XmlHelper_1.buildXml)(this.builder, parsed);
         this.pkg.updateFile(pagePath, newXml);
         this.pageCache.set(pagePath, { content: newXml, parsed });
     }
@@ -189,7 +191,7 @@ class ShapeModifier {
             parsed.PageContents.Shapes = { Shape: [] };
         }
         if (!Array.isArray(parsed.PageContents.Shapes.Shape)) {
-            parsed.PageContents.Shapes.Shape = [parsed.PageContents.Shapes.Shape];
+            parsed.PageContents.Shapes.Shape = parsed.PageContents.Shapes.Shape ? [parsed.PageContents.Shapes.Shape] : [];
         }
         const newId = this.getNextId(parsed);
         const shapeHierarchy = ConnectorBuilder_1.ConnectorBuilder.buildShapeHierarchy(parsed);
@@ -206,6 +208,7 @@ class ShapeModifier {
         const connectorShape = ConnectorBuilder_1.ConnectorBuilder.createConnectorShapeObject(newId, layout, validateArrow(beginArrow), validateArrow(endArrow));
         const topLevelShapes = parsed.PageContents.Shapes.Shape;
         topLevelShapes.push(connectorShape);
+        this.getShapeMap(parsed).set(newId, connectorShape);
         ConnectorBuilder_1.ConnectorBuilder.addConnectorToConnects(parsed, newId, fromShapeId, toShapeId);
         this.saveParsed(pageId, parsed);
         return newId;
@@ -221,7 +224,6 @@ class ShapeModifier {
             topLevelShapes = topLevelShapes ? [topLevelShapes] : [];
             parsed.PageContents.Shapes.Shape = topLevelShapes;
         }
-        const allShapes = this.getAllShapes(parsed);
         // Auto-generate ID if not provided
         let newId = props.id;
         if (!newId) {
@@ -245,7 +247,7 @@ class ShapeModifier {
         }
         if (parentId) {
             // Add to Parent Group
-            const parent = allShapes.find((s) => s['@_ID'] == parentId);
+            const parent = this.getShapeMap(parsed).get(parentId);
             if (!parent) {
                 throw new Error(`Parent shape ${parentId} not found`);
             }
@@ -266,83 +268,120 @@ class ShapeModifier {
             // Add to Page
             topLevelShapes.push(newShape);
         }
+        this.getShapeMap(parsed).set(newId, newShape);
         this.saveParsed(pageId, parsed);
         return newId;
     }
-    async updateShapeText(pageId, shapeId, newText) {
+    async deleteShape(pageId, shapeId) {
         const parsed = this.getParsed(pageId);
-        let found = false;
-        // Helper to recursively find and update shape
-        const findAndUpdate = (shapes) => {
-            for (const shape of shapes) {
-                if (shape['@_ID'] == shapeId) {
-                    shape.Text = {
-                        '#text': newText
-                    };
-                    found = true;
-                    return;
-                }
-                // If shapes can be nested (Groups), check for sub-shapes - future improvement
-                // But typically basic Text is on top level or group level.
+        // 1. Remove shape from the shape tree (handles top-level and nested groups)
+        const removed = this.removeShapeFromTree(parsed.PageContents.Shapes, shapeId);
+        if (!removed) {
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        }
+        // 2. Remove any Connect elements referencing this shape
+        if (parsed.PageContents.Connects?.Connect) {
+            let connects = parsed.PageContents.Connects.Connect;
+            if (!Array.isArray(connects))
+                connects = [connects];
+            const filtered = connects.filter((c) => c['@_FromSheet'] !== shapeId && c['@_ToSheet'] !== shapeId);
+            parsed.PageContents.Connects.Connect = filtered;
+        }
+        // 3. Remove any Relationship elements referencing this shape (container membership, etc.)
+        if (parsed.PageContents.Relationships?.Relationship) {
+            let rels = parsed.PageContents.Relationships.Relationship;
+            if (!Array.isArray(rels))
+                rels = [rels];
+            parsed.PageContents.Relationships.Relationship = rels.filter((r) => r['@_ShapeID'] !== shapeId && r['@_RelatedShapeID'] !== shapeId);
+        }
+        // 4. Invalidate the shape cache so the map is rebuilt on next access
+        this.shapeCache.delete(parsed);
+        this.saveParsed(pageId, parsed);
+    }
+    removeShapeFromTree(shapesContainer, shapeId) {
+        if (!shapesContainer?.Shape)
+            return false;
+        let shapes = shapesContainer.Shape;
+        if (!Array.isArray(shapes))
+            shapes = [shapes];
+        const idx = shapes.findIndex((s) => s['@_ID'] === shapeId);
+        if (idx !== -1) {
+            shapes.splice(idx, 1);
+            shapesContainer.Shape = shapes;
+            return true;
+        }
+        // Recurse into nested group children
+        for (const shape of shapes) {
+            if (shape.Shapes && this.removeShapeFromTree(shape.Shapes, shapeId)) {
+                return true;
             }
-        };
-        const shapesData = parsed.PageContents?.Shapes?.Shape;
-        if (shapesData) {
-            const shapesArray = Array.isArray(shapesData) ? shapesData : [shapesData];
-            findAndUpdate(shapesArray);
         }
-        if (!found) {
+        return false;
+    }
+    async updateShapeText(pageId, shapeId, newText) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape) {
             throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
         }
+        shape.Text = {
+            '#text': newText
+        };
         this.saveParsed(pageId, parsed);
     }
     async updateShapeStyle(pageId, shapeId, style) {
         const parsed = this.getParsed(pageId);
-        let found = false;
-        const findAndUpdate = (shapes) => {
-            for (const shape of shapes) {
-                if (shape['@_ID'] == shapeId) {
-                    found = true;
-                    // Ensure Section array exists
-                    if (!shape.Section) {
-                        shape.Section = [];
-                    }
-                    else if (!Array.isArray(shape.Section)) {
-                        shape.Section = [shape.Section];
-                    }
-                    // Update/Add Fill
-                    if (style.fillColor) {
-                        // Remove existing Fill section if any (simplified: assuming IX=0)
-                        shape.Section = shape.Section.filter((s) => s['@_N'] !== 'Fill');
-                        shape.Section.push((0, StyleHelpers_1.createFillSection)(style.fillColor));
-                    }
-                    // Update/Add Character (Font/Text Style)
-                    if (style.fontColor || style.bold !== undefined) {
-                        // Remove existing Character section if any
-                        shape.Section = shape.Section.filter((s) => s['@_N'] !== 'Character');
-                        shape.Section.push((0, StyleHelpers_1.createCharacterSection)({
-                            bold: style.bold,
-                            color: style.fontColor
-                        }));
-                    }
-                    return;
-                }
-            }
-        };
-        const shapesData = parsed.PageContents?.Shapes?.Shape;
-        if (shapesData) {
-            const shapesArray = Array.isArray(shapesData) ? shapesData : [shapesData];
-            findAndUpdate(shapesArray);
-        }
-        if (!found) {
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape) {
             throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
         }
+        // Ensure Section array exists
+        if (!shape.Section) {
+            shape.Section = [];
+        }
+        else if (!Array.isArray(shape.Section)) {
+            shape.Section = [shape.Section];
+        }
+        // Update/Add Fill
+        if (style.fillColor) {
+            // Remove existing Fill section if any (simplified: assuming IX=0)
+            shape.Section = shape.Section.filter((s) => s['@_N'] !== 'Fill');
+            shape.Section.push((0, StyleHelpers_1.createFillSection)(style.fillColor));
+        }
+        // Update/Add Character (Font/Text Style)
+        if (style.fontColor || style.bold !== undefined || style.fontSize !== undefined || style.fontFamily !== undefined) {
+            shape.Section = shape.Section.filter((s) => s['@_N'] !== 'Character');
+            shape.Section.push((0, StyleHelpers_1.createCharacterSection)({
+                bold: style.bold,
+                color: style.fontColor,
+                fontSize: style.fontSize,
+                fontFamily: style.fontFamily,
+            }));
+        }
+        // Update/Add Paragraph (Horizontal Alignment)
+        if (style.horzAlign !== undefined) {
+            shape.Section = shape.Section.filter((s) => s['@_N'] !== 'Paragraph');
+            shape.Section.push((0, StyleHelpers_1.createParagraphSection)(style.horzAlign));
+        }
+        // Update/Add VerticalAlign (top-level shape Cell)
+        if (style.verticalAlign !== undefined) {
+            if (!shape.Cell)
+                shape.Cell = [];
+            if (!Array.isArray(shape.Cell))
+                shape.Cell = [shape.Cell];
+            const existingCell = shape.Cell.find((c) => c['@_N'] === 'VerticalAlign');
+            if (existingCell) {
+                existingCell['@_V'] = (0, StyleHelpers_1.vertAlignValue)(style.verticalAlign);
+            }
+            else {
+                shape.Cell.push({ '@_N': 'VerticalAlign', '@_V': (0, StyleHelpers_1.vertAlignValue)(style.verticalAlign) });
+            }
+        }
         this.saveParsed(pageId, parsed);
     }
     async updateShapeDimensions(pageId, shapeId, w, h) {
         const parsed = this.getParsed(pageId);
-        const shapes = this.getAllShapes(parsed);
-        const shape = shapes.find((s) => s['@_ID'] == shapeId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
         if (!shape)
             throw new Error(`Shape ${shapeId} not found`);
         // Ensure Cell array
@@ -361,115 +400,175 @@ class ShapeModifier {
         updateCell('Height', h.toString());
         this.saveParsed(pageId, parsed);
     }
-    async updateShapePosition(pageId, shapeId, x, y) {
+    /**
+     * Set the rotation angle of a shape. Degrees are converted to radians
+     * for storage in the Angle cell (Visio's native unit).
+     */
+    async rotateShape(pageId, shapeId, degrees) {
         const parsed = this.getParsed(pageId);
-        let found = false;
-        const findAndUpdate = (shapes) => {
-            for (const shape of shapes) {
-                if (shape['@_ID'] == shapeId) {
-                    found = true;
-                    // Ensure Cell array exists
-                    if (!shape.Cell) {
-                        shape.Cell = [];
-                    }
-                    else if (!Array.isArray(shape.Cell)) {
-                        shape.Cell = [shape.Cell];
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape)
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        if (!shape.Cell)
+            shape.Cell = [];
+        if (!Array.isArray(shape.Cell))
+            shape.Cell = [shape.Cell];
+        const radians = (degrees * Math.PI) / 180;
+        const existing = shape.Cell.find((c) => c['@_N'] === 'Angle');
+        if (existing)
+            existing['@_V'] = radians.toString();
+        else
+            shape.Cell.push({ '@_N': 'Angle', '@_V': radians.toString() });
+        this.saveParsed(pageId, parsed);
+    }
+    /**
+     * Set the flip state for a shape along the X or Y axis.
+     * FlipX mirrors left-to-right; FlipY mirrors top-to-bottom.
+     */
+    setShapeFlip(pageId, shapeId, axis, enabled) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape)
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        if (!shape.Cell)
+            shape.Cell = [];
+        if (!Array.isArray(shape.Cell))
+            shape.Cell = [shape.Cell];
+        const cellName = axis === 'x' ? 'FlipX' : 'FlipY';
+        const value = enabled ? '1' : '0';
+        const existing = shape.Cell.find((c) => c['@_N'] === cellName);
+        if (existing)
+            existing['@_V'] = value;
+        else
+            shape.Cell.push({ '@_N': cellName, '@_V': value });
+        this.saveParsed(pageId, parsed);
+    }
+    /**
+     * Resize a shape, keeping it centred on its current PinX/PinY.
+     * Updates Width, Height, LocPinX, LocPinY, and the cached @_V on any
+     * Geometry cells whose @_F formula references Width or Height, so that
+     * non-Visio renderers see consistent values.
+     */
+    async resizeShape(pageId, shapeId, width, height) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape)
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        if (!shape.Cell)
+            shape.Cell = [];
+        if (!Array.isArray(shape.Cell))
+            shape.Cell = [shape.Cell];
+        const upsert = (name, val) => {
+            const cell = shape.Cell.find((c) => c['@_N'] === name);
+            if (cell)
+                cell['@_V'] = val;
+            else
+                shape.Cell.push({ '@_N': name, '@_V': val });
+        };
+        upsert('Width', width.toString());
+        upsert('Height', height.toString());
+        upsert('LocPinX', (width / 2).toString());
+        upsert('LocPinY', (height / 2).toString());
+        // Keep cached @_V consistent for renderers that don't evaluate formulas
+        if (shape.Section) {
+            const sections = Array.isArray(shape.Section) ? shape.Section : [shape.Section];
+            for (const section of sections) {
+                if (section['@_N'] !== 'Geometry' || !section.Row)
+                    continue;
+                const rows = Array.isArray(section.Row) ? section.Row : [section.Row];
+                for (const row of rows) {
+                    if (!row.Cell)
+                        continue;
+                    const cells = Array.isArray(row.Cell) ? row.Cell : [row.Cell];
+                    for (const cell of cells) {
+                        if (cell['@_F'] === 'Width')
+                            cell['@_V'] = width.toString();
+                        if (cell['@_F'] === 'Height')
+                            cell['@_V'] = height.toString();
                     }
-                    // Helper to update specific cell
-                    const updateCell = (name, value) => {
-                        const cell = shape.Cell.find((c) => c['@_N'] === name);
-                        if (cell) {
-                            cell['@_V'] = value;
-                        }
-                        else {
-                            shape.Cell.push({ '@_N': name, '@_V': value });
-                        }
-                    };
-                    updateCell('PinX', x.toString());
-                    updateCell('PinY', y.toString());
-                    return;
                 }
             }
-        };
-        const shapesData = parsed.PageContents?.Shapes?.Shape;
-        if (shapesData) {
-            const shapesArray = Array.isArray(shapesData) ? shapesData : [shapesData];
-            findAndUpdate(shapesArray);
         }
-        if (!found) {
+        this.saveParsed(pageId, parsed);
+    }
+    async updateShapePosition(pageId, shapeId, x, y) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape) {
             throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
         }
+        // Ensure Cell array exists
+        if (!shape.Cell) {
+            shape.Cell = [];
+        }
+        else if (!Array.isArray(shape.Cell)) {
+            shape.Cell = [shape.Cell];
+        }
+        // Helper to update specific cell
+        const updateCell = (name, value) => {
+            const cell = shape.Cell.find((c) => c['@_N'] === name);
+            if (cell) {
+                cell['@_V'] = value;
+            }
+            else {
+                shape.Cell.push({ '@_N': name, '@_V': value });
+            }
+        };
+        updateCell('PinX', x.toString());
+        updateCell('PinY', y.toString());
         this.saveParsed(pageId, parsed);
     }
     addPropertyDefinition(pageId, shapeId, name, type, options = {}) {
         const parsed = this.getParsed(pageId);
-        let found = false;
-        const findAndUpdate = (shapes) => {
-            for (const shape of shapes) {
-                if (shape['@_ID'] == shapeId) {
-                    found = true;
-                    // Ensure Section array exists
-                    if (!shape.Section)
-                        shape.Section = [];
-                    if (!Array.isArray(shape.Section))
-                        shape.Section = [shape.Section];
-                    // Find or Create Property Section
-                    let propSection = shape.Section.find((s) => s['@_N'] === 'Property');
-                    if (!propSection) {
-                        propSection = { '@_N': 'Property', Row: [] };
-                        shape.Section.push(propSection);
-                    }
-                    // Ensure Row array exists
-                    if (!propSection.Row)
-                        propSection.Row = [];
-                    if (!Array.isArray(propSection.Row))
-                        propSection.Row = [propSection.Row];
-                    // Check if property already exists
-                    const existingRow = propSection.Row.find((r) => r['@_N'] === `Prop.${name}`);
-                    if (existingRow) {
-                        // Update existing Definition
-                        const updateCell = (n, v) => {
-                            let c = existingRow.Cell.find((x) => x['@_N'] === n);
-                            if (c)
-                                c['@_V'] = v;
-                            else
-                                existingRow.Cell.push({ '@_N': n, '@_V': v });
-                        };
-                        if (options.label !== undefined)
-                            updateCell('Label', options.label);
-                        updateCell('Type', type.toString());
-                        if (options.invisible !== undefined)
-                            updateCell('Invisible', options.invisible ? '1' : '0');
-                    }
-                    else {
-                        // Create New Row
-                        propSection.Row.push({
-                            '@_N': `Prop.${name}`,
-                            Cell: [
-                                { '@_N': 'Label', '@_V': options.label || name }, // Default label to name
-                                { '@_N': 'Type', '@_V': type.toString() },
-                                { '@_N': 'Invisible', '@_V': options.invisible ? '1' : '0' },
-                                { '@_N': 'Value', '@_V': '0' } // Initialize with default
-                            ]
-                        });
-                    }
-                    return;
-                }
-                // Recurse into nested shapes (groups/containers)
-                if (shape.Shapes?.Shape) {
-                    const children = Array.isArray(shape.Shapes.Shape) ? shape.Shapes.Shape : [shape.Shapes.Shape];
-                    findAndUpdate(children);
-                }
-            }
-        };
-        const shapesData = parsed.PageContents?.Shapes?.Shape;
-        if (shapesData) {
-            const shapesArray = Array.isArray(shapesData) ? shapesData : [shapesData];
-            findAndUpdate(shapesArray);
-        }
-        if (!found) {
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape) {
             throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
         }
+        // Ensure Section array exists
+        if (!shape.Section)
+            shape.Section = [];
+        if (!Array.isArray(shape.Section))
+            shape.Section = [shape.Section];
+        // Find or Create Property Section
+        let propSection = shape.Section.find((s) => s['@_N'] === 'Property');
+        if (!propSection) {
+            propSection = { '@_N': 'Property', Row: [] };
+            shape.Section.push(propSection);
+        }
+        // Ensure Row array exists
+        if (!propSection.Row)
+            propSection.Row = [];
+        if (!Array.isArray(propSection.Row))
+            propSection.Row = [propSection.Row];
+        // Check if property already exists
+        const existingRow = propSection.Row.find((r) => r['@_N'] === `Prop.${name}`);
+        if (existingRow) {
+            // Update existing Definition
+            const updateCell = (n, v) => {
+                let c = existingRow.Cell.find((x) => x['@_N'] === n);
+                if (c)
+                    c['@_V'] = v;
+                else
+                    existingRow.Cell.push({ '@_N': n, '@_V': v });
+            };
+            if (options.label !== undefined)
+                updateCell('Label', options.label);
+            updateCell('Type', type.toString());
+            if (options.invisible !== undefined)
+                updateCell('Invisible', options.invisible ? '1' : '0');
+        }
+        else {
+            // Create New Row
+            propSection.Row.push({
+                '@_N': `Prop.${name}`,
+                Cell: [
+                    { '@_N': 'Label', '@_V': options.label || name }, // Default label to name
+                    { '@_N': 'Type', '@_V': type.toString() },
+                    { '@_N': 'Invisible', '@_V': options.invisible ? '1' : '0' },
+                    { '@_N': 'Value', '@_V': '0' } // Initialize with default
+                ]
+            });
+        }
         this.saveParsed(pageId, parsed);
     }
     dateToVisioString(date) {
@@ -479,69 +578,50 @@ class ShapeModifier {
     }
     setPropertyValue(pageId, shapeId, name, value) {
         const parsed = this.getParsed(pageId);
-        let found = false;
-        const findAndUpdate = (shapes) => {
-            for (const shape of shapes) {
-                if (shape['@_ID'] == shapeId) {
-                    found = true;
-                    // Ensure Section array exists
-                    const sections = shape.Section ? (Array.isArray(shape.Section) ? shape.Section : [shape.Section]) : [];
-                    const propSection = sections.find((s) => s['@_N'] === 'Property');
-                    if (!propSection) {
-                        throw new Error(`Property definition 'Prop.${name}' does not exist on shape ${shapeId}. Call addPropertyDefinition first.`);
-                    }
-                    const rows = propSection.Row ? (Array.isArray(propSection.Row) ? propSection.Row : [propSection.Row]) : [];
-                    const row = rows.find((r) => r['@_N'] === `Prop.${name}`);
-                    if (!row) {
-                        throw new Error(`Property definition 'Prop.${name}' does not exist on shape ${shapeId}. Call addPropertyDefinition first.`);
-                    }
-                    // Determine Visio Value String
-                    let visioValue = '';
-                    if (value instanceof Date) {
-                        visioValue = this.dateToVisioString(value);
-                    }
-                    else if (typeof value === 'boolean') {
-                        visioValue = value ? '1' : '0'; // Should boolean be V='TRUE' or 1? Standard practice is often 1/0 or TRUE/FALSE. Cells are formulaic.
-                        // However, if the Type is 3 (Boolean), Visio often expects 0/1 or TRUE/FALSE.
-                        // Let's stick to '1'/'0' for safety in formulas if generic.
-                    }
-                    else {
-                        visioValue = value.toString();
-                    }
-                    // Update or Add Value Cell
-                    // Note: If Type is String (0), V="String". If Number (2), V="123".
-                    // Visio often puts string values in formulae as "String", but in XML V attribute it's raw text?
-                    // Actually, for String props, V usually contains the string.
-                    let valCell = row.Cell.find((c) => c['@_N'] === 'Value');
-                    if (valCell) {
-                        valCell['@_V'] = visioValue;
-                    }
-                    else {
-                        row.Cell.push({ '@_N': 'Value', '@_V': visioValue });
-                    }
-                    return;
-                }
-                // Recurse into nested shapes (groups/containers)
-                if (shape.Shapes?.Shape) {
-                    const children = Array.isArray(shape.Shapes.Shape) ? shape.Shapes.Shape : [shape.Shapes.Shape];
-                    findAndUpdate(children);
-                }
-            }
-        };
-        const shapesData = parsed.PageContents?.Shapes?.Shape;
-        if (shapesData) {
-            const shapesArray = Array.isArray(shapesData) ? shapesData : [shapesData];
-            findAndUpdate(shapesArray);
-        }
-        if (!found) {
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape) {
             throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
         }
+        // Ensure Section array exists
+        const sections = shape.Section ? (Array.isArray(shape.Section) ? shape.Section : [shape.Section]) : [];
+        const propSection = sections.find((s) => s['@_N'] === 'Property');
+        if (!propSection) {
+            throw new Error(`Property definition 'Prop.${name}' does not exist on shape ${shapeId}. Call addPropertyDefinition first.`);
+        }
+        const rows = propSection.Row ? (Array.isArray(propSection.Row) ? propSection.Row : [propSection.Row]) : [];
+        const row = rows.find((r) => r['@_N'] === `Prop.${name}`);
+        if (!row) {
+            throw new Error(`Property definition 'Prop.${name}' does not exist on shape ${shapeId}. Call addPropertyDefinition first.`);
+        }
+        // Determine Visio Value String
+        let visioValue = '';
+        if (value instanceof Date) {
+            visioValue = this.dateToVisioString(value);
+        }
+        else if (typeof value === 'boolean') {
+            visioValue = value ? '1' : '0'; // Should boolean be V='TRUE' or 1? Standard practice is often 1/0 or TRUE/FALSE. Cells are formulaic.
+            // However, if the Type is 3 (Boolean), Visio often expects 0/1 or TRUE/FALSE.
+            // Let's stick to '1'/'0' for safety in formulas if generic.
+        }
+        else {
+            visioValue = value.toString();
+        }
+        // Update or Add Value Cell
+        // Note: If Type is String (0), V="String". If Number (2), V="123".
+        // Visio often puts string values in formulae as "String", but in XML V attribute it's raw text?
+        // Actually, for String props, V usually contains the string.
+        let valCell = row.Cell.find((c) => c['@_N'] === 'Value');
+        if (valCell) {
+            valCell['@_V'] = visioValue;
+        }
+        else {
+            row.Cell.push({ '@_N': 'Value', '@_V': visioValue });
+        }
         this.saveParsed(pageId, parsed);
     }
     getShapeGeometry(pageId, shapeId) {
         const parsed = this.getParsed(pageId);
-        const shapes = this.getAllShapes(parsed);
-        const shape = shapes.find((s) => s['@_ID'] == shapeId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
         if (!shape)
             throw new Error(`Shape ${shapeId} not found`);
         const getCellVal = (name) => {
@@ -622,8 +702,7 @@ class ShapeModifier {
     async addListItem(pageId, listId, itemId) {
         // 1. Get List Properties (Direction, Spacing)
         const parsed = this.getParsed(pageId);
-        const shapes = this.getAllShapes(parsed);
-        const listShape = shapes.find((s) => s['@_ID'] == listId);
+        const listShape = this.getShapeMap(parsed).get(listId);
         if (!listShape)
             throw new Error(`List ${listId} not found`);
         const getUserVal = (name, def) => {
@@ -718,8 +797,7 @@ class ShapeModifier {
     }
     async addHyperlink(pageId, shapeId, details) {
         const parsed = this.getParsed(pageId);
-        const shapes = this.getAllShapes(parsed);
-        const shape = shapes.find((s) => s['@_ID'] == shapeId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
         if (!shape)
             throw new Error(`Shape ${shapeId} not found`);
         // Ensure Section array
@@ -806,8 +884,7 @@ class ShapeModifier {
     }
     async assignLayer(pageId, shapeId, layerIndex) {
         const parsed = this.getParsed(pageId);
-        const shapes = this.getAllShapes(parsed);
-        const shape = shapes.find((s) => s['@_ID'] == shapeId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
         if (!shape)
             throw new Error(`Shape ${shapeId} not found`);
         // Ensure Section array
@@ -885,5 +962,112 @@ class ShapeModifier {
         }
         this.saveParsed(pageId, parsed);
     }
+    /**
+     * Read back all custom property (shape data) entries for a shape.
+     * Returns a map of property key → ShapeData, with values coerced to
+     * the declared type (Number, Boolean, Date, or String).
+     */
+    getShapeProperties(pageId, shapeId) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape)
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        const result = {};
+        if (!shape.Section)
+            return result;
+        const sections = Array.isArray(shape.Section) ? shape.Section : [shape.Section];
+        const propSection = sections.find((s) => s['@_N'] === 'Property');
+        if (!propSection?.Row)
+            return result;
+        const rows = Array.isArray(propSection.Row) ? propSection.Row : [propSection.Row];
+        for (const row of rows) {
+            // Row names are "Prop.KeyName" — strip the prefix to recover the user-facing key
+            const rawKey = row['@_N'] ?? '';
+            const key = rawKey.startsWith('Prop.') ? rawKey.slice(5) : rawKey;
+            if (!key)
+                continue;
+            const cells = Array.isArray(row.Cell) ? row.Cell : (row.Cell ? [row.Cell] : []);
+            const getCell = (name) => cells.find((c) => c['@_N'] === name)?.['@_V'];
+            const rawValue = getCell('Value') ?? '';
+            const type = parseInt(getCell('Type') ?? '0');
+            const label = getCell('Label');
+            const hidden = getCell('Invisible') === '1';
+            let value;
+            switch (type) {
+                case VisioTypes_1.VisioPropType.Number:
+                case VisioTypes_1.VisioPropType.Currency:
+                case VisioTypes_1.VisioPropType.Duration:
+                    value = parseFloat(rawValue) || 0;
+                    break;
+                case VisioTypes_1.VisioPropType.Boolean:
+                    value = rawValue === '1' || rawValue.toLowerCase() === 'true';
+                    break;
+                case VisioTypes_1.VisioPropType.Date:
+                    value = new Date(rawValue);
+                    break;
+                default:
+                    value = rawValue;
+            }
+            result[key] = { value, label, hidden, type };
+        }
+        return result;
+    }
+    /**
+     * Read back all hyperlinks attached to a shape.
+     */
+    getShapeHyperlinks(pageId, shapeId) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape)
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        const result = [];
+        if (!shape.Section)
+            return result;
+        const sections = Array.isArray(shape.Section) ? shape.Section : [shape.Section];
+        const linkSection = sections.find((s) => s['@_N'] === 'Hyperlink');
+        if (!linkSection?.Row)
+            return result;
+        const rows = Array.isArray(linkSection.Row) ? linkSection.Row : [linkSection.Row];
+        for (const row of rows) {
+            const cells = Array.isArray(row.Cell) ? row.Cell : (row.Cell ? [row.Cell] : []);
+            const getCell = (name) => cells.find((c) => c['@_N'] === name)?.['@_V'];
+            result.push({
+                address: getCell('Address'),
+                subAddress: getCell('SubAddress'),
+                description: getCell('Description'),
+                newWindow: getCell('NewWindow') === '1',
+            });
+        }
+        return result;
+    }
+    /**
+     * Read back the layer indices a shape is assigned to.
+     * Returns an empty array if the shape has no layer assignment.
+     */
+    getShapeLayerIndices(pageId, shapeId) {
+        const parsed = this.getParsed(pageId);
+        const shape = this.getShapeMap(parsed).get(shapeId);
+        if (!shape)
+            throw new Error(`Shape ${shapeId} not found on page ${pageId}`);
+        if (!shape.Section)
+            return [];
+        const sections = Array.isArray(shape.Section) ? shape.Section : [shape.Section];
+        const memSection = sections.find((s) => s['@_N'] === 'LayerMem');
+        if (!memSection?.Row)
+            return [];
+        const rows = Array.isArray(memSection.Row) ? memSection.Row : [memSection.Row];
+        const row = rows[0];
+        if (!row)
+            return [];
+        const cells = Array.isArray(row.Cell) ? row.Cell : (row.Cell ? [row.Cell] : []);
+        const memberCell = cells.find((c) => c['@_N'] === 'LayerMember');
+        if (!memberCell?.['@_V'])
+            return [];
+        return memberCell['@_V']
+            .split(';')
+            .filter((s) => s.length > 0)
+            .map((s) => parseInt(s))
+            .filter((n) => !isNaN(n));
+    }
 }
 exports.ShapeModifier = ShapeModifier;