weml-monaco 0.7.0 → 0.7.1

package/CHANGELOG.md

@@ -8,6 +8,13 @@ This package shares the language logic of the VS Code extension (`weml-support`)
 entries below track the port catching up with its provider changes; since the shared language
 features, both take the same code.
 
+## [0.7.1] — 2026-10-09
+
+### Fixed
+- Cycle formatting restores each cursor to its containing `div` by ID, or to
+  the closest `div` on the same line or nearby lines when outside a block.
+  The block selection logic is shared with the VS Code extension.
+
 ## [0.7.0] — 2026-10-08
 
 ### Added

package/dist/index.cjs

@@ -31678,6 +31678,47 @@ function planDivIdRenumber(text) {
   return edits;
 }
 
+// ../weml-language-core/src/toolbar/formatCursor.ts
+function collectDivs2(nodes, divs = []) {
+  for (const node of nodes) {
+    if (node.tag?.toLowerCase() === "div") divs.push(node);
+    collectDivs2(node.children, divs);
+  }
+  return divs;
+}
+function uniqueDivWithId(divs, id) {
+  const matches = divs.filter((node) => stripQuotes2(node.attributes?.id) === id);
+  return matches.length === 1 ? matches[0] : void 0;
+}
+function formatCursorDivId(textDocument, htmlDocument, offset) {
+  const divs = collectDivs2(htmlDocument.roots);
+  let selected;
+  for (const div of divs) {
+    if (div.start <= offset && offset < div.end) selected = div;
+  }
+  if (!selected) {
+    const line = textDocument.positionAt(offset).line;
+    let bestLineDistance = Infinity;
+    let bestOffsetDistance = Infinity;
+    for (const div of divs) {
+      const startLine = textDocument.positionAt(div.start).line;
+      const endLine = textDocument.positionAt(Math.max(div.start, div.end - 1)).line;
+      const lineDistance = Math.max(startLine - line, line - endLine, 0);
+      const offsetDistance = Math.max(div.start - offset, offset - div.end, 0);
+      if (lineDistance < bestLineDistance || lineDistance === bestLineDistance && offsetDistance < bestOffsetDistance) {
+        selected = div;
+        bestLineDistance = lineDistance;
+        bestOffsetDistance = offsetDistance;
+      }
+    }
+  }
+  const id = stripQuotes2(selected?.attributes?.id);
+  return id && uniqueDivWithId(divs, id) ? id : void 0;
+}
+function formatCursorDivOffset(htmlDocument, id) {
+  return uniqueDivWithId(collectDivs2(htmlDocument.roots), id)?.start;
+}
+
 // ../weml-language-core/src/toolbar/toolModel.ts
 var WRAP_INLINE_TAGS = ["w-color", "w-lang", "w-non-egw", "w-entity", "w-sent", "a"];
 var WRAP_OPTIONS = [
@@ -32247,7 +32288,32 @@ function cycleFormat(editor, options = {}) {
   cycleState.set(key, step + 1);
   options.onStatus?.(asHtml ? "WEML: formatted as HTML" : "WEML: canonical format");
   if (formatted === original) return;
-  editor.executeEdits("weml.cycleFormat", [{ range: model.getFullModelRange(), text: formatted }]);
+  const { textDocument, htmlDocument } = getWemlDocument(model);
+  const divIds = (editor.getSelections() ?? []).map((selection) => selection.isEmpty() ? formatCursorDivId(textDocument, htmlDocument, offsetAt(textDocument, selection.getPosition())) : void 0);
+  const applied = editor.executeEdits("weml.cycleFormat", [{ range: model.getFullModelRange(), text: formatted }]);
+  if (!applied || !divIds.some((id) => id !== void 0) || editor.getModel() !== model) return;
+  const selections = editor.getSelections();
+  if (!selections || selections.length !== divIds.length) return;
+  const updated = getWemlDocument(model);
+  let primaryPosition;
+  editor.setSelections(selections.map((selection, index) => {
+    const id = divIds[index];
+    const offset = id === void 0 ? void 0 : formatCursorDivOffset(updated.htmlDocument, id);
+    if (offset === void 0) return selection;
+    const position = positionAt(updated.textDocument, offset);
+    if (index === 0) primaryPosition = position;
+    return {
+      startLineNumber: position.lineNumber,
+      startColumn: position.column,
+      endLineNumber: position.lineNumber,
+      endColumn: position.column,
+      selectionStartLineNumber: position.lineNumber,
+      selectionStartColumn: position.column,
+      positionLineNumber: position.lineNumber,
+      positionColumn: position.column
+    };
+  }), "weml.cycleFormat");
+  if (primaryPosition) editor.revealPositionInCenterIfOutsideViewport(primaryPosition);
 }
 function registerWemlEditorActions(m2, editor, options = {}) {
   const disposables = [];