webpipe-js 2.0.42 → 2.0.44

package/dist/index.cjs

@@ -1652,6 +1652,11 @@ function printMock(mock, indent = "  ") {
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
+  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}`;
+  }
   if (condition.field === "selector" && condition.selector && condition.domAssert) {
     const selector = condition.selector;
     const formatValue = (val) => {
@@ -1661,13 +1666,13 @@ function printCondition(condition, indent = "    ") {
     };
     if (condition.domAssert.kind === "Exists") {
       const operation = condition.comparison === "exists" ? "exists" : "does not exist";
-      return `${indent}${condType} selector "${selector}" ${operation}`;
+      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} ${formatValue(condition.value)}`;
     } else if (condition.domAssert.kind === "Count") {
-      return `${indent}${condType} selector "${selector}" count ${condition.comparison} ${condition.value}`;
+      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} ${formatValue(condition.value)}`;
     }
   }
   const fieldPart = condition.headerName ? `${condition.field} "${condition.headerName}"` : condition.jqExpr ? `${condition.field} \`${condition.jqExpr}\`` : condition.field;
@@ -1680,24 +1685,33 @@ function printTest(test) {
   test.mocks.forEach((mock) => {
     lines.push(printMock(mock, "    "));
   });
-  lines.push(`    when ${formatWhen(test.when)}`);
-  if (test.variables) {
+  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;
       lines.push(`    let ${variable.name} = ${formattedValue}`);
     });
+    lines.push("");
   }
-  if (test.input) {
-    lines.push(`    with input \`${test.input}\``);
+  lines.push(`    when ${formatWhen(test.when)}`);
+  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));

package/dist/index.mjs

@@ -1599,6 +1599,11 @@ function printMock(mock, indent = "  ") {
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
+  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}`;
+  }
   if (condition.field === "selector" && condition.selector && condition.domAssert) {
     const selector = condition.selector;
     const formatValue = (val) => {
@@ -1608,13 +1613,13 @@ function printCondition(condition, indent = "    ") {
     };
     if (condition.domAssert.kind === "Exists") {
       const operation = condition.comparison === "exists" ? "exists" : "does not exist";
-      return `${indent}${condType} selector "${selector}" ${operation}`;
+      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} ${formatValue(condition.value)}`;
     } else if (condition.domAssert.kind === "Count") {
-      return `${indent}${condType} selector "${selector}" count ${condition.comparison} ${condition.value}`;
+      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} ${formatValue(condition.value)}`;
     }
   }
   const fieldPart = condition.headerName ? `${condition.field} "${condition.headerName}"` : condition.jqExpr ? `${condition.field} \`${condition.jqExpr}\`` : condition.field;
@@ -1627,24 +1632,33 @@ function printTest(test) {
   test.mocks.forEach((mock) => {
     lines.push(printMock(mock, "    "));
   });
-  lines.push(`    when ${formatWhen(test.when)}`);
-  if (test.variables) {
+  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;
       lines.push(`    let ${variable.name} = ${formattedValue}`);
     });
+    lines.push("");
   }
-  if (test.input) {
-    lines.push(`    with input \`${test.input}\``);
+  lines.push(`    when ${formatWhen(test.when)}`);
+  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));

package/package.json

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