webpipe-js 2.0.43 → 2.0.45

package/dist/index.cjs

@@ -1648,7 +1648,8 @@ function printTypeResolver(resolver) {
   return lines.join("\n");
 }
 function printMock(mock, indent = "  ") {
-  return `${indent}with mock ${mock.target} returning \`${mock.returnValue}\``;
+  const target = mock.target.replace(/\.(.*?)$/, " $1");
+  return `${indent}with mock ${target} returning \`${mock.returnValue}\``;
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
@@ -1693,17 +1694,25 @@ function printTest(test) {
     lines.push("");
   }
   lines.push(`    when ${formatWhen(test.when)}`);
-  if (test.input) {
-    lines.push(`    with input \`${test.input}\``);
+  let hasWithClause = false;
+  if (test.headers) {
+    lines.push(`    with headers \`${test.headers}\``);
+    hasWithClause = true;
   }
   if (test.body) {
-    lines.push(`    with body \`${test.body}\``);
+    const prefix = hasWithClause ? "and with" : "with";
+    lines.push(`    ${prefix} body \`${test.body}\``);
+    hasWithClause = true;
   }
-  if (test.headers) {
-    lines.push(`    with headers \`${test.headers}\``);
+  if (test.input) {
+    const prefix = hasWithClause ? "and with" : "with";
+    lines.push(`    ${prefix} input \`${test.input}\``);
+    hasWithClause = true;
   }
   if (test.cookies) {
-    lines.push(`    with cookies \`${test.cookies}\``);
+    const prefix = hasWithClause ? "and with" : "with";
+    lines.push(`    ${prefix} cookies \`${test.cookies}\``);
+    hasWithClause = true;
   }
   test.conditions.forEach((condition) => {
     lines.push(printCondition(condition));
@@ -1781,48 +1790,56 @@ function prettyPrint(program) {
   });
   allItems.sort((a, b) => a.lineNumber - b.lineNumber);
   allItems.forEach((entry, index) => {
+    const nextItem = allItems[index + 1];
+    const shouldAddBlankLine = () => {
+      if (!nextItem) return false;
+      if (entry.type === "comment") {
+        if (nextItem.type === "comment") return false;
+        return nextItem.lineNumber - entry.lineNumber > 1;
+      }
+      if (entry.type === "variable") {
+        return nextItem.type !== "variable";
+      }
+      if (nextItem.type === "comment") {
+        return nextItem.lineNumber - entry.lineNumber > 1;
+      }
+      return true;
+    };
     switch (entry.type) {
       case "comment":
         lines.push(printComment(entry.item));
         break;
       case "config":
         lines.push(printConfig(entry.item));
-        lines.push("");
         break;
       case "graphqlSchema":
         lines.push(printGraphQLSchema(entry.item));
-        lines.push("");
         break;
       case "query":
         lines.push(printQueryResolver(entry.item));
-        lines.push("");
         break;
       case "mutation":
         lines.push(printMutationResolver(entry.item));
-        lines.push("");
         break;
       case "resolver":
         lines.push(printTypeResolver(entry.item));
-        lines.push("");
         break;
       case "route":
         lines.push(printRoute(entry.item));
-        lines.push("");
         break;
       case "pipeline":
         lines.push(printPipeline(entry.item));
-        lines.push("");
         break;
       case "variable":
         lines.push(printVariable(entry.item));
-        const nextNonVariable = allItems.slice(index + 1).find((item) => item.type !== "variable");
-        if (nextNonVariable) lines.push("");
         break;
       case "describe":
         lines.push(printDescribe(entry.item));
-        lines.push("");
         break;
     }
+    if (shouldAddBlankLine()) {
+      lines.push("");
+    }
   });
   return lines.join("\n").trim() + "\n";
 }

package/dist/index.mjs

@@ -1595,7 +1595,8 @@ function printTypeResolver(resolver) {
   return lines.join("\n");
 }
 function printMock(mock, indent = "  ") {
-  return `${indent}with mock ${mock.target} returning \`${mock.returnValue}\``;
+  const target = mock.target.replace(/\.(.*?)$/, " $1");
+  return `${indent}with mock ${target} returning \`${mock.returnValue}\``;
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
@@ -1640,17 +1641,25 @@ function printTest(test) {
     lines.push("");
   }
   lines.push(`    when ${formatWhen(test.when)}`);
-  if (test.input) {
-    lines.push(`    with input \`${test.input}\``);
+  let hasWithClause = false;
+  if (test.headers) {
+    lines.push(`    with headers \`${test.headers}\``);
+    hasWithClause = true;
   }
   if (test.body) {
-    lines.push(`    with body \`${test.body}\``);
+    const prefix = hasWithClause ? "and with" : "with";
+    lines.push(`    ${prefix} body \`${test.body}\``);
+    hasWithClause = true;
   }
-  if (test.headers) {
-    lines.push(`    with headers \`${test.headers}\``);
+  if (test.input) {
+    const prefix = hasWithClause ? "and with" : "with";
+    lines.push(`    ${prefix} input \`${test.input}\``);
+    hasWithClause = true;
   }
   if (test.cookies) {
-    lines.push(`    with cookies \`${test.cookies}\``);
+    const prefix = hasWithClause ? "and with" : "with";
+    lines.push(`    ${prefix} cookies \`${test.cookies}\``);
+    hasWithClause = true;
   }
   test.conditions.forEach((condition) => {
     lines.push(printCondition(condition));
@@ -1728,48 +1737,56 @@ function prettyPrint(program) {
   });
   allItems.sort((a, b) => a.lineNumber - b.lineNumber);
   allItems.forEach((entry, index) => {
+    const nextItem = allItems[index + 1];
+    const shouldAddBlankLine = () => {
+      if (!nextItem) return false;
+      if (entry.type === "comment") {
+        if (nextItem.type === "comment") return false;
+        return nextItem.lineNumber - entry.lineNumber > 1;
+      }
+      if (entry.type === "variable") {
+        return nextItem.type !== "variable";
+      }
+      if (nextItem.type === "comment") {
+        return nextItem.lineNumber - entry.lineNumber > 1;
+      }
+      return true;
+    };
     switch (entry.type) {
       case "comment":
         lines.push(printComment(entry.item));
         break;
       case "config":
         lines.push(printConfig(entry.item));
-        lines.push("");
         break;
       case "graphqlSchema":
         lines.push(printGraphQLSchema(entry.item));
-        lines.push("");
         break;
       case "query":
         lines.push(printQueryResolver(entry.item));
-        lines.push("");
         break;
       case "mutation":
         lines.push(printMutationResolver(entry.item));
-        lines.push("");
         break;
       case "resolver":
         lines.push(printTypeResolver(entry.item));
-        lines.push("");
         break;
       case "route":
         lines.push(printRoute(entry.item));
-        lines.push("");
         break;
       case "pipeline":
         lines.push(printPipeline(entry.item));
-        lines.push("");
         break;
       case "variable":
         lines.push(printVariable(entry.item));
-        const nextNonVariable = allItems.slice(index + 1).find((item) => item.type !== "variable");
-        if (nextNonVariable) lines.push("");
         break;
       case "describe":
         lines.push(printDescribe(entry.item));
-        lines.push("");
         break;
     }
+    if (shouldAddBlankLine()) {
+      lines.push("");
+    }
   });
   return lines.join("\n").trim() + "\n";
 }

package/package.json

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