@bettercms-ai/richtext 0.8.1 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettercms-ai/richtext",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "type": "module",
   "sideEffects": false,
   "description": "The one Portable Text contract for BetterCMS: schema, converters, and rendering. Shared by the backend, the dashboard and every delivery SDK.",

package/src/ingest.ts

@@ -187,13 +187,20 @@ function tableRule(key: KeyGenerator, ingestCell: (html: string) => PortableText
   };
 }
 
-/** A code block's text, line breaks included: Lexical writes them as `<br>`, not newlines. */
+/** A highlighter's line box (Expressive Code): a `<div>` directly under the `<code>` or the `<pre>`. */
+const isCodeLine = (node: Node): boolean =>
+  node.nodeName.toLowerCase() === "div" && /^(code|pre)$/i.test(node.parentNode?.nodeName ?? "");
+
+/**
+ * A code block's text, line breaks included: Lexical writes them as `<br>`, a highlighter that
+ * boxes each line writes none at all, and read without one two commands became one word.
+ */
 const codeText = (node: Node): string =>
   node.nodeName.toLowerCase() === "br"
     ? "\n"
     : node.nodeType === 3
       ? (node.textContent ?? "")
-      : [...node.childNodes].map(codeText).join("");
+      : [...node.childNodes].map(codeText).join("") + (isCodeLine(node) ? "\n" : "");
 
 /** `language-x` on the `<code>` (Markdown, our renderer) or `data-language` on the `<pre>` (Lexical, Shiki). */
 const codeLanguage = (pre: Element): string | undefined =>

package/src/styled.ts

@@ -36,8 +36,14 @@ export const STYLED_TAGS = [
   "strong", "b", "em", "i", "u", "s", "mark", "code", "q", "cite", "dfn", "var", "samp", "ins", "del",
 ] as const;
 
-/** Tags whose bare form IS the design, so they are annotated even with no class. */
-export const BARE_IS_DESIGN: ReadonlySet<string> = new Set(["small", "sup", "sub", "kbd", "abbr", "time"]);
+/**
+ * Tags whose bare form IS the design, so they are annotated even with no class: every styled tag
+ * that is neither a `<span>` nor a tag a decorator already holds. A keycap, a citation or a
+ * deleted price dropped to bare words is the page restyled by the author's first save.
+ */
+export const BARE_IS_DESIGN: ReadonlySet<string> = new Set([
+  "small", "sup", "sub", "kbd", "abbr", "time", "q", "cite", "dfn", "var", "samp", "ins", "del",
+]);
 
 export type StyledTag = (typeof STYLED_TAGS)[number];