refactor(jupyter-client): 优化运行结果数据解析方案 | Optimize the data parsing sc…

…heme of the running result.
Zuoqiu-Yingyi · Sep 5, 2023 · 02d443e · 02d443e
1 parent 64dd0e7
commit 02d443e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/src/jupyter/import.ts b/src/jupyter/import.ts
@@ -381,7 +381,7 @@ export class IpynbImport {
                             markdowns.push(markdown);
                             break;
                         case "stderr":
-                            const lines = markdown.split("\n{2,}");
+                            const lines = markdown.split(/\n{2,}/);
                             for (let j = 0; j < lines.length; ++j) {
                                 markdowns.push(lines[j]);
                                 markdowns.push(createIAL({ style: CONSTANTS.styles.error }));

diff --git a/src/jupyter/parse.ts b/src/jupyter/parse.ts
@@ -61,14 +61,30 @@ export function parseText(
  * @param data 数据
  * @param metadata 元数据
  * @param options 解析选项
+ * @param split 解析后的块是否分割
  * @returns 解析后的文本
  */
 export async function parseData(
     client: InstanceType<typeof Client>,
     options: IJupyterParserOptions,
     data: IData,
     metadata?: Record<string, string>,
-): Promise<string> {
+    split?: false,
+): Promise<string>;
+export async function parseData(
+    client: InstanceType<typeof Client>,
+    options: IJupyterParserOptions,
+    data: IData,
+    metadata?: Record<string, string>,
+    split?: true,
+): Promise<string[]>;
+export async function parseData(
+    client: InstanceType<typeof Client>,
+    options: IJupyterParserOptions,
+    data: IData,
+    metadata?: Record<string, string>,
+    split: boolean = false,
+): Promise<string | string[]> {
     let filedata: string;
     const markdowns = new PriorityQueue<string>();
     for (const [mime, datum] of Object.entries(data)) {
@@ -95,7 +111,7 @@ export async function parseData(
                         markdowns.enqueue(parseText(text, options), 0);
                         break;
                     case "html":
-                        markdowns.enqueue(`<div>${text}</div>`, 1);
+                        markdowns.enqueue(`<div>${text.replaceAll(/\n+/g, "\n")}</div>`, 1);
                         break;
                     case "markdown":
                         markdowns.enqueue(text, 1);
@@ -183,5 +199,9 @@ export async function parseData(
                 break;
         }
     }
-    return markdowns.items.map((item) => item.value).join("\n");
+
+    const blocks = markdowns.items.map((item) => item.value);
+    return split
+        ? blocks
+        : blocks.join("\n\n");
 }
diff --git a/src/workers/jupyter.ts b/src/workers/jupyter.ts
@@ -733,19 +733,22 @@ async function handleExecuteResultMessage(
     message: KernelMessage.IExecuteResultMsg,
     context: IExecuteContext,
 ): Promise<void> {
-    const kramdown = await parseData(
+    const kramdowns = await parseData(
         client,
         context.output.options,
         message.content.data as IData,
         message.content.metadata as Record<string, string>,
+        true,
     );
 
     context.output.hrs.execute_result.used = true;
-    await client.insertBlock({
-        nextID: context.output.hrs.execute_result.id,
-        data: kramdown,
-        dataType: "markdown",
-    });
+    for (const kramdown of kramdowns) {
+        await client.insertBlock({
+            nextID: context.output.hrs.execute_result.id,
+            data: kramdown,
+            dataType: "markdown",
+        });
+    }
 }
 
 /**