dsh-drawai 0.2.7 → 0.3.0

package/lib/mxfile.js

@@ -53,16 +53,44 @@ export const META_ID = 'drawai-meta'
 
 // ---- 文本与属性小工具（mxfile 的属性/文本足够用，不引入 XML 依赖）-----------
 
-/** 解码 XML 实体（含数字实体）。*/
+/** 常见命名实体（数字实体之外；`&` 必须最后解）。*/
+const NAMED_ENTITIES = {
+  nbsp: '\u00A0',
+  ensp: '\u2002',
+  emsp: '\u2003',
+  thinsp: '\u2009',
+  mdash: '\u2014',
+  ndash: '\u2013',
+  lsquo: '\u2018',
+  rsquo: '\u2019',
+  ldquo: '\u201C',
+  rdquo: '\u201D',
+  hellip: '\u2026',
+  middot: '\u00B7',
+  bull: '\u2022',
+  copy: '\u00A9',
+  reg: '\u00AE',
+  trade: '\u2122',
+  deg: '\u00B0',
+  times: '\u00D7',
+  divide: '\u00F7',
+}
+
+/** 解码 XML 实体（含数字实体与常见命名实体）。*/
 function decodeEntities(text) {
   return String(text)
     .replace(/&#x([0-9a-fA-F]+);/g, (m, hex) => String.fromCodePoint(parseInt(hex, 16)))
     .replace(/&#(\d+);/g, (m, dec) => String.fromCodePoint(parseInt(dec, 10)))
-    .replace(/&lt;/g, '<')
-    .replace(/&gt;/g, '>')
-    .replace(/&quot;/g, '"')
-    .replace(/&apos;/g, "'")
-    .replace(/&amp;/g, '&')
+    .replace(/&([a-zA-Z]+);/g, (m, name) => {
+      const key = name.toLowerCase()
+      if (key === 'lt') return '<'
+      if (key === 'gt') return '>'
+      if (key === 'quot') return '"'
+      if (key === 'apos') return "'"
+      if (key === 'amp') return '&'
+      const named = NAMED_ENTITIES[key]
+      return named === undefined ? m : named
+    })
 }
 
 /** 属性值转义（写回用）。*/
@@ -194,8 +222,12 @@ function attrIn(text, attrsStart, attrsEnd, name) {
 /**
  * 把 drawio 的标签文本变成"纯文本标签"。
  *
- * 我们按纯文本渲染标签，而 drawio 的标签常带 HTML（`html=1` + `<br>`、`<b>`…）。
- * 所以把 `<br>` 折成空格、去掉其余标签，再解实体 —— 读起来才是人写的那句话。
+ * 我们按纯文本渲染标签，而 drawio 的标签常带 HTML（`html=1` + `<br>`、`<b>`、表格…）。
+ * 折算规则（有损但可读）：
+ *   · `<br>` / 块级收尾标签 → 换行；
+ *   · `<td>` / `<th>` 之间留空格（表格粗折算成列）；
+ *   · 其余标签剥掉；命名实体（含 `&nbsp;`）解码；
+ *   · 行内空白折叠，**换行保留**。
  * 代价：改过标签的单元写回时 markup 回不去（如实记在 notes 里）。
  */
 function labelFromValue(value) {
@@ -203,9 +235,23 @@ function labelFromValue(value) {
   let text = String(value)
   if (text.indexOf('<') < 0 && text.indexOf('&') < 0) return text
   const hadMarkup = /<[a-zA-Z/][^>]*>/.test(text)
-  text = text.replace(/<br\s*\/?>/gi, ' ').replace(/<[^>]*>/g, '')
+  // 先把换行语义钉死，再剥其余标签 —— 顺序反了会丢行结构。
+  text = text
+    .replace(/<br\s*\/?>/gi, '\n')
+    .replace(/<\/(?:div|p|tr|li|h[1-6])\s*>/gi, '\n')
+    .replace(/<\/(?:td|th)\s*>/gi, ' ')
+    .replace(/<(?:td|th)\b[^>]*>/gi, '')
+    .replace(/<[^>]*>/g, '')
   text = decodeEntities(text)
-  return hadMarkup ? text.replace(/\s+/g, ' ').trim() : text
+  if (!hadMarkup) return text
+  // 折叠行内空白，保留换行；首尾空白与多余空行去掉。
+  text = text
+    .split('\n')
+    .map((line) => line.replace(/[^\S\n]+/g, ' ').trim())
+    .join('\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim()
+  return text
 }
 
 /** 这个标签文本里是否含 markup（用于 notes）。*/
@@ -345,7 +391,7 @@ function scanCells(source, from, to) {
       }
       // `<mxPoint as="offset"/>`：drawio 存"标签相对于那个点的残余偏移"用的。
       // 没有 x/y 属性时按 (0,0) 处理。
-      const offsetMatch = /<mxPoint\b([^>]*?)as\s*=\s*"offset"[^>]*?\/>/.exec(geoInnerText)
+      const offsetMatch = Array.from(geoInnerText.matchAll(/<mxPoint\b([^>]*?)\/>/g)).find((match) => attr(match[1], 'as') === 'offset') || null
       const offset =
         offsetMatch === null
           ? { x: 0, y: 0 }
@@ -783,6 +829,10 @@ export function parseMxfile(text, options) {
       w: geo !== null && geo.width !== undefined ? geo.width : 120,
       h: geo !== null && geo.height !== undefined ? geo.height : 60,
     }
+    if (geo && geo.offset && (geo.offset.x !== 0 || geo.offset.y !== 0)) {
+      node.labelOffsetX = geo.offset.x
+      node.labelOffsetY = geo.offset.y
+    }
     if (cell.data !== undefined && cell.data !== null && Object.keys(cell.data).length > 0) node.data = cell.data
     // 属于哪个图层（沿 parent 往上找第一个图层）：渲染时隐藏层要整层不画。
     const layerId = layerIdOf(info, cell)
@@ -960,10 +1010,13 @@ function nodeCellXml(node, parentId, indent) {
   const y = Number.isFinite(Number(node.y)) ? Number(node.y) : 0
   const w = Number.isFinite(Number(node.w)) ? Number(node.w) : 120
   const h = Number.isFinite(Number(node.h)) ? Number(node.h) : 60
+  const offset = nodeLabelOffset(node)
+  const head = indent + '  <mxGeometry x="' + x + '" y="' + y + '" width="' + w + '" height="' + h + '" as="geometry"'
+  const geometry = offset.x === 0 && offset.y === 0 ? head + ' />' : head + '><mxPoint x="' + offset.x + '" y="' + offset.y + '" as="offset" /></mxGeometry>'
   return withDataWrapper(
     [
       indent + '<mxCell id="' + escapeAttr(String(node.id)) + '"' + label + style + ' vertex="1" parent="' + escapeAttr(parentId) + '">',
-      indent + '  <mxGeometry x="' + x + '" y="' + y + '" width="' + w + '" height="' + h + '" as="geometry" />',
+      geometry,
       indent + '</mxCell>',
     ],
     node,
@@ -1137,6 +1190,23 @@ function wrapAsObject(cell, text, data) {
   return '<object label="' + escapeAttr(labelFromValue(cell.label)) + '"' + attrs + ' id="' + escapeAttr(String(cell.id)) + '">' + inner + '</object>'
 }
 
+function nodeLabelOffset(node) {
+  return { x: Number.isFinite(node.labelOffsetX) ? node.labelOffsetX : 0, y: Number.isFinite(node.labelOffsetY) ? node.labelOffsetY : 0 }
+}
+
+/** 仅修改顶点标签的原生 offset 点，保留折叠尺寸等未知几何子元素。 */
+function writeNodeLabelOffset(text, cell, offset) {
+  const point = offset.x === 0 && offset.y === 0 ? '' : '<mxPoint x="' + offset.x + '" y="' + offset.y + '" as="offset" />'
+  if (!cell.geo) return appendGeometry(text, cell, '<mxGeometry as="geometry">' + point + '</mxGeometry>')
+  const geo = cell.geo
+  if (geo.selfClosing) return text.slice(0, geo.start) + '<mxGeometry' + text.slice(geo.attrsStart, geo.attrsEnd) + '>' + point + '</mxGeometry>' + text.slice(geo.end)
+  const inner = text.slice(geo.innerFrom, geo.innerTo)
+  const match = Array.from(inner.matchAll(/<mxPoint\b([^>]*?)\/>/g)).find((item) => attr(item[1], 'as') === 'offset')
+  const replacement = match && point ? setAttrsIn(match[0], '<mxPoint'.length, match[0].length - 2, { x: String(offset.x), y: String(offset.y) }) : point
+  const next = match ? inner.slice(0, match.index) + replacement + inner.slice(match.index + match[0].length) : inner + point
+  return text.slice(0, geo.innerFrom) + next + text.slice(geo.innerTo)
+}
+
 /** 改写一个顶点单元：标签、style、几何（几何要写回**相对父级**的坐标）。 */
 function rebuildNodeCell(info, cell, node, chain) {
   // 单元跨度是**相对页体（mxGraphModel）**的，不是相对整份文件 —— 切错参照系会把
@@ -1154,6 +1224,12 @@ function rebuildNodeCell(info, cell, node, chain) {
       subject = fresh
     }
   }
+  const wantLabelOffset = nodeLabelOffset(node)
+  const fileLabelOffset = subject.geometry && subject.geometry.offset || { x: 0, y: 0 }
+  if (wantLabelOffset.x !== fileLabelOffset.x || wantLabelOffset.y !== fileLabelOffset.y) {
+    original = writeNodeLabelOffset(original, subject, wantLabelOffset)
+    subject = rescanCell(original) || subject
+  }
   const changes = []
   const label = typeof node.label === 'string' ? node.label : ''
   if (label !== labelFromValue(subject.label)) {

package/lib/performance-log.js

@@ -0,0 +1,66 @@
+/* 由 tools/build.mjs 生成 —— 请勿直接编辑；改 src/ 下的源文件。 */
+import { mkdirSync, writeFileSync, renameSync, readdirSync, rmSync, readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { randomUUID, createHash } from 'node:crypto'
+import { cpus, totalmem } from 'node:os'
+import { monitorEventLoopDelay } from 'node:perf_hooks'
+import { createPerformanceMetrics } from './performance-metrics.js'
+
+let environment
+function environmentInfo() {
+  if (!environment) {
+    const cpu = cpus()
+    let sourceSha256 = null
+    try { sourceSha256 = createHash('sha256').update(['trace-image.js', 'raster.js', 'video-trace-worker.js', 'video-trace-pool.js', 'video-trace-reuse.js', 'video-export.js']
+      .map((file) => readFileSync(new URL(file, import.meta.url))).join('')).digest('hex') } catch {}
+    environment = { node: process.version, platform: process.platform, arch: process.arch, cpu: cpu[0]?.model,
+      logicalCpus: cpu.length, totalMemoryBytes: totalmem(), sourceSha256 }
+  }
+  return environment
+}
+
+// Diagnostics must never change the outcome of a drawing/export task.
+export function createPerformanceLog(root, kind, metadata = {}, options = {}) {
+  const enabled = options.enabled ?? process.env.DRAWAI_PERF === '1'
+  const metrics = createPerformanceMetrics(), id = randomUUID(), startedAt = new Date().toISOString()
+  const cpuStart = enabled ? process.cpuUsage() : null
+  let finished = false, report = null, timer, delay
+  function sample() {
+    if (!enabled) return
+    const memory = process.memoryUsage()
+    metrics.peak('hostRssBytes', memory.rss); metrics.peak('hostHeapUsedBytes', memory.heapUsed)
+  }
+  if (enabled) {
+    sample(); timer = setInterval(sample, 250); timer.unref?.()
+    delay = monitorEventLoopDelay({ resolution: 20 }); delay.enable()
+  }
+  return {
+    enabled, id,
+    start(name) { return enabled ? metrics.start(name) : () => {} },
+    add(name, ms) { if (enabled) metrics.add(name, ms) },
+    count(name, value) { if (enabled) metrics.count(name, value) },
+    peak(name, value) { if (enabled) metrics.peak(name, value) },
+    merge(prefix, value) { if (enabled) metrics.merge(prefix, value) },
+    snapshot() { sample(); return enabled ? metrics.snapshot() : undefined },
+    finish(status, extra = {}) {
+      if (!enabled || finished) return report
+      finished = true; clearInterval(timer); sample(); delay.disable()
+      const cpu = process.cpuUsage(cpuStart)
+      metrics.count('hostCpuUserMs', cpu.user / 1000); metrics.count('hostCpuSystemMs', cpu.system / 1000)
+      if (Number.isFinite(delay.max)) metrics.peak('hostEventLoopDelayMaxMs', delay.max / 1e6)
+      report = { schemaVersion: 1, id, kind, status, startedAt, environment: environmentInfo(), metadata: { ...metadata, ...extra }, ...metrics.snapshot(),
+        resources: { intervalMs: 250, rssScope: 'sampled host process including Workers; excludes FFmpeg/browser',
+          ffmpegPeakRssBytes: null, browserPeakRssBytes: null } }
+      try {
+        const dir = join(root, '.drawai-cache', 'performance')
+        mkdirSync(dir, { recursive: true })
+        const name = startedAt.replace(/[:.]/g, '-') + '-' + id + '.json', dest = join(dir, name)
+        writeFileSync(dest + '.tmp', JSON.stringify(report, null, 2)); renameSync(dest + '.tmp', dest)
+        // Keep at most 100 reports, never traverse media directories or retain source data.
+        const names = readdirSync(dir).filter((entry) => /^\d{4}-.*-[0-9a-f-]{36}\.json$/.test(entry)).sort()
+        for (const entry of names.slice(0, Math.max(0, names.length - 100))) rmSync(join(dir, entry), { force: true })
+      } catch { /* Unwritable diagnostics are non-fatal. */ }
+      return report
+    },
+  }
+}

package/lib/performance-metrics.js

@@ -0,0 +1,47 @@
+/* 由 tools/build.mjs 生成 —— 请勿直接编辑；改 src/ 下的源文件。 */
+// Bounded aggregates shared by browser, host and Workers. Durations may overlap.
+export function createPerformanceMetrics(clock = () => performance.now()) {
+  const started = clock(), stages = Object.create(null), counters = Object.create(null), peaks = Object.create(null)
+  function add(name, ms, count = 1, max = ms) {
+    if (!/^[a-zA-Z][\w.-]{0,79}$/.test(name) || !Number.isFinite(ms) || ms < 0 || !Number.isSafeInteger(count) || count < 1 || !Number.isFinite(max) || max < 0) return
+    if (!stages[name] && Object.keys(stages).length >= 96) return
+    const stage = stages[name] || (stages[name] = { count: 0, totalMs: 0, maxMs: 0 })
+    stage.count += count; stage.totalMs += ms; stage.maxMs = Math.max(stage.maxMs, max)
+  }
+  return {
+    add,
+    start(name) { const at = clock(); let ended = false; return () => { if (!ended) { ended = true; add(name, clock() - at) } } },
+    count(name, value = 1) { if (/^[a-zA-Z][\w.-]{0,79}$/.test(name) && Number.isFinite(value) && value >= 0 && (name in counters || Object.keys(counters).length < 96)) counters[name] = (counters[name] || 0) + value },
+    peak(name, value) { if (/^[a-zA-Z][\w.-]{0,79}$/.test(name) && Number.isFinite(value) && value >= 0 && (name in peaks || Object.keys(peaks).length < 32)) peaks[name] = Math.max(peaks[name] || 0, value) },
+    merge(prefix, report) {
+      // Only numeric, bounded aggregates cross the trust boundary; never copy raw objects/paths.
+      for (const [name, stage] of Object.entries(report?.stages || {}).slice(0, 96)) {
+        if (stage && typeof stage === 'object') add(prefix + name, stage.totalMs, stage.count, stage.maxMs)
+      }
+      for (const [name, value] of Object.entries(report?.counters || {}).slice(0, 96)) this.count(prefix + name, value)
+      for (const [name, value] of Object.entries(report?.peaks || {}).slice(0, 32)) this.peak(prefix + name, value)
+    },
+    snapshot() { return JSON.parse(JSON.stringify({ wallMs: Math.max(0, clock() - started), stages, counters, peaks })) },
+  }
+}
+
+export function createMediaPerformance() {
+  const metrics = createPerformanceMetrics()
+  let observer
+  function accept(entries) {
+    for (const entry of entries) { metrics.add('longTask', entry.duration); metrics.count('longTasks') }
+  }
+  return {
+    ...metrics,
+    enable(enabled) {
+      if (!enabled || observer || typeof PerformanceObserver === 'undefined') return
+      try { observer = new PerformanceObserver((list) => accept(list.getEntries())); observer.observe({ entryTypes: ['longtask'] }) }
+      catch { observer?.disconnect(); observer = null }
+    },
+    async measure(name, action) { const done = metrics.start(name); try { return await action() } finally { done() } },
+    report() {
+      if (observer) { accept(observer.takeRecords()); observer.disconnect(); observer = null }
+      return metrics.snapshot()
+    },
+  }
+}

package/lib/raster.js

@@ -107,7 +107,8 @@ export function decodePng(bytes) {
   let interlace = 0
   let palette = null // Buffer（RGB 三元组）
   let paletteAlpha = null // Buffer（每索引一个 alpha）
-  let trnsGray = null // 灰度/RGB 的单色透明键（这里只用于灰度）
+  let trnsGray = null // 原始位深下的透明键，必须在转换成 RGBA8 之前比较
+  let trnsRgb = null
   const idat = []
 
   let offset = 8
@@ -131,6 +132,9 @@ export function decodePng(bytes) {
     } else if (type === 'tRNS') {
       if (colorType === 3) paletteAlpha = Buffer.from(chunk)
       else if (colorType === 0 && chunk.length >= 2) trnsGray = (chunk[0] << 8) | chunk[1]
+      else if (colorType === 2 && chunk.length >= 6) {
+        trnsRgb = [(chunk[0] << 8) | chunk[1], (chunk[2] << 8) | chunk[3], (chunk[4] << 8) | chunk[5]]
+      }
     } else if (type === 'IDAT') {
       idat.push(Buffer.from(chunk))
     } else if (type === 'IEND') {
@@ -175,16 +179,22 @@ export function decodePng(bytes) {
       } else if (colorType === 0 || colorType === 4) {
         // 灰度：位深 1/2/4/8/16，可带 alpha
         let v
-        if (bitDepth === 8) v = samples[col * spp]
-        else if (bitDepth === 16) v = samples[col * spp * 2] // 取高字节（8 位精度足够）
+        let rawGray
+        if (bitDepth === 8) v = rawGray = samples[col * spp]
+        else if (bitDepth === 16) {
+          const o = col * spp * 2
+          rawGray = (samples[o] << 8) | samples[o + 1]
+          v = rawGray >>> 8
+        }
         else {
           const perByte = 8 / bitDepth
           const byte = samples[Math.floor(col / perByte)]
           const shift = 8 - bitDepth * ((col % perByte) + 1)
           const raw0 = (byte >> shift) & ((1 << bitDepth) - 1)
+          rawGray = raw0
           v = Math.round((raw0 * 255) / ((1 << bitDepth) - 1)) // 1/2/4 位要拉伸到 0..255
         }
-        if (trnsGray !== null && bitDepth === 8 && v === (trnsGray & 0xff)) a = 0
+        if (colorType === 0 && trnsGray !== null && rawGray === trnsGray) a = 0
         r = v
         g = v
         b = v
@@ -202,6 +212,13 @@ export function decodePng(bytes) {
           b = samples[col * spp + 2]
           if (colorType === 6) a = samples[col * spp + 3]
         }
+        if (colorType === 2 && trnsRgb !== null) {
+          const o = col * pixelBytes
+          const rawRgb = bitDepth === 16
+            ? [(samples[o] << 8) | samples[o + 1], (samples[o + 2] << 8) | samples[o + 3], (samples[o + 4] << 8) | samples[o + 5]]
+            : [r, g, b]
+          if (rawRgb.every((v, i) => v === trnsRgb[i])) a = 0
+        }
       }
       const o = (y * width + x) * 4
       out[o] = r

package/lib/style-kernel.js

@@ -94,6 +94,10 @@ var NODE_SHAPE_STYLE = {
   // image：内嵌位图（png/jpeg/gif/webp 的 data URI）。落盘同样是 drawio 的图片形状；
   // 缺省 imageAspect=1（等比居中）—— 截图/照片拉伸会变形，和 svg 图标的缺省相反。
   image: 'shape=image;imageAspect=1',
+  // video：画布上的统一播放器节点。落盘仍是 shape=image + 海报 SVG；真实元数据在
+  // `<object>` 的 drawaiMedia / mediaClip 上（旁路 `*.media/<clip>/`）。style 层面与 svg 同构，
+  // 识别视频靠 data，不靠 style 键 —— 这样 drawio 桌面版也能看见海报静帧。
+  video: 'shape=image;imageAspect=0',
   // 分区（飞书式区块 / drawio 的 group 容器）：可插入的容器元素，不是"选中后成组"。
   // verticalAlign=top + align=left：标题贴在框顶部左侧（区块名），里面再放其它节点。
   section:
@@ -101,18 +105,43 @@ var NODE_SHAPE_STYLE = {
 }
 
 /** 形状枚举的顺序（UI 菜单、read 输出的稳定顺序）。顺序对齐 drawio 的形状面板。 */
-var NODE_SHAPES = ['rect', 'rounded', 'text', 'section', 'stadium', 'ellipse', 'diamond', 'parallelogram', 'cylinder', 'document', 'hexagon', 'svg', 'image']
+var NODE_SHAPES = ['rect', 'rounded', 'text', 'section', 'stadium', 'ellipse', 'diamond', 'parallelogram', 'cylinder', 'document', 'hexagon', 'svg', 'image', 'video']
+
+/** 视频节点缺省海报（播放按钮静帧）。 */
+var DEFAULT_VIDEO_POSTER =
+  '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 90">' +
+  '<rect width="160" height="90" fill="#1f1f1f"/>' +
+  '<circle cx="80" cy="45" r="20" fill="#ffffff" fill-opacity="0.92"/>' +
+  '<path d="M74 35 L74 55 L94 45 Z" fill="#1f1f1f"/>' +
+  '</svg>'
 
 /** 文字形状独有的"隐形"设置：离开文字形状时要清掉（它们不该跟着变成别的形状）。 */
 var TEXT_SHAPE_ONLY_KEYS = { strokeColor: 'none', fillColor: 'none' }
 
-/** SVG / 位图形状独有的键：离开这类形状时要清掉（否则文件里留着一大段看不见的 data URI）。 */
+/** SVG / 位图 / 视频海报形状独有的键：离开这类形状时要清掉（否则文件里留着一大段看不见的 data URI）。 */
 var SVG_SHAPE_ONLY_KEYS = ['image', 'imageAspect']
 var IMAGE_SHAPE_ONLY_KEYS = SVG_SHAPE_ONLY_KEYS
+var VIDEO_SHAPE_ONLY_KEYS = SVG_SHAPE_ONLY_KEYS
+
+/** 节点是否为视频播放器（看 `<object>` 数据，不看 style）。 */
+function isVideoNodeData(data) {
+  if (data === null || data === undefined || typeof data !== 'object') return false
+  var v = data.drawaiMedia
+  return v === '1' || v === 1 || v === true
+}
+
+/** 报告/UI 用的形状名：视频优先于 style 推导的 svg/image。 */
+function reportNodeShape(node) {
+  if (node !== null && node !== undefined && typeof node === 'object' && isVideoNodeData(node.data)) return 'video'
+  return nodeShapeFromStyle(node && typeof node.style === 'string' ? node.style : '')
+}
 
 /** 分区形状独有的键：离开 section 时要清掉（否则普通矩形仍带着 container=1）。 */
 var SECTION_SHAPE_ONLY_KEYS = ['group', 'container', 'collapsible', 'recursiveResize', 'spacingLeft', 'spacingTop', 'fontStyle']
 
+/** swimlane 独有的键：离开时清掉，避免普通矩形仍被认成泳道。 */
+var SWIMLANE_SHAPE_ONLY_KEYS = ['swimlane', 'startSize', 'swimlaneFillColor', 'horizontal', 'collapsible']
+
 /** 线型枚举 → style 键。solid 是缺省，落盘即"没有 dashed 键"。 */
 var DASH_PRESETS = {
   solid: null,
@@ -293,9 +322,11 @@ function styleIsEmpty(style) {
 function nodeShapeFromStyle(style) {
   // 独立文字：drawio 用裸键 `text`（不是 `shape=text`）表达，所以要单独认一次。
   if (styleGet(style, 'text', null) !== null) return 'text'
+  // swimlane：标题带容器（startSize）；优先于 container=1 的分区判定。
+  if (styleGet(style, 'swimlane', null) !== null || styleGet(style, 'shape', null) === 'swimlane') return 'swimlane'
   // 分区 / 分组容器：drawio 用裸键 `group` + `container=1`（不是 shape=group）。
   if (styleGet(style, 'group', null) !== null) return 'section'
-  if (styleGet(style, 'container', null) === '1' && styleGet(style, 'swimlane', null) === null) return 'section'
+  if (styleGet(style, 'container', null) === '1') return 'section'
   var shape = styleGet(style, 'shape', null)
   // 图片形状：`shape=image`（或 drawio 的裸键写法留下的 `image=` data URI）。
   //   · SVG data URI → 工具形状 `svg`（可编辑标记）
@@ -335,6 +366,9 @@ function styleWithNodeShape(style, shape) {
   var wasSvg = nodeShapeFromStyle(style) === 'svg'
   var wasImage = nodeShapeFromStyle(style) === 'image'
   var wasSection = nodeShapeFromStyle(style) === 'section'
+  var wasSwimlane = nodeShapeFromStyle(style) === 'swimlane'
+  // video 在 style 层与 svg 同构（都是 shape=image + image=）；换离视频时清海报键。
+  var target = shape === 'video' ? 'svg' : shape
   var shapeKeys = ['shape', 'ellipse', 'rhombus', 'rounded', 'arcSize', 'text']
   for (var i = 0; i < shapeKeys.length; i += 1) delete map[shapeKeys[i]]
   // 从"文字"换成别的形状：把它的隐形设置也清掉，否则换出来的矩形/椭圆是看不见的
@@ -345,20 +379,23 @@ function styleWithNodeShape(style, shape) {
       if (String(map[noneKeys[n]]).toLowerCase() === TEXT_SHAPE_ONLY_KEYS[noneKeys[n]]) delete map[noneKeys[n]]
     }
   }
-  // 同理：从"SVG 图形 / 位图"换成别的形状时，把那段内嵌 data URI 一起清掉 —— 留着它
-  // 没人看得见，却会让文件白白胖一大截（而且下次换回会突然冒出一张旧图）。
-  // svg ↔ image 互切也要清：一个是标记、一个是位图，不能共用同一段 image=。
-  if ((wasSvg || wasImage) && shape !== 'svg' && shape !== 'image') {
+  // 同理：从"SVG 图形 / 位图 / 视频海报"换成别的形状时，把那段内嵌 data URI 一起清掉。
+  // video 在 style 层等同 svg（都是 image + svg data URI）；svg ↔ image 互切也要清。
+  var keepImage = target === 'svg' || target === 'image' || shape === 'video'
+  if ((wasSvg || wasImage) && keepImage === false) {
     for (var s = 0; s < SVG_SHAPE_ONLY_KEYS.length; s += 1) delete map[SVG_SHAPE_ONLY_KEYS[s]]
-  } else if (wasSvg && shape === 'image') {
+  } else if (wasSvg && target === 'image') {
     for (var s2 = 0; s2 < SVG_SHAPE_ONLY_KEYS.length; s2 += 1) delete map[SVG_SHAPE_ONLY_KEYS[s2]]
-  } else if (wasImage && shape === 'svg') {
+  } else if (wasImage && (target === 'svg' || shape === 'video')) {
     for (var s3 = 0; s3 < IMAGE_SHAPE_ONLY_KEYS.length; s3 += 1) delete map[IMAGE_SHAPE_ONLY_KEYS[s3]]
   }
   // 离开分区：清掉容器键，否则普通矩形还会带着 container=1，被当成分区。
   if (wasSection && shape !== 'section') {
     for (var c = 0; c < SECTION_SHAPE_ONLY_KEYS.length; c += 1) delete map[SECTION_SHAPE_ONLY_KEYS[c]]
   }
+  if (wasSwimlane && shape !== 'swimlane') {
+    for (var sw = 0; sw < SWIMLANE_SHAPE_ONLY_KEYS.length; sw += 1) delete map[SWIMLANE_SHAPE_ONLY_KEYS[sw]]
+  }
   var preset = parseStyle(styleFromNodeShape(shape))
   var names = Object.keys(preset)
   for (var p = 0; p < names.length; p += 1) map[names[p]] = preset[names[p]]
@@ -920,6 +957,8 @@ function normalizeDrawioDoc(raw) {
     out.y = Number.isFinite(Number(rawNode.y)) ? Number(rawNode.y) : 0
     out.w = Number.isFinite(Number(rawNode.w)) ? Number(rawNode.w) : 0
     out.h = Number.isFinite(Number(rawNode.h)) ? Number(rawNode.h) : 0
+    if (Number.isFinite(rawNode.labelOffsetX)) out.labelOffsetX = rawNode.labelOffsetX
+    if (Number.isFinite(rawNode.labelOffsetY)) out.labelOffsetY = rawNode.labelOffsetY
     // 编辑数据（drawio 用户对象上的自定义属性）：只收字符串值，原样带上。
     var data = rawNode.data
     if (isObject(data)) out.data = copyData(data)
@@ -1011,9 +1050,9 @@ function normalizeDrawioDoc(raw) {
 
 export {
   STYLE_KEY_ORDER, PALETTE, NODE_SHAPES, NODE_SHAPE_STYLE, DASH_KINDS, ARROW_KINDS, SIDES,
-  DEFAULT_FILL, DEFAULT_STROKE, DEFAULT_FONT, DEFAULT_NODE_STYLE, DEFAULT_EDGE_STYLE,
+  DEFAULT_FILL, DEFAULT_STROKE, DEFAULT_FONT, DEFAULT_NODE_STYLE, DEFAULT_EDGE_STYLE, DEFAULT_VIDEO_POSTER,
   parseStyle, formatStyle, styleGet, styleSet, stylePatch, styleIsEmpty, styleNumber,
-  nodeShapeFromStyle, styleFromNodeShape, styleWithNodeShape,
+  nodeShapeFromStyle, styleFromNodeShape, styleWithNodeShape, isVideoNodeData, reportNodeShape,
   isSvgMarkup, normalizeSvgMarkup, isSvgDataUri, isRasterDataUri, svgMarkupFromImageValue, imageValueFromSvgMarkup,
   imageValueFromStyle, svgMarkupFromStyle, styleWithSvgMarkup, styleWithoutSvgMarkup,
   styleWithImageDataUri, styleWithoutImageDataUri,
@@ -1028,5 +1067,6 @@ export {
   avoidFromStyle, styleWithAvoid,
   normalizePoint, normalizePoints, pointsEqual,
   edgeTerminalId, edgeFreePoint,
+  copyData,
   normalizeDrawioDoc, snapDocGeometry,
 }