fix: enhance embed token handling in paragraphs and table cells

Author: sy-records

src/core/render/compiler/paragraph.js

@@ -1,16 +1,48 @@
 import{helperashelperTpl}from'../tpl.js';
 
+functionrenderParagraphText(text){
+if(text.startsWith('!>')){
+returnhelperTpl('callout important',text);
+}
+if(text.startsWith('?>')){
+returnhelperTpl('callout tip',text);
+}
+return/* html */`<p>${text}</p>`;
+}
+
 exportconstparagraphCompiler=({ renderer })=>
-(renderer.paragraph=function({ tokens }){
-consttext=this.parser.parseInline(tokens);
+(renderer.paragraph=function({ tokens, embedTokenMap }){
 letresult;
 
-if(text.startsWith('!&gt;')){
-result=helperTpl('callout important',text);
-}elseif(text.startsWith('?&gt;')){
-result=helperTpl('callout tip',text);
+if(embedTokenMap&&tokens?.length){
+// Keep original inline order: plain text/link tokens stay inline, include links are replaced.
+constparts=[];
+letinlineBuffer=[];
+
+constflushInlineBuffer=()=>{
+if(!inlineBuffer.length){
+return;
+}
+consttext=this.parser.parseInline(inlineBuffer);
+parts.push(renderParagraphText(text));
+inlineBuffer=[];
+};
+
+tokens.forEach((inlineToken,inlineIndex)=>{
+constembedToken=embedTokenMap[inlineIndex];
+if(embedToken?.length){
+flushInlineBuffer();
+parts.push(this.parser.parse(embedToken));
+}else{
+inlineBuffer.push(inlineToken);
+}
+});
+
+flushInlineBuffer();
+result=parts.join('');
 }else{
-result=/* html */`<p>${text}</p>`;
+consttext=this.parser.parseInline(tokens);
+result=renderParagraphText(text);
 }
 
 returnresult;

src/core/render/compiler/tableCell.js

@@ -2,7 +2,18 @@ export const tableCellCompiler = ({ renderer }) =>
 (renderer.tablecell=function(token){
 letcontent;
 
-if(token.embedTokens&&token.embedTokens.length>0){
+if(token.embedTokenMap&&token.tokens?.length){
+// Preserve mixed content order: render inline tokens, replacing include links by position.
+content='';
+token.tokens.forEach((inlineToken,inlineIndex)=>{
+constembedToken=token.embedTokenMap[inlineIndex];
+if(embedToken?.length){
+content+=this.parser.parse(embedToken);
+}else{
+content+=this.parser.parseInline([inlineToken]);
+}
+});
+}elseif(token.embedTokens&&token.embedTokens.length>0){
 content=this.parser.parse(token.embedTokens);
 }else{
 content=this.parser.parseInline(token.tokens);

src/core/render/embed.js

@@ -33,18 +33,13 @@ function extractFragmentContent(text, fragment, fullLine) {
 }
 
 functionwalkFetchEmbed({ embedTokens, compile, fetch },cb){
-lettoken;
-letstep=0;
-letcount=0;
-
 if(!embedTokens.length){
 returncb({});
 }
 
-while((token=embedTokens[step++])){
-constcurrentToken=token;
+constprocessStep=step=>{
+constcurrentToken=embedTokens[step];
 
-// eslint-disable-next-line no-loop-func
 constnext=text=>{
 letembedToken;
 if(text){
@@ -119,17 +114,21 @@ function walkFetchEmbed({ embedTokens, compile, fetch }, cb) {
 tokenRef: currentToken.tokenRef,
 });
 
-if(++count>=embedTokens.length){
+if(step+1>=embedTokens.length){
 cb({});
+}else{
+processStep(step+1);
 }
 };
 
-if(token.embed.url){
-get(token.embed.url).then(next);
+if(currentToken.embed.url){
+get(currentToken.embed.url).then(next);
 }else{
-next(token.embed.html);
+next(currentToken.embed.html);
 }
-}
+};
+
+processStep(0);
 }
 
 exportfunctionprerenderEmbed({ compiler, raw ='', fetch },done){
@@ -143,46 +142,56 @@ export function prerenderEmbed({ compiler, raw = '', fetch }, done) {
 constcompile=compiler._marked;
 lettokens=compile.lexer(raw);
 constembedTokens=[];
-constlinkRE=compile.Lexer.rules.inline.normal.link;
 constlinks=tokens.links;
 
-constlinkMatcher=newRegExp(linkRE.source,'g');
-
 tokens.forEach((token,index)=>{
 if(token.type==='paragraph'){
-token.text=token.text.replace(
-linkMatcher,
-(src,filename,href,title)=>{
-constembed=compiler.compileEmbed(href,title);
+(token.tokens||[]).forEach(
+(
+/** @type {{ type: string; href: any; title: any; }} */inlineToken,
+inlineIndex,
+)=>{
+if(inlineToken.type!=='link'){
+return;
+}
+
+constembed=compiler.compileEmbed(
+inlineToken.href,
+inlineToken.title,
+);
 if(embed){
 embedTokens.push({
  index,
 tokenRef: token,
+ inlineIndex,
  embed,
 });
 }
-returnsrc;
 },
 );
 }elseif(token.type==='table'){
 token.rows.forEach((row,rowIndex)=>{
 row.forEach((cell,cellIndex)=>{
-cell.text=cell.text.replace(
-linkMatcher,
-(src,filename,href,title)=>{
-constembed=compiler.compileEmbed(href,title);
-if(embed){
-embedTokens.push({
- index,
-tokenRef: token,
- rowIndex,
- cellIndex,
- embed,
-});
-}
-returnsrc;
-},
-);
+(cell.tokens||[]).forEach((inlineToken,inlineIndex)=>{
+if(inlineToken.type!=='link'){
+return;
+}
+
+constembed=compiler.compileEmbed(
+inlineToken.href,
+inlineToken.title,
+);
+if(embed){
+embedTokens.push({
+ index,
+tokenRef: token,
+ rowIndex,
+ cellIndex,
+ inlineIndex,
+ embed,
+});
+}
+});
 });
 });
 }
@@ -192,30 +201,73 @@ export function prerenderEmbed({ compiler, raw = '', fetch }, done) {
 // so that we know where to insert the embedded tokens as they
 // are returned
 constmoves=[];
+consttokenInsertState=newWeakMap();
 walkFetchEmbed(
 { compile, embedTokens, fetch },
 ({ embedToken, token, rowIndex, cellIndex, tokenRef })=>{
 if(token){
+Object.assign(links,embedToken.links);
+
 if(typeofrowIndex==='number'&&typeofcellIndex==='number'){
 constcell=tokenRef.rows[rowIndex][cellIndex];
+if(typeoftoken.inlineIndex==='number'){
+cell.embedTokenMap||={};
+constexisting=cell.embedTokenMap[token.inlineIndex];
+cell.embedTokenMap[token.inlineIndex]=existing
+ ? existing.concat(embedToken)
+ : embedToken;
+}
 
-cell.embedTokens=embedToken;
+// Keep the flattened array for backward compatibility with older render paths.
+if(cell.embedTokens&&cell.embedTokens.length){
+cell.embedTokens=cell.embedTokens.concat(embedToken);
+}else{
+cell.embedTokens=embedToken;
+}
+}elseif(tokenRef.type==='paragraph'){
+if(typeoftoken.inlineIndex==='number'){
+tokenRef.embedTokenMap||={};
+constexisting=tokenRef.embedTokenMap[token.inlineIndex];
+tokenRef.embedTokenMap[token.inlineIndex]=existing
+ ? existing.concat(embedToken)
+ : embedToken;
+}
+
+// Keep a flattened form as a fallback for custom renderers.
+if(tokenRef.embedTokens&&tokenRef.embedTokens.length){
+tokenRef.embedTokens=tokenRef.embedTokens.concat(embedToken);
+}else{
+tokenRef.embedTokens=embedToken;
+}
 }else{
-// iterate through the array of previously inserted tokens
-// to determine where the current embedded tokens should be inserted
-letindex=token.index;
-moves.forEach(pos=>{
-if(index>pos.start){
-index+=pos.length;
-}
-});
+conststate=tokenInsertState.get(tokenRef);
 
-Object.assign(links,embedToken.links);
+if(state){
+constinsertAt=state.nextIndex;
 
-tokens=tokens
-.slice(0,index)
-.concat(embedToken,tokens.slice(index+1));
-moves.push({start: index,length: embedToken.length-1});
+tokens=tokens
+.slice(0,insertAt)
+.concat(embedToken,tokens.slice(insertAt));
+moves.push({start: insertAt,delta: embedToken.length});
+state.nextIndex=insertAt+embedToken.length;
+}else{
+// iterate through the array of previously inserted tokens
+// to determine where the current embedded tokens should be inserted
+letindex=token.index;
+moves.forEach(pos=>{
+if(index>pos.start){
+index+=pos.delta;
+}
+});
+
+tokens=tokens
+.slice(0,index)
+.concat(embedToken,tokens.slice(index+1));
+moves.push({start: index,delta: embedToken.length-1});
+tokenInsertState.set(tokenRef,{
+nextIndex: index+embedToken.length,
+});
+}
 }
 }else{
 cached[raw]=tokens.concat();