ts-visio 1.0.2 → 1.2.0

package/README.md

@@ -12,7 +12,7 @@ Built using specific schema-level abstractions to handle the complex internal st
 
 ## Features
 
-- **Read VSDX**: Open and parse `.vsdx` files (zippped XML).
+- **Read VSDX**: Open and parse `.vsdx` files (zipped XML).
 - **Strict Typing**: Interact with `VisioPage`, `VisioShape`, and `VisioConnect` objects.
 - **ShapeSheet Access**: Read `Cells`, `Rows`, and `Sections` directly.
 - **Connections**: Analyze connectivity between shapes.
@@ -20,6 +20,11 @@ Built using specific schema-level abstractions to handle the complex internal st
 - **Modify Content**: Update text content of shapes.
 - **Create Shapes**: Add new rectangular shapes with text to pages.
 - **Connect Shapes**: Create dynamic connectors between shapes.
+- **Text Styling**: Font size, font family, bold, color, horizontal/vertical alignment.
+- **Shape Transformations**: Rotate, flip (X/Y), and resize shapes via a fluent API.
+- **Deletion**: Remove shapes and pages cleanly (including orphaned connectors and relationships).
+- **Lookup API**: Find shapes by ID, predicate, or look up pages by name.
+- **Read-Back API**: Read custom properties, hyperlinks, and layer assignments from existing shapes.
 
 ## Installation
 
@@ -63,9 +68,13 @@ const shape = await page.addShape({
     y: 1,
     width: 3,
     height: 1,
-    fillColor: "#ff0000", // Option hexadecimal fill color
+    fillColor: "#ff0000",   // Hex fill color
     fontColor: "#ffffff",
-    bold: true
+    bold: true,
+    fontSize: 14,           // Points
+    fontFamily: "Segoe UI",
+    horzAlign: "center",    // "left" | "center" | "right" | "justify"
+    verticalAlign: "middle" // "top" | "middle" | "bottom"
 });
 
 // Modify text
@@ -345,6 +354,70 @@ await lane1.addMember(startShape);
 await lane2.addMember(serverShape);
 ```
 
+#### 19. Shape Transformations
+Rotate, flip, and resize shapes using a fluent API.
+
+```typescript
+const shape = await page.addShape({ text: "Widget", x: 3, y: 3, width: 2, height: 1 });
+
+// Rotate 45 degrees (clockwise)
+await shape.rotate(45);
+console.log(shape.angle); // 45
+
+// Mirror horizontally or vertically
+await shape.flipX();
+await shape.flipY(false); // un-flip
+
+// Resize (keeps the pin point centred)
+await shape.resize(4, 2);
+console.log(shape.width, shape.height); // 4, 2
+
+// Chainable
+await shape.rotate(90).then(s => s.resize(3, 1));
+```
+
+#### 20. Deleting Shapes and Pages
+Remove shapes or entire pages. Orphaned connectors and relationships are cleaned up automatically.
+
+```typescript
+// Delete a shape
+await shape.delete();
+
+// Delete a page (removes page file, rels, and all back-page references)
+await doc.deletePage(page2);
+```
+
+#### 21. Lookup API
+Find shapes and pages without iterating manually.
+
+```typescript
+// Find a shape by its numeric ID (searches nested groups too)
+const target = await page.getShapeById("42");
+
+// Find all shapes matching a predicate
+const servers = await page.findShapes(s => s.text.startsWith("Server"));
+
+// Look up a page by name (exact, case-sensitive)
+const detailPage = doc.getPage("Architecture Diagram");
+```
+
+#### 22. Reading Shape Data Back
+Retrieve custom properties, hyperlinks, and layer assignments that were previously written.
+
+```typescript
+// Custom properties (shape data)
+const props = shape.getProperties();
+console.log(props["IP"].value);    // "192.168.1.10"
+console.log(props["Port"].type);   // VisioPropType.Number
+
+// Hyperlinks
+const links = shape.getHyperlinks();
+// [ { address: "https://example.com", description: "Docs", newWindow: false } ]
+
+// Layer indices
+const indices = shape.getLayerIndices(); // e.g. [0, 2]
+```
+
 ## Examples
 
 Check out the [examples](./examples) directory for complete scripts.

package/dist/Layer.d.ts

@@ -1,10 +1,12 @@
 import { VisioPackage } from './VisioPackage';
+import { ShapeModifier } from './ShapeModifier';
 export declare class Layer {
     name: string;
     index: number;
     private pageId?;
     private pkg?;
-    constructor(name: string, index: number, pageId?: string | undefined, pkg?: VisioPackage | undefined);
+    private modifier;
+    constructor(name: string, index: number, pageId?: string | undefined, pkg?: VisioPackage | undefined, modifier?: ShapeModifier);
     setVisible(visible: boolean): Promise<this>;
     setLocked(locked: boolean): Promise<this>;
     hide(): Promise<this>;

package/dist/Layer.js

@@ -3,26 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Layer = void 0;
 const ShapeModifier_1 = require("./ShapeModifier");
 class Layer {
-    constructor(name, index, pageId, pkg) {
+    constructor(name, index, pageId, pkg, modifier) {
         this.name = name;
         this.index = index;
         this.pageId = pageId;
         this.pkg = pkg;
+        this.modifier = modifier ?? (pkg ? new ShapeModifier_1.ShapeModifier(pkg) : null);
     }
     async setVisible(visible) {
-        if (!this.pageId || !this.pkg) {
+        if (!this.pageId || !this.modifier) {
             throw new Error('Layer was not created with page context. Cannot update properties.');
         }
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.updateLayerProperty(this.pageId, this.index, 'Visible', visible ? '1' : '0');
+        await this.modifier.updateLayerProperty(this.pageId, this.index, 'Visible', visible ? '1' : '0');
         return this;
     }
     async setLocked(locked) {
-        if (!this.pageId || !this.pkg) {
+        if (!this.pageId || !this.modifier) {
             throw new Error('Layer was not created with page context. Cannot update properties.');
         }
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.updateLayerProperty(this.pageId, this.index, 'Lock', locked ? '1' : '0');
+        await this.modifier.updateLayerProperty(this.pageId, this.index, 'Lock', locked ? '1' : '0');
         return this;
     }
     async hide() {

package/dist/Page.d.ts

@@ -12,10 +12,22 @@ export declare class Page {
     private media;
     private rels;
     private modifier;
+    /** Resolved OPC part path for this page's XML file. */
+    private pagePath;
     constructor(internalPage: VisioPage, pkg: VisioPackage, media?: MediaManager, rels?: RelsManager, modifier?: ShapeModifier);
     get id(): string;
     get name(): string;
     getShapes(): Shape[];
+    /**
+     * Find a shape by its ID anywhere on the page, including shapes nested inside groups.
+     * Returns undefined if no shape with that ID exists.
+     */
+    getShapeById(id: string): Shape | undefined;
+    /**
+     * Return all shapes on the page (including nested group children) that satisfy
+     * the predicate. Equivalent to getAllShapes().filter(predicate).
+     */
+    findShapes(predicate: (shape: Shape) => boolean): Shape[];
     addShape(props: NewShapeProps, parentId?: string): Promise<Shape>;
     connectShapes(fromShape: Shape, toShape: Shape, beginArrow?: string, endArrow?: string): Promise<void>;
     addImage(data: Buffer, name: string, x: number, y: number, width: number, height: number): Promise<Shape>;

package/dist/Page.js

@@ -12,9 +12,13 @@ class Page {
     constructor(internalPage, pkg, media, rels, modifier) {
         this.internalPage = internalPage;
         this.pkg = pkg;
+        // Prefer the relationship-resolved path over the ID-derived fallback so
+        // that loaded files with non-sequential page filenames work correctly.
+        this.pagePath = internalPage.xmlPath ?? `visio/pages/page${internalPage.ID}.xml`;
         this.media = media || new MediaManager_1.MediaManager(pkg);
         this.rels = rels || new RelsManager_1.RelsManager(pkg);
         this.modifier = modifier || new ShapeModifier_1.ShapeModifier(pkg);
+        this.modifier.registerPage(internalPage.ID, this.pagePath);
     }
     get id() {
         return this.internalPage.ID;
@@ -24,18 +28,37 @@ class Page {
     }
     getShapes() {
         const reader = new ShapeReader_1.ShapeReader(this.pkg);
-        // Assuming standard path mapping for now
-        const pagePath = `visio/pages/page${this.id}.xml`;
         try {
-            const internalShapes = reader.readShapes(pagePath);
-            return internalShapes.map(s => new Shape_1.Shape(s, this.id, this.pkg));
+            const internalShapes = reader.readShapes(this.pagePath);
+            return internalShapes.map(s => new Shape_1.Shape(s, this.id, this.pkg, this.modifier));
         }
         catch (e) {
-            // If page file doesn't exist or is empty, return empty array
             console.warn(`Could not read shapes for page ${this.id}:`, e);
             return [];
         }
     }
+    /**
+     * Find a shape by its ID anywhere on the page, including shapes nested inside groups.
+     * Returns undefined if no shape with that ID exists.
+     */
+    getShapeById(id) {
+        const reader = new ShapeReader_1.ShapeReader(this.pkg);
+        const internal = reader.readShapeById(this.pagePath, id);
+        if (!internal)
+            return undefined;
+        return new Shape_1.Shape(internal, this.id, this.pkg, this.modifier);
+    }
+    /**
+     * Return all shapes on the page (including nested group children) that satisfy
+     * the predicate. Equivalent to getAllShapes().filter(predicate).
+     */
+    findShapes(predicate) {
+        const reader = new ShapeReader_1.ShapeReader(this.pkg);
+        const all = reader.readAllShapes(this.pagePath);
+        return all
+            .map(s => new Shape_1.Shape(s, this.id, this.pkg, this.modifier))
+            .filter(predicate);
+    }
     async addShape(props, parentId) {
         const newId = await this.modifier.addShape(this.id, props, parentId);
         // Return a fresh Shape object representing the new shape
@@ -53,7 +76,7 @@ class Page {
                 'LocPinY': props.height / 2
             }
         });
-        return new Shape_1.Shape(internalStub, this.id, this.pkg);
+        return new Shape_1.Shape(internalStub, this.id, this.pkg, this.modifier);
     }
     async connectShapes(fromShape, toShape, beginArrow, endArrow) {
         await this.modifier.addConnector(this.id, fromShape.id, toShape.id, beginArrow, endArrow);
@@ -61,8 +84,8 @@ class Page {
     async addImage(data, name, x, y, width, height) {
         // 1. Upload Media
         const mediaPath = this.media.addMedia(name, data);
-        // 2. Link Page to Media
-        const rId = await this.rels.addPageImageRel(this.id, mediaPath);
+        // 2. Link Page to Media (use resolved path so loaded files work correctly)
+        const rId = await this.rels.addImageRelationship(this.pagePath, mediaPath);
         // 3. Create Shape
         const newId = await this.modifier.addShape(this.id, {
             text: '',
@@ -80,7 +103,7 @@ class Page {
                 'PinY': y
             }
         });
-        return new Shape_1.Shape(internalStub, this.id, this.pkg);
+        return new Shape_1.Shape(internalStub, this.id, this.pkg, this.modifier);
     }
     async addContainer(props) {
         const newId = await this.modifier.addContainer(this.id, props);
@@ -94,7 +117,7 @@ class Page {
                 'PinY': props.y
             }
         });
-        return new Shape_1.Shape(internalStub, this.id, this.pkg);
+        return new Shape_1.Shape(internalStub, this.id, this.pkg, this.modifier);
     }
     async addList(props, direction = 'vertical') {
         const newId = await this.modifier.addList(this.id, props, direction);
@@ -108,7 +131,7 @@ class Page {
                 'PinY': props.y
             }
         });
-        return new Shape_1.Shape(internalStub, this.id, this.pkg);
+        return new Shape_1.Shape(internalStub, this.id, this.pkg, this.modifier);
     }
     /**
      * Creates a Swimlane Pool (which is technically a Vertical List of Containers).
@@ -179,7 +202,7 @@ class Page {
     }
     async addLayer(name, options) {
         const info = await this.modifier.addLayer(this.id, name, options);
-        return new Layer_1.Layer(info.name, info.index, this.id, this.pkg);
+        return new Layer_1.Layer(info.name, info.index, this.id, this.pkg, this.modifier);
     }
 }
 exports.Page = Page;

package/dist/Shape.d.ts

@@ -1,6 +1,6 @@
 import { VisioShape } from './types/VisioTypes';
 import { VisioPackage } from './VisioPackage';
-import { ShapeStyle } from './ShapeModifier';
+import { ShapeModifier, ShapeStyle } from './ShapeModifier';
 import { VisioPropType } from './types/VisioTypes';
 import { Layer } from './Layer';
 export interface ShapeData {
@@ -9,11 +9,18 @@ export interface ShapeData {
     hidden?: boolean;
     type?: VisioPropType;
 }
+export interface ShapeHyperlink {
+    address?: string;
+    subAddress?: string;
+    description?: string;
+    newWindow: boolean;
+}
 export declare class Shape {
     private internalShape;
     private pageId;
     private pkg;
-    constructor(internalShape: VisioShape, pageId: string, pkg: VisioPackage);
+    private modifier;
+    constructor(internalShape: VisioShape, pageId: string, pkg: VisioPackage, modifier?: ShapeModifier);
     get id(): string;
     get name(): string;
     get text(): string;
@@ -22,6 +29,7 @@ export declare class Shape {
     get height(): number;
     get x(): number;
     get y(): number;
+    delete(): Promise<void>;
     connectTo(targetShape: Shape, beginArrow?: string, endArrow?: string): Promise<this>;
     setStyle(style: ShapeStyle): Promise<this>;
     placeRightOf(targetShape: Shape, options?: {
@@ -36,6 +44,41 @@ export declare class Shape {
     }): this;
     setPropertyValue(name: string, value: string | number | boolean | Date): this;
     addData(key: string, data: ShapeData): this;
+    /**
+     * Read back all custom property (shape data) entries written to this shape.
+     * Returns a map of property key → ShapeData. Values are coerced to the
+     * declared Visio type (Number, Boolean, Date, or String).
+     */
+    getProperties(): Record<string, ShapeData>;
+    /**
+     * Read back all hyperlinks attached to this shape.
+     */
+    getHyperlinks(): ShapeHyperlink[];
+    /**
+     * Read back the layer indices this shape is assigned to.
+     * Returns an empty array if the shape has no layer assignment.
+     */
+    getLayerIndices(): number[];
+    /** Current rotation angle in degrees (0 if no Angle cell is set). */
+    get angle(): number;
+    /**
+     * Rotate the shape to an absolute angle (degrees, clockwise).
+     * Replaces any existing rotation.
+     */
+    rotate(degrees: number): Promise<this>;
+    /**
+     * Resize the shape to the given width and height (in inches).
+     * Updates LocPinX/LocPinY to keep the centre-pin at width/2, height/2.
+     */
+    resize(width: number, height: number): Promise<this>;
+    /**
+     * Flip the shape horizontally. Pass `false` to un-flip.
+     */
+    flipX(enabled?: boolean): Promise<this>;
+    /**
+     * Flip the shape vertically. Pass `false` to un-flip.
+     */
+    flipY(enabled?: boolean): Promise<this>;
     addMember(memberShape: Shape): Promise<this>;
     addListItem(item: Shape): Promise<this>;
     resizeToFit(padding?: number): Promise<this>;
@@ -65,4 +108,6 @@ export declare class Shape {
      * Alias for assignLayer. Adds this shape to a layer.
      */
     addToLayer(layer: Layer | number): Promise<this>;
+    private setLocalCoord;
+    private setLocalRawCell;
 }

package/dist/Shape.js

@@ -3,11 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Shape = void 0;
 const ShapeModifier_1 = require("./ShapeModifier");
 const VisioTypes_1 = require("./types/VisioTypes");
+/** Round a coordinate to 10 decimal places to prevent float-to-string-to-float precision drift. */
+function fmtCoord(n) {
+    return parseFloat(n.toFixed(10)).toString();
+}
 class Shape {
-    constructor(internalShape, pageId, pkg) {
+    constructor(internalShape, pageId, pkg, modifier) {
         this.internalShape = internalShape;
         this.pageId = pageId;
         this.pkg = pkg;
+        this.modifier = modifier ?? new ShapeModifier_1.ShapeModifier(pkg);
     }
     get id() {
         return this.internalShape.ID;
@@ -19,9 +24,7 @@ class Shape {
         return this.internalShape.Text || '';
     }
     async setText(newText) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.updateShapeText(this.pageId, this.id, newText);
-        // Update local state to reflect change
+        await this.modifier.updateShapeText(this.pageId, this.id, newText);
         this.internalShape.Text = newText;
     }
     get width() {
@@ -36,65 +39,47 @@ class Shape {
     get y() {
         return this.internalShape.Cells['PinY'] ? Number(this.internalShape.Cells['PinY'].V) : 0;
     }
+    async delete() {
+        await this.modifier.deleteShape(this.pageId, this.id);
+    }
     async connectTo(targetShape, beginArrow, endArrow) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.addConnector(this.pageId, this.id, targetShape.id, beginArrow, endArrow);
+        await this.modifier.addConnector(this.pageId, this.id, targetShape.id, beginArrow, endArrow);
         return this;
     }
     async setStyle(style) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.updateShapeStyle(this.pageId, this.id, style);
-        // Minimal local state update to reflect changes if necessary
-        // For now, valid XML is the priority.
+        await this.modifier.updateShapeStyle(this.pageId, this.id, style);
         return this;
     }
     async placeRightOf(targetShape, options = { gap: 1 }) {
-        const newX = targetShape.x + targetShape.width + options.gap;
-        const newY = targetShape.y; // Keep same Y (per instructions, aligns center-to-center if PinY is center)
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.updateShapePosition(this.pageId, this.id, newX, newY);
-        // Update local state is crucial for chaining successive placements
-        if (this.internalShape.Cells['PinX'])
-            this.internalShape.Cells['PinX'].V = newX.toString();
-        else
-            this.internalShape.Cells['PinX'] = { V: newX.toString(), N: 'PinX' };
-        if (this.internalShape.Cells['PinY'])
-            this.internalShape.Cells['PinY'].V = newY.toString();
-        else
-            this.internalShape.Cells['PinY'] = { V: newY.toString(), N: 'PinY' };
+        // PinX is the shape centre, so right edge of target = target.x + target.width/2;
+        // left edge of this = newX - this.width/2. Set left edge = right edge of target + gap.
+        const newX = targetShape.x + (targetShape.width / 2) + options.gap + (this.width / 2);
+        const newY = targetShape.y; // Align centres vertically
+        await this.modifier.updateShapePosition(this.pageId, this.id, newX, newY);
+        // Update local state — rounded to avoid float precision drift in chained placements
+        this.setLocalCoord('PinX', newX);
+        this.setLocalCoord('PinY', newY);
         return this;
     }
     async placeBelow(targetShape, options = { gap: 1 }) {
-        const newX = targetShape.x; // Align Centers
-        // Target Bottom = target.y - target.height / 2
-        // My Top = Target Bottom - gap
-        // My Center = My Top - my.height / 2
-        // My Center = target.y - target.height/2 - gap - my.height/2
+        const newX = targetShape.x; // Align centres horizontally
+        // Target bottom edge = target.y - target.height/2
+        // This centre = target bottom - gap - this.height/2
         const newY = targetShape.y - (targetShape.height + this.height) / 2 - options.gap;
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.updateShapePosition(this.pageId, this.id, newX, newY);
-        if (this.internalShape.Cells['PinX'])
-            this.internalShape.Cells['PinX'].V = newX.toString();
-        else
-            this.internalShape.Cells['PinX'] = { V: newX.toString(), N: 'PinX' };
-        if (this.internalShape.Cells['PinY'])
-            this.internalShape.Cells['PinY'].V = newY.toString();
-        else
-            this.internalShape.Cells['PinY'] = { V: newY.toString(), N: 'PinY' };
+        await this.modifier.updateShapePosition(this.pageId, this.id, newX, newY);
+        this.setLocalCoord('PinX', newX);
+        this.setLocalCoord('PinY', newY);
         return this;
     }
     addPropertyDefinition(name, type, options = {}) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        modifier.addPropertyDefinition(this.pageId, this.id, name, type, options);
+        this.modifier.addPropertyDefinition(this.pageId, this.id, name, type, options);
         return this;
     }
     setPropertyValue(name, value) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        modifier.setPropertyValue(this.pageId, this.id, name, value);
+        this.modifier.setPropertyValue(this.pageId, this.id, name, value);
         return this;
     }
     addData(key, data) {
-        // Auto-detect type if not provided
         let type = data.type;
         if (type === undefined) {
             if (data.value instanceof Date) {
@@ -110,59 +95,103 @@ class Shape {
                 type = VisioTypes_1.VisioPropType.String;
             }
         }
-        // 1. Define Property
-        this.addPropertyDefinition(key, type, {
-            label: data.label,
-            invisible: data.hidden
-        });
-        // 2. Set Value
+        this.addPropertyDefinition(key, type, { label: data.label, invisible: data.hidden });
         this.setPropertyValue(key, data.value);
         return this;
     }
+    /**
+     * Read back all custom property (shape data) entries written to this shape.
+     * Returns a map of property key → ShapeData. Values are coerced to the
+     * declared Visio type (Number, Boolean, Date, or String).
+     */
+    getProperties() {
+        return this.modifier.getShapeProperties(this.pageId, this.id);
+    }
+    /**
+     * Read back all hyperlinks attached to this shape.
+     */
+    getHyperlinks() {
+        return this.modifier.getShapeHyperlinks(this.pageId, this.id);
+    }
+    /**
+     * Read back the layer indices this shape is assigned to.
+     * Returns an empty array if the shape has no layer assignment.
+     */
+    getLayerIndices() {
+        return this.modifier.getShapeLayerIndices(this.pageId, this.id);
+    }
+    /** Current rotation angle in degrees (0 if no Angle cell is set). */
+    get angle() {
+        const cell = this.internalShape.Cells['Angle'];
+        return cell ? (parseFloat(cell.V) * 180) / Math.PI : 0;
+    }
+    /**
+     * Rotate the shape to an absolute angle (degrees, clockwise).
+     * Replaces any existing rotation.
+     */
+    async rotate(degrees) {
+        await this.modifier.rotateShape(this.pageId, this.id, degrees);
+        const radians = (degrees * Math.PI) / 180;
+        this.setLocalCoord('Angle', radians);
+        return this;
+    }
+    /**
+     * Resize the shape to the given width and height (in inches).
+     * Updates LocPinX/LocPinY to keep the centre-pin at width/2, height/2.
+     */
+    async resize(width, height) {
+        if (width <= 0 || height <= 0)
+            throw new Error('Shape dimensions must be positive');
+        await this.modifier.resizeShape(this.pageId, this.id, width, height);
+        this.setLocalCoord('Width', width);
+        this.setLocalCoord('Height', height);
+        this.setLocalCoord('LocPinX', width / 2);
+        this.setLocalCoord('LocPinY', height / 2);
+        return this;
+    }
+    /**
+     * Flip the shape horizontally. Pass `false` to un-flip.
+     */
+    async flipX(enabled = true) {
+        this.modifier.setShapeFlip(this.pageId, this.id, 'x', enabled);
+        this.setLocalRawCell('FlipX', enabled ? '1' : '0');
+        return this;
+    }
+    /**
+     * Flip the shape vertically. Pass `false` to un-flip.
+     */
+    async flipY(enabled = true) {
+        this.modifier.setShapeFlip(this.pageId, this.id, 'y', enabled);
+        this.setLocalRawCell('FlipY', enabled ? '1' : '0');
+        return this;
+    }
     async addMember(memberShape) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        // Type="Container" is the standard for Container relationships
-        await modifier.addRelationship(this.pageId, this.id, memberShape.id, 'Container');
+        await this.modifier.addRelationship(this.pageId, this.id, memberShape.id, 'Container');
         return this;
     }
     async addListItem(item) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.addListItem(this.pageId, this.id, item.id);
-        // Refresh local state after modifer updates (resizeToFit called internally)
+        await this.modifier.addListItem(this.pageId, this.id, item.id);
         await this.refreshLocalState();
         return this;
     }
     async resizeToFit(padding = 0.25) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.resizeContainerToFit(this.pageId, this.id, padding);
+        await this.modifier.resizeContainerToFit(this.pageId, this.id, padding);
         await this.refreshLocalState();
         return this;
     }
     async refreshLocalState() {
-        // Reloads internal Cells from modifier's fresh XML
-        // This is a bit expensive but ensures consistency
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        const geo = modifier.getShapeGeometry(this.pageId, this.id);
-        const update = (n, v) => {
-            if (this.internalShape.Cells[n])
-                this.internalShape.Cells[n].V = v;
-            else
-                this.internalShape.Cells[n] = { V: v, N: n };
-        };
-        update('PinX', geo.x.toString());
-        update('PinY', geo.y.toString());
-        update('Width', geo.width.toString());
-        update('Height', geo.height.toString());
+        const geo = this.modifier.getShapeGeometry(this.pageId, this.id);
+        this.setLocalCoord('PinX', geo.x);
+        this.setLocalCoord('PinY', geo.y);
+        this.setLocalCoord('Width', geo.width);
+        this.setLocalCoord('Height', geo.height);
     }
     async addHyperlink(address, description) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.addHyperlink(this.pageId, this.id, { address, description });
+        await this.modifier.addHyperlink(this.pageId, this.id, { address, description });
         return this;
     }
     async linkToPage(targetPage, description) {
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        // Internal links use SubAddress='PageName' and empty Address
-        await modifier.addHyperlink(this.pageId, this.id, {
+        await this.modifier.addHyperlink(this.pageId, this.id, {
             address: '',
             subAddress: targetPage.name,
             description
@@ -189,8 +218,7 @@ class Shape {
     }
     async assignLayer(layer) {
         const index = typeof layer === 'number' ? layer : layer.index;
-        const modifier = new ShapeModifier_1.ShapeModifier(this.pkg);
-        await modifier.assignLayer(this.pageId, this.id, index);
+        await this.modifier.assignLayer(this.pageId, this.id, index);
         return this;
     }
     /**
@@ -199,5 +227,18 @@ class Shape {
     async addToLayer(layer) {
         return this.assignLayer(layer);
     }
+    setLocalCoord(name, value) {
+        const v = fmtCoord(value);
+        if (this.internalShape.Cells[name])
+            this.internalShape.Cells[name].V = v;
+        else
+            this.internalShape.Cells[name] = { V: v, N: name };
+    }
+    setLocalRawCell(name, value) {
+        if (this.internalShape.Cells[name])
+            this.internalShape.Cells[name].V = value;
+        else
+            this.internalShape.Cells[name] = { V: value, N: name };
+    }
 }
 exports.Shape = Shape;