chore: simplify placeholder matching; fix replaceInto selector for multiple equal shape names

Author: singerla

src/classes/has-shapes.ts

@@ -592,6 +592,7 @@ export default class HasShapes {
     return {
       mode: importElement.mode,
       name: selector,
+      selector: XmlSlideHelper.getSelector(sourceElement),
       hasCreationId: mode === 'findByElementCreationId',
       sourceArchive,
       sourceSlideNumber: slideNumber,

src/classes/shape.ts

@@ -1,5 +1,5 @@
 import { XmlHelper } from '../helper/xml-helper';
-import { GeneralHelper, vd } from '../helper/general-helper';
+import { GeneralHelper } from '../helper/general-helper';
 import { HyperlinkProcessor } from '../helper/hyperlink-processor';
 import {
   ChartModificationCallback,
@@ -11,7 +11,10 @@ import {
 } from '../types/types';
 import { RootPresTemplate } from '../interfaces/root-pres-template';
 import { XmlDocument, XmlElement } from '../types/xml-types';
-import { ContentTypeExtension, ContentTypeMap } from '../enums/content-type-map';
+import {
+  ContentTypeExtension,
+  ContentTypeMap,
+} from '../enums/content-type-map';
 import { ElementSubtype } from '../enums/element-type';
 import IArchive from '../interfaces/iarchive';
 
@@ -121,7 +124,10 @@ export class Shape {
   async processHyperlinks(): Promise<void> {
     if (!this.targetElement || !this.createdRid) return;
 
-    await HyperlinkProcessor.processSingleHyperlink(this.targetElement, this.createdRid);
+    await HyperlinkProcessor.processSingleHyperlink(
+      this.targetElement,
+      this.createdRid,
+    );
   }
 
   async replaceIntoSlideTree(): Promise<void> {
@@ -142,10 +148,14 @@ export class Shape {
     );
 
     const findMethod = this.hasCreationId ? 'findByCreationId' : 'findByName';
+    const selector = this.hasCreationId
+      ? this.shape.selector.creationId
+      : this.shape.selector.name;
 
     const sourceElementOnTargetSlide = await XmlHelper[findMethod](
       targetSlideXml,
-      this.name,
+      selector,
+      this.shape.selector.nameIdx,
     );
 
     if (!sourceElementOnTargetSlide?.parentNode) {
@@ -172,7 +182,9 @@ export class Shape {
     XmlHelper.writeXmlToArchive(archive, slideFile, targetSlideXml);
   }
 
-  async updateElementsRelId(cb?: (targetElement: XmlElement) => void): Promise<void> {
+  async updateElementsRelId(
+    cb?: (targetElement: XmlElement) => void,
+  ): Promise<void> {
     const targetSlideXml = await XmlHelper.getXmlFromArchive(
       this.targetArchive,
       this.targetSlideFile,
@@ -184,8 +196,8 @@ export class Shape {
     );
 
     targetElements.forEach((targetElement: XmlElement) => {
-      if(cb && typeof cb === 'function') {
-        cb(targetElement)
+      if (cb && typeof cb === 'function') {
+        cb(targetElement);
       } else {
         this.relParent(targetElement)
           .getElementsByTagName(this.relRootTag)[0]
@@ -212,11 +224,7 @@ export class Shape {
       .getElementsByTagName('p:cSld')[0]
       .getElementsByTagName(this.relRootTag);
 
-    return XmlHelper.findByAttributeValue(
-      sourceList,
-      this.relAttribute,
-      rId,
-    );
+    return XmlHelper.findByAttributeValue(sourceList, this.relAttribute, rId);
   }
 
   async updateTargetElementRelId(): Promise<void> {

src/helper/modify-cleanup-helper.ts

@@ -143,12 +143,12 @@ export default class ModifyCleanupHelper {
    * @param element - The XML element to clean up
    */
   static removeEffects(element: XmlElement): void {
-    this.removeShapeStyle(element);
-    this.removeColorAdjustment(element);
-    this.removeShadowEffects(element);
-    this.remove3dEffects(element);
-    this.removeFillEffects(element);
-    this.removeTextEffects(element);
+    ModifyCleanupHelper.removeShapeStyle(element);
+    ModifyCleanupHelper.removeColorAdjustment(element);
+    ModifyCleanupHelper.removeShadowEffects(element);
+    ModifyCleanupHelper.remove3dEffects(element);
+    ModifyCleanupHelper.removeFillEffects(element);
+    ModifyCleanupHelper.removeTextEffects(element);
 
     // Determine the visual type of the element (picture, chart, etc.)
     // Apply type-specific cleanup

src/helper/modify-table-helper.ts

@@ -82,4 +82,47 @@ export default class ModifyTableHelper {
       const modTable = new ModifyTable(element);
       modTable.updateRowHeight(index, size);
     };
+
+  static setTableStyle =
+    (styleId: string, attribs: string[]) => (element: XmlElement) => {
+      const tblPr = element.getElementsByTagName('a:tblPr').item(0);
+
+      const setTableStyleId = (tableStyleId: XmlElement, id: string) => {
+        tableStyleId.textContent = id;
+      };
+
+      const createTableStyleId = (tblPr: XmlElement) => {
+        const tableStyleId =
+          tblPr.ownerDocument.createElement('a:tableStyleId');
+        tblPr.appendChild(tableStyleId);
+        return tableStyleId;
+      };
+      const updateTable = (tblPr: XmlElement) => {
+        [
+          'firstRow',
+          'firstCol',
+          'lastRow',
+          'lastCol',
+          'bandRow',
+          'bandCol',
+        ].forEach((attrib) => {
+          if (attribs.includes(attrib)) {
+            tblPr.setAttribute(attrib, '1');
+          } else {
+            tblPr.removeAttribute(attrib);
+          }
+        });
+
+        const tableStyleId =
+          element.getElementsByTagName('a:tableStyleId').item(0) ||
+          createTableStyleId(tblPr);
+
+        if (tableStyleId) {
+          setTableStyleId(tableStyleId, styleId);
+        }
+      };
+      if (tblPr) {
+        updateTable(tblPr);
+      }
+    };
 }

src/helper/xml-helper.ts

@@ -425,7 +425,6 @@ export class XmlHelper {
     archive: IArchive,
     path: string,
     creationId: string,
-    nameIdx?: number,
   ): Promise<XmlElement> {
     const slideXml = await XmlHelper.getXmlFromArchive(archive, path);