inkpen 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ea78d50df5410aabd191ea25e49c9ab48af1eef675730800c9da56da7334e3
-  data.tar.gz: 8548b3d724fb90ffe29425f21d05262456668ddb3a1de61dd294167b0df1bbc5
+  metadata.gz: 92089e260ac3068e3e269e864d4ec9f0294447bbb4e28764f02f5c722debc155
+  data.tar.gz: 1b824dd56c5ccd3f1c448cf841ea53db2660617f14a6b4fe5a41ee9b20f15f7e
 SHA512:
-  metadata.gz: bf1b3f8eeff1b7473d36404621c9786447a8dec4298838c4257f666ba3249f0f6000999d39dc8c0876ee0017422d9f18799e57376e0f5ff71e998f756cf635a7
-  data.tar.gz: '09ae1684455de6530e3deb50f75c36a853ff8067640c1b9ade012089c2a8595e1f49869e04b5aaeb86d03c327fb8d01e9e74850a32dc6d928b92f43a2c21e129'
+  metadata.gz: 5d6ceb94d0867ab0b0a5194f6a1468454c1ef8b6782b94cd62ce469a15667ca04ad3c764681130c1e148cc823ef0b8cdd770a0822a01ffb402be632300869ce0
+  data.tar.gz: 9420e9694ce248bec30176e60e26a3521749a1e7b5463ba14423a58b87df6b18b40a82b82ff5ab9aa1f9146637f8330e32f1abb309744ca89d09346deaa28e89

data/app/assets/javascripts/inkpen/controllers/editor_controller.js

@@ -200,6 +200,7 @@ const EXTENSION_LOADERS = {
 // surface. Not part of the public gem API; the controller is the only
 // production consumer.
 export const __EXTENSION_LOADER_NAMES__ = Object.keys(EXTENSION_LOADERS)
+export const __loadEditorModulesForTest = loadEditorModules
 
 async function loadEditorModules(enabledExtensions = []) {
   const enabledSet = new Set(enabledExtensions)

data/app/assets/javascripts/inkpen/export/markdown.js

@@ -291,11 +291,11 @@ function serializeInlineContent(node) {
   const iterate = (items) => {
     if (Array.isArray(items)) {
       for (const item of items) {
-        result += serializeTextWithMarks(item)
+        result += serializeInlineNode(item)
       }
     } else if (typeof items.forEach === "function") {
       items.forEach(item => {
-        result += serializeTextWithMarks(item)
+        result += serializeInlineNode(item)
       })
     }
   }
@@ -304,6 +304,16 @@ function serializeInlineContent(node) {
   return result
 }
 
+function serializeInlineNode(node) {
+  if (!node) return ""
+
+  const type = node.type?.name || node.type
+  if (type === "text") return serializeTextWithMarks(node)
+  if (type === "hardBreak") return "\n"
+
+  return serializeNode(node).trim()
+}
+
 /**
  * Serialize text node with marks
  */
@@ -316,8 +326,24 @@ function serializeTextWithMarks(node) {
     return text
   }
 
-  // Apply marks in order (innermost first)
-  for (const mark of node.marks) {
+  const markName = mark => mark.type?.name || mark.type
+  const hasBold = node.marks.some(mark => ["bold", "strong"].includes(markName(mark)))
+  const hasItalic = node.marks.some(mark => ["italic", "em"].includes(markName(mark)))
+
+  if (hasBold && hasItalic) {
+    text = `***${text}***`
+  } else if (hasBold) {
+    text = MARK_SERIALIZERS.bold(text)
+  } else if (hasItalic) {
+    text = MARK_SERIALIZERS.italic(text)
+  }
+
+  const remainingMarks = node.marks.filter(mark => {
+    const name = markName(mark)
+    return !["bold", "strong", "italic", "em"].includes(name)
+  })
+
+  for (const mark of remainingMarks) {
     const serializer = MARK_SERIALIZERS[mark.type?.name || mark.type]
     if (serializer) {
       text = serializer(text, mark)
@@ -425,7 +451,8 @@ function serializeBlockquote(node, options) {
  */
 function serializeCodeBlock(node) {
   const language = node.attrs?.language || ""
-  return "```" + language + "\n" + node.textContent + "\n```"
+  const content = (node.textContent || "").replace(/\n$/, "")
+  return "```" + language + "\n" + content + "\n```"
 }
 
 /**
@@ -470,7 +497,7 @@ function serializeTable(node, options) {
     const rowChildren = row.content?.content || row.content || []
 
     iterate(rowChildren, (cell, cellIndex) => {
-      const content = serializeInlineContent(cell).trim() || " "
+      const content = serializeTableCell(cell, options)
       cells.push(content)
 
       // Track alignment from first row cells
@@ -500,6 +527,15 @@ function serializeTable(node, options) {
   return rows.join("\n") + "\n"
 }
 
+function serializeTableCell(cell, options) {
+  const content = serializeChildren(cell, options)
+    .trim()
+    .replace(/\n+/g, "<br>")
+    .replace(/\s*\|\s*/g, "\\|")
+
+  return content || " "
+}
+
 /**
  * Serialize callout to GFM-style alert
  */