@sveltia/ui 0.75.2 → 0.75.3

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

@@ -62,7 +62,12 @@ import {
   TEXT_FORMAT_BUTTON_TYPES,
   TRANSFORMER_MAP,
 } from './constants.js';
-import { increaseListIndentation, splitMultilineFormatting } from './markdown.js';
+import {
+  increaseListIndentation,
+  padBlankBlockquoteLines,
+  splitMultilineFormatting,
+  trimBlankBlockquoteLines,
+} from './markdown.js';
 import {
   isPlainLanguage,
   loadCodeLanguage,
@@ -182,16 +187,18 @@ export const onEditorUpdate = (editor, enabledTransformers) => {
   editor.getRootElement()?.dispatchEvent(
     new CustomEvent('Update', {
       detail: {
-        value: convertToMarkdownString(transformers)
-          // Remove unnecessary backslash for underscore and backslash characters
-          // @see https://github.com/sveltia/sveltia-cms/issues/430
-          // @see https://github.com/sveltia/sveltia-cms/issues/512
-          .replace(/\\([_\\])/g, '$1')
-          // Replace encoded spaces with regular spaces. The HTML entity can appear with a
-          // combination of bold and italic text
-          // @see https://github.com/sveltia/sveltia-cms/issues/511
-          // @see https://github.com/sveltia/sveltia-cms/issues/534
-          .replace(/ /g, ' '),
+        value: trimBlankBlockquoteLines(
+          convertToMarkdownString(transformers)
+            // Remove unnecessary backslash for underscore and backslash characters
+            // @see https://github.com/sveltia/sveltia-cms/issues/430
+            // @see https://github.com/sveltia/sveltia-cms/issues/512
+            .replace(/\\([_\\])/g, '$1')
+            // Replace encoded spaces with regular spaces. The HTML entity can appear with a
+            // combination of bold and italic text
+            // @see https://github.com/sveltia/sveltia-cms/issues/511
+            // @see https://github.com/sveltia/sveltia-cms/issues/534
+            .replace(/ /g, ' '),
+        ),
         selection: getSelectionTypes(),
       },
     }),
@@ -508,6 +515,9 @@ export const convertMarkdownToLexical = async (editor, value, enabledTransformer
   // Increase list indentation levels to prevent Markdown parsing issues
   value = increaseListIndentation(value);
 
+  // Pad blank blockquote lines so they are not imported as literal `>` text
+  value = padBlankBlockquoteLines(value);
+
   return new Promise((resolve, reject) => {
     editor.update(() => {
       try {

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

@@ -1,2 +1,4 @@
 export function splitMultilineFormatting(value: string): string;
 export function increaseListIndentation(value: string): string;
+export function padBlankBlockquoteLines(value: string): string;
+export function trimBlankBlockquoteLines(value: string): string;

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

@@ -12,24 +12,20 @@ export const splitMultilineFormatting = (value) =>
     .replace(/(\s+)`([^`\n]+?)\n([^`\n]+?)`(\s+)/gm, '$1`$2`\n`$3`$4');
 
 /**
- * Increase list indentation levels to prevent Markdown parsing issues.
- * Slate uses 2 spaces per indentation level, whereas Lexical uses 4 spaces.
- * This function doubles the indentation to match Lexical's expectations.
+ * Apply a function to each line of a Markdown string, leaving the lines inside fenced code blocks
+ * untouched.
  * @param {string} value Markdown string to process.
+ * @param {(line: string) => string} callback Function that returns a processed line.
  * @returns {string} Processed Markdown string.
- * @see https://github.com/sveltia/sveltia-cms/issues/549
  */
-export const increaseListIndentation = (value) => {
-  if (!value.match(/^\s{2}(?:-|\+|\*|\d+\.)\s/m)) {
-    return value;
-  }
-
+const mapLinesOutsideCodeBlocks = (value, callback) => {
   let inCodeBlock = false;
 
   return value
     .split('\n')
     .map((line) => {
-      if (/^(`{3,}|~{3,})/.test(line)) {
+      // Like Lexical's `CODE_START_REGEX`, allow an indented fence
+      if (/^[ \t]*(`{3,}|~{3,})/.test(line)) {
         inCodeBlock = !inCodeBlock;
         return line;
       }
@@ -38,10 +34,56 @@ export const increaseListIndentation = (value) => {
         return line;
       }
 
-      return line.replace(
-        /^(\s+)(-|\+|\*|\d+\.)/,
-        (_match, p1, p2) => `${' '.repeat(p1.length * 2)}${p2}`,
-      );
+      return callback(line);
     })
     .join('\n');
 };
+
+/**
+ * Increase list indentation levels to prevent Markdown parsing issues.
+ * Slate uses 2 spaces per indentation level, whereas Lexical uses 4 spaces.
+ * This function doubles the indentation to match Lexical's expectations.
+ * @param {string} value Markdown string to process.
+ * @returns {string} Processed Markdown string.
+ * @see https://github.com/sveltia/sveltia-cms/issues/549
+ */
+export const increaseListIndentation = (value) => {
+  if (!value.match(/^\s{2}(?:-|\+|\*|\d+\.)\s/m)) {
+    return value;
+  }
+
+  return mapLinesOutsideCodeBlocks(value, (line) =>
+    line.replace(/^(\s+)(-|\+|\*|\d+\.)/, (_match, p1, p2) => `${' '.repeat(p1.length * 2)}${p2}`),
+  );
+};
+
+/**
+ * Add a trailing space to a blank blockquote line (`>`) so Lexical treats it as a blank line within
+ * the blockquote. Without the space, the line does not match Lexical's `/^>\s/` quote pattern and
+ * is imported as literal `>` text, which is then exported as `> >`, an empty nested blockquote.
+ * @param {string} value Markdown string to process.
+ * @returns {string} Processed Markdown string.
+ * @see https://github.com/sveltia/sveltia-cms/issues/995
+ */
+export const padBlankBlockquoteLines = (value) => {
+  if (!/^>$/m.test(value)) {
+    return value;
+  }
+
+  return mapLinesOutsideCodeBlocks(value, (line) => (line === '>' ? '> ' : line));
+};
+
+/**
+ * Remove the trailing space Lexical outputs for a blank blockquote line (`> `) so the line
+ * round-trips as `>`, the canonical form.
+ * @param {string} value Markdown string to process.
+ * @returns {string} Processed Markdown string.
+ * @see https://github.com/sveltia/sveltia-cms/issues/995
+ */
+export const trimBlankBlockquoteLines = (value) => {
+  if (!/^> $/m.test(value)) {
+    return value;
+  }
+
+  return mapLinesOutsideCodeBlocks(value, (line) => (line === '> ' ? '>' : line));
+};

package/dist/components/text-editor/shiki/version.d.ts

@@ -1,4 +1,4 @@
 /**
  * Version of this package, used to resolve the prebuilt Shiki engine chunk from a CDN.
  */
-export const UI_VERSION: "0.75.2";
+export const UI_VERSION: "0.75.3";

package/dist/components/text-editor/shiki/version.js

@@ -3,4 +3,4 @@
 /**
  * Version of this package, used to resolve the prebuilt Shiki engine chunk from a CDN.
  */
-export const UI_VERSION = '0.75.2';
+export const UI_VERSION = '0.75.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltia/ui",
-  "version": "0.75.2",
+  "version": "0.75.3",
   "description": "A collection of Svelte components and utilities for building user interfaces.",
   "repository": {
     "type": "git",
@@ -36,20 +36,20 @@
     "!dist/test-utils"
   ],
   "dependencies": {
-    "@lexical/code-core": "^0.50.0",
-    "@lexical/dragon": "^0.50.0",
-    "@lexical/extension": "^0.50.0",
-    "@lexical/history": "^0.50.0",
-    "@lexical/link": "^0.50.0",
-    "@lexical/list": "^0.50.0",
-    "@lexical/markdown": "^0.50.0",
-    "@lexical/rich-text": "^0.50.0",
-    "@lexical/selection": "^0.50.0",
-    "@lexical/table": "^0.50.0",
-    "@lexical/utils": "^0.50.0",
+    "@lexical/code-core": "^0.51.0",
+    "@lexical/dragon": "^0.51.0",
+    "@lexical/extension": "^0.51.0",
+    "@lexical/history": "^0.51.0",
+    "@lexical/link": "^0.51.0",
+    "@lexical/list": "^0.51.0",
+    "@lexical/markdown": "^0.51.0",
+    "@lexical/rich-text": "^0.51.0",
+    "@lexical/selection": "^0.51.0",
+    "@lexical/table": "^0.51.0",
+    "@lexical/utils": "^0.51.0",
     "@sveltia/i18n": "^1.4.0",
     "@sveltia/utils": "^0.12.1",
-    "lexical": "^0.50.0"
+    "lexical": "^0.51.0"
   },
   "devDependencies": {
     "@rollup/plugin-yaml": "^5.0.0",