testomatio-editor-blocks 0.4.62 → 0.4.64

package/package/editor/blocks/step.js

@@ -93,13 +93,8 @@ export function canInsertStepOrSnippet(editor, referenceBlockId) {
  * Returns the inserted step's block ID (for focusing), or null.
  */
 export function addStepsBlock(editor) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const allBlocks = editor.document;
-    const emptyStep = {
-        type: "testStep",
-        props: { stepTitle: "", stepData: "", expectedResult: "" },
-        children: [],
-    };
     let stepsHeadingIndex = -1;
     for (let i = 0; i < allBlocks.length; i++) {
         const b = allBlocks[i];
@@ -129,8 +124,17 @@ export function addStepsBlock(editor) {
                 continue;
             break;
         }
-        const inserted = editor.insertBlocks([emptyStep], allBlocks[lastIndex].id, "after");
-        return (_b = (_a = inserted === null || inserted === void 0 ? void 0 : inserted[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null;
+        const previousStep = allBlocks[lastIndex];
+        const inheritedListStyle = (previousStep === null || previousStep === void 0 ? void 0 : previousStep.type) === "testStep"
+            ? ((_b = (_a = previousStep.props) === null || _a === void 0 ? void 0 : _a.listStyle) !== null && _b !== void 0 ? _b : "bullet")
+            : "bullet";
+        const emptyStep = {
+            type: "testStep",
+            props: { stepTitle: "", stepData: "", expectedResult: "", listStyle: inheritedListStyle },
+            children: [],
+        };
+        const inserted = editor.insertBlocks([emptyStep], previousStep.id, "after");
+        return (_d = (_c = inserted === null || inserted === void 0 ? void 0 : inserted[0]) === null || _c === void 0 ? void 0 : _c.id) !== null && _d !== void 0 ? _d : null;
     }
     const lastBlock = allBlocks[allBlocks.length - 1];
     const stepsHeading = {
@@ -139,8 +143,13 @@ export function addStepsBlock(editor) {
         content: [{ type: "text", text: "Steps" }],
         children: [],
     };
+    const emptyStep = {
+        type: "testStep",
+        props: { stepTitle: "", stepData: "", expectedResult: "" },
+        children: [],
+    };
     const inserted = editor.insertBlocks([stepsHeading, emptyStep], lastBlock.id, "after");
-    return (_d = (_c = inserted === null || inserted === void 0 ? void 0 : inserted[1]) === null || _c === void 0 ? void 0 : _c.id) !== null && _d !== void 0 ? _d : null;
+    return (_f = (_e = inserted === null || inserted === void 0 ? void 0 : inserted[1]) === null || _e === void 0 ? void 0 : _e.id) !== null && _f !== void 0 ? _f : null;
 }
 /**
  * Programmatically add an empty snippet block to the editor.
@@ -346,12 +355,14 @@ export const stepBlock = createReactBlockSpec({
             });
         }, [editor, block.id, expectedResult]);
         const handleInsertNextStep = useCallback(() => {
+            var _a;
             const allBlocks = editor.document;
             const idx = allBlocks.findIndex((b) => b.id === block.id);
             const next = idx >= 0 ? allBlocks[idx + 1] : null;
             if (next && isEmptyParagraph(next)) {
                 editor.removeBlocks([next.id]);
             }
+            const currentListStyle = (_a = block.props.listStyle) !== null && _a !== void 0 ? _a : "bullet";
             editor.insertBlocks([
                 {
                     type: "testStep",
@@ -359,11 +370,12 @@ export const stepBlock = createReactBlockSpec({
                         stepTitle: "",
                         stepData: "",
                         expectedResult: "",
+                        listStyle: currentListStyle,
                     },
                     children: [],
                 },
             ], block.id, "after");
-        }, [editor, block.id]);
+        }, [editor, block.id, block.props]);
         const handleFieldFocus = useCallback(() => {
             var _a, _b, _c;
             const selection = editor.getSelection();

package/package/editor/customMarkdownConverter.js

@@ -262,7 +262,8 @@ function serializeBlock(block, ctx, orderedIndex, stepIndex) {
             return lines;
         }
         case "codeBlock": {
-            const language = block.props.language || "";
+            const rawLanguage = block.props.language || "";
+            const language = /[\s`]/.test(rawLanguage) ? "" : rawLanguage;
             const fence = "```" + language;
             const body = inlineContentToPlainText(block.content);
             lines.push(fence);
@@ -1087,8 +1088,17 @@ function parseCodeBlock(lines, index) {
             nextIndex: index + 1,
         };
     }
-    const language = afterOpening.trim();
+    const info = afterOpening.trim();
+    let language = "";
     const body = [];
+    if (info.length > 0) {
+        if (/[\s`]/.test(info)) {
+            body.push(afterOpening);
+        }
+        else {
+            language = info;
+        }
+    }
     let next = index + 1;
     while (next < lines.length && !lines[next].startsWith("```")) {
         body.push(lines[next]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testomatio-editor-blocks",
-  "version": "0.4.62",
+  "version": "0.4.64",
   "description": "Custom BlockNote schema, markdown conversion helpers, and UI for Testomatio-style test cases and steps.",
   "type": "module",
   "main": "./package/index.js",

package/src/editor/blocks/step.tsx

@@ -108,11 +108,6 @@ export function addStepsBlock(editor: {
   insertBlocks: (blocks: any[], referenceId: string, placement: "before" | "after") => any[];
 }): string | null {
   const allBlocks = editor.document;
-  const emptyStep = {
-    type: "testStep" as const,
-    props: { stepTitle: "", stepData: "", expectedResult: "" },
-    children: [],
-  };
 
   let stepsHeadingIndex = -1;
   for (let i = 0; i < allBlocks.length; i++) {
@@ -142,7 +137,17 @@ export function addStepsBlock(editor: {
       if (isEmptyParagraph(b)) continue;
       break;
     }
-    const inserted = editor.insertBlocks([emptyStep], allBlocks[lastIndex].id, "after");
+    const previousStep = allBlocks[lastIndex];
+    const inheritedListStyle =
+      previousStep?.type === "testStep"
+        ? ((previousStep.props as any)?.listStyle ?? "bullet")
+        : "bullet";
+    const emptyStep = {
+      type: "testStep" as const,
+      props: { stepTitle: "", stepData: "", expectedResult: "", listStyle: inheritedListStyle },
+      children: [],
+    };
+    const inserted = editor.insertBlocks([emptyStep], previousStep.id, "after");
     return inserted?.[0]?.id ?? null;
   }
 
@@ -153,6 +158,11 @@ export function addStepsBlock(editor: {
     content: [{ type: "text" as const, text: "Steps" }],
     children: [],
   };
+  const emptyStep = {
+    type: "testStep" as const,
+    props: { stepTitle: "", stepData: "", expectedResult: "" },
+    children: [],
+  };
   const inserted = editor.insertBlocks([stepsHeading, emptyStep], lastBlock.id, "after");
   return inserted?.[1]?.id ?? null;
 }
@@ -399,6 +409,7 @@ export const stepBlock = createReactBlockSpec(
         if (next && isEmptyParagraph(next)) {
           editor.removeBlocks([next.id]);
         }
+        const currentListStyle = (block.props as any).listStyle ?? "bullet";
         editor.insertBlocks(
           [
             {
@@ -407,6 +418,7 @@ export const stepBlock = createReactBlockSpec(
                 stepTitle: "",
                 stepData: "",
                 expectedResult: "",
+                listStyle: currentListStyle,
               },
               children: [],
             },
@@ -414,7 +426,7 @@ export const stepBlock = createReactBlockSpec(
           block.id,
           "after",
         );
-      }, [editor, block.id]);
+      }, [editor, block.id, block.props]);
 
       const handleFieldFocus = useCallback(() => {
         const selection = editor.getSelection();

package/src/editor/customMarkdownConverter.test.ts

@@ -1696,6 +1696,36 @@ describe("markdownToBlocks", () => {
     expect(stepBlocks[1].props).toMatchObject({ stepTitle: "Second step", listStyle: "ordered" });
   });
 
+  it("serializes a new ordered step appended to a numbered list as N.", () => {
+    const orderedSteps: CustomEditorBlock[] = [
+      {
+        id: "s1",
+        type: "testStep",
+        props: { stepTitle: "First step", stepData: "", expectedResult: "", listStyle: "ordered" },
+        content: undefined as any,
+        children: [],
+      } as any,
+      {
+        id: "s2",
+        type: "testStep",
+        props: { stepTitle: "Second step", stepData: "", expectedResult: "", listStyle: "ordered" },
+        content: undefined as any,
+        children: [],
+      } as any,
+      {
+        id: "s3",
+        type: "testStep",
+        props: { stepTitle: "Newly added step", stepData: "", expectedResult: "", listStyle: "ordered" },
+        content: undefined as any,
+        children: [],
+      } as any,
+    ];
+
+    expect(blocksToMarkdown(orderedSteps)).toBe(
+      ["1. First step", "2. Second step", "3. Newly added step"].join("\n"),
+    );
+  });
+
   it("parses steps under an h4 'step' heading (lowercase)", () => {
     const markdown = ["#### step", "", "* Do something"].join("\n");
     const blocks = markdownToBlocks(markdown);
@@ -2655,6 +2685,90 @@ describe("markdownToBlocks", () => {
       },
     ]);
   });
+
+  it("preserves opening-fence content when it is not a clean language identifier", () => {
+    const markdown = [
+      "```curl `http://localhost:3000/projects/classic-project/test/e1c1b38c/edit` \\",
+      "{{baseURL}}/endpoint?query_param_one=value_one&query_param_two=value_two",
+      "```",
+    ].join("\n");
+    const blocks = markdownToBlocks(markdown);
+    expect(blocks).toEqual([
+      {
+        type: "codeBlock",
+        props: { language: "" },
+        content: [
+          {
+            type: "text",
+            text: [
+              "curl `http://localhost:3000/projects/classic-project/test/e1c1b38c/edit` \\",
+              "{{baseURL}}/endpoint?query_param_one=value_one&query_param_two=value_two",
+            ].join("\n"),
+            styles: {},
+          },
+        ],
+        children: [],
+      },
+    ]);
+  });
+
+  it("round-trips an opening-fence-with-content code block to stable markdown", () => {
+    const markdown = [
+      "```curl `http://localhost:3000/projects/classic-project/test/e1c1b38c/edit` \\",
+      "{{baseURL}}/endpoint?query_param_one=value_one&query_param_two=value_two",
+      "```",
+    ].join("\n");
+    const blocks = markdownToBlocks(markdown);
+    const serialized = blocksToMarkdown(blocks as CustomEditorBlock[]);
+    expect(serialized).toBe(
+      [
+        "```",
+        "curl `http://localhost:3000/projects/classic-project/test/e1c1b38c/edit` \\",
+        "{{baseURL}}/endpoint?query_param_one=value_one&query_param_two=value_two",
+        "```",
+      ].join("\n"),
+    );
+    expect(markdownToBlocks(serialized)).toEqual(blocks);
+  });
+
+  it("preserves hyphenated language identifiers like shell-session", () => {
+    const markdown = ["```shell-session", "$ ls", "```"].join("\n");
+    const blocks = markdownToBlocks(markdown);
+    expect(blocks).toEqual([
+      {
+        type: "codeBlock",
+        props: { language: "shell-session" },
+        content: [{ type: "text", text: "$ ls", styles: {} }],
+        children: [],
+      },
+    ]);
+  });
+
+  it("preserves digit-prefixed language identifiers like 1c-enterprise", () => {
+    const markdown = ["```1c-enterprise", "code", "```"].join("\n");
+    const blocks = markdownToBlocks(markdown);
+    expect(blocks).toEqual([
+      {
+        type: "codeBlock",
+        props: { language: "1c-enterprise" },
+        content: [{ type: "text", text: "code", styles: {} }],
+        children: [],
+      },
+    ]);
+  });
+
+  it("sanitizes a malformed in-memory language prop on serialize", () => {
+    const blocks: CustomEditorBlock[] = [
+      {
+        id: "1",
+        type: "codeBlock",
+        props: { ...baseProps, language: "curl http://x" } as any,
+        content: [{ type: "text", text: "body", styles: {} }] as any,
+        children: [],
+      },
+    ];
+    expect(blocksToMarkdown(blocks)).toBe(["```", "body", "```"].join("\n"));
+  });
 });
 
 describe("file block serialization", () => {

package/src/editor/customMarkdownConverter.ts

@@ -334,7 +334,8 @@ function serializeBlock(
       return lines;
     }
     case "codeBlock": {
-      const language = (block.props as any).language || "";
+      const rawLanguage = (block.props as any).language || "";
+      const language = /[\s`]/.test(rawLanguage) ? "" : rawLanguage;
       const fence = "```" + language;
       const body = inlineContentToPlainText(block.content);
       lines.push(fence);
@@ -1290,8 +1291,16 @@ function parseCodeBlock(lines: string[], index: number): { block: CustomPartialB
     };
   }
 
-  const language = afterOpening.trim();
+  const info = afterOpening.trim();
+  let language = "";
   const body: string[] = [];
+  if (info.length > 0) {
+    if (/[\s`]/.test(info)) {
+      body.push(afterOpening);
+    } else {
+      language = info;
+    }
+  }
   let next = index + 1;
   while (next < lines.length && !lines[next].startsWith("```") ) {
     body.push(lines[next]);