@superdoc-dev/cli 0.3.0-next.1 → 0.3.0-next.2

package/dist/index.js

@@ -38858,7 +38858,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-DX_sXuMp.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-i9G7_t3u.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -75103,7 +75103,11 @@ var isRegExp = (value) => {
   }
   #generate_xml_as_list(data, debug = false) {
     const json = JSON.parse(JSON.stringify(data));
-    const declaration = this.converter.declaration.attributes;
+    const declaration = this.converter.declaration?.attributes ?? {
+      version: "1.0",
+      encoding: "UTF-8",
+      standalone: "yes"
+    };
     return [`<?xml${Object.entries(declaration).map(([key, value]) => ` ${key}="${value}"`).join("")}?>`, ...this.#generateXml(json, debug)];
   }
   #replaceSpecialCharacters(text$2) {
@@ -75686,7 +75690,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_DX_sXuMp_es = __esm(() => {
+var init_SuperConverter_i9G7_t3u_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -110431,7 +110435,7 @@ var init_remark_stringify_D8vxv_XI_es = __esm(() => {
   eol = /\r?\n|\r/g;
 });
 
-// ../../packages/superdoc/dist/chunks/DocxZipper-DTP6a0rR.es.js
+// ../../packages/superdoc/dist/chunks/DocxZipper-DcuMk8AE.es.js
 function getLens2(b64) {
   var len$1 = b64.length;
   if (len$1 % 4 > 0)
@@ -111002,6 +111006,8 @@ var DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.docum
     });
   }
   async exportFromCollaborativeDocx(docx, updatedDocs, media, fonts) {
+    if (!Array.isArray(docx))
+      throw new Error("Collaborative DOCX export requires base package entries");
     const zip = new import_jszip_min.default;
     for (const file of docx) {
       const content2 = file.content;
@@ -111067,7 +111073,7 @@ var DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.docum
     return `image/${MIME_TYPE_FOR_EXT[detectedType] || detectedType}`;
   }
 }, DocxZipper_default;
-var init_DocxZipper_DTP6a0rR_es = __esm(() => {
+var init_DocxZipper_DcuMk8AE_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -136170,7 +136176,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CjQaxvoG.es.js
+// ../../packages/superdoc/dist/chunks/src-CL8tC0je.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -214293,13 +214299,19 @@ var Node$13 = class Node$14 {
       return;
     if (event.button !== 0)
       return;
-    const annotationEl = event.target?.closest?.(".annotation[data-pm-start]");
+    const target = event.target;
+    const annotationEl = target?.closest?.(".annotation[data-pm-start]");
     if (annotationEl) {
       event.preventDefault();
       event.stopPropagation();
       this.#handleAnnotationDoubleClick(event, annotationEl);
       return;
     }
+    if ((this.#deps.getHeaderFooterSession()?.session?.mode ?? "body") !== "body") {
+      const activeEditorHost = this.#deps.getHeaderFooterSession()?.overlayManager?.getActiveEditorHost?.();
+      if (activeEditorHost && (activeEditorHost.contains(target) || activeEditorHost === target))
+        return;
+    }
     if (!this.#deps.getLayoutState().layout)
       return;
     const normalized = this.#callbacks.normalizeClientPoint?.(event.clientX, event.clientY);
@@ -216358,6 +216370,18 @@ var Node$13 = class Node$14 {
       try {
         editor.setEditable(true);
         editor.setOptions({ documentMode: "editing" });
+        try {
+          const editorView = editor.view;
+          if (editorView && editorHost) {
+            const focusHandler = () => {
+              try {
+                editorView.focus();
+              } catch {}
+            };
+            editorHost.addEventListener("mousedown", focusHandler);
+            this.#managerCleanups.push(() => editorHost.removeEventListener("mousedown", focusHandler));
+          }
+        } catch {}
         try {
           const doc$2 = editor.state?.doc;
           if (doc$2) {
@@ -216381,7 +216405,6 @@ var Node$13 = class Node$14 {
         });
         return;
       }
-      this.#overlayManager.hideSelectionOverlay();
       this.#activeEditor = editor;
       this.#setupActiveEditorEventBridge(editor);
       this.#session = {
@@ -216684,6 +216707,12 @@ var Node$13 = class Node$14 {
     };
   }
   computeSelectionRects(from$1, to) {
+    if (this.#session.mode === "body")
+      return [];
+    const activeEditor = this.#activeEditor;
+    if (!activeEditor?.view)
+      return [];
+    const view = activeEditor.view;
     const context = this.getContext();
     if (!context) {
       console.warn("[HeaderFooterSessionManager] Header/footer context unavailable for selection rects", {
@@ -216692,19 +216721,48 @@ var Node$13 = class Node$14 {
       });
       return [];
     }
+    const region = context.region;
+    const pageIndex = region.pageIndex;
+    const domSelection = view.dom.ownerDocument?.getSelection?.();
+    let domRectList = [];
+    if (domSelection && domSelection.rangeCount > 0) {
+      for (let i$1 = 0;i$1 < domSelection.rangeCount; i$1 += 1) {
+        const range = domSelection.getRangeAt(i$1);
+        if (!range)
+          continue;
+        const rangeRects = Array.from(range.getClientRects());
+        domRectList.push(...rangeRects);
+      }
+      domRectList = deduplicateOverlappingRects(domRectList);
+    }
+    if (!domRectList.length)
+      return [];
+    const editorHostRect = view.dom.getBoundingClientRect();
     const bodyPageHeight = this.#deps?.getBodyPageHeight() ?? this.#options.defaultPageSize.h;
-    const rects = selectionToRects(context.layout, context.blocks, context.measures, from$1, to, undefined) ?? [];
-    const headerPageHeight = context.layout.pageSize?.h ?? context.region.height ?? 1;
-    return rects.map((rect) => {
-      const headerLocalY = rect.y - rect.pageIndex * headerPageHeight;
-      return {
-        pageIndex: context.region.pageIndex,
-        x: rect.x + context.region.localX,
-        y: context.region.pageIndex * bodyPageHeight + context.region.localY + headerLocalY,
-        width: rect.width,
-        height: rect.height
-      };
-    });
+    const layoutOptions = this.#deps?.getLayoutOptions() ?? {};
+    const zoom = typeof layoutOptions.zoom === "number" && Number.isFinite(layoutOptions.zoom) && layoutOptions.zoom > 0 ? layoutOptions.zoom : 1;
+    const toLayoutUnits = (viewportPixels) => viewportPixels / zoom;
+    const layoutRects = [];
+    for (const clientRect$1 of domRectList) {
+      const horizontallyOverlaps = clientRect$1.right > editorHostRect.left && clientRect$1.left < editorHostRect.right;
+      const verticallyOverlaps = clientRect$1.bottom > editorHostRect.top && clientRect$1.top < editorHostRect.bottom;
+      if (!horizontallyOverlaps || !verticallyOverlaps)
+        continue;
+      const localX = toLayoutUnits(clientRect$1.left - editorHostRect.left);
+      const localY = toLayoutUnits(clientRect$1.top - editorHostRect.top);
+      const width = toLayoutUnits(clientRect$1.width);
+      const height = toLayoutUnits(clientRect$1.height);
+      if (!Number.isFinite(localX) || !Number.isFinite(localY) || width <= 0 || height <= 0)
+        continue;
+      layoutRects.push({
+        pageIndex,
+        x: region.localX + localX,
+        y: pageIndex * bodyPageHeight + region.localY + localY,
+        width,
+        height
+      });
+    }
+    return layoutRects;
   }
   getContext() {
     if (this.#session.mode === "body")
@@ -222083,16 +222141,16 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_CjQaxvoG_es = __esm(() => {
+var init_src_CL8tC0je_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_DX_sXuMp_es();
+  init_SuperConverter_i9G7_t3u_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
   init_unified_BRHLwnjP_es();
   init_remark_gfm_z_sDF4ss_es();
   init_remark_stringify_D8vxv_XI_es();
-  init_DocxZipper_DTP6a0rR_es();
+  init_DocxZipper_DcuMk8AE_es();
   init_vue_DQHWm9lq_es();
   init__plugin_vue_export_helper_HmhZBO0u_es();
   init_eventemitter3_DGBTyUUP_es();
@@ -231724,18 +231782,8 @@ function print() { __p += __j.call(arguments, '') }
             this.#sourcePath = null;
           }
         } else if (resolvedMode === "docx" && !options?.content && !options?.html && !options?.markdown) {
-          const arrayBuffer = await getArrayBufferFromUrl(BLANK_DOCX_DATA_URI);
-          const canUseBuffer = typeof process$1$1 !== "undefined" && !!process$1$1.versions?.node && typeof Buffer3 !== "undefined";
-          const uint8Array = new Uint8Array(arrayBuffer);
-          let fileSource;
-          if (canUseBuffer)
-            fileSource = Buffer3.from(uint8Array);
-          else if (typeof Blob !== "undefined")
-            fileSource = new Blob([uint8Array]);
-          else
-            throw new Error("Blob is not available to create blank DOCX");
-          const [docx, _media, mediaFiles, fonts] = await Editor2.loadXmlData(fileSource, canUseBuffer);
-          resolvedOptions.content = docx;
+          const { content: content3, mediaFiles, fonts, fileSource } = await this.#loadBlankDocxTemplate();
+          resolvedOptions.content = content3;
           resolvedOptions.mediaFiles = {
             ...mediaFiles,
             ...options?.mediaFiles ?? {}
@@ -232224,6 +232272,40 @@ function print() { __p += __j.call(arguments, '') }
           isNewFile: this.options.isNewFile ?? false
         });
     }
+    async#loadBlankDocxTemplate() {
+      const arrayBuffer = await getArrayBufferFromUrl(BLANK_DOCX_DATA_URI);
+      const canUseBuffer = typeof process$1$1 !== "undefined" && !!process$1$1.versions?.node && typeof Buffer3 !== "undefined";
+      const uint8Array = new Uint8Array(arrayBuffer);
+      let fileSource;
+      if (canUseBuffer)
+        fileSource = Buffer3.from(uint8Array);
+      else if (typeof Blob !== "undefined")
+        fileSource = new Blob([uint8Array]);
+      else
+        throw new Error("Blob is not available to create blank DOCX");
+      const [content3, _media, mediaFiles, fonts] = await Editor2.loadXmlData(fileSource, canUseBuffer);
+      return {
+        content: content3,
+        mediaFiles,
+        fonts,
+        fileSource
+      };
+    }
+    async#getBaseDocxEntriesForExport() {
+      if (Array.isArray(this.options.content))
+        return this.options.content;
+      const blankDocx = await this.#loadBlankDocxTemplate();
+      this.options.content = blankDocx.content;
+      this.options.mediaFiles = {
+        ...blankDocx.mediaFiles,
+        ...this.options.mediaFiles ?? {}
+      };
+      this.options.fonts = {
+        ...blankDocx.fonts,
+        ...this.options.fonts ?? {}
+      };
+      return blankDocx.content;
+    }
     #initMedia() {
       if (this.options.isChildEditor)
         return;
@@ -232810,8 +232892,9 @@ function print() { __p += __j.call(arguments, '') }
           updatedDocs["_rels/.rels"] = relsXml;
           return updatedDocs;
         }
+        const baseDocxEntries = !this.options.fileSource && !Array.isArray(this.options.content) ? await this.#getBaseDocxEntriesForExport() : this.options.content;
         return await zipper.updateZip({
-          docx: this.options.content,
+          docx: baseDocxEntries,
           updatedDocs,
           originalDocxFile: this.options.fileSource,
           media: media2,
@@ -241031,6 +241114,8 @@ function print() { __p += __j.call(arguments, '') }
     #ariaLiveRegion = null;
     #a11ySelectionAnnounceTimeout = null;
     #a11yLastAnnouncedSelectionKey = null;
+    #headerFooterSelectionHandler = null;
+    #headerFooterEditor = null;
     #lastSelectedFieldAnnotation = null;
     #lastSelectedStructuredContentBlock = null;
     #lastSelectedStructuredContentInline = null;
@@ -242651,7 +242736,27 @@ function print() { __p += __j.call(arguments, '') }
         },
         onEditingContext: (data) => {
           this.emit("headerFooterEditingContext", data);
-          this.#announce(data.kind === "body" ? "Exited header/footer edit mode." : `Editing ${data.kind === "header" ? "Header" : "Footer"} (${data.sectionType ?? "default"})`);
+          if (this.#headerFooterEditor && this.#headerFooterSelectionHandler) {
+            this.#headerFooterEditor.off?.("selectionUpdate", this.#headerFooterSelectionHandler);
+            this.#headerFooterEditor = null;
+            this.#headerFooterSelectionHandler = null;
+          }
+          if (data.kind === "body") {
+            this.#announce("Exited header/footer edit mode.");
+            this.#scheduleSelectionUpdate({ immediate: true });
+          } else {
+            this.#announce(`Editing ${data.kind === "header" ? "Header" : "Footer"} (${data.sectionType ?? "default"})`);
+            const headerFooterEditor = data.editor;
+            const handler2 = () => {
+              this.#scheduleSelectionUpdate();
+              this.#scheduleA11ySelectionAnnouncement();
+            };
+            headerFooterEditor.on?.("selectionUpdate", handler2);
+            this.#headerFooterEditor = headerFooterEditor;
+            this.#headerFooterSelectionHandler = handler2;
+            this.#scheduleSelectionUpdate({ immediate: true });
+            this.#scheduleA11ySelectionAnnouncement({ immediate: true });
+          }
         },
         onEditBlocked: (reason) => {
           this.emit("headerFooterEditBlocked", { reason });
@@ -243407,7 +243512,7 @@ function print() { __p += __j.call(arguments, '') }
       const shouldScrollIntoView = this.#shouldScrollSelectionIntoView;
       this.#shouldScrollSelectionIntoView = false;
       if ((this.#headerFooterSession?.session?.mode ?? "body") !== "body") {
-        this.#clearSelectedFieldAnnotationClass();
+        this.#updateHeaderFooterSelection();
         return;
       }
       if (!this.#localSelectionLayer)
@@ -243820,8 +243925,6 @@ function print() { __p += __j.call(arguments, '') }
     #announceSelectionNow() {
       if (!this.#ariaLiveRegion)
         return;
-      if ((this.#headerFooterSession?.session?.mode ?? "body") !== "body")
-        return;
       const announcement = computeA11ySelectionAnnouncement(this.getActiveEditor().state);
       if (!announcement)
         return;
@@ -244378,6 +244481,43 @@ function print() { __p += __j.call(arguments, '') }
           this.#errorBannerMessage.textContent += ` (${this.#layoutOptions.debugLabel}: ${error.message})`;
       }
     }
+    #updateHeaderFooterSelection() {
+      this.#clearSelectedFieldAnnotationClass();
+      if (!this.#localSelectionLayer)
+        return;
+      const selection = this.getActiveEditor()?.state?.selection;
+      if (!selection) {
+        try {
+          this.#localSelectionLayer.innerHTML = "";
+        } catch {}
+        return;
+      }
+      const { from: from$1, to } = selection;
+      if (from$1 === to) {
+        try {
+          this.#localSelectionLayer.innerHTML = "";
+        } catch {}
+        return;
+      }
+      const rects = this.#computeHeaderFooterSelectionRects(from$1, to);
+      if (!rects.length)
+        return;
+      const pageHeight = this.#getBodyPageHeight();
+      const pageGap = 0;
+      try {
+        this.#localSelectionLayer.innerHTML = "";
+        renderSelectionRects({
+          localSelectionLayer: this.#localSelectionLayer,
+          rects,
+          pageHeight,
+          pageGap,
+          convertPageLocalToOverlayCoords: (pageIndex, x, y$1) => this.#convertPageLocalToOverlayCoords(pageIndex, x, y$1)
+        });
+      } catch (error) {
+        if (process$1$1.env.NODE_ENV === "development")
+          console.warn("[PresentationEditor] Failed to render header/footer selection rects:", error);
+      }
+    }
     #dismissErrorBanner() {
       this.#errorBanner?.remove();
       this.#errorBanner = null;
@@ -255992,13 +256132,13 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CjQaxvoG_es();
-  init_SuperConverter_DX_sXuMp_es();
+  init_src_CL8tC0je_es();
+  init_SuperConverter_i9G7_t3u_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
   init_constants_ep1_Gwqi_es();
   init_unified_BRHLwnjP_es();
-  init_DocxZipper_DTP6a0rR_es();
+  init_DocxZipper_DcuMk8AE_es();
   init_vue_DQHWm9lq_es();
   init_eventemitter3_DGBTyUUP_es();
   init_zipper_DqXT7uTa_es();
@@ -317799,7 +317939,11 @@ class DocxExporter2 {
   }
   #generate_xml_as_list(data, debug = false) {
     const json = JSON.parse(JSON.stringify(data));
-    const declaration = this.converter.declaration.attributes;
+    const declaration = this.converter.declaration?.attributes ?? {
+      version: "1.0",
+      encoding: "UTF-8",
+      standalone: "yes"
+    };
     const xmlTag = `<?xml${Object.entries(declaration).map(([key2, value]) => ` ${key2}="${value}"`).join("")}?>`;
     const result = this.#generateXml(json, debug);
     const final = [xmlTag, ...result];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.1",
+  "version": "0.3.0-next.2",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -20,21 +20,21 @@
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/document-api": "0.0.1",
+    "superdoc": "1.19.0",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.19.0"
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.1",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.1",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.1",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.1",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.1"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.2",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.2",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.2",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.2",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.2"
   },
   "scripts": {
     "dev": "bun run src/index.ts",