@sveltia/ui 0.32.0 → 0.32.2

package/dist/components/text-editor/core.js

@@ -1,64 +1,55 @@
 import {
+  $createCodeNode,
+  $isCodeHighlightNode,
+  $isCodeNode,
   CodeHighlightNode,
   CodeNode,
   PrismTokenizer,
-  $createCodeNode as createCodeNode,
-  $isCodeHighlightNode as isCodeHighlightNode,
-  $isCodeNode as isCodeNode,
   registerCodeHighlighting,
 } from '@lexical/code';
 import { registerDragonSupport } from '@lexical/dragon';
 import { HorizontalRuleNode } from '@lexical/extension';
 import { createEmptyHistoryState, registerHistory } from '@lexical/history';
+import { $isLinkNode, $toggleLink, LinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link';
 import {
-  LinkNode,
-  TOGGLE_LINK_COMMAND,
-  $isLinkNode as isLinkNode,
-  $toggleLink as toggleLink,
-} from '@lexical/link';
-import {
+  $handleListInsertParagraph,
+  $insertList,
+  $isListItemNode,
+  $isListNode,
   INSERT_ORDERED_LIST_COMMAND,
   INSERT_UNORDERED_LIST_COMMAND,
   ListItemNode,
   ListNode,
-  $handleListInsertParagraph as handleListInsertParagraph,
-  $insertList as insertList,
-  $isListItemNode as isListItemNode,
-  $isListNode as isListNode,
 } from '@lexical/list';
 import {
+  $convertFromMarkdownString,
+  $convertToMarkdownString,
   TRANSFORMERS,
-  $convertFromMarkdownString as convertFromMarkdownString,
-  $convertToMarkdownString as convertToMarkdownString,
 } from '@lexical/markdown';
 import {
+  $isHeadingNode,
+  $isQuoteNode,
   HeadingNode,
   QuoteNode,
-  $isHeadingNode as isHeadingNode,
-  $isQuoteNode as isQuoteNode,
   registerRichText,
 } from '@lexical/rich-text';
 import { TableCellNode, TableNode, TableRowNode } from '@lexical/table';
-import { $getNearestNodeOfType as getNearestNodeOfType } from '@lexical/utils';
+import { $getNearestNodeOfType } from '@lexical/utils';
 import { sleep } from '@sveltia/utils/misc';
 import {
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
   COMMAND_PRIORITY_NORMAL,
   ElementNode,
   INDENT_CONTENT_COMMAND,
   INSERT_PARAGRAPH_COMMAND,
   OUTDENT_CONTENT_COMMAND,
   createEditor,
-  $getRoot as getRoot,
-  $getSelection as getSelection,
-  $isRangeSelection as isRangeSelection,
 } from 'lexical';
 import prismComponents from 'prismjs/components';
 import { BLOCK_BUTTON_TYPES, TEXT_FORMAT_BUTTON_TYPES } from './constants.js';
-import {
-  fixMarkdownFormatting,
-  increaseListIndentation,
-  splitMultilineFormatting,
-} from './markdown.js';
+import { increaseListIndentation, splitMultilineFormatting } from './markdown.js';
 import { HR } from './transformers/hr.js';
 import { TABLE } from './transformers/table.js';
 
@@ -150,9 +141,9 @@ const editorConfig = {
  * @returns {TextEditorSelectionState} Current selection state.
  */
 const getSelectionTypes = () => {
-  const selection = getSelection();
+  const selection = $getSelection();
 
-  if (!isRangeSelection(selection)) {
+  if (!$isRangeSelection(selection)) {
     return {
       blockNodeKey: null,
       blockType: 'paragraph',
@@ -167,15 +158,15 @@ const getSelectionTypes = () => {
   const inlineTypes = TEXT_FORMAT_BUTTON_TYPES.filter((type) => selection.hasFormat(type));
 
   if (anchor.getType() !== 'root') {
-    parent = anchor instanceof ElementNode ? anchor : getNearestNodeOfType(anchor, ElementNode);
+    parent = anchor instanceof ElementNode ? anchor : $getNearestNodeOfType(anchor, ElementNode);
 
-    if (isLinkNode(parent)) {
+    if ($isLinkNode(parent)) {
       inlineTypes.push('link');
-      parent = getNearestNodeOfType(parent, ElementNode);
+      parent = $getNearestNodeOfType(parent, ElementNode);
     }
 
-    if (isListItemNode(parent)) {
-      parent = getNearestNodeOfType(parent, ListNode);
+    if ($isListItemNode(parent)) {
+      parent = $getNearestNodeOfType(parent, ListNode);
     }
   }
 
@@ -185,19 +176,19 @@ const getSelectionTypes = () => {
         return 'paragraph';
       }
 
-      if (isHeadingNode(parent)) {
+      if ($isHeadingNode(parent)) {
         return `heading-${parent.getTag().match(/\d/)?.[0]}`;
       }
 
-      if (isListNode(parent)) {
+      if ($isListNode(parent)) {
         return parent.getListType() === 'bullet' ? 'bulleted-list' : 'numbered-list';
       }
 
-      if (isQuoteNode(parent)) {
+      if ($isQuoteNode(parent)) {
         return 'blockquote';
       }
 
-      if (isCodeNode(parent) || isCodeHighlightNode(parent)) {
+      if ($isCodeNode(parent) || $isCodeHighlightNode(parent)) {
         return 'code-block';
       }
 
@@ -226,7 +217,7 @@ const onEditorUpdate = (editor) => {
   editor.getRootElement()?.dispatchEvent(
     new CustomEvent('Update', {
       detail: {
-        value: convertToMarkdownString(
+        value: $convertToMarkdownString(
           // Use underscores for italic text in Markdown instead of asterisks
           allTransformers.filter((/** @type {any} */ { tag }) => tag !== '*'),
         ) // Remove unnecessary backslash for underscore and backslash characters
@@ -276,7 +267,7 @@ export const initEditor = ({
   editor.registerCommand(
     TOGGLE_LINK_COMMAND,
     (payload) => {
-      toggleLink(typeof payload === 'string' ? payload : null);
+      $toggleLink(typeof payload === 'string' ? payload : null);
 
       return true;
     },
@@ -286,7 +277,7 @@ export const initEditor = ({
   editor.registerCommand(
     INSERT_UNORDERED_LIST_COMMAND,
     () => {
-      insertList('bullet');
+      $insertList('bullet');
 
       return true;
     },
@@ -296,7 +287,7 @@ export const initEditor = ({
   editor.registerCommand(
     INSERT_ORDERED_LIST_COMMAND,
     () => {
-      insertList('number');
+      $insertList('number');
 
       return true;
     },
@@ -306,7 +297,7 @@ export const initEditor = ({
   // https://github.com/facebook/lexical/blob/main/packages/lexical-react/src/shared/useList.ts
   editor.registerCommand(
     INSERT_PARAGRAPH_COMMAND,
-    () => handleListInsertParagraph(),
+    () => $handleListInsertParagraph(),
     COMMAND_PRIORITY_NORMAL,
   );
 
@@ -320,15 +311,15 @@ export const initEditor = ({
     editor.update(() => {
       // Prevent CodeNode from being removed
       if (isCodeEditor) {
-        const root = getRoot();
+        const root = $getRoot();
         const children = root.getChildren();
 
-        if (children.length === 1 && !isCodeNode(children[0])) {
+        if (children.length === 1 && !$isCodeNode(children[0])) {
           children[0].remove();
         }
 
         if (children.length === 0) {
-          const node = createCodeNode();
+          const node = $createCodeNode();
 
           node.setLanguage(defaultLanguage);
           root.append(node);
@@ -346,18 +337,18 @@ export const initEditor = ({
       root.addEventListener('keydown', (event) => {
         editor.update(() => {
           if (event.key === 'Tab') {
-            const selection = getSelection();
+            const selection = $getSelection();
 
-            if (!isRangeSelection(selection)) {
+            if (!$isRangeSelection(selection)) {
               return;
             }
 
             const anchor = selection.anchor.getNode();
 
             const parent =
-              anchor instanceof ElementNode ? anchor : getNearestNodeOfType(anchor, ElementNode);
+              anchor instanceof ElementNode ? anchor : $getNearestNodeOfType(anchor, ElementNode);
 
-            if (isListItemNode(parent) && parent.canIndent()) {
+            if ($isListItemNode(parent) && parent.canIndent()) {
               if (!event.shiftKey) {
                 event.preventDefault();
                 editor.dispatchCommand(INDENT_CONTENT_COMMAND, undefined);
@@ -420,16 +411,13 @@ export const convertMarkdownToLexical = async (editor, value) => {
   // Split multiline formatting into separate lines to prevent Markdown parsing issues
   value = splitMultilineFormatting(value);
 
-  // Fix unclosed formatting markers (work around Lexical bug)
-  value = fixMarkdownFormatting(value);
-
   // Increase list indentation levels to prevent Markdown parsing issues
   value = increaseListIndentation(value);
 
   return new Promise((resolve, reject) => {
     editor.update(() => {
       try {
-        convertFromMarkdownString(value, allTransformers);
+        $convertFromMarkdownString(value, allTransformers);
         resolve(undefined);
       } catch (ex) {
         reject(new Error('Failed to convert Markdown', { cause: ex }));

package/dist/components/text-editor/markdown.d.ts

@@ -1,3 +1,2 @@
 export function splitMultilineFormatting(value: string): string;
-export function fixMarkdownFormatting(value: string): string;
 export function increaseListIndentation(value: string): string;

package/dist/components/text-editor/markdown.js

@@ -11,20 +11,6 @@ export const splitMultilineFormatting = (value) =>
     .replace(/(\s+)~~([^~\n]+?)\n([^~\n]+?)~~(\s+)/gm, '$1~~$2~~\n~~$3~~$4')
     .replace(/(\s+)`([^`\n]+?)\n([^`\n]+?)`(\s+)/gm, '$1`$2`\n`$3`$4');
 
-/**
- * Fix malformed Markdown formatting markers.
- * Converts unclosed formatting markers like `**foo **bar` to `**foo** bar`.
- * This works around a Lexical bug with certain formatting patterns.
- * @param {string} value Markdown string to fix.
- * @returns {string} Fixed Markdown string.
- * @see https://github.com/sveltia/sveltia-cms/issues/599
- */
-export const fixMarkdownFormatting = (value) =>
-  value
-    .replace(/\*\*(\S+?) \*\*/gm, '**$1** ')
-    .replace(/_(\S+?) _/gm, '_$1_ ')
-    .replace(/~~(\S+?) ~~/gm, '~~$1~~ ');
-
 /**
  * Increase list indentation levels to prevent Markdown parsing issues.
  * Slate uses 2 spaces per indentation level, whereas Lexical uses 4 spaces.

package/dist/components/text-editor/markdown.test.js

@@ -1,9 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import {
-  fixMarkdownFormatting,
-  increaseListIndentation,
-  splitMultilineFormatting,
-} from './markdown.js';
+import { increaseListIndentation, splitMultilineFormatting } from './markdown.js';
 
 describe('splitMultilineFormatting', () => {
   it('should split italic formatting across lines', () => {
@@ -43,96 +39,6 @@ describe('splitMultilineFormatting', () => {
   });
 });
 
-describe('fixMarkdownFormatting', () => {
-  it('should fix unclosed bold markers with space in between', () => {
-    expect(fixMarkdownFormatting('**foo **bar')).toBe('**foo** bar');
-  });
-
-  it('should fix unclosed italic markers with space in between', () => {
-    expect(fixMarkdownFormatting('_foo _bar')).toBe('_foo_ bar');
-  });
-
-  it('should fix multiple bold markers', () => {
-    expect(fixMarkdownFormatting('**foo **bar **baz **qux')).toBe('**foo** bar **baz** qux');
-  });
-
-  it('should fix multiple italic markers', () => {
-    expect(fixMarkdownFormatting('_foo _bar _baz _qux')).toBe('_foo_ bar _baz_ qux');
-  });
-
-  it('should fix mixed bold and italic markers', () => {
-    expect(fixMarkdownFormatting('**foo **bar _baz _qux')).toBe('**foo** bar _baz_ qux');
-  });
-
-  it('should not affect properly closed bold markers', () => {
-    expect(fixMarkdownFormatting('**foo** bar')).toBe('**foo** bar');
-  });
-
-  it('should not affect properly closed italic markers', () => {
-    expect(fixMarkdownFormatting('_foo_ bar')).toBe('_foo_ bar');
-  });
-
-  it('should preserve other formatting', () => {
-    expect(fixMarkdownFormatting('~~strikethrough~~ **bold** _italic_')).toBe(
-      '~~strikethrough~~ **bold** _italic_',
-    );
-  });
-
-  it('should handle bold and italic in combination', () => {
-    expect(fixMarkdownFormatting('**foo **bar _baz _qux **test **end')).toBe(
-      '**foo** bar _baz_ qux **test** end',
-    );
-  });
-
-  it('should handle markers at the start of a line', () => {
-    expect(fixMarkdownFormatting('**foo **bar\n_baz _qux')).toBe('**foo** bar\n_baz_ qux');
-  });
-
-  it('should handle markers at the end of a line', () => {
-    expect(fixMarkdownFormatting('line 1 **foo **bar\nline 2 _baz _qux')).toBe(
-      'line 1 **foo** bar\nline 2 _baz_ qux',
-    );
-  });
-
-  it('should work with global flag for multiple occurrences', () => {
-    expect(fixMarkdownFormatting('**a **b **c **d _e _f')).toBe('**a** b **c** d _e_ f');
-  });
-
-  it('should not break when markers are not present', () => {
-    expect(fixMarkdownFormatting('regular text without formatting')).toBe(
-      'regular text without formatting',
-    );
-  });
-
-  it('should handle edge case with only formatting markers', () => {
-    expect(fixMarkdownFormatting('**foo **')).toBe('**foo** ');
-  });
-
-  it('should handle underscores in words (not formatting)', () => {
-    expect(fixMarkdownFormatting('snake_case_variable **foo **bar')).toBe(
-      'snake_case_variable **foo** bar',
-    );
-  });
-
-  it('should fix unclosed strikethrough markers with space in between', () => {
-    expect(fixMarkdownFormatting('~~foo ~~bar')).toBe('~~foo~~ bar');
-  });
-
-  it('should fix multiple strikethrough markers', () => {
-    expect(fixMarkdownFormatting('~~foo ~~bar ~~baz ~~qux')).toBe('~~foo~~ bar ~~baz~~ qux');
-  });
-
-  it('should fix mixed formatting with strikethrough', () => {
-    expect(fixMarkdownFormatting('**bold **text _italic _text ~~strike ~~text')).toBe(
-      '**bold** text _italic_ text ~~strike~~ text',
-    );
-  });
-
-  it('should not affect properly closed strikethrough markers', () => {
-    expect(fixMarkdownFormatting('~~foo~~ bar')).toBe('~~foo~~ bar');
-  });
-});
-
 describe('increaseListIndentation', () => {
   it('should double indentation for bullet lists', () => {
     expect(increaseListIndentation('  - item')).toBe('    - item');

package/dist/components/text-editor/transformers/table.js

@@ -5,23 +5,23 @@
 /* eslint-disable jsdoc/require-param-description */
 
 import {
+  $convertFromMarkdownString,
+  $convertToMarkdownString,
   TRANSFORMERS,
-  $convertFromMarkdownString as convertFromMarkdownString,
-  $convertToMarkdownString as convertToMarkdownString,
 } from '@lexical/markdown';
 import {
+  $createTableCellNode,
+  $createTableNode,
+  $createTableRowNode,
+  $isTableCellNode,
+  $isTableNode,
+  $isTableRowNode,
   TableCellHeaderStates,
   TableCellNode,
   TableNode,
   TableRowNode,
-  $createTableCellNode as createTableCellNode,
-  $createTableNode as createTableNode,
-  $createTableRowNode as createTableRowNode,
-  $isTableCellNode as isTableCellNode,
-  $isTableNode as isTableNode,
-  $isTableRowNode as isTableRowNode,
 } from '@lexical/table';
-import { $isParagraphNode as isParagraphNode, $isTextNode as isTextNode } from 'lexical';
+import { $isParagraphNode, $isTextNode } from 'lexical';
 
 /**
  * @import { ElementTransformer } from '@lexical/markdown';
@@ -38,7 +38,7 @@ const TABLE_ROW_DIVIDER_REG_EXP = /^(\| ?:?-*:? ?)+\|\s?$/;
 function getTableColumnsSize(table) {
   const row = table.getFirstChild();
 
-  return isTableRowNode(row) ? row.getChildrenSize() : 0;
+  return $isTableRowNode(row) ? row.getChildrenSize() : 0;
 }
 
 /**
@@ -49,9 +49,9 @@ function getTableColumnsSize(table) {
 const createTableCell = (textContent) => {
   textContent = textContent.replace(/\\n/g, '\n');
 
-  const cell = createTableCellNode(TableCellHeaderStates.NO_STATUS);
+  const cell = $createTableCellNode(TableCellHeaderStates.NO_STATUS);
 
-  convertFromMarkdownString(textContent, TRANSFORMERS, cell);
+  $convertFromMarkdownString(textContent, TRANSFORMERS, cell);
 
   return cell;
 };
@@ -77,7 +77,7 @@ const mapToTableCells = (textContent) => {
 export const TABLE = {
   dependencies: [TableNode, TableRowNode, TableCellNode],
   export: (node) => {
-    if (!isTableNode(node)) {
+    if (!$isTableNode(node)) {
       return null;
     }
 
@@ -88,7 +88,7 @@ export const TABLE = {
       /** @type {string[]} */
       const rowOutput = [];
 
-      if (!isTableRowNode(row)) {
+      if (!$isTableRowNode(row)) {
         return;
       }
 
@@ -96,8 +96,8 @@ export const TABLE = {
 
       row.getChildren().forEach((cell) => {
         // It’s TableCellNode so it’s just to make flow happy
-        if (isTableCellNode(cell)) {
-          rowOutput.push(convertToMarkdownString(TRANSFORMERS, cell).replace(/\n/g, '\\n').trim());
+        if ($isTableCellNode(cell)) {
+          rowOutput.push($convertToMarkdownString(TRANSFORMERS, cell).replace(/\n/g, '\\n').trim());
 
           if (cell.__headerState === TableCellHeaderStates.ROW) {
             isHeaderRow = true;
@@ -120,20 +120,20 @@ export const TABLE = {
     if (TABLE_ROW_DIVIDER_REG_EXP.test(textContent)) {
       const table = parentNode.getPreviousSibling();
 
-      if (!table || !isTableNode(table)) {
+      if (!table || !$isTableNode(table)) {
         return;
       }
 
       const rows = table.getChildren();
       const lastRow = rows[rows.length - 1];
 
-      if (!lastRow || !isTableRowNode(lastRow)) {
+      if (!lastRow || !$isTableRowNode(lastRow)) {
         return;
       }
 
       // Add header state to row cells
       lastRow.getChildren().forEach((cell) => {
-        if (!isTableCellNode(cell)) {
+        if (!$isTableCellNode(cell)) {
           return;
         }
 
@@ -157,7 +157,7 @@ export const TABLE = {
     let maxCells = matchCells.length;
 
     while (sibling) {
-      if (!isParagraphNode(sibling)) {
+      if (!$isParagraphNode(sibling)) {
         break;
       }
 
@@ -167,7 +167,7 @@ export const TABLE = {
 
       const firstChild = sibling.getFirstChild();
 
-      if (!isTextNode(firstChild)) {
+      if (!$isTextNode(firstChild)) {
         break;
       }
 
@@ -186,10 +186,10 @@ export const TABLE = {
       sibling = previousSibling;
     }
 
-    const table = createTableNode();
+    const table = $createTableNode();
 
     rows.forEach((cells) => {
-      const tableRow = createTableRowNode();
+      const tableRow = $createTableRowNode();
 
       table.append(tableRow);
 
@@ -200,7 +200,7 @@ export const TABLE = {
 
     const previousSibling = parentNode.getPreviousSibling();
 
-    if (isTableNode(previousSibling) && getTableColumnsSize(previousSibling) === maxCells) {
+    if ($isTableNode(previousSibling) && getTableColumnsSize(previousSibling) === maxCells) {
       previousSibling.append(...table.getChildren());
       parentNode.remove();
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltia/ui",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -8,19 +8,19 @@
     "url": "github:sveltia/sveltia-ui"
   },
   "dependencies": {
-    "@lexical/code": "^0.40.0",
-    "@lexical/dragon": "^0.40.0",
-    "@lexical/extension": "^0.40.0",
-    "@lexical/history": "^0.40.0",
-    "@lexical/link": "^0.40.0",
-    "@lexical/list": "^0.40.0",
-    "@lexical/markdown": "^0.40.0",
-    "@lexical/rich-text": "^0.40.0",
-    "@lexical/selection": "^0.40.0",
-    "@lexical/table": "^0.40.0",
-    "@lexical/utils": "^0.40.0",
+    "@lexical/code": "^0.41.0",
+    "@lexical/dragon": "^0.41.0",
+    "@lexical/extension": "^0.41.0",
+    "@lexical/history": "^0.41.0",
+    "@lexical/link": "^0.41.0",
+    "@lexical/list": "^0.41.0",
+    "@lexical/markdown": "^0.41.0",
+    "@lexical/rich-text": "^0.41.0",
+    "@lexical/selection": "^0.41.0",
+    "@lexical/table": "^0.41.0",
+    "@lexical/utils": "^0.41.0",
     "@sveltia/utils": "^0.8.6",
-    "lexical": "^0.40.0",
+    "lexical": "^0.41.0",
     "prismjs": "^1.30.0",
     "svelte-i18n": "^4.0.1"
   },
@@ -28,29 +28,29 @@
     "svelte": "^5.0.0"
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^7.0.0",
-    "@sveltejs/kit": "^2.50.2",
+    "@sveltejs/adapter-auto": "^7.0.1",
+    "@sveltejs/kit": "^2.53.0",
     "@sveltejs/package": "^2.5.7",
     "@sveltejs/vite-plugin-svelte": "^6.2.4",
     "@vitest/coverage-v8": "^4.0.18",
-    "cspell": "^9.6.4",
+    "cspell": "^9.7.0",
     "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^62.5.1",
+    "eslint-plugin-jsdoc": "^62.7.1",
     "eslint-plugin-svelte": "^2.46.1",
-    "oxlint": "^1.43.0",
+    "oxlint": "^1.50.0",
     "postcss": "^8.5.6",
     "postcss-html": "^1.8.1",
     "prettier": "^3.8.1",
-    "prettier-plugin-svelte": "^3.4.1",
+    "prettier-plugin-svelte": "^3.5.0",
     "sass": "^1.97.3",
-    "stylelint": "^17.1.1",
+    "stylelint": "^17.3.0",
     "stylelint-config-recommended-scss": "^17.0.0",
     "stylelint-scss": "^7.0.0",
-    "svelte": "^5.49.2",
-    "svelte-check": "^4.3.6",
+    "svelte": "^5.53.3",
+    "svelte-check": "^4.4.3",
     "svelte-preprocess": "^6.0.3",
     "tslib": "^2.8.1",
     "vite": "^7.3.1",