@superdoc-dev/cli 0.3.0-next.19 → 0.3.0-next.20

package/dist/index.js

@@ -39076,7 +39076,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-hvBoS9gB.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-CW9LgOv_.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -62650,9 +62650,9 @@ function buildHlinkClickElement(attrs, hlinkRId) {
     attributes: hlinkAttrs
   };
 }
-function buildDocPrElement(attrs, imageName, hlinkRId) {
+function buildDocPrElement(attrs, imageName, hlinkRId, drawingId) {
   const docPrAttrs = {
-    id: attrs.id || 0,
+    id: drawingId,
     name: attrs.alt || `Picture ${imageName}`
   };
   if (!attrs.decorative && attrs.title)
@@ -62682,7 +62682,7 @@ function buildDocPrElement(attrs, imageName, hlinkRId) {
     ...children.length ? { elements: children } : {}
   };
 }
-function buildNvPicPrElement(attrs, imageName, hlinkRId) {
+function buildNvPicPrElement(attrs, imageName, hlinkRId, drawingId) {
   const cNvPrChildren = [];
   const hlinkEl = buildHlinkClickElement(attrs, hlinkRId);
   if (hlinkEl)
@@ -62692,7 +62692,7 @@ function buildNvPicPrElement(attrs, imageName, hlinkRId) {
     elements: [{
       name: "pic:cNvPr",
       attributes: {
-        id: attrs.id || 0,
+        id: drawingId,
         name: attrs.alt || `Picture ${imageName}`
       },
       ...cNvPrChildren.length ? { elements: cNvPrChildren } : {}
@@ -62841,7 +62841,9 @@ function translateShapeGroup(params) {
   });
 }
 function mergeDrawingChildren({ order: order2, generated, original }) {
-  return mergeWithOrder(order2, groupByName(generated), groupByIndex(original));
+  const merged = mergeWithOrder(order2, groupByName(generated), groupByIndex(original));
+  fixZeroDrawingIds(merged, generated);
+  return merged;
 }
 function groupByIndex(entries = []) {
   const map3 = /* @__PURE__ */ new Map;
@@ -62900,6 +62902,17 @@ function groupByName(nodes = []) {
   });
   return map3;
 }
+function fixZeroDrawingIds(merged, generated) {
+  const validId = generated?.find((el) => el?.name === "wp:docPr")?.attributes?.id;
+  if (!validId || !(Number(validId) > 0))
+    return;
+  const docPr = merged.find((el) => el?.name === "wp:docPr");
+  if (docPr?.attributes && !(Number(docPr.attributes.id) > 0))
+    docPr.attributes.id = validId;
+  const cNvPr = merged.find((el) => el?.name === "a:graphic")?.elements?.find((el) => el?.name === "a:graphicData")?.elements?.find((el) => el?.name === "pic:pic")?.elements?.find((el) => el?.name === "pic:nvPicPr")?.elements?.find((el) => el?.name === "pic:cNvPr");
+  if (cNvPr?.attributes && !(Number(cNvPr.attributes.id) > 0))
+    cNvPr.attributes.id = validId;
+}
 function translateAnchorNode(params) {
   const { attrs } = params.node;
   const anchorElements = [];
@@ -62960,6 +62973,8 @@ function translateAnchorNode(params) {
     });
   }
   const nodeElements = translateImageNode(params);
+  if (!nodeElements?.elements?.some((el) => el?.name === "wp:extent"))
+    return nodeElements;
   const inlineAttrs = {
     ...attrs.originalAttributes || {},
     ...nodeElements.attributes || {}
@@ -63069,6 +63084,8 @@ function handleInlineNode(params) {
 function translateInlineNode(params) {
   const { attrs } = params.node;
   const nodeElements = translateImageNode(params);
+  if (!nodeElements?.elements?.some((el) => el?.name === "wp:extent"))
+    return nodeElements;
   const inlineAttrs = {
     ...attrs.originalAttributes || {},
     ...nodeElements.attributes || {}
@@ -63131,9 +63148,12 @@ function decode$46(params) {
     return null;
   if (node3.type === "chart" && node3.attrs.originalXml)
     return wrapTextInRun(carbonCopy(node3.attrs.originalXml), []);
+  const resultNode = (node3.attrs.isAnchor ? translator$197 : translator$198).decode(params);
+  if (!resultNode || resultNode.name !== "wp:inline" && resultNode.name !== "wp:anchor")
+    return resultNode;
   return wrapTextInRun({
     name: "w:drawing",
-    elements: [(node3.attrs.isAnchor ? translator$197 : translator$198).decode(params)]
+    elements: [resultNode]
   }, []);
 }
 function getTextNodeForExport(text$2, marks, params) {
@@ -78730,6 +78750,7 @@ var isRegExp = (value) => {
       }
     });
   const hlinkRId = resolveHyperlinkRId(attrs, params);
+  const drawingId = attrs.id && Number(attrs.id) > 0 ? attrs.id : Math.max(1, parseInt(generateDocxRandomId(), 16));
   return {
     attributes: inlineAttrs,
     elements: [
@@ -78744,7 +78765,7 @@ var isRegExp = (value) => {
         name: "wp:effectExtent",
         attributes: effectExtentAttrs
       },
-      buildDocPrElement(attrs, imageName, hlinkRId),
+      buildDocPrElement(attrs, imageName, hlinkRId, drawingId),
       {
         name: "wp:cNvGraphicFramePr",
         elements: [{
@@ -78765,7 +78786,7 @@ var isRegExp = (value) => {
             name: "pic:pic",
             attributes: { "xmlns:pic": pictureXmlns },
             elements: [
-              buildNvPicPrElement(attrs, imageName, hlinkRId),
+              buildNvPicPrElement(attrs, imageName, hlinkRId, drawingId),
               {
                 name: "pic:blipFill",
                 elements: [
@@ -82522,7 +82543,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_hvBoS9gB_es = __esm(() => {
+var init_SuperConverter_CW9LgOv__es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -144386,7 +144407,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-B23kCZxx.es.js
+// ../../packages/superdoc/dist/chunks/src-C3vsNW1f.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -225047,9 +225068,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_B23kCZxx_es = __esm(() => {
+var init_src_C3vsNW1f_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_hvBoS9gB_es();
+  init_SuperConverter_CW9LgOv__es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
@@ -258135,8 +258156,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_B23kCZxx_es();
-  init_SuperConverter_hvBoS9gB_es();
+  init_src_C3vsNW1f_es();
+  init_SuperConverter_CW9LgOv__es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
   init_constants_ep1_Gwqi_es();
@@ -309488,9 +309509,9 @@ function buildHlinkClickElement2(attrs, hlinkRId) {
   }
   return { name: "a:hlinkClick", attributes: hlinkAttrs };
 }
-function buildDocPrElement2(attrs, imageName, hlinkRId) {
+function buildDocPrElement2(attrs, imageName, hlinkRId, drawingId) {
   const docPrAttrs = {
-    id: attrs.id || 0,
+    id: drawingId,
     name: attrs.alt || `Picture ${imageName}`
   };
   if (!attrs.decorative && attrs.title) {
@@ -309523,7 +309544,7 @@ function buildDocPrElement2(attrs, imageName, hlinkRId) {
     ...children.length ? { elements: children } : {}
   };
 }
-function buildNvPicPrElement2(attrs, imageName, hlinkRId) {
+function buildNvPicPrElement2(attrs, imageName, hlinkRId, drawingId) {
   const cNvPrChildren = [];
   const hlinkEl = buildHlinkClickElement2(attrs, hlinkRId);
   if (hlinkEl)
@@ -309534,7 +309555,7 @@ function buildNvPicPrElement2(attrs, imageName, hlinkRId) {
       {
         name: "pic:cNvPr",
         attributes: {
-          id: attrs.id || 0,
+          id: drawingId,
           name: attrs.alt || `Picture ${imageName}`
         },
         ...cNvPrChildren.length ? { elements: cNvPrChildren } : {}
@@ -309792,6 +309813,7 @@ var DECORATIVE_EXT_URI2 = "{C183D7F6-B498-43B3-948B-1728B52AA6E4}", DECORATIVE_N
     });
   }
   const hlinkRId = resolveHyperlinkRId2(attrs, params3);
+  const drawingId = attrs.id && Number(attrs.id) > 0 ? attrs.id : Math.max(1, parseInt(generateDocxRandomId2(), 16));
   return {
     attributes: inlineAttrs,
     elements: [
@@ -309806,7 +309828,7 @@ var DECORATIVE_EXT_URI2 = "{C183D7F6-B498-43B3-948B-1728B52AA6E4}", DECORATIVE_N
         name: "wp:effectExtent",
         attributes: effectExtentAttrs
       },
-      buildDocPrElement2(attrs, imageName, hlinkRId),
+      buildDocPrElement2(attrs, imageName, hlinkRId, drawingId),
       {
         name: "wp:cNvGraphicFramePr",
         elements: [
@@ -309831,7 +309853,7 @@ var DECORATIVE_EXT_URI2 = "{C183D7F6-B498-43B3-948B-1728B52AA6E4}", DECORATIVE_N
                 name: "pic:pic",
                 attributes: { "xmlns:pic": pictureXmlns },
                 elements: [
-                  buildNvPicPrElement2(attrs, imageName, hlinkRId),
+                  buildNvPicPrElement2(attrs, imageName, hlinkRId, drawingId),
                   {
                     name: "pic:blipFill",
                     elements: [
@@ -309906,7 +309928,9 @@ var init_decode_image_node_helpers = __esm(() => {
 function mergeDrawingChildren2({ order: order4, generated, original }) {
   const genQueues = groupByName2(generated);
   const originalsByIndex = groupByIndex2(original);
-  return mergeWithOrder2(order4, genQueues, originalsByIndex);
+  const merged = mergeWithOrder2(order4, genQueues, originalsByIndex);
+  fixZeroDrawingIds2(merged, generated);
+  return merged;
 }
 function groupByIndex2(entries = []) {
   const map9 = new Map;
@@ -309967,6 +309991,24 @@ function groupByName2(nodes = []) {
   });
   return map9;
 }
+function fixZeroDrawingIds2(merged, generated) {
+  const genDocPr = generated?.find((el) => el?.name === "wp:docPr");
+  const validId = genDocPr?.attributes?.id;
+  if (!validId || !(Number(validId) > 0))
+    return;
+  const docPr = merged.find((el) => el?.name === "wp:docPr");
+  if (docPr?.attributes && !(Number(docPr.attributes.id) > 0)) {
+    docPr.attributes.id = validId;
+  }
+  const graphic = merged.find((el) => el?.name === "a:graphic");
+  const graphicData = graphic?.elements?.find((el) => el?.name === "a:graphicData");
+  const pic = graphicData?.elements?.find((el) => el?.name === "pic:pic");
+  const nvPicPr = pic?.elements?.find((el) => el?.name === "pic:nvPicPr");
+  const cNvPr = nvPicPr?.elements?.find((el) => el?.name === "pic:cNvPr");
+  if (cNvPr?.attributes && !(Number(cNvPr.attributes.id) > 0)) {
+    cNvPr.attributes.id = validId;
+  }
+}
 var init_merge_drawing_children = () => {};
 
 // ../../packages/super-editor/src/core/super-converter/v3/handlers/wp/anchor/helpers/translate-anchor-node.js
@@ -310023,6 +310065,9 @@ function translateAnchorNode2(params3) {
     });
   }
   const nodeElements = translateImageNode2(params3);
+  if (!nodeElements?.elements?.some((el) => el?.name === "wp:extent")) {
+    return nodeElements;
+  }
   const inlineAttrs = {
     ...attrs.originalAttributes || {},
     ...nodeElements.attributes || {}
@@ -310198,6 +310243,9 @@ var init_handle_inline_node = __esm(() => {
 function translateInlineNode2(params3) {
   const { attrs } = params3.node;
   const nodeElements = translateImageNode2(params3);
+  if (!nodeElements?.elements?.some((el) => el?.name === "wp:extent")) {
+    return nodeElements;
+  }
   const inlineAttrs = {
     ...attrs.originalAttributes || {},
     ...nodeElements.attributes || {}
@@ -310293,6 +310341,9 @@ function decode38(params3) {
   }
   const childTranslator = node4.attrs.isAnchor ? translator151 : translator152;
   const resultNode = childTranslator.decode(params3);
+  if (!resultNode || resultNode.name !== "wp:inline" && resultNode.name !== "wp:anchor") {
+    return resultNode;
+  }
   return wrapTextInRun2({
     name: "w:drawing",
     elements: [resultNode]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.19",
+  "version": "0.3.0-next.20",
   "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/super-editor": "0.0.1",
-    "superdoc": "1.19.0"
+    "@superdoc/pm-adapter": "0.0.0",
+    "superdoc": "1.19.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.19",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.19",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.19",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.19",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.19"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.20",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.20",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.20",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.20",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.20"
   },
   "scripts": {
     "dev": "bun run src/index.ts",