address bugbot

Author: icecrasher321

apps/sim/lib/pptx-renderer/model/nodes/shape-node.ts

@@ -70,28 +70,6 @@ function parseParagraph(pNode: SafeXmlNode): TextParagraph {
   const pPr = pNode.child('pPr')
   const level = pPr.numAttr('lvl') ?? 0
 
-  const runs: TextRun[] = []
-
-  // Regular runs (a:r)
-  for (const rNode of pNode.children('r')) {
-    const rPr = rNode.child('rPr')
-    const tNode = rNode.child('t')
-    runs.push({
-      text: tNode.text(),
-      properties: rPr.exists() ? rPr : undefined,
-    })
-  }
-
-  // Line breaks (a:br) — treated as runs with newline text
-  // Field codes (a:fld) — treated as runs with their display text
-  for (const child of pNode.allChildren()) {
-    if (child.localName === 'br') {
-      // a:br nodes are interspersed with a:r nodes, but since we iterate
-      // children separately, we need a combined approach. We handle this
-      // by re-scanning all children in order below.
-    }
-  }
-
   // Re-scan in document order to get correct interleaving of r, br, fld
   const orderedRuns: TextRun[] = []
   for (const child of pNode.allChildren()) {
@@ -122,7 +100,7 @@ function parseParagraph(pNode: SafeXmlNode): TextParagraph {
   const endParaRPrNode = pNode.child('endParaRPr')
   return {
     properties: pPr.exists() ? pPr : undefined,
-    runs: orderedRuns.length > 0 ? orderedRuns : runs,
+    runs: orderedRuns,
     level,
     endParaRPr: endParaRPrNode.exists() ? endParaRPrNode : undefined,
   }

apps/sim/lib/pptx-renderer/model/presentation.test.ts

@@ -0,0 +1,79 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { describe, expect, it } from 'vitest'
+import { buildPresentation } from '@/lib/pptx-renderer/model/presentation'
+import type { PptxFiles } from '@/lib/pptx-renderer/parser/zip-parser'
+
+function createFiles(presentation: string): PptxFiles {
+  return {
+    contentTypes: '<Types />',
+    presentation,
+    presentationRels: `<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+      <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" Target="slides/slide1.xml" />
+      <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" Target="slides/slide2.xml" />
+    </Relationships>`,
+    slides: new Map([
+      ['ppt/slides/slide1.xml', createSlideXml()],
+      ['ppt/slides/slide2.xml', createSlideXml()],
+    ]),
+    slideRels: new Map([
+      ['ppt/slides/_rels/slide1.xml.rels', '<Relationships />'],
+      ['ppt/slides/_rels/slide2.xml.rels', '<Relationships />'],
+    ]),
+    slideLayouts: new Map(),
+    slideLayoutRels: new Map(),
+    slideMasters: new Map(),
+    slideMasterRels: new Map(),
+    themes: new Map(),
+    media: new Map(),
+    charts: new Map(),
+    chartStyles: new Map(),
+    chartColors: new Map(),
+    diagramDrawings: new Map(),
+  }
+}
+
+function createPresentationXml(markers = ''): string {
+  return `<p:presentation xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" ${markers}>
+    <p:sldSz cx="9144000" cy="5143500" />
+    <p:sldIdLst>
+      <p:sldId id="256" r:id="rId2" />
+      <p:sldId id="257" r:id="rId1" />
+    </p:sldIdLst>
+  </p:presentation>`
+}
+
+function createSlideXml(): string {
+  return `<p:sld xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
+    <p:cSld>
+      <p:spTree>
+        <p:nvGrpSpPr><p:cNvPr id="1" name="" /><p:cNvGrpSpPr /><p:nvPr /></p:nvGrpSpPr>
+        <p:grpSpPr />
+      </p:spTree>
+    </p:cSld>
+  </p:sld>`
+}
+
+describe('buildPresentation', () => {
+  it('does not treat the standard wps namespace prefix as WPS Office', () => {
+    const presentation = buildPresentation(
+      createFiles(
+        createPresentationXml(
+          'xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"'
+        )
+      )
+    )
+
+    expect(presentation.isWps).toBe(false)
+  })
+
+  it('orders slides by relationship id instead of numeric slide id', () => {
+    const presentation = buildPresentation(createFiles(createPresentationXml()))
+
+    expect(presentation.slides.map((slide) => slide.slidePath)).toEqual([
+      'ppt/slides/slide2.xml',
+      'ppt/slides/slide1.xml',
+    ])
+  })
+})

apps/sim/lib/pptx-renderer/model/presentation.ts

@@ -48,31 +48,15 @@ function relsPathFor(filePath: string): string {
   return `${dir}/_rels/${fileName}.rels`
 }
 
-/**
- * Extract ordered slide rId list from presentation.xml.
- * Reads `p:sldIdLst > p:sldId` elements and returns their r:id attributes in order.
- */
-function _getSlideOrder(presRoot: SafeXmlNode): string[] {
-  const sldIdLst = presRoot.child('sldIdLst')
-  const rIds: string[] = []
-  for (const sldId of sldIdLst.children('sldId')) {
-    const rId = sldId.attr('id') ?? sldId.attr('r:id')
-    if (rId) rIds.push(rId)
-  }
-  return rIds
-}
-
 /**
  * Detect WPS (Kingsoft Office / WPS Office) by checking for known markers
  * in the presentation XML string.
  */
 function detectWps(presentationXml: string): boolean {
-  // WPS adds its own namespace or processing instructions
   return (
-    presentationXml.includes('wps') ||
-    presentationXml.includes('kso') ||
-    presentationXml.includes('Kingsoft') ||
-    presentationXml.includes('WPS')
+    /\bKingsoft\b/i.test(presentationXml) ||
+    /\bWPS Office\b/i.test(presentationXml) ||
+    /xmlns:[\w.-]*kso[\w.-]*=/i.test(presentationXml)
   )
 }