@openpresentation/opf-pptx 0.20.3 → 0.22.0

package/dist/template-layouts.js

@@ -78,18 +78,27 @@ export function placeholderType(region) {
 }
 
 /** Which slide objects a placeholder of each type takes (binding a `none` region's lone object). */
-const BINDS = {title: ['title'], ctrTitle: ['title'], pic: ['picture'], chart: ['chart'], tbl: ['table'], obj: ['picture', 'chart', 'table']};
+const BINDS = {title: ['title'], ctrTitle: ['title'], body: ['body'], pic: ['picture'], chart: ['chart'], tbl: ['table'], obj: ['picture', 'chart', 'table']};
 export const bindsObject = (type, object) => (BINDS[type] ?? []).includes(object);
 
 /** The placeholder index of each region: its kind's base plus its position among the regions of that kind (REGION_IDX_BASE). */
-export function regionIndexes(record) {
+export function regionIndexes(record, nativeBodyRegion) {
   const regions = new Map(layoutTemplate(record).regions.map(region => [region.name, region]));
   const counts = {};
-  return Object.fromEntries(Object.keys(record?.regions ?? {}).filter(name => regions.has(name)).map(name => {
+  const indexes = Object.fromEntries(Object.keys(record?.regions ?? {}).filter(name => regions.has(name)).map(name => {
     const type = placeholderType(regions.get(name));
     counts[type] = (counts[type] ?? -1) + 1;
     return [name, REGION_IDX_BASE[type] + counts[type]];
   }));
+  // A native variant changes only its selected slot. Other object kinds retain
+  // their original indexes, so Change Layout cannot move a neighbouring picture.
+  if (nativeBodyRegion !== undefined && regions.has(nativeBodyRegion) && placeholderType(regions.get(nativeBodyRegion)) !== 'body') {
+    const used = new Set(Object.values(indexes));
+    let idx = REGION_IDX_BASE.body;
+    while (used.has(idx)) idx++;
+    indexes[nativeBodyRegion] = idx;
+  }
+  return indexes;
 }
 
 // FNV-1a (64-bit) of the record's canonical JSON: evidence of which record the layout was made from.
@@ -196,7 +205,7 @@ export function layoutPlaceholders(template) {
   const parsed = layoutTemplate(record);
   const {areas} = composeLayoutAreas(record, {...template.areaOptions, textMeasurement: undefined});
   const regions = new Map(parsed.regions.map(region => [region.name, region]));
-  const indexes = regionIndexes(record);
+  const indexes = regionIndexes(record, template.nativeBodyRegion);
   const emu = box => ({x: Math.round(box.x * EMU), y: Math.round(box.y * EMU), cx: Math.max(0, Math.round(box.width * EMU)), cy: Math.max(0, Math.round(box.height * EMU))});
   const result = [];
   for (const area of areas) {
@@ -210,7 +219,8 @@ export function layoutPlaceholders(template) {
     }
     if (area.name === 'subtitle') { result.push({name: 'Subtitle', type: 'subTitle', idx: SUBTITLE_IDX, anchor: 't', ...emu(area.box)}); continue; }
     const region = regions.get(area.name);
-    if (region) result.push({name: region.name, type: placeholderType(region), idx: indexes[region.name], ...emu(area.box)});
+    if (region) result.push({name: region.name, type: region.name === template.nativeBodyRegion ? 'body' : placeholderType(region), idx: indexes[region.name],
+      ...(region.name === template.nativeBodyRegion ? {anchor: {top: 't', middle: 'ctr', bottom: 'b'}[region.anchor]} : {}), ...emu(area.box)});
   }
   const sample = composeSlide({title: 'Title', subtitle: 'Subtitle', blocks: [{text: 'Body'}]}, {...template.areaOptions, layout: record, textMeasurement: undefined});
   for (const placeholder of result) {
@@ -244,7 +254,7 @@ function placeholderShape(placeholder, id) {
  */
 export function layoutTagValue(template, {record = false} = {}) {
   return {v: 1, id: template.id, group: template.group, ...(template.source !== undefined ? {source: template.source} : {}), reference: template.reference,
-    hash: recordHash(template.record), regions: Object.fromEntries(Object.entries(regionIndexes(template.record)).map(([name, idx]) => [String(idx), name])),
+    hash: recordHash(template.record), regions: Object.fromEntries(Object.entries(regionIndexes(template.record, template.nativeBodyRegion)).map(([name, idx]) => [String(idx), name])),
     ...(record && template.origin === 'document' ? {record: template.record} : {})};
 }
 
@@ -297,6 +307,7 @@ export function writeTemplateLayouts(output, slides, templates, bindings = new M
       const key = `${master}\u0001${template.key}`;
       const path = `ppt/slideLayouts/slideLayout${nextLayout++}.xml`, tagPath = `ppt/tags/opfLayout${nextTag++}.xml`;
       let name = typeof template.record.name === 'string' && template.record.name.trim() ? template.record.name : template.id;
+      if (template.nativeBodyRegion) name += ' (native body)';
       if (taken.has(name)) name = `${name} (${template.group}:${template.id})`;
       taken.add(name);
       const type = POWERPOINT_LAYOUT_TYPES[template.id] ?? 'cust';
@@ -329,17 +340,22 @@ export function writeTemplateLayouts(output, slides, templates, bindings = new M
     }
   }
   // Automatic composition is its own titleOnly layout, independently of catalog region templates.
-  for (const [master, base] of masters) {
-    const first = automaticSlides.find((plan, index) => plan && related(related(slidePaths[index], 'slideLayout'), 'slideMaster') === master);
+  for (const [master, base] of masters) for (const native of [false, true]) {
+    const first = automaticSlides.find((plan, index) => plan && Boolean(plan.nativeBody) === native && related(related(slidePaths[index], 'slideLayout'), 'slideMaster') === master);
     if (!first) continue;
     const path = `ppt/slideLayouts/slideLayout${nextLayout++}.xml`, tagPath = `ppt/tags/opfLayout${nextTag++}.xml`;
     // Reuse accepted title geometry; an empty slide needs only the engine's default prompt, never a re-fit through the caller's measurement provider.
     const title = first.title ?? composeSlide({title: 'Title'}, {...first.areaOptions, layout: undefined, textMeasurement: undefined}).items.find(item => item.field === 'title');
     const placeholder = {name: 'Title', type: 'title', x: Math.round(title.box.x * EMU), y: Math.round(title.box.y * EMU), cx: Math.round(title.box.width * EMU), cy: Math.round(title.box.height * EMU), style: {...title.textStyle, fontSize: title.text.fontSize, alignment: title.alignment}};
-    let xml = read(base).replace(/<p:sldLayout\b[^>]*>/, open => `${open.slice(0, -1).replace(/\s+(?:type|userDrawn|showMasterSp)="[^"]*"/g, '')} type="titleOnly" userDrawn="1">`);
-    xml = xml.replace(/(<p:cSld\b[^>]*?)(\s+name="[^"]*")?(\s*>)/, (match, open, _name, close) => `${open} name="OPF auto"${close}`);
+    const body = native ? {name: 'Body', type: 'body', idx: REGION_IDX_BASE.body,
+      ...Object.fromEntries(['x', 'y'].map(key => [key, Math.round(first.nativeBody.box[key] * EMU)])),
+      cx: Math.round(first.nativeBody.box.width * EMU), cy: Math.round(first.nativeBody.box.height * EMU),
+      anchor: {top: 't', middle: 'ctr', bottom: 'b'}[first.nativeBody.anchor],
+      style: {...first.nativeBody.item.textStyle, fontSize: first.nativeBody.item.text.fontSize, alignment: first.nativeBody.item.alignment}} : undefined;
+    let xml = read(base).replace(/<p:sldLayout\b[^>]*>/, open => `${open.slice(0, -1).replace(/\s+(?:type|userDrawn|showMasterSp)="[^"]*"/g, '')} type="${native ? 'tx' : 'titleOnly'}" userDrawn="1">`);
+    xml = xml.replace(/(<p:cSld\b[^>]*?)(\s+name="[^"]*")?(\s*>)/, (match, open, _name, close) => `${open} name="${native ? 'OPF auto (native body)' : 'OPF auto'}"${close}`);
     const nextId = Math.max(1, ...[...xml.matchAll(/<p:cNvPr\b[^>]*\bid="(\d+)"/g)].map(match => Number(match[1]))) + 1;
-    xml = xml.replace('</p:grpSpPr>', `</p:grpSpPr>${placeholderShape(placeholder, nextId)}`);
+    xml = xml.replace('</p:grpSpPr>', `</p:grpSpPr>${placeholderShape(placeholder, nextId)}${body ? placeholderShape(body, nextId + 1) : ''}`);
     const masterRel = relationships(read(relsOf(base))).find(rel => rel.type === `${REL}/slideMaster`);
     const tagged = addRelationship(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">${masterRel.node}</Relationships>`, `${REL}/tags`, relativeTarget(path, tagPath));
     xml = xml.replace('</p:spTree>', `</p:spTree><p:custDataLst><p:tags r:id="${tagged.rid}"/></p:custDataLst>`);
@@ -349,13 +365,13 @@ export function writeTemplateLayouts(output, slides, templates, bindings = new M
     const added = addRelationship(read(relsOf(master)), `${REL}/slideLayout`, relativeTarget(master, path));
     write(relsOf(master), added.relsXml);
     write(master, read(master).replace('</p:sldLayoutIdLst>', `<p:sldLayoutId id="${nextLayoutId++}" r:id="${added.rid}"/></p:sldLayoutIdLst>`));
-    created.set(`${master}\u0001auto`, {path, placeholders: new Map([['Title', placeholder]])});
+    created.set(`${master}\u0001${native ? 'auto-native-body' : 'auto'}`, {path, placeholders: new Map([['Title', placeholder], ...(body ? [['Body', body]] : [])])});
   }
   for (const [index, plan] of slidePaths.map((_, index) => slides[index]).entries()) {
     if (!plan && !automaticSlides[index]) continue;
     const slidePath = slidePaths[index];
     const master = related(related(slidePath, 'slideLayout'), 'slideMaster');
-    const layout = created.get(`${master}\u0001${plan ? plan.template.key : 'auto'}`);
+    const layout = created.get(`${master}\u0001${plan ? plan.template.key : automaticSlides[index].nativeBody ? 'auto-native-body' : 'auto'}`);
     if (!layout) throw new Error(`Slide ${index + 1} has no template layout.`);
     const slideRels = relsOf(slidePath);
     write(slideRels, read(slideRels).replace(/<Relationship\b[^>]*\/>/g, node => attribute(node, 'Type') === `${REL}/slideLayout` ? node.replace(/\sTarget="[^"]*"/, ` Target="${relativeTarget(slidePath, layout.path)}"`) : node));
@@ -366,7 +382,7 @@ export function writeTemplateLayouts(output, slides, templates, bindings = new M
       const placeholder = layout.placeholders.get(binding.region);
       if (!placeholder || !bindsObject(placeholder.type, binding.object)) continue;
       const ph = `<p:ph${placeholder.type === 'obj' ? '' : ` type="${placeholder.type}"`}${placeholder.idx !== undefined ? ` idx="${placeholder.idx}"` : ''}/>`;
-      const element = binding.object === 'picture' ? 'pic' : binding.object === 'title' ? 'sp' : 'graphicFrame';
+      const element = binding.object === 'picture' ? 'pic' : ['title', 'body'].includes(binding.object) ? 'sp' : 'graphicFrame';
       const pattern = new RegExp(`<p:${element}>[\\s\\S]*?<\\/p:${element}>`, 'g');
       slideXml = slideXml.replace(pattern, shape => {
         if (unescapeAttribute(shape.match(/<p:cNvPr\b[^>]*\bname="([^"]*)"/)?.[1] ?? '') !== objectName || /<p:ph\b/.test(shape)) return shape;

package/dist/text-provenance.js

@@ -1,9 +1,9 @@
 import {XMLParser} from 'fast-xml-parser';
-import {attachTextTags,decodeTextTag} from './code-provenance.js';
+import {attachTextTags,decodeTextTag,groupUnchanged} from './code-provenance.js';
 const TAG='OPF_TEXT_V1',REL='http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags';
 const parser=new XMLParser({ignoreAttributes:false,attributeNamePrefix:'',parseTagValue:false,trimValues:false});
 const decoder=new TextDecoder('utf-8',{fatal:true}),array=value=>value===undefined?[]:Array.isArray(value)?value:[value];
-export const attachPlainTextTags=(entries,records)=>attachTextTags(entries,records,TAG,'opfText','plain text');
+export const attachPlainTextTags=(entries,records)=>attachTextTags(entries,records,TAG,'opfText','plain text',{signed:true});
 
 // Only boundaries are stored. Current native characters, including edits and
 // empty lines, always supply the text; tags cannot restore discarded old words.
@@ -48,7 +48,7 @@ export function importPlainTextGroups(shapes,paragraphs,relationships,entries,re
   const restored=sourceLineParagraphs(ordered,paragraphs);
   for(const item of ordered)consumed.add(item.shape);
   items.push({shapes:ordered.map(item=>item.shape),paragraphs:restored});
-  report({code:'text-import-reflow',message:'Complete tagged lines retain current native text, whitespace and authored line boundaries. Native formatting, geometry and OPF nesting are not reconstructed; review the reflowed text.'});
+  if(!groupUnchanged(ordered,paragraphs))report({code:'text-import-reflow',message:'Complete tagged lines retain current native text, whitespace and authored line boundaries. Native formatting, geometry and OPF nesting are not reconstructed; review the reflowed text.'});
  }catch(error){report({code:'invalid-text-provenance',message:`${error.message} Ordinary import retains current native text without restoring old source words.`});}
  return {consumed,items};
 }

package/dist/timeline-provenance.js

@@ -1,13 +1,13 @@
 import {XMLParser} from 'fast-xml-parser';
 import {isValidFormat} from './format-check.js';
-import {attachTextTags,decodeTextTag} from './code-provenance.js';
+import {attachTextTags,decodeTextTag,groupUnchanged} from './code-provenance.js';
 import {sourceLineParagraphs} from './text-provenance.js';
 
 const STATUSES=['done','current','planned'];
 const TAG='OPF_TIMELINE_V1',REL='http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags';
 const parser=new XMLParser({ignoreAttributes:false,attributeNamePrefix:'',parseTagValue:false,trimValues:false});
 const decoder=new TextDecoder('utf-8',{fatal:true}),array=value=>value===undefined?[]:Array.isArray(value)?value:[value];
-export const attachTimelineTags=(entries,records)=>attachTextTags(entries,records,TAG,'opfTimeline','timeline');
+export const attachTimelineTags=(entries,records)=>attachTextTags(entries,records,TAG,'opfTimeline','timeline',{signed:true});
 
 // Only topology and line boundaries are retained. Every field value comes from
 // current native text; clearing or editing a field cannot restore old words.
@@ -86,7 +86,7 @@ export function importTimelineGroups(shapes,paragraphs,relationships,entries,rep
     if(!isValidFormat({slides:[{timeline}]}))throw Error('Current native text does not form a valid timeline.');
     for(const item of group)consumed.add(item.shape);
     items.push({shapes:group.map(item=>item.shape),payload:{type:'timeline',timeline}});
-    report({code:'timeline-import-reflow',message:'Timeline field order, source boundaries and current native text were recovered. Native formatting, positions, marker styling and font theme are not reconstructed; review the reflowed timeline.'});
+    if(!groupUnchanged(group,paragraphs))report({code:'timeline-import-reflow',message:'Timeline field order, source boundaries and current native text were recovered. Native formatting, positions, marker styling and font theme are not reconstructed; review the reflowed timeline.'});
   }catch(error){report({code:'invalid-timeline-provenance',message:`${error.message} Ordinary import retains current native text without restoring old source words.`});}
   return {consumed,items};
 }

package/dist/typeface-inventory.js

@@ -1,4 +1,4 @@
-import {unzipSync} from 'fflate';
+import {checkInputEntries,readInputZip,readNestedInputZip} from './input-safety.js';
 
 // Typeface inventory for a PPTX package (FF-08, font-fidelity-everywhere).
 //
@@ -45,7 +45,7 @@ export function inventoryTypefaces(input, options = {}) {
     for (const path of Object.keys(entries).sort()) {
       const bytes = entries[path];
       if (NESTED_PACKAGE.test(path)) {
-        if (options.nested !== false) visit(unzipSync(bytes), `${prefix}${path}!/`);
+        if (options.nested !== false) visit(readNestedInputZip(entries,path), `${prefix}${path}!/`);
         continue;
       }
       if (!XML_PART.test(path)) continue;
@@ -162,9 +162,9 @@ export function compareFontNames(left, right) {
 }
 
 function toEntries(input) {
-  if (input instanceof Uint8Array) return unzipSync(input);
-  if (input instanceof ArrayBuffer) return unzipSync(new Uint8Array(input));
-  if (input && typeof input === 'object') return input;
+  if (input instanceof Uint8Array) return readInputZip(input);
+  if (input instanceof ArrayBuffer) return readInputZip(new Uint8Array(input));
+  if (input && typeof input === 'object') return checkInputEntries(input);
   throw new TypeError('Expected PPTX bytes or a map of package parts.');
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-pptx",
-  "version": "0.20.3",
+  "version": "0.22.0",
   "description": "Pure local OPF to PPTX export and PPTX to OPF import tooling.",
   "license": "MIT",
   "type": "module",
@@ -66,7 +66,7 @@
   "dependencies": {
     "@node-projects/jszip": "4.3.0",
     "@openpresentation/gallery": "^3.0.0",
-    "@openpresentation/opf": "^0.20.2",
+    "@openpresentation/opf": "^0.22.1",
     "@rgrove/parse-xml": "4.2.3",
     "fast-xml-parser": "^5.8.0",
     "fflate": "^0.8.3",
@@ -74,7 +74,7 @@
     "sharp": "0.35.5"
   },
   "peerDependencies": {
-    "@openpresentation/opf-render": "^0.20.2"
+    "@openpresentation/opf-render": "^0.22.1"
   },
   "peerDependenciesMeta": {
     "@openpresentation/opf-render": {
@@ -98,7 +98,7 @@
     "@expo-google-fonts/roboto": "0.4.3",
     "@expo-google-fonts/roboto-mono": "0.4.2",
     "@expo-google-fonts/tinos": "0.4.2",
-    "@openpresentation/opf-render": "0.20.2",
+    "@openpresentation/opf-render": "0.22.1",
     "@resvg/resvg-js": "2.6.2",
     "esbuild": "0.28.2",
     "playwright": "1.64.0"