webpipe-js 2.0.20 → 2.0.22

package/dist/index.cjs

@@ -367,7 +367,7 @@ var Parser = class {
     if (this.cur() === ")") {
       throw new ParseFailure("empty tag arguments not allowed", this.pos);
     }
-    args.push(this.parseIdentifier());
+    args.push(this.parseTagArgument());
     this.skipInlineSpaces();
     while (this.cur() === ",") {
       this.pos++;
@@ -375,12 +375,17 @@ var Parser = class {
       if (this.cur() === ")") {
         throw new ParseFailure("trailing comma in tag arguments", this.pos);
       }
-      args.push(this.parseIdentifier());
+      args.push(this.parseTagArgument());
       this.skipInlineSpaces();
     }
     this.expect(")");
     return args;
   }
+  parseTagArgument() {
+    const bt = this.tryParse(() => this.parseBacktickString());
+    if (bt !== null) return bt;
+    return this.parseIdentifier();
+  }
   parseTags() {
     const tags = [];
     while (!this.eof()) {
@@ -912,6 +917,85 @@ var Parser = class {
         callTarget
       };
     }
+    if (field === "selector") {
+      const selectorStr = (() => {
+        const bt = this.tryParse(() => this.parseBacktickString());
+        if (bt !== null) return bt;
+        const qt = this.tryParse(() => this.parseQuotedString());
+        if (qt !== null) return qt;
+        throw new Error("selector requires quoted string");
+      })();
+      this.skipInlineSpaces();
+      const operation = this.consumeWhile((c) => c !== " " && c !== "\n");
+      this.skipInlineSpaces();
+      let domAssert;
+      let comparison2;
+      let value2;
+      if (operation === "exists") {
+        domAssert = { kind: "Exists" };
+        comparison2 = "exists";
+        value2 = "true";
+      } else if (operation === "does") {
+        this.expect("not");
+        this.skipInlineSpaces();
+        this.expect("exist");
+        domAssert = { kind: "Exists" };
+        comparison2 = "does_not_exist";
+        value2 = "false";
+      } else if (operation === "text") {
+        domAssert = { kind: "Text" };
+        this.skipInlineSpaces();
+        comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
+        this.skipInlineSpaces();
+        value2 = (() => {
+          const v1 = this.tryParse(() => this.parseBacktickString());
+          if (v1 !== null) return v1;
+          const v2 = this.tryParse(() => this.parseQuotedString());
+          if (v2 !== null) return v2;
+          return this.consumeWhile((c) => c !== "\n");
+        })();
+      } else if (operation === "count") {
+        domAssert = { kind: "Count" };
+        let compParts = "";
+        while (this.pos < this.text.length && this.text[this.pos] !== "\n") {
+          const c = this.text[this.pos];
+          if (/\d/.test(c)) break;
+          compParts += c;
+          this.pos++;
+        }
+        comparison2 = compParts.trim();
+        value2 = this.consumeWhile((c) => c !== "\n").trim();
+      } else if (operation === "attribute") {
+        const attrName = (() => {
+          const bt = this.tryParse(() => this.parseBacktickString());
+          if (bt !== null) return bt;
+          const qt = this.tryParse(() => this.parseQuotedString());
+          if (qt !== null) return qt;
+          throw new Error("attribute requires quoted name");
+        })();
+        this.skipInlineSpaces();
+        comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
+        this.skipInlineSpaces();
+        value2 = (() => {
+          const v1 = this.tryParse(() => this.parseBacktickString());
+          if (v1 !== null) return v1;
+          const v2 = this.tryParse(() => this.parseQuotedString());
+          if (v2 !== null) return v2;
+          return this.consumeWhile((c) => c !== "\n");
+        })();
+        domAssert = { kind: "Attribute", name: attrName };
+      } else {
+        throw new Error(`Unknown selector operation: ${operation}`);
+      }
+      return {
+        conditionType: ct,
+        field: "selector",
+        comparison: comparison2,
+        value: value2,
+        selector: selectorStr,
+        domAssert
+      };
+    }
     let headerName;
     if (field === "header") {
       const h1 = this.tryParse(() => this.parseBacktickString());
@@ -1194,6 +1278,24 @@ function printMock(mock, indent = "  ") {
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
+  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)}`;
+    } 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)}`;
+    }
+  }
   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}`;
@@ -1406,7 +1508,13 @@ function formatTags(tags) {
 }
 function formatTag(tag) {
   const negation = tag.negated ? "!" : "";
-  const args = tag.args.length > 0 ? `(${tag.args.join(",")})` : "";
+  const formattedArgs = tag.args.map((arg) => {
+    if (/[^a-zA-Z0-9_-]/.test(arg)) {
+      return `\`${arg}\``;
+    }
+    return arg;
+  });
+  const args = tag.args.length > 0 ? `(${formattedArgs.join(",")})` : "";
   return `@${negation}${tag.name}${args}`;
 }
 function formatTagExpr(expr) {

package/dist/index.d.cts

@@ -180,6 +180,16 @@ type When = {
     varType: string;
     name: string;
 };
+type DomAssertType = {
+    kind: 'Exists';
+} | {
+    kind: 'Text';
+} | {
+    kind: 'Count';
+} | {
+    kind: 'Attribute';
+    name: string;
+};
 interface Condition {
     conditionType: 'Then' | 'And';
     field: string;
@@ -189,6 +199,8 @@ interface Condition {
     value: string;
     isCallAssertion?: boolean;
     callTarget?: string;
+    selector?: string;
+    domAssert?: DomAssertType;
 }
 type DiagnosticSeverity = 'error' | 'warning' | 'info';
 interface ParseDiagnostic {
@@ -232,4 +244,4 @@ declare function formatTagExpr(expr: TagExpr): string;
 declare function formatPipelineRef(ref: PipelineRef): string[];
 declare function formatWhen(when: When): string;
 
-export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type GraphQLSchema, type It, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type It, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -180,6 +180,16 @@ type When = {
     varType: string;
     name: string;
 };
+type DomAssertType = {
+    kind: 'Exists';
+} | {
+    kind: 'Text';
+} | {
+    kind: 'Count';
+} | {
+    kind: 'Attribute';
+    name: string;
+};
 interface Condition {
     conditionType: 'Then' | 'And';
     field: string;
@@ -189,6 +199,8 @@ interface Condition {
     value: string;
     isCallAssertion?: boolean;
     callTarget?: string;
+    selector?: string;
+    domAssert?: DomAssertType;
 }
 type DiagnosticSeverity = 'error' | 'warning' | 'info';
 interface ParseDiagnostic {
@@ -232,4 +244,4 @@ declare function formatTagExpr(expr: TagExpr): string;
 declare function formatPipelineRef(ref: PipelineRef): string[];
 declare function formatWhen(when: When): string;
 
-export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type GraphQLSchema, type It, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type It, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -317,7 +317,7 @@ var Parser = class {
     if (this.cur() === ")") {
       throw new ParseFailure("empty tag arguments not allowed", this.pos);
     }
-    args.push(this.parseIdentifier());
+    args.push(this.parseTagArgument());
     this.skipInlineSpaces();
     while (this.cur() === ",") {
       this.pos++;
@@ -325,12 +325,17 @@ var Parser = class {
       if (this.cur() === ")") {
         throw new ParseFailure("trailing comma in tag arguments", this.pos);
       }
-      args.push(this.parseIdentifier());
+      args.push(this.parseTagArgument());
       this.skipInlineSpaces();
     }
     this.expect(")");
     return args;
   }
+  parseTagArgument() {
+    const bt = this.tryParse(() => this.parseBacktickString());
+    if (bt !== null) return bt;
+    return this.parseIdentifier();
+  }
   parseTags() {
     const tags = [];
     while (!this.eof()) {
@@ -862,6 +867,85 @@ var Parser = class {
         callTarget
       };
     }
+    if (field === "selector") {
+      const selectorStr = (() => {
+        const bt = this.tryParse(() => this.parseBacktickString());
+        if (bt !== null) return bt;
+        const qt = this.tryParse(() => this.parseQuotedString());
+        if (qt !== null) return qt;
+        throw new Error("selector requires quoted string");
+      })();
+      this.skipInlineSpaces();
+      const operation = this.consumeWhile((c) => c !== " " && c !== "\n");
+      this.skipInlineSpaces();
+      let domAssert;
+      let comparison2;
+      let value2;
+      if (operation === "exists") {
+        domAssert = { kind: "Exists" };
+        comparison2 = "exists";
+        value2 = "true";
+      } else if (operation === "does") {
+        this.expect("not");
+        this.skipInlineSpaces();
+        this.expect("exist");
+        domAssert = { kind: "Exists" };
+        comparison2 = "does_not_exist";
+        value2 = "false";
+      } else if (operation === "text") {
+        domAssert = { kind: "Text" };
+        this.skipInlineSpaces();
+        comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
+        this.skipInlineSpaces();
+        value2 = (() => {
+          const v1 = this.tryParse(() => this.parseBacktickString());
+          if (v1 !== null) return v1;
+          const v2 = this.tryParse(() => this.parseQuotedString());
+          if (v2 !== null) return v2;
+          return this.consumeWhile((c) => c !== "\n");
+        })();
+      } else if (operation === "count") {
+        domAssert = { kind: "Count" };
+        let compParts = "";
+        while (this.pos < this.text.length && this.text[this.pos] !== "\n") {
+          const c = this.text[this.pos];
+          if (/\d/.test(c)) break;
+          compParts += c;
+          this.pos++;
+        }
+        comparison2 = compParts.trim();
+        value2 = this.consumeWhile((c) => c !== "\n").trim();
+      } else if (operation === "attribute") {
+        const attrName = (() => {
+          const bt = this.tryParse(() => this.parseBacktickString());
+          if (bt !== null) return bt;
+          const qt = this.tryParse(() => this.parseQuotedString());
+          if (qt !== null) return qt;
+          throw new Error("attribute requires quoted name");
+        })();
+        this.skipInlineSpaces();
+        comparison2 = this.consumeWhile((c) => c !== " " && c !== "\n");
+        this.skipInlineSpaces();
+        value2 = (() => {
+          const v1 = this.tryParse(() => this.parseBacktickString());
+          if (v1 !== null) return v1;
+          const v2 = this.tryParse(() => this.parseQuotedString());
+          if (v2 !== null) return v2;
+          return this.consumeWhile((c) => c !== "\n");
+        })();
+        domAssert = { kind: "Attribute", name: attrName };
+      } else {
+        throw new Error(`Unknown selector operation: ${operation}`);
+      }
+      return {
+        conditionType: ct,
+        field: "selector",
+        comparison: comparison2,
+        value: value2,
+        selector: selectorStr,
+        domAssert
+      };
+    }
     let headerName;
     if (field === "header") {
       const h1 = this.tryParse(() => this.parseBacktickString());
@@ -1144,6 +1228,24 @@ function printMock(mock, indent = "  ") {
 }
 function printCondition(condition, indent = "    ") {
   const condType = condition.conditionType.toLowerCase();
+  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)}`;
+    } 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)}`;
+    }
+  }
   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}`;
@@ -1356,7 +1458,13 @@ function formatTags(tags) {
 }
 function formatTag(tag) {
   const negation = tag.negated ? "!" : "";
-  const args = tag.args.length > 0 ? `(${tag.args.join(",")})` : "";
+  const formattedArgs = tag.args.map((arg) => {
+    if (/[^a-zA-Z0-9_-]/.test(arg)) {
+      return `\`${arg}\``;
+    }
+    return arg;
+  });
+  const args = tag.args.length > 0 ? `(${formattedArgs.join(",")})` : "";
   return `@${negation}${tag.name}${args}`;
 }
 function formatTagExpr(expr) {

package/package.json

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