@superdoc-dev/cli 0.13.0-next.5 → 0.13.0-next.7

package/dist/index.js

@@ -67593,7 +67593,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-yBMSqEiB.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-k7GHkV-c.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -96262,6 +96262,33 @@ function _getReferencedTableStyles(tableStyleReference, params3) {
     ...styleProps
   };
 }
+function buildFieldResultRuns(params3, outputMarks) {
+  const { node: node3 } = params3;
+  const contentNodes = (node3.content ?? []).flatMap((child) => exportSchemaToJson({
+    ...params3,
+    node: child
+  }));
+  if (contentNodes.length > 0)
+    return contentNodes;
+  const resolvedText = node3.attrs?.resolvedText;
+  if (typeof resolvedText !== "string" || resolvedText.length === 0)
+    return [];
+  const textAttributes = /^\s|\s$/.test(resolvedText) ? { "xml:space": "preserve" } : undefined;
+  return [{
+    name: "w:r",
+    elements: [{
+      name: "w:rPr",
+      elements: outputMarks
+    }, {
+      name: "w:t",
+      attributes: textAttributes,
+      elements: [{
+        text: resolvedText,
+        type: "text"
+      }]
+    }]
+  }];
+}
 function parseTarget(instruction) {
   if (!instruction)
     return "";
@@ -96315,7 +96342,19 @@ function parseCitationSourceIds(instruction) {
 function extractResolvedText$1(content$2) {
   if (!Array.isArray(content$2))
     return "";
-  return content$2.filter((n) => n.type === "text").map((n) => n.text || "").join("");
+  let out = "";
+  const walk = (nodes) => {
+    for (const node3 of nodes) {
+      if (!node3)
+        continue;
+      if (node3.type === "text")
+        out += node3.text || "";
+      else if (Array.isArray(node3.content))
+        walk(node3.content);
+    }
+  };
+  walk(content$2);
+  return out;
 }
 function parseTaInstruction(instruction) {
   let longCitation = "";
@@ -118468,10 +118507,7 @@ var isRegExp = (value) => {
 }, decode$20 = (params3) => {
   const { node: node3 } = params3;
   const outputMarks = processOutputMarks(node3.attrs?.marksAsAttrs || []);
-  const contentNodes = (node3.content ?? []).flatMap((n) => exportSchemaToJson({
-    ...params3,
-    node: n
-  }));
+  const contentNodes = buildFieldResultRuns(params3, outputMarks);
   const instructionElements = buildInstructionElements(node3.attrs?.instruction, node3.attrs?.instructionTokens);
   return [
     {
@@ -118536,10 +118572,7 @@ var isRegExp = (value) => {
 }, decode$19 = (params3) => {
   const { node: node3 } = params3;
   const outputMarks = processOutputMarks(node3.attrs?.marksAsAttrs || []);
-  const contentNodes = (node3.content ?? []).flatMap((n) => exportSchemaToJson({
-    ...params3,
-    node: n
-  }));
+  const contentNodes = buildFieldResultRuns(params3, outputMarks);
   const instructionElements = buildInstructionElements(node3.attrs?.instruction, node3.attrs?.instructionTokens);
   return [
     {
@@ -121679,7 +121712,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_yBMSqEiB_es = __esm(() => {
+var init_SuperConverter_k7GHkV_c_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -159859,7 +159892,7 @@ var init_SuperConverter_yBMSqEiB_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-DOHBUV3P.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-dycevpY9.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -169884,8 +169917,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_DOHBUV3P_es = __esm(() => {
-  init_SuperConverter_yBMSqEiB_es();
+var init_create_headless_toolbar_dycevpY9_es = __esm(() => {
+  init_SuperConverter_k7GHkV_c_es();
   init_uuid_qzgm05fK_es();
   init_constants_DrU4EASo_es();
   init_dist_B8HfvhaK_es();
@@ -219090,7 +219123,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-Cccxf1lk.es.js
+// ../../packages/superdoc/dist/chunks/src-D6w3M9Bh.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -220977,6 +221010,86 @@ function backfillCapability(metaMap, ydoc) {
 function createReplacer(data) {
   return ({ part }) => replacePartData(part, data);
 }
+function normalizeYjsFragmentForSchema(fragment2) {
+  if (!isTraversableYjsXml(fragment2))
+    return false;
+  let changed = false;
+  const normalize4 = () => {
+    changed = stripSchemaAtomChildren(fragment2) || changed;
+  };
+  if (fragment2.doc)
+    fragment2.doc.transact(normalize4, NORMALIZE_YJS_FRAGMENT_ORIGIN);
+  else
+    normalize4();
+  return changed;
+}
+function normalizeYjsFragmentEventsForSchema(events, fallbackFragment) {
+  if (!Array.isArray(events) || events.length === 0)
+    return normalizeYjsFragmentForSchema(fallbackFragment);
+  if (events.some((event) => event?.transaction?.origin === NORMALIZE_YJS_FRAGMENT_ORIGIN))
+    return false;
+  let changed = false;
+  const normalize4 = () => {
+    const visited = /* @__PURE__ */ new Set;
+    for (const event of events) {
+      const target = findNormalizableEventTarget(event?.target);
+      if (!isTraversableYjsXml(target) || visited.has(target))
+        continue;
+      visited.add(target);
+      changed = stripSchemaAtomChildren(target) || changed;
+    }
+  };
+  const doc$12 = fallbackFragment?.doc || findEventDoc(events);
+  if (doc$12)
+    doc$12.transact(normalize4, NORMALIZE_YJS_FRAGMENT_ORIGIN);
+  else
+    normalize4();
+  return changed;
+}
+function stripSchemaAtomChildren(parent) {
+  if (!isTraversableYjsXml(parent))
+    return false;
+  if (parent instanceof YXmlElement && SCHEMA_ATOM_NODE_NAMES.has(parent.nodeName)) {
+    if (parent.length === 0)
+      return false;
+    parent.delete(0, parent.length);
+    return true;
+  }
+  let changed = false;
+  for (const child of parent.toArray()) {
+    if (!(child instanceof YXmlElement))
+      continue;
+    if (SCHEMA_ATOM_NODE_NAMES.has(child.nodeName)) {
+      if (child.length > 0) {
+        child.delete(0, child.length);
+        changed = true;
+      }
+      continue;
+    }
+    changed = stripSchemaAtomChildren(child) || changed;
+  }
+  return changed;
+}
+function findNormalizableEventTarget(target) {
+  let current = target;
+  while (current) {
+    if (current instanceof YXmlElement && SCHEMA_ATOM_NODE_NAMES.has(current.nodeName))
+      return current;
+    current = current.parent;
+  }
+  return target;
+}
+function findEventDoc(events) {
+  for (const event of events) {
+    const doc$12 = event?.target?.doc;
+    if (doc$12)
+      return doc$12;
+  }
+  return null;
+}
+function isTraversableYjsXml(value) {
+  return Boolean(value && typeof value.toArray === "function");
+}
 function getEditorSurfaceElement(editor) {
   if (!editor)
     return null;
@@ -221479,13 +221592,8 @@ function splitBlockPatch(state, dispatch, editor) {
         atStart = $from.start(d) == $from.pos - ($from.depth - d);
         deflt = defaultBlockAt($from.node(d - 1).contentMatchAt($from.indexAfter(d - 1)));
         const sourceParagraphStyleId = node3.attrs?.paragraphProperties?.styleId;
-        paragraphAttrs = {
-          ...node3.attrs,
-          sdBlockId: null,
-          sdBlockRev: null,
-          paraId: null,
-          textId: null
-        };
+        const extensionAttrs = editor?.extensionService?.attributes ?? [];
+        paragraphAttrs = Attribute2.getSplittedAttributes(extensionAttrs, node3.type.name, node3.attrs);
         paragraphAttrs = clearInheritedLinkedStyleId(paragraphAttrs, editor, { emptyParagraph: atEnd });
         if (atEnd && $from.parent.type.name === "run") {
           if (!isLinkedParagraphStyleId(editor, sourceParagraphStyleId))
@@ -242586,10 +242694,7 @@ function tablesSplitAdapter(editor, input2, options) {
       const rEnd = tr.mapping.slice(mapFrom).map(rowPositions[i4] + tableNode.child(i4).nodeSize);
       tr.delete(rp, rEnd);
     }
-    const newTableAttrs = { ...tableNode.attrs };
-    delete newTableAttrs.sdBlockId;
-    delete newTableAttrs.paraId;
-    delete newTableAttrs.textId;
+    const newTableAttrs = Attribute2.getSplittedAttributes(editor.extensionService?.attributes ?? [], tableNode.type.name, tableNode.attrs);
     const newTable = schema.nodes.table.create(newTableAttrs, secondTableRows);
     const separatorParagraph = createSeparatorParagraph(schema);
     if (!separatorParagraph)
@@ -278995,7 +279100,7 @@ var Node$13 = class Node$14 {
     let $pos = doc$12.resolve(this.pos);
     return GapCursor.valid($pos) ? new GapCursor($pos) : Selection.near($pos);
   }
-}, handleKeyDown2, Gapcursor, PARTS_MAP_KEY = "parts", META_MAP_KEY = "meta", META_PARTS_SCHEMA_VERSION_KEY = "partsSchemaVersion", META_PARTS_MIGRATION_KEY = "partsMigration", META_PARTS_LAST_HYDRATED_AT_KEY = "partsLastHydratedAt", META_PARTS_FALLBACK_MODE_KEY = "partsFallbackMode", META_PARTS_CAPABILITY_KEY = "partsCapability", SOURCE_COLLAB_REMOTE_PARTS = "collab:remote:parts", SOURCE_COLLAB_REMOTE_PREFIX = "collab:remote:", EXCLUDED_PART_IDS, CRITICAL_PART_IDS, isApplyingRemoteParts = false, headlessBindingStateByEditor, headlessCleanupRegisteredEditors, META_BODY_SECT_PR_KEY = "bodySectPr", BODY_SECT_PR_SYNC_META_KEY = "bodySectPrSync", collaborationCleanupByEditor, registerHeadlessBindingCleanup = (editor, cleanup) => {
+}, handleKeyDown2, Gapcursor, PARTS_MAP_KEY = "parts", META_MAP_KEY = "meta", META_PARTS_SCHEMA_VERSION_KEY = "partsSchemaVersion", META_PARTS_MIGRATION_KEY = "partsMigration", META_PARTS_LAST_HYDRATED_AT_KEY = "partsLastHydratedAt", META_PARTS_FALLBACK_MODE_KEY = "partsFallbackMode", META_PARTS_CAPABILITY_KEY = "partsCapability", SOURCE_COLLAB_REMOTE_PARTS = "collab:remote:parts", SOURCE_COLLAB_REMOTE_PREFIX = "collab:remote:", EXCLUDED_PART_IDS, CRITICAL_PART_IDS, isApplyingRemoteParts = false, SCHEMA_ATOM_NODE_NAMES, NORMALIZE_YJS_FRAGMENT_ORIGIN, headlessBindingStateByEditor, headlessCleanupRegisteredEditors, META_BODY_SECT_PR_KEY = "bodySectPr", BODY_SECT_PR_SYNC_META_KEY = "bodySectPrSync", collaborationCleanupByEditor, registerHeadlessBindingCleanup = (editor, cleanup) => {
   if (!cleanup || headlessCleanupRegisteredEditors.has(editor))
     return;
   headlessCleanupRegisteredEditors.add(editor);
@@ -279079,6 +279184,7 @@ var Node$13 = class Node$14 {
   if (!cleanup)
     return;
   cleanup.syncListenerCleanup?.();
+  cleanup.fragmentNormalizeCleanup?.();
   cleanup.mediaMap?.unobserve?.(cleanup.mediaMapObserver);
   cleanup.metaMap?.unobserve?.(cleanup.metaMapObserver);
   cleanup.partSyncHandle?.destroy();
@@ -279089,12 +279195,23 @@ var Node$13 = class Node$14 {
   collaborationCleanupByEditor.delete(editor);
 }, createSyncPlugin = (ydoc, editor) => {
   const fragment2 = ydoc.getXmlFragment("supereditor");
+  normalizeYjsFragmentForSchema(fragment2);
   const onFirstRender = () => {
     if (!editor.options.isNewFile)
       return;
     initializeMetaMap(ydoc, editor);
   };
   return [ySyncPlugin(fragment2, { onFirstRender }), fragment2];
+}, registerYjsFragmentNormalizer = (fragment2) => {
+  if (!fragment2 || typeof fragment2.observeDeep !== "function" || typeof fragment2.unobserveDeep !== "function")
+    return () => {};
+  const normalize4 = (events) => {
+    normalizeYjsFragmentEventsForSchema(events, fragment2);
+  };
+  fragment2.observeDeep(normalize4);
+  return () => {
+    fragment2.unobserveDeep(normalize4);
+  };
 }, initializeMetaMap = (ydoc, editor) => {
   seedPartsFromEditor(editor, ydoc);
   const mediaMap = ydoc.getMap("media");
@@ -307646,13 +307763,13 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions;
-var init_src_Cccxf1lk_es = __esm(() => {
+var init_src_D6w3M9Bh_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_yBMSqEiB_es();
+  init_SuperConverter_k7GHkV_c_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_DOHBUV3P_es();
+  init_create_headless_toolbar_dycevpY9_es();
   init_constants_DrU4EASo_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -308874,6 +308991,8 @@ ${err.toString()}`);
     "word/_rels/document.xml.rels",
     "[Content_Types].xml"
   ]);
+  SCHEMA_ATOM_NODE_NAMES = new Set(["crossReference", "citation"]);
+  NORMALIZE_YJS_FRAGMENT_ORIGIN = Symbol.for("superdoc/yjs-fragment-normalize");
   new PluginKey("collaboration");
   headlessBindingStateByEditor = /* @__PURE__ */ new WeakMap;
   headlessCleanupRegisteredEditors = /* @__PURE__ */ new WeakSet;
@@ -308901,6 +309020,7 @@ ${err.toString()}`);
       const syncListenerCleanup = initSyncListener(this.options.ydoc, this.editor, this);
       const [syncPlugin, fragment2] = createSyncPlugin(this.options.ydoc, this.editor);
       this.options.fragment = fragment2;
+      const fragmentNormalizeCleanup = registerYjsFragmentNormalizer(fragment2);
       const mediaMap = this.options.ydoc.getMap("media");
       const mediaMapObserver = (event) => {
         event.changes.keys.forEach((_$1, key2) => {
@@ -308915,6 +309035,7 @@ ${err.toString()}`);
         syncListenerCleanup,
         mediaMap,
         mediaMapObserver,
+        fragmentNormalizeCleanup,
         metaMap: null,
         metaMapObserver: null,
         partSyncHandle: null,
@@ -310533,8 +310654,14 @@ ${err.toString()}`);
     },
     addAttributes() {
       return {
-        paraId: { rendered: false },
-        textId: { rendered: false },
+        paraId: {
+          rendered: false,
+          keepOnSplit: false
+        },
+        textId: {
+          rendered: false,
+          keepOnSplit: false
+        },
         rsidR: { rendered: false },
         rsidRDefault: { rendered: false },
         rsidP: { rendered: false },
@@ -331691,6 +331818,7 @@ function print() { __p += __j.call(arguments, '') }
     }
     #telemetry = null;
     #documentOpenTracked = false;
+    #constructorFragment = null;
     constructor(options) {
       super();
       this.extensionStorage = {};
@@ -331796,6 +331924,7 @@ function print() { __p += __j.call(arguments, '') }
         resolvedOptions.element = null;
         resolvedOptions.selector = null;
       }
+      this.#constructorFragment = resolvedOptions.fragment ?? null;
       this.#checkHeadless(resolvedOptions);
       this.setOptions(resolvedOptions);
       this.#renderer = resolvedOptions.renderer ?? (domAvailable ? new ProseMirrorRenderer : null);
@@ -331917,6 +332046,7 @@ function print() { __p += __j.call(arguments, '') }
       try {
         const resolvedMode = options?.mode ?? this.options.mode ?? "docx";
         const explicitIsNewFile = options?.isNewFile;
+        const hasOpenFragment = Object.prototype.hasOwnProperty.call(options ?? {}, "fragment");
         const resolvedOptions = {
           ...this.options,
           mode: resolvedMode,
@@ -331925,7 +332055,8 @@ function print() { __p += __j.call(arguments, '') }
           documentMode: options?.documentMode ?? this.options.documentMode ?? "editing",
           html: options?.html,
           markdown: options?.markdown,
-          jsonOverride: options?.json ?? null
+          jsonOverride: options?.json ?? null,
+          fragment: hasOpenFragment ? options?.fragment ?? null : this.options.fragment ?? this.#constructorFragment
         };
         const loadOptions = options?.password ? { password: options.password } : undefined;
         if (typeof source === "string")
@@ -332059,6 +332190,7 @@ function print() { __p += __j.call(arguments, '') }
       this.options.initialState = null;
       this.options.content = "";
       this.options.fileSource = null;
+      this.options.fragment = null;
       this._state = undefined;
     }
     #initProtectionState() {
@@ -332763,8 +332895,10 @@ function print() { __p += __j.call(arguments, '') }
               });
             else if (this.options.jsonOverride)
               doc$12 = this.schema.nodeFromJSON(this.options.jsonOverride);
-            if (fragment2)
+            if (fragment2) {
+              normalizeYjsFragmentForSchema(fragment2);
               doc$12 = yXmlFragmentToProseMirrorRootNode(fragment2, this.schema);
+            }
           }
         else if (mode === "text" || mode === "html")
           if (loadFromSchema && hasJsonContent(content3))
@@ -333330,12 +333464,13 @@ function print() { __p += __j.call(arguments, '') }
         isHeadless: !(config2?.element != null || config2?.selector != null),
         ...config2
       };
-      const { html: html3, markdown, json, isCommentsEnabled, suppressDefaultDocxStyles, documentMode, content: content3, mediaFiles, fonts, isNewFile, password, ...editorConfig } = resolvedConfig;
+      const { html: html3, markdown, json, fragment: fragment2, isCommentsEnabled, suppressDefaultDocxStyles, documentMode, content: content3, mediaFiles, fonts, isNewFile, password, ...editorConfig } = resolvedConfig;
       const openOptions = {
         mode: resolvedConfig.mode,
         html: html3,
         markdown,
         json,
+        fragment: fragment2,
         isCommentsEnabled,
         suppressDefaultDocxStyles,
         documentMode,
@@ -345449,11 +345584,11 @@ function print() { __p += __j.call(arguments, '') }
   ];
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-Dv5eUJtx.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-BLDU9pTd.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_Dv5eUJtx_es = __esm(() => {
-  init_SuperConverter_yBMSqEiB_es();
-  init_create_headless_toolbar_DOHBUV3P_es();
+var init_create_super_doc_ui_BLDU9pTd_es = __esm(() => {
+  init_SuperConverter_k7GHkV_c_es();
+  init_create_headless_toolbar_dycevpY9_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -345495,16 +345630,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_Cccxf1lk_es();
-  init_SuperConverter_yBMSqEiB_es();
+  init_src_D6w3M9Bh_es();
+  init_SuperConverter_k7GHkV_c_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_DOHBUV3P_es();
+  init_create_headless_toolbar_dycevpY9_es();
   init_constants_DrU4EASo_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_CZMPWpOp_es();
-  init_create_super_doc_ui_Dv5eUJtx_es();
+  init_create_super_doc_ui_BLDU9pTd_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.13.0-next.5",
+  "version": "0.13.0-next.7",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,20 +25,20 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.35.0"
+    "superdoc": "1.35.0",
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.13.0-next.5",
-    "@superdoc-dev/cli-darwin-x64": "0.13.0-next.5",
-    "@superdoc-dev/cli-linux-x64": "0.13.0-next.5",
-    "@superdoc-dev/cli-linux-arm64": "0.13.0-next.5",
-    "@superdoc-dev/cli-windows-x64": "0.13.0-next.5"
+    "@superdoc-dev/cli-darwin-arm64": "0.13.0-next.7",
+    "@superdoc-dev/cli-darwin-x64": "0.13.0-next.7",
+    "@superdoc-dev/cli-linux-x64": "0.13.0-next.7",
+    "@superdoc-dev/cli-linux-arm64": "0.13.0-next.7",
+    "@superdoc-dev/cli-windows-x64": "0.13.0-next.7"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",