webpipe-js 2.0.44 → 2.0.46

package/dist/index.cjs

@@ -1648,36 +1648,42 @@ 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(/^(query|mutation)\.(.*)$/, "$1 $2");
+  return `${indent}with mock ${target} returning \`${mock.returnValue}\``;
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
+  const formatConditionValue = (val) => {
+    if (val.startsWith("`") || val.startsWith('"')) return val;
+    const isBareTemplate = /^\{\{[^}]+\}\}$/.test(val);
+    if (isBareTemplate) return val;
+    const hasTemplateVars = /\{\{[^}]+\}\}/.test(val);
+    if (hasTemplateVars) return `"${val}"`;
+    if (val.includes("\n") || val.includes("{") && val.includes("}") || val.includes("[") && val.includes("]")) {
+      return `\`${val}\``;
+    }
+    if (val.includes(" ") || val.includes(",")) return `"${val}"`;
+    return val;
+  };
   if (condition.isCallAssertion && condition.callTarget) {
     const [callType, callName] = condition.callTarget.split(".");
-    const value2 = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
-    return `${indent}${condType} call ${callType} ${callName} ${condition.comparison} ${value2}`;
+    return `${indent}${condType} call ${callType} ${callName} ${condition.comparison} ${formatConditionValue(condition.value)}`;
   }
   if (condition.field === "selector" && condition.selector && condition.domAssert) {
     const selector = condition.selector;
-    const formatValue = (val) => {
-      if (val.startsWith("`") || val.startsWith('"')) return val;
-      if (val.includes("\n") || val.includes("{") || val.includes("[")) return `\`${val}\``;
-      return `"${val}"`;
-    };
     if (condition.domAssert.kind === "Exists") {
       const operation = condition.comparison === "exists" ? "exists" : "does not exist";
       return `${indent}${condType} selector \`${selector}\` ${operation}`;
     } else if (condition.domAssert.kind === "Text") {
-      return `${indent}${condType} selector \`${selector}\` text ${condition.comparison} ${formatValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` text ${condition.comparison} ${formatConditionValue(condition.value)}`;
     } else if (condition.domAssert.kind === "Count") {
       return `${indent}${condType} selector \`${selector}\` count ${condition.comparison} ${condition.value}`;
     } else if (condition.domAssert.kind === "Attribute") {
-      return `${indent}${condType} selector \`${selector}\` attribute "${condition.domAssert.name}" ${condition.comparison} ${formatValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` attribute "${condition.domAssert.name}" ${condition.comparison} ${formatConditionValue(condition.value)}`;
     }
   }
   const fieldPart = condition.headerName ? `${condition.field} "${condition.headerName}"` : condition.jqExpr ? `${condition.field} \`${condition.jqExpr}\`` : condition.field;
-  const value = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
-  return `${indent}${condType} ${fieldPart} ${condition.comparison} ${value}`;
+  return `${indent}${condType} ${fieldPart} ${condition.comparison} ${formatConditionValue(condition.value)}`;
 }
 function printTest(test) {
   const lines = [];
@@ -1789,48 +1795,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,36 +1595,42 @@ 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(/^(query|mutation)\.(.*)$/, "$1 $2");
+  return `${indent}with mock ${target} returning \`${mock.returnValue}\``;
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
+  const formatConditionValue = (val) => {
+    if (val.startsWith("`") || val.startsWith('"')) return val;
+    const isBareTemplate = /^\{\{[^}]+\}\}$/.test(val);
+    if (isBareTemplate) return val;
+    const hasTemplateVars = /\{\{[^}]+\}\}/.test(val);
+    if (hasTemplateVars) return `"${val}"`;
+    if (val.includes("\n") || val.includes("{") && val.includes("}") || val.includes("[") && val.includes("]")) {
+      return `\`${val}\``;
+    }
+    if (val.includes(" ") || val.includes(",")) return `"${val}"`;
+    return val;
+  };
   if (condition.isCallAssertion && condition.callTarget) {
     const [callType, callName] = condition.callTarget.split(".");
-    const value2 = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
-    return `${indent}${condType} call ${callType} ${callName} ${condition.comparison} ${value2}`;
+    return `${indent}${condType} call ${callType} ${callName} ${condition.comparison} ${formatConditionValue(condition.value)}`;
   }
   if (condition.field === "selector" && condition.selector && condition.domAssert) {
     const selector = condition.selector;
-    const formatValue = (val) => {
-      if (val.startsWith("`") || val.startsWith('"')) return val;
-      if (val.includes("\n") || val.includes("{") || val.includes("[")) return `\`${val}\``;
-      return `"${val}"`;
-    };
     if (condition.domAssert.kind === "Exists") {
       const operation = condition.comparison === "exists" ? "exists" : "does not exist";
       return `${indent}${condType} selector \`${selector}\` ${operation}`;
     } else if (condition.domAssert.kind === "Text") {
-      return `${indent}${condType} selector \`${selector}\` text ${condition.comparison} ${formatValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` text ${condition.comparison} ${formatConditionValue(condition.value)}`;
     } else if (condition.domAssert.kind === "Count") {
       return `${indent}${condType} selector \`${selector}\` count ${condition.comparison} ${condition.value}`;
     } else if (condition.domAssert.kind === "Attribute") {
-      return `${indent}${condType} selector \`${selector}\` attribute "${condition.domAssert.name}" ${condition.comparison} ${formatValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` attribute "${condition.domAssert.name}" ${condition.comparison} ${formatConditionValue(condition.value)}`;
     }
   }
   const fieldPart = condition.headerName ? `${condition.field} "${condition.headerName}"` : condition.jqExpr ? `${condition.field} \`${condition.jqExpr}\`` : condition.field;
-  const value = condition.value.startsWith("`") ? condition.value : condition.value.includes("\n") || condition.value.includes("{") || condition.value.includes("[") ? `\`${condition.value}\`` : condition.value;
-  return `${indent}${condType} ${fieldPart} ${condition.comparison} ${value}`;
+  return `${indent}${condType} ${fieldPart} ${condition.comparison} ${formatConditionValue(condition.value)}`;
 }
 function printTest(test) {
   const lines = [];
@@ -1736,48 +1742,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.44",
+  "version": "2.0.46",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",