webpipe-js 2.0.62 → 2.0.63

package/dist/index.cjs

@@ -1767,9 +1767,6 @@ function printCondition(condition, indent = "    ") {
 function printTest(test) {
   const lines = [];
   lines.push(`  it "${test.name}"`);
-  test.mocks.forEach((mock) => {
-    lines.push(printMock(mock, "    "));
-  });
   if (test.variables && test.variables.length > 0) {
     test.variables.forEach((variable) => {
       const formattedValue = variable.format === "quoted" ? `"${variable.value}"` : variable.format === "backtick" ? `\`${variable.value}\`` : variable.value;
@@ -1779,18 +1776,25 @@ function printTest(test) {
   }
   lines.push(`    when ${formatWhen(test.when)}`);
   let hasWithClause = false;
-  if (test.headers) {
-    lines.push(`    with headers \`${test.headers}\``);
+  if (test.input) {
+    lines.push(`    with input \`${test.input}\``);
     hasWithClause = true;
   }
-  if (test.body) {
+  test.mocks.forEach((mock) => {
+    const prefix = hasWithClause ? "and" : "with";
+    const mockLine = printMock(mock, "    ");
+    const mockContent = mockLine.trim().replace(/^(with|and)\s+/, "");
+    lines.push(`    ${prefix} ${mockContent}`);
+    hasWithClause = true;
+  });
+  if (test.headers) {
     const prefix = hasWithClause ? "and with" : "with";
-    lines.push(`    ${prefix} body \`${test.body}\``);
+    lines.push(`    ${prefix} headers \`${test.headers}\``);
     hasWithClause = true;
   }
-  if (test.input) {
+  if (test.body) {
     const prefix = hasWithClause ? "and with" : "with";
-    lines.push(`    ${prefix} input \`${test.input}\``);
+    lines.push(`    ${prefix} body \`${test.body}\``);
     hasWithClause = true;
   }
   if (test.cookies) {

package/dist/index.mjs

@@ -1714,9 +1714,6 @@ function printCondition(condition, indent = "    ") {
 function printTest(test) {
   const lines = [];
   lines.push(`  it "${test.name}"`);
-  test.mocks.forEach((mock) => {
-    lines.push(printMock(mock, "    "));
-  });
   if (test.variables && test.variables.length > 0) {
     test.variables.forEach((variable) => {
       const formattedValue = variable.format === "quoted" ? `"${variable.value}"` : variable.format === "backtick" ? `\`${variable.value}\`` : variable.value;
@@ -1726,18 +1723,25 @@ function printTest(test) {
   }
   lines.push(`    when ${formatWhen(test.when)}`);
   let hasWithClause = false;
-  if (test.headers) {
-    lines.push(`    with headers \`${test.headers}\``);
+  if (test.input) {
+    lines.push(`    with input \`${test.input}\``);
     hasWithClause = true;
   }
-  if (test.body) {
+  test.mocks.forEach((mock) => {
+    const prefix = hasWithClause ? "and" : "with";
+    const mockLine = printMock(mock, "    ");
+    const mockContent = mockLine.trim().replace(/^(with|and)\s+/, "");
+    lines.push(`    ${prefix} ${mockContent}`);
+    hasWithClause = true;
+  });
+  if (test.headers) {
     const prefix = hasWithClause ? "and with" : "with";
-    lines.push(`    ${prefix} body \`${test.body}\``);
+    lines.push(`    ${prefix} headers \`${test.headers}\``);
     hasWithClause = true;
   }
-  if (test.input) {
+  if (test.body) {
     const prefix = hasWithClause ? "and with" : "with";
-    lines.push(`    ${prefix} input \`${test.input}\``);
+    lines.push(`    ${prefix} body \`${test.body}\``);
     hasWithClause = true;
   }
   if (test.cookies) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpipe-js",
-  "version": "2.0.62",
+  "version": "2.0.63",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",