webpipe-js 2.0.14 → 2.0.16

package/dist/index.cjs

@@ -879,7 +879,20 @@ var Parser = class {
     this.skipInlineSpaces();
     const field = this.consumeWhile((c) => c !== " " && c !== "\n" && c !== "`");
     this.skipInlineSpaces();
-    const jqExpr = this.tryParse(() => this.parseBacktickString());
+    let headerName;
+    if (field === "header") {
+      const h1 = this.tryParse(() => this.parseBacktickString());
+      if (h1 !== null) {
+        headerName = h1;
+      } else {
+        const h2 = this.tryParse(() => this.parseQuotedString());
+        if (h2 !== null) {
+          headerName = h2;
+        }
+      }
+      this.skipInlineSpaces();
+    }
+    const jqExpr = headerName === void 0 ? this.tryParse(() => this.parseBacktickString()) : null;
     this.skipInlineSpaces();
     const comparison = this.consumeWhile((c) => c !== " " && c !== "\n");
     this.skipInlineSpaces();
@@ -890,7 +903,7 @@ var Parser = class {
       if (v2 !== null) return v2;
       return this.consumeWhile((c) => c !== "\n");
     })();
-    return { conditionType: ct, field, jqExpr: jqExpr ?? void 0, comparison, value };
+    return { conditionType: ct, field, headerName: headerName ?? void 0, jqExpr: jqExpr ?? void 0, comparison, value };
   }
   parseMockHead(prefixWord) {
     this.skipSpaces();
@@ -930,15 +943,50 @@ var Parser = class {
     this.skipInlineSpaces();
     const when = this.parseWhen();
     this.skipSpaces();
-    const input = this.tryParse(() => {
-      this.expect("with");
-      this.skipInlineSpaces();
-      this.expect("input");
-      this.skipInlineSpaces();
-      const v = this.parseBacktickString();
-      this.skipSpaces();
-      return v;
-    }) ?? void 0;
+    let input;
+    let body;
+    let headers;
+    let cookies;
+    while (true) {
+      const parsed = this.tryParse(() => {
+        this.expect("with");
+        this.skipInlineSpaces();
+        if (this.text.startsWith("input", this.pos)) {
+          this.expect("input");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "input", value: v };
+        } else if (this.text.startsWith("body", this.pos)) {
+          this.expect("body");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "body", value: v };
+        } else if (this.text.startsWith("headers", this.pos)) {
+          this.expect("headers");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "headers", value: v };
+        } else if (this.text.startsWith("cookies", this.pos)) {
+          this.expect("cookies");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "cookies", value: v };
+        } else if (this.text.startsWith("mock", this.pos)) {
+          throw new Error("mock");
+        } else {
+          throw new Error("unknown with clause");
+        }
+      });
+      if (!parsed) break;
+      if (parsed.type === "input") input = parsed.value;
+      else if (parsed.type === "body") body = parsed.value;
+      else if (parsed.type === "headers") headers = parsed.value;
+      else if (parsed.type === "cookies") cookies = parsed.value;
+    }
     const extraMocks = [];
     while (true) {
       const m = this.tryParse(() => this.parseAndMock());
@@ -952,7 +1000,7 @@ var Parser = class {
       if (!c) break;
       conditions.push(c);
     }
-    return { name, mocks: [...mocks, ...extraMocks], when, input, conditions };
+    return { name, mocks: [...mocks, ...extraMocks], when, input, body, headers, cookies, conditions };
   }
   parseDescribe() {
     this.skipSpaces();
@@ -1089,9 +1137,9 @@ function printMock(mock, indent = "  ") {
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
-  const jqPart = condition.jqExpr ? ` \`${condition.jqExpr}\`` : "";
+  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} ${condition.field}${jqPart} ${condition.comparison} ${value}`;
+  return `${indent}${condType} ${fieldPart} ${condition.comparison} ${value}`;
 }
 function printTest(test) {
   const lines = [];
@@ -1103,6 +1151,15 @@ function printTest(test) {
   if (test.input) {
     lines.push(`    with input \`${test.input}\``);
   }
+  if (test.body) {
+    lines.push(`    with body \`${test.body}\``);
+  }
+  if (test.headers) {
+    lines.push(`    with headers \`${test.headers}\``);
+  }
+  if (test.cookies) {
+    lines.push(`    with cookies \`${test.cookies}\``);
+  }
   test.conditions.forEach((condition) => {
     lines.push(printCondition(condition));
   });

package/dist/index.d.cts

@@ -163,6 +163,9 @@ interface It {
     mocks: Mock[];
     when: When;
     input?: string;
+    body?: string;
+    headers?: string;
+    cookies?: string;
     conditions: Condition[];
 }
 type When = {
@@ -180,6 +183,7 @@ type When = {
 interface Condition {
     conditionType: 'Then' | 'And';
     field: string;
+    headerName?: string;
     jqExpr?: string;
     comparison: string;
     value: string;

package/dist/index.d.ts

@@ -163,6 +163,9 @@ interface It {
     mocks: Mock[];
     when: When;
     input?: string;
+    body?: string;
+    headers?: string;
+    cookies?: string;
     conditions: Condition[];
 }
 type When = {
@@ -180,6 +183,7 @@ type When = {
 interface Condition {
     conditionType: 'Then' | 'And';
     field: string;
+    headerName?: string;
     jqExpr?: string;
     comparison: string;
     value: string;

package/dist/index.mjs

@@ -829,7 +829,20 @@ var Parser = class {
     this.skipInlineSpaces();
     const field = this.consumeWhile((c) => c !== " " && c !== "\n" && c !== "`");
     this.skipInlineSpaces();
-    const jqExpr = this.tryParse(() => this.parseBacktickString());
+    let headerName;
+    if (field === "header") {
+      const h1 = this.tryParse(() => this.parseBacktickString());
+      if (h1 !== null) {
+        headerName = h1;
+      } else {
+        const h2 = this.tryParse(() => this.parseQuotedString());
+        if (h2 !== null) {
+          headerName = h2;
+        }
+      }
+      this.skipInlineSpaces();
+    }
+    const jqExpr = headerName === void 0 ? this.tryParse(() => this.parseBacktickString()) : null;
     this.skipInlineSpaces();
     const comparison = this.consumeWhile((c) => c !== " " && c !== "\n");
     this.skipInlineSpaces();
@@ -840,7 +853,7 @@ var Parser = class {
       if (v2 !== null) return v2;
       return this.consumeWhile((c) => c !== "\n");
     })();
-    return { conditionType: ct, field, jqExpr: jqExpr ?? void 0, comparison, value };
+    return { conditionType: ct, field, headerName: headerName ?? void 0, jqExpr: jqExpr ?? void 0, comparison, value };
   }
   parseMockHead(prefixWord) {
     this.skipSpaces();
@@ -880,15 +893,50 @@ var Parser = class {
     this.skipInlineSpaces();
     const when = this.parseWhen();
     this.skipSpaces();
-    const input = this.tryParse(() => {
-      this.expect("with");
-      this.skipInlineSpaces();
-      this.expect("input");
-      this.skipInlineSpaces();
-      const v = this.parseBacktickString();
-      this.skipSpaces();
-      return v;
-    }) ?? void 0;
+    let input;
+    let body;
+    let headers;
+    let cookies;
+    while (true) {
+      const parsed = this.tryParse(() => {
+        this.expect("with");
+        this.skipInlineSpaces();
+        if (this.text.startsWith("input", this.pos)) {
+          this.expect("input");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "input", value: v };
+        } else if (this.text.startsWith("body", this.pos)) {
+          this.expect("body");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "body", value: v };
+        } else if (this.text.startsWith("headers", this.pos)) {
+          this.expect("headers");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "headers", value: v };
+        } else if (this.text.startsWith("cookies", this.pos)) {
+          this.expect("cookies");
+          this.skipInlineSpaces();
+          const v = this.parseBacktickString();
+          this.skipSpaces();
+          return { type: "cookies", value: v };
+        } else if (this.text.startsWith("mock", this.pos)) {
+          throw new Error("mock");
+        } else {
+          throw new Error("unknown with clause");
+        }
+      });
+      if (!parsed) break;
+      if (parsed.type === "input") input = parsed.value;
+      else if (parsed.type === "body") body = parsed.value;
+      else if (parsed.type === "headers") headers = parsed.value;
+      else if (parsed.type === "cookies") cookies = parsed.value;
+    }
     const extraMocks = [];
     while (true) {
       const m = this.tryParse(() => this.parseAndMock());
@@ -902,7 +950,7 @@ var Parser = class {
       if (!c) break;
       conditions.push(c);
     }
-    return { name, mocks: [...mocks, ...extraMocks], when, input, conditions };
+    return { name, mocks: [...mocks, ...extraMocks], when, input, body, headers, cookies, conditions };
   }
   parseDescribe() {
     this.skipSpaces();
@@ -1039,9 +1087,9 @@ function printMock(mock, indent = "  ") {
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
-  const jqPart = condition.jqExpr ? ` \`${condition.jqExpr}\`` : "";
+  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} ${condition.field}${jqPart} ${condition.comparison} ${value}`;
+  return `${indent}${condType} ${fieldPart} ${condition.comparison} ${value}`;
 }
 function printTest(test) {
   const lines = [];
@@ -1053,6 +1101,15 @@ function printTest(test) {
   if (test.input) {
     lines.push(`    with input \`${test.input}\``);
   }
+  if (test.body) {
+    lines.push(`    with body \`${test.body}\``);
+  }
+  if (test.headers) {
+    lines.push(`    with headers \`${test.headers}\``);
+  }
+  if (test.cookies) {
+    lines.push(`    with cookies \`${test.cookies}\``);
+  }
   test.conditions.forEach((condition) => {
     lines.push(printCondition(condition));
   });

package/package.json

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