@jacobbubu/md-to-lark 1.5.0 → 1.5.1

package/dist/pipeline/hast-to-last.js

@@ -145,7 +145,7 @@ function createDividerBlock(ctx, parentId) {
     });
     return blockId;
 }
-function createImageBlock(ctx, parentId, sourceUrl) {
+function createImageBlock(ctx, parentId, sourceUrl, alt = null) {
     const blockId = nextBlockId(ctx);
     const parentBlock = ctx.blocks[parentId];
     const blockBase = {
@@ -155,8 +155,15 @@ function createImageBlock(ctx, parentId, sourceUrl) {
         children: [],
         payload: createDefaultImagePayload(parentBlock?.type),
     };
+    const selectorAttrs = {};
     if (sourceUrl) {
-        blockBase.selector = { attrs: { sourceUrl } };
+        selectorAttrs.sourceUrl = sourceUrl;
+    }
+    if (alt) {
+        selectorAttrs.alt = alt;
+    }
+    if (Object.keys(selectorAttrs).length > 0) {
+        blockBase.selector = { attrs: selectorAttrs };
     }
     addBlock(ctx, blockBase);
     return blockId;
@@ -358,14 +365,31 @@ function isWhitespaceTextNode(node) {
 function getMeaningfulChildren(nodes) {
     return nodes.filter((child) => !isWhitespaceTextNode(child));
 }
-function findStandaloneImageSrcInParagraph(paragraph) {
+function extractImageSourceFromElement(element) {
+    if (element.tagName === 'img') {
+        return {
+            sourceUrl: getStringProp(element, 'src'),
+            alt: getStringProp(element, 'alt'),
+        };
+    }
+    if (element.tagName !== 'a')
+        return null;
+    const meaningfulChildren = getMeaningfulChildren(getChildren(element));
+    if (meaningfulChildren.length !== 1)
+        return null;
+    const only = meaningfulChildren[0];
+    if (!only || !isElement(only))
+        return null;
+    return extractImageSourceFromElement(only);
+}
+function findStandaloneImageInParagraph(paragraph) {
     const meaningfulChildren = getMeaningfulChildren(getChildren(paragraph));
     if (meaningfulChildren.length !== 1)
         return null;
     const only = meaningfulChildren[0];
-    if (!only || !isElement(only) || only.tagName !== 'img')
+    if (!only || !isElement(only))
         return null;
-    return getStringProp(only, 'src');
+    return extractImageSourceFromElement(only);
 }
 function parseHttpUrl(url) {
     try {
@@ -472,10 +496,11 @@ function findStandaloneRichItemInTableCell(cell) {
     }
     if (!only || !isElement(only))
         return null;
-    if (only.tagName === 'img') {
+    const imageSource = extractImageSourceFromElement(only);
+    if (imageSource) {
         return {
             kind: 'image',
-            sourceUrl: getStringProp(only, 'src'),
+            ...imageSource,
         };
     }
     if (only.tagName !== 'a')
@@ -667,7 +692,7 @@ function convertTable(ctx, table, parentId) {
             const cellBlock = ctx.blocks[cellId];
             const richItem = cell ? findStandaloneRichItemInTableCell(cell) : null;
             if (cellBlock?.type === 'table_cell' && richItem?.kind === 'image') {
-                const imageId = createImageBlock(ctx, cellId, richItem.sourceUrl);
+                const imageId = createImageBlock(ctx, cellId, richItem.sourceUrl, richItem.alt);
                 cellBlock.children = [imageId];
                 cells.push(cellId);
                 continue;
@@ -733,6 +758,44 @@ function convertUnknownElement(ctx, element, parentId) {
         ]),
     ];
 }
+function hasNonWhitespaceInline(inlines) {
+    return inlines.some((inline) => toSearchText(inline).text.trim().length > 0);
+}
+function convertParagraph(ctx, paragraph, parentId) {
+    const standaloneImage = findStandaloneImageInParagraph(paragraph);
+    if (standaloneImage?.sourceUrl) {
+        return [createImageBlock(ctx, parentId, standaloneImage.sourceUrl, standaloneImage.alt)];
+    }
+    const standaloneIframe = findStandaloneIframePayloadInParagraph(paragraph);
+    if (standaloneIframe) {
+        return [createIframeBlock(ctx, parentId, standaloneIframe.url, standaloneIframe.iframeType)];
+    }
+    const ids = [];
+    let pendingInlineNodes = [];
+    const flushText = () => {
+        if (pendingInlineNodes.length === 0)
+            return;
+        const inlines = parseInlineNodes(ctx, pendingInlineNodes);
+        pendingInlineNodes = [];
+        if (!hasNonWhitespaceInline(inlines))
+            return;
+        ids.push(createTextualBlock(ctx, 'text', parentId, inlines));
+    };
+    for (const child of getChildren(paragraph)) {
+        const image = isElement(child) ? extractImageSourceFromElement(child) : null;
+        if (image?.sourceUrl) {
+            flushText();
+            ids.push(createImageBlock(ctx, parentId, image.sourceUrl, image.alt));
+            continue;
+        }
+        pendingInlineNodes.push(child);
+    }
+    flushText();
+    if (ids.length > 0) {
+        return ids;
+    }
+    return [createTextualBlock(ctx, 'text', parentId, parseInlineNodes(ctx, getChildren(paragraph)))];
+}
 function convertBlock(ctx, node, parentId) {
     if (isWhitespaceTextNode(node)) {
         return [];
@@ -753,17 +816,8 @@ function convertBlock(ctx, node, parentId) {
         return [];
     }
     switch (node.tagName) {
-        case 'p': {
-            const standaloneImageSrc = findStandaloneImageSrcInParagraph(node);
-            if (standaloneImageSrc) {
-                return [createImageBlock(ctx, parentId, standaloneImageSrc)];
-            }
-            const standaloneIframe = findStandaloneIframePayloadInParagraph(node);
-            if (standaloneIframe) {
-                return [createIframeBlock(ctx, parentId, standaloneIframe.url, standaloneIframe.iframeType)];
-            }
-            return [createTextualBlock(ctx, 'text', parentId, parseInlineNodes(ctx, getChildren(node)))];
-        }
+        case 'p':
+            return convertParagraph(ctx, node, parentId);
         case 'h1':
         case 'h2':
         case 'h3':
@@ -789,7 +843,7 @@ function convertBlock(ctx, node, parentId) {
         case 'table':
             return convertTable(ctx, node, parentId);
         case 'img':
-            return [createImageBlock(ctx, parentId, getStringProp(node, 'src'))];
+            return [createImageBlock(ctx, parentId, getStringProp(node, 'src'), getStringProp(node, 'alt'))];
         case 'br':
             return [
                 createTextualBlock(ctx, 'text', parentId, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacobbubu/md-to-lark",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Publish Markdown to Feishu docs with a stable pipeline.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",