webpipe-js 2.0.48 → 2.0.50

package/dist/index.cjs

@@ -1275,7 +1275,7 @@ var Parser = class {
     const returnValue = this.parseBacktickString();
     this.skipSpaces();
     const end = this.pos;
-    return { target, targetStart, returnValue, start, end };
+    return { target, targetStart, returnValue, lineNumber: this.getLineNumber(start), start, end };
   }
   parseMock() {
     return this.parseMockHead("with");
@@ -1351,6 +1351,7 @@ var Parser = class {
       name,
       value,
       format,
+      lineNumber: this.getLineNumber(fullStart),
       start: nameStart,
       end: nameEnd,
       fullStart,
@@ -1467,6 +1468,7 @@ var Parser = class {
       headers,
       cookies,
       conditions,
+      lineNumber: this.getLineNumber(start),
       start,
       end
     };
@@ -1485,8 +1487,14 @@ var Parser = class {
     const variables = [];
     const mocks = [];
     const tests = [];
+    const comments = [];
     while (true) {
       this.skipSpaces();
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (comment) {
+        comments.push(comment);
+        continue;
+      }
       const letBinding = this.tryParse(() => this.parseLetBinding());
       if (letBinding) {
         variables.push(letBinding);
@@ -1511,7 +1519,7 @@ var Parser = class {
     }
     this.currentDescribeName = null;
     const end = this.pos;
-    return { name, variables, mocks, tests, inlineComment: inlineComment || void 0, start, end };
+    return { name, variables, mocks, tests, comments, inlineComment: inlineComment || void 0, start, end };
   }
 };
 function parseProgram(text) {
@@ -1603,9 +1611,7 @@ function printVariable(variable) {
 }
 function printGraphQLSchema(schema) {
   const firstLine = schema.inlineComment ? `graphqlSchema = \` ${printComment(schema.inlineComment)}` : "graphqlSchema = `";
-  return `${firstLine}
-${schema.sdl}
-\``;
+  return `${firstLine}${schema.sdl}\``;
 }
 function printQueryResolver(query) {
   const lines = [];
@@ -1670,15 +1676,20 @@ function printCondition(condition, indent = "    ") {
   }
   if (condition.field === "selector" && condition.selector && condition.domAssert) {
     const selector = condition.selector;
+    const formatSelectorValue = (val) => {
+      if (val.startsWith("`") || val.startsWith('"')) return val;
+      if (/\{\{[^}]+\}\}/.test(val)) return `"${val}"`;
+      return formatConditionValue(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} ${formatConditionValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` text ${condition.comparison} ${formatSelectorValue(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} ${formatConditionValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` attribute "${condition.domAssert.name}" ${condition.comparison} ${formatSelectorValue(condition.value)}`;
     }
   }
   const fieldPart = condition.headerName ? `${condition.field} "${condition.headerName}"` : condition.jqExpr ? `${condition.field} \`${condition.jqExpr}\`` : condition.field;
@@ -1740,22 +1751,46 @@ function printDescribe(describe) {
   } else {
     lines.push(describeLine);
   }
-  if (describe.variables && describe.variables.length > 0) {
-    describe.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("");
-  }
+  const items = [];
+  describe.variables.forEach((variable) => {
+    items.push({ type: "variable", item: variable, lineNumber: variable.lineNumber || 0 });
+  });
   describe.mocks.forEach((mock) => {
-    lines.push(printMock(mock));
+    items.push({ type: "mock", item: mock, lineNumber: mock.lineNumber || 0 });
+  });
+  describe.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, lineNumber: comment.lineNumber || 0 });
   });
-  if (describe.mocks.length > 0) {
-    lines.push("");
-  }
   describe.tests.forEach((test) => {
-    lines.push(printTest(test));
-    lines.push("");
+    items.push({ type: "test", item: test, lineNumber: test.lineNumber || 0 });
+  });
+  items.sort((a, b) => a.lineNumber - b.lineNumber);
+  let lastType = null;
+  items.forEach((entry) => {
+    if (lastType === "variable" && entry.type !== "variable") {
+      lines.push("");
+    }
+    switch (entry.type) {
+      case "variable":
+        const variable = entry.item;
+        const formattedValue = variable.format === "quoted" ? `"${variable.value}"` : variable.format === "backtick" ? `\`${variable.value}\`` : variable.value;
+        lines.push(`  let ${variable.name} = ${formattedValue}`);
+        break;
+      case "mock":
+        lines.push(printMock(entry.item));
+        break;
+      case "comment":
+        lines.push(`  ${printComment(entry.item)}`);
+        break;
+      case "test":
+        if (lastType && lastType !== "test") {
+          lines.push("");
+        }
+        lines.push(printTest(entry.item));
+        lines.push("");
+        break;
+    }
+    lastType = entry.type;
   });
   return lines.join("\n").replace(/\n\n$/, "\n");
 }

package/dist/index.d.cts

@@ -125,6 +125,7 @@ interface LetVariable {
     name: string;
     value: string;
     format: LetValueFormat;
+    lineNumber?: number;
     start: number;
     end: number;
     fullStart: number;
@@ -215,6 +216,7 @@ interface Describe {
     variables: LetVariable[];
     mocks: Mock[];
     tests: It[];
+    comments: Comment[];
     lineNumber?: number;
     inlineComment?: Comment;
     start: number;
@@ -224,6 +226,7 @@ interface Mock {
     target: string;
     targetStart: number;
     returnValue: string;
+    lineNumber?: number;
     start: number;
     end: number;
 }
@@ -237,6 +240,7 @@ interface It {
     headers?: string;
     cookies?: string;
     conditions: Condition[];
+    lineNumber?: number;
     start: number;
     end: number;
 }

package/dist/index.d.ts

@@ -125,6 +125,7 @@ interface LetVariable {
     name: string;
     value: string;
     format: LetValueFormat;
+    lineNumber?: number;
     start: number;
     end: number;
     fullStart: number;
@@ -215,6 +216,7 @@ interface Describe {
     variables: LetVariable[];
     mocks: Mock[];
     tests: It[];
+    comments: Comment[];
     lineNumber?: number;
     inlineComment?: Comment;
     start: number;
@@ -224,6 +226,7 @@ interface Mock {
     target: string;
     targetStart: number;
     returnValue: string;
+    lineNumber?: number;
     start: number;
     end: number;
 }
@@ -237,6 +240,7 @@ interface It {
     headers?: string;
     cookies?: string;
     conditions: Condition[];
+    lineNumber?: number;
     start: number;
     end: number;
 }

package/dist/index.mjs

@@ -1222,7 +1222,7 @@ var Parser = class {
     const returnValue = this.parseBacktickString();
     this.skipSpaces();
     const end = this.pos;
-    return { target, targetStart, returnValue, start, end };
+    return { target, targetStart, returnValue, lineNumber: this.getLineNumber(start), start, end };
   }
   parseMock() {
     return this.parseMockHead("with");
@@ -1298,6 +1298,7 @@ var Parser = class {
       name,
       value,
       format,
+      lineNumber: this.getLineNumber(fullStart),
       start: nameStart,
       end: nameEnd,
       fullStart,
@@ -1414,6 +1415,7 @@ var Parser = class {
       headers,
       cookies,
       conditions,
+      lineNumber: this.getLineNumber(start),
       start,
       end
     };
@@ -1432,8 +1434,14 @@ var Parser = class {
     const variables = [];
     const mocks = [];
     const tests = [];
+    const comments = [];
     while (true) {
       this.skipSpaces();
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (comment) {
+        comments.push(comment);
+        continue;
+      }
       const letBinding = this.tryParse(() => this.parseLetBinding());
       if (letBinding) {
         variables.push(letBinding);
@@ -1458,7 +1466,7 @@ var Parser = class {
     }
     this.currentDescribeName = null;
     const end = this.pos;
-    return { name, variables, mocks, tests, inlineComment: inlineComment || void 0, start, end };
+    return { name, variables, mocks, tests, comments, inlineComment: inlineComment || void 0, start, end };
   }
 };
 function parseProgram(text) {
@@ -1550,9 +1558,7 @@ function printVariable(variable) {
 }
 function printGraphQLSchema(schema) {
   const firstLine = schema.inlineComment ? `graphqlSchema = \` ${printComment(schema.inlineComment)}` : "graphqlSchema = `";
-  return `${firstLine}
-${schema.sdl}
-\``;
+  return `${firstLine}${schema.sdl}\``;
 }
 function printQueryResolver(query) {
   const lines = [];
@@ -1617,15 +1623,20 @@ function printCondition(condition, indent = "    ") {
   }
   if (condition.field === "selector" && condition.selector && condition.domAssert) {
     const selector = condition.selector;
+    const formatSelectorValue = (val) => {
+      if (val.startsWith("`") || val.startsWith('"')) return val;
+      if (/\{\{[^}]+\}\}/.test(val)) return `"${val}"`;
+      return formatConditionValue(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} ${formatConditionValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` text ${condition.comparison} ${formatSelectorValue(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} ${formatConditionValue(condition.value)}`;
+      return `${indent}${condType} selector \`${selector}\` attribute "${condition.domAssert.name}" ${condition.comparison} ${formatSelectorValue(condition.value)}`;
     }
   }
   const fieldPart = condition.headerName ? `${condition.field} "${condition.headerName}"` : condition.jqExpr ? `${condition.field} \`${condition.jqExpr}\`` : condition.field;
@@ -1687,22 +1698,46 @@ function printDescribe(describe) {
   } else {
     lines.push(describeLine);
   }
-  if (describe.variables && describe.variables.length > 0) {
-    describe.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("");
-  }
+  const items = [];
+  describe.variables.forEach((variable) => {
+    items.push({ type: "variable", item: variable, lineNumber: variable.lineNumber || 0 });
+  });
   describe.mocks.forEach((mock) => {
-    lines.push(printMock(mock));
+    items.push({ type: "mock", item: mock, lineNumber: mock.lineNumber || 0 });
+  });
+  describe.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, lineNumber: comment.lineNumber || 0 });
   });
-  if (describe.mocks.length > 0) {
-    lines.push("");
-  }
   describe.tests.forEach((test) => {
-    lines.push(printTest(test));
-    lines.push("");
+    items.push({ type: "test", item: test, lineNumber: test.lineNumber || 0 });
+  });
+  items.sort((a, b) => a.lineNumber - b.lineNumber);
+  let lastType = null;
+  items.forEach((entry) => {
+    if (lastType === "variable" && entry.type !== "variable") {
+      lines.push("");
+    }
+    switch (entry.type) {
+      case "variable":
+        const variable = entry.item;
+        const formattedValue = variable.format === "quoted" ? `"${variable.value}"` : variable.format === "backtick" ? `\`${variable.value}\`` : variable.value;
+        lines.push(`  let ${variable.name} = ${formattedValue}`);
+        break;
+      case "mock":
+        lines.push(printMock(entry.item));
+        break;
+      case "comment":
+        lines.push(`  ${printComment(entry.item)}`);
+        break;
+      case "test":
+        if (lastType && lastType !== "test") {
+          lines.push("");
+        }
+        lines.push(printTest(entry.item));
+        lines.push("");
+        break;
+    }
+    lastType = entry.type;
   });
   return lines.join("\n").replace(/\n\n$/, "\n");
 }

package/package.json

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